Merge remote-tracking branch 'origin/develop' into feature/additional_submenus

# Conflicts:
#	src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
#	src/components/application_manager/include/application_manager/smart_object_keys.h
#	src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
#	src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
#	src/components/application_manager/src/hmi_capabilities_impl.cc
#	src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
#	src/components/include/application_manager/hmi_capabilities.h
#	src/components/interfaces/HMI_API.xml
#	src/components/interfaces/MOBILE_API.xml

1113 files changed, 69762 insertions, 120735 deletions

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 672768add7..1da30fbf62 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -4,8 +4,8 @@ Third party contributions are essential for making SDL great. However, we do hav
 
 ## Environment
 Currently supported:
-* Ubuntu Linux 14.04 with GCC 4.9.x
 * Ubuntu Linux 16.04 with GCC 5.4.x
+* Ubuntu Linux 18.04 with GCC 7.3.x
 * [C++11 standard](https://github.com/smartdevicelink/sdl_evolution/issues/132)
 
 ### Issues
diff --git a/.gitignore b/.gitignore
index ec291473fe..3570938a52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,8 @@ CMakeFiles/
 *.pyc
 .idea
 src/appMain/build_config.txt
+*venv*
+*.DS_Store
+*htmlcov
+*.coverage
+src/components/interfaces/MOBILE_API.*
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..7e9eba6b45
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "src/3rd_party-static/jsoncpp"]
+	path = src/3rd_party-static/jsoncpp
+	url = https://github.com/smartdevicelink/jsoncpp.git
+[submodule "tools/rpc_spec"]
+	path = tools/rpc_spec
+	url = https://github.com/smartdevicelink/rpc_spec.git
diff --git a/.travis.yml b/.travis.yml
index 643597354c..9d9cfedb82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ addons:
 
 before_install:
   - sudo apt-get update
-  - sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck
+  - sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck python3-pip python3-setuptools
   - sudo apt-get install -f clang-format-6.0
 
 script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38bb95c9fa..764a050b91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OF
 option(BUILD_BT_SUPPORT "Bluetooth support" ON)
 option(BUILD_USB_SUPPORT "libusb support" ON)
 option(BUILD_CLOUD_APP_SUPPORT "Cloud App Transport Support" ON)
+option(BUILD_WEBSOCKET_SERVER_SUPPORT "Web Engine App Transport Support" ON)
 option(BUILD_BACKTRACE_SUPPORT "backtrace support" ON)
 option(BUILD_TESTS "Possibility to build and run tests" OFF)
 option(TELEMETRY_MONITOR "Enable profiling time test util" ON)
@@ -52,6 +53,7 @@ option(ENABLE_GCOV "gcov code coverage feature" OFF)
 option(ENABLE_SANITIZE "Sanitize tool" OFF)
 option(ENABLE_SECURITY "Security Ford protocol protection" ON)
 option(ENABLE_HMI_PTU_DECRYPTION "Policy table update parsed by hmi" ON)
+option(ENABLE_IAP2EMULATION "IAP2 emulation via tcp" OFF)
 option(USE_COTIRE "Use Cotire to speed up build (currently only for commands tests)" ON)
 option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON)
 option(USE_CCACHE "Turn on ccache usage" ON)
@@ -208,6 +210,13 @@ get_property(cValue CACHE ENABLE_HMI_PTU_DECRYPTION PROPERTY VALUE)
 file(APPEND "${build_config_path}" "//${cHelpString}\n")
 file(APPEND "${build_config_path}" "ENABLE_HMI_PTU_DECRYPTION:${cType}=${cValue}\n")
 
+get_property(cHelpString CACHE BUILD_WEBSOCKET_SERVER_SUPPORT PROPERTY HELPSTRING)
+get_property(cType CACHE BUILD_WEBSOCKET_SERVER_SUPPORT PROPERTY TYPE)
+get_property(cValue CACHE BUILD_WEBSOCKET_SERVER_SUPPORT PROPERTY VALUE)
+file(APPEND "${build_config_path}" "//${cHelpString}\n")
+file(APPEND "${build_config_path}" "BUILD_WEBSOCKET_SERVER_SUPPORT:${cType}=${cValue}\n")
+
+
 add_custom_target(pasa-tarball
   COMMAND ${CMAKE_SOURCE_DIR}/tools/Utils/export-customer-specific.sh ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} pasa
   COMMAND tar -cz -C /tmp/PASA -f ${CMAKE_BINARY_DIR}/pasa.tar.gz .
@@ -237,7 +246,7 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR})
 set(ARCHIVE_OUTPUT_DIRECTORY ./bin)
 
 set(EXCLUDE_ERROR_FLAGS "-Wno-error=unused-variable -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations")
-set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -Werror ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla")
+set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -fvisibility=hidden -Werror ${EXCLUDE_ERROR_FLAGS} -Wuninitialized -Wvla")
 
 if (USE_GOLD_LD)
   execute_process(COMMAND ld -v OUTPUT_VARIABLE result)
@@ -322,6 +331,11 @@ if (BUILD_CLOUD_APP_SUPPORT)
   message(STATUS "Cloud app websocket support enabled")
 endif()
 
+if (BUILD_WEBSOCKET_SERVER_SUPPORT)
+  add_definitions(-DWEBSOCKET_SERVER_TRANSPORT_SUPPORT)
+  message(STATUS "Web engine app websocket support enabled")
+endif()
+
 if (BUILD_BACKTRACE_SUPPORT)
   add_definitions(-DBACKTRACE_SUPPORT)
   message(STATUS "Backtrace support enabled")
@@ -343,7 +357,9 @@ endif()
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
     add_definitions(-DEXTERNAL_PROPRIETARY_MODE)
     set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_external/)
-    set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_external/)
+    set(POLICY_GLOBAL_INCLUDE_PATH
+      ${COMPONENTS_DIR}/include/policy/policy_external/
+      ${CMAKE_BINARY_DIR}/src/components/policy/policy_external/)
     set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_external/)
     message(STATUS "EXTERNAL_PROPRIETARY policy enabled")
 else()
@@ -354,7 +370,9 @@ else()
      message(STATUS "HTTP policy enabled")
    endif()
    set(POLICY_PATH ${COMPONENTS_DIR}/policy/policy_regular/)
-   set(POLICY_GLOBAL_INCLUDE_PATH ${COMPONENTS_DIR}/include/policy/policy_regular/)
+   set(POLICY_GLOBAL_INCLUDE_PATH
+    ${COMPONENTS_DIR}/include/policy/policy_regular/
+    ${CMAKE_BINARY_DIR}/src/components/policy/policy_regular/)
    set(POLICY_MOCK_INCLUDE_PATH ${COMPONENTS_DIR}/include/test/policy/policy_regular/)
 endif()
 
@@ -418,6 +436,11 @@ if(ENABLE_HMI_PTU_DECRYPTION)
   message(STATUS "HMI PTU decription enabled")
 endif()
 
+if(ENABLE_IAP2EMULATION)
+  add_definitions(-DENABLE_IAP2EMULATION)
+  message(STATUS "IAP2 emulation enabled")
+endif()
+
 set(RTLIB rt)
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
   set(RTLIB )
diff --git a/Doxyfile b/Doxyfile
index 36155e37a7..79f0c3510e 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -899,7 +899,9 @@ EXAMPLE_RECURSIVE      = NO
 # \image command).
 
 IMAGE_PATH             = \
-                         src/components/security_manager/docs/assets
+                         src/components/security_manager/docs/assets \
+                         src/components/protocol_handler/docs/assets \
+                         src/components/transport_manager/docs/assets
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
diff --git a/LICENSE b/LICENSE
index ae3e57d852..6dc6f78f09 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017 - 2018 SmartDeviceLink Consortium, Inc. 
+Copyright (c) 2017 - 2020 SmartDeviceLink Consortium, Inc. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 6166a51344..d75e14465b 100644
--- a/README.md
+++ b/README.md
@@ -1,149 +1,50 @@
 [![Slack Status](http://sdlslack.herokuapp.com/badge.svg)](http://slack.smartdevicelink.com)
-[![codecov.io](https://codecov.io/github/smartdevicelink/sdl_core/coverage.svg?branch=develop)](https://codecov.io/github/smartdevicelink/sdl_core?branch=develop)
 [![Build Status](http://opensdl-jenkins.luxoft.com:8080/view/develop/job/develop_nightly_coverage/badge/icon)](http://opensdl-jenkins.luxoft.com:8080/view/develop/job/develop_nightly_coverage/)
 
 # SmartDeviceLink (SDL)
 
 SmartDeviceLink (SDL) is a standard set of protocols and messages that connect applications on a smartphone to a vehicle head unit. This messaging enables a consumer to interact with their application using common in-vehicle interfaces such as a touch screen display, embedded voice recognition, steering wheel controls and various vehicle knobs and buttons. There are three main components that make up the SDL ecosystem.
 
-  * The [Core](https://github.com/smartdevicelink/sdl_core) component is the software which Vehicle Manufacturers (OEMs)  implement in their vehicle head units. Integrating this component into their head unit and HMI based on a set of guidelines and templates enables access to various smartphone applications.
+  * The [Core](https://github.com/smartdevicelink/sdl_core) component is the software which Vehicle Manufacturers (OEMs) include in their vehicle head units. Integrating this component into their head unit and HMI based on a set of guidelines and templates enables access to various smartphone applications.
   * The optional [SDL Server](https://github.com/smartdevicelink/sdl_server) can be used by Vehicle OEMs to update application policies and gather usage information for connected applications.
   * The [iOS](https://github.com/smartdevicelink/sdl_ios) and [Android](https://github.com/smartdevicelink/sdl_android) libraries are implemented by app developers into their applications to enable command and control via the connected head unit.
 
+## SDL Core
+
+The Core component of SDL runs on a vehicle's computing system (head unit). Core’s primary responsibility is to route messages between connected smartphone applications and the vehicle HMI. It can connect a smartphone to a vehicle's head unit via a variety of transport protocols such as Bluetooth, USB, Android AOA, and TCP. Once a connection is established, Core discovers compatible applications and displays them to the driver for interaction via voice or display. The Core component is configured to follow a set of policies defined in its local policy database and updated by a [policy server](https://www.github.com/smartdevicelink/sdl_server). The messaging between a connected application and SDL Core is defined by the [Mobile API](https://github.com/smartdevicelink/sdl_core/blob/master/src/components/interfaces/MOBILE_API.xml) and the messaging between SDL Core and the vehicle is defined by the [HMI API](https://github.com/smartdevicelink/sdl_core/blob/master/src/components/interfaces/HMI_API.xml).
+
 Pull Requests Welcome!
 
-## Documentation
+## Environment
+Currently supported:
+* Ubuntu Linux 16.04 with GCC 5.4.x
+* Ubuntu Linux 18.04 with GCC 7.3.x
+* [C++11 standard](https://github.com/smartdevicelink/sdl_evolution/issues/132)
 
-  * [Software Architecture Document](https://smartdevicelink.com/en/docs/sdl-core/master/software-architecture-document/table-of-contents/)
-  * [Transport Manager Programming Guide](https://smartdevicelink.com/en/guides/core/transport-manager-programming/)
-  * [Software Detailed Design](https://app.box.com/s/ohgrvemtx39f8hfea1ab676xxrzvyx1y)
-  * [Integration Guidelines](https://smartdevicelink.com/en/docs/hmi/master/overview/)
-  * [Evolution Proposals versus Issues](https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals_versus_issues.md)
+## Getting Started
+See the [Getting Started](https://smartdevicelink.com/en/guides/core/getting-started/install-and-run/) guide in the developer portal for instructions on how to build and start SDL Core.
 
-## SDL Core
+## Connect a Web HMI
+After setting up SDL Core, you will need to connect it to an external HMI. The HMI component of SDL needs to be developed separately from this project, and should be tailored to your specific head unit. Several sample browser-based HMIs are available for testing purposes:
 
-The Core component of SDL runs on a vehicle's computing system (head unit). Core’s primary responsibility is to pass messages between connected smartphone applications and the vehicle HMI, and pass notifications from the vehicle to those applications. It can connect a smartphone to a vehicle's head unit via a variety of transport protocols such as Bluetooth, USB, Android AOA, and TCP. Once a connection is established, Core discovers compatible applications and displays them to the driver for interaction via voice or display. The core component is implemented into the vehicle HMI based on the integration guidelines above. The core component is configured to follow a set of policies defined in a policy database and updated by a [policy server](https://www.github.com/smartdevicelink/sdl_server). The messaging between a connected application and core is defined by the [Mobile API](https://github.com/smartdevicelink/sdl_core/blob/master/src/components/interfaces/MOBILE_API.xml) and the messaging between sdl core and the vehicle is defined by the [HMI API](https://github.com/smartdevicelink/sdl_core/blob/master/src/components/interfaces/HMI_API.xml).
-
-## Project Status
-We're ramping up our efforts to get SmartDeviceLink developed and maintained directly in the open. For the Mobile libraries, we're expecting better integration soon, SDL Core is slightly more complicated. We are currently working on generating documentation, creating a developer portal, an open forum, Mobile validation, and everything else that we've been asked for to renew the community's interest in this project. From a technical standpoint, SDL is stable, and the most work is being put into making it a more robust solution for app connectivity. We are, however, definitely looking for and interested in other people and company's contributions to SDL whether it be feature based, bug fixes, healthy conversation, or even just suggestions for improvement.
-
-# Getting Started
-A quick guide to installing, configuring, and running an instance of the SDL Core on a linux OS.
-
-  1. Clone this repository
-  2. Create a folder for your build outside of the source folder and run `cmake {path_to_sdl_core_source_folder}` from the build folder you created
-  3. If there are any dependency issues, install missing dependencies
-  4. Run the following commands to compile and install smartdevicelink
-
-
-
-```
-%make
-%make install
-```
-
-## Start SDL Core
-Once SDL Core is compiled and installed you can start it from the executable in the bin folder
-
-```
-%cd bin/
-%./start.sh
-```
-
-## Start WEB HMI
-Web HMI is separated from SDL Core and located in another repository. So to make it workable please do next steps.
-
-  1. Clone http://github.com/smartdevicelink/sdl_hmi.git
-  2. Follow the instruction from readme file in sdl_hmi repository.
-
-
-## A quick note about dependencies
-The dependencies for SDL Core vary based on the configuration. You can change SDL Core's configuration in the top level CMakeLists.txt. We have defaulted this file to a configuration which we believe is common for people who are interested in getting up and running quickly, generally on a Linux VM.
-
-### Dependencies list
-
-| Flag | Description | Dependencies |
-|------|-------------|--------------|
-|Web HMI|Use HTML5 HMI|chromium-browser|
-|EXTENDED_MEDIA_MODE|Support Video and Audio Streaming|Opengl es2, gstreamer1.0*|
-|Bluetooth|Enable bluetooth transport adapter|libbluetooth3, libbluetooth-dev, bluez-tools|
-|USB|Enable USB transport adapter|libusb-dev|
-|Testing framework|Needed to support running unit tests|libgtest-dev|
-|Cmake|Needed to configure SDL prior to compilation|cmake|
-
-#### Sample Policy Manager
-The included sample policy manager (for use with `EXTERNAL_PROPRIETARY` policy mode) requires the following packages:
-  - python-pip
-  - python-dev
-
-### Known Dependency Issues
-  * log4cxx - We know that the version of log4cxx on a linux machine can conflict with the one used, which is why it is provided in the repository. To avoid the conflict, we recommend removing liblog4cxx*.
-  * cmake - on some versions of linux, the included cmake package doesn't have the right version. If apt-get is your package manager, you can find the correct version using
-```
-sudo apt-get install cmake
-sudo add-apt-repository ppa:kalakris/cmake
-sudo apt-get update
-sudo apt-get upgrade
-```
-
-## Required RPCs
-There are several RPCs that are "required" to be implemented in order for SDL to work across vehicle manufacturers and applications, listed below.  The RPC specification can be found in the [Mobile API Spec](src/components/interfaces/MOBILE_API.xml).
-
-  * RegisterAppInterface
-  * UnregisterAppInterface
-  * SetGlobalProperties
-  * ResetGlobalProperties
-  * AddCommand
-  * DeleteCommand
-  * AddSubMenu
-  * DeleteSubMenu
-  * ShowAppMenu
-  * CreateInteractionChoiceSet
-  * PerformInteraction
-  * DeleteInteractionChoiceSet
-  * Alert
-  * Show
-  * SetMediaClockTimer
-  * SubscribeButton
-  * UnsubscribeButton
-  * ChangeRegistration
-  * GenericResponse
-  * SystemRequest
-  * OnHMIStatus
-  * OnAppInterfaceUnregistered
-  * OnButtonEvent
-  * OnButtonPress
-  * OnCommand
-  * OnDriverDistraction
-  * OnPermissionsChange
-  * OnLanguageChange
-  * OnSystemRequest
-  * Speak
+  1. The [Generic HMI](https://github.com/smartdevicelink/generic_hmi) (preferred) is a reference implementation for an SDL-connected HMI, including examples of many of the UI elements and templates available to SDL applications.
+  2. The [SDL HMI](https://github.com/smartdevicelink/sdl_hmi) emulates a full infotainment system which includes a simplified SDL component.
 
-## Frequently Asked Questions
+See the [HMI Development Guide](https://smartdevicelink.com/en/guides/core/integrating-your-hmi/sdl-core-and-hmi-communication/) for more information on building your own HMI.
 
-If you have any questions regarding the setup of SDL Core or regarding the integration of SDL into an infotainment system, first visit our [SDL Core FAQ](https://smartdevicelink.com/en/guides/core/faq/). If you still have questions, you can post a question in the `core-help` channel of our Slack group (sign up [here](http://slack.smartdevicelink.com/))
+## Manticore
+If you are just developing an SDL-connected application and simply want an environment to test it in, it is not necessary to build SDL Core from scratch. You can use our [Manticore](https://smartdevicelink.com/resources/manticore/) project first, which creates a testing environment in the cloud using SDL Core and the Generic HMI.
 
-## Test Coverage
-### Used technologies
-  * GCOV - test coverage program.
-  * LCOV - graphical front-end for GCC's coverage testing tool for gcov.
-  * codecov.io - service for assembling code coverage and representing it in a clear for reading form.
+## Frequently Asked Questions
 
-### Excluded folders
-_We test only sources written by us and we don`t need to test external sources(open source libraries)._
-  * '/usr/\*' - local libraries shouldn`t be covered by tests.
-  * '\*/test/\*' - we don`t need to cover tests.
-  * '\*/src/3rd\*' - open source libraries shouldn`t be covered by tests.
+If you have any questions regarding the setup of SDL Core or regarding the integration of SDL into a head unit, first visit our [SDL Core FAQ](https://smartdevicelink.com/en/guides/core/faq/). If you still have questions, you can post a question in the `core-help` channel of our Slack group (sign up [here](http://slack.smartdevicelink.com/)).
 
-### Current test coverage
-You can find it in [Coverage report](https://codecov.io/gh/smartdevicelink/sdl_core/branch/develop)
+## Additional References
 
-### How to get Test Coverage locally
- 1. Build project with enabled flag _-DBUILD_TESTS=on_
- 2. Execute command 'make test'
- 3. Execute './tools/Utils/collect_coverage.sh <path_to_build_directory>'
+  * [Transport Manager Programming Guide](https://smartdevicelink.com/en/guides/core/transport-manager-programming/)
+  * [HMI API Documentation](https://smartdevicelink.com/en/docs/hmi/master/overview/)
+  * [Evolution Proposals versus Issues](https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals_versus_issues.md)
 
 ## Contributions
 
-Conversation regarding the design and development of SmartDeviceLink technology should be directed at the [GENIVI mailing list](https://lists.genivi.org/mailman/listinfo/genivi-smartdevicelink), which anyone can join. Public conference calls regarding the SmartDeviceLink technology will be announced to the GENIVI mailing list, we expect to have conversations every other week. We also encourage interested parties to write issues against our software, and submit pull requests right here in the GitHub repository.
+Conversation regarding the design and development of SmartDeviceLink technology is managed via the [SDL Evolution Process](https://github.com/smartdevicelink/sdl_evolution/blob/master/process.md). We also encourage interested parties to write issues and submit pull requests right here in the GitHub repository. If you choose to do so, please read our [Contributing Guide](https://github.com/smartdevicelink/sdl_core/blob/master/.github/CONTRIBUTING.md) beforehand.
diff --git a/src/3rd_party-static/CMakeLists.txt b/src/3rd_party-static/CMakeLists.txt
index 029c0b3d8d..1b4591e0aa 100644
--- a/src/3rd_party-static/CMakeLists.txt
+++ b/src/3rd_party-static/CMakeLists.txt
@@ -29,9 +29,18 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 # --- jsoncpp
-add_subdirectory(./jsoncpp)
+include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
+
+set(JSONCPP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/include ${CMAKE_SOURCE_DIR}/src/components/utils/include)
 set(JSONCPP_INCLUDE_DIRECTORY ${JSONCPP_INCLUDE_DIRECTORY} PARENT_SCOPE)
 
+include_directories(
+  ${JSONCPP_INCLUDE_DIRECTORY}
+)
+
+collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/jsoncpp/src/lib_json")
+add_library(jsoncpp ${SOURCES})
+
 # --- encryption
 add_subdirectory(./encryption)
 set(ENCRYPTION_INCLUDE_DIRECTORY ${ENCRYPTION_INCLUDE_DIRECTORY} PARENT_SCOPE)
diff --git a/src/3rd_party-static/gmock-1.7.0/gtest/cmake/internal_utils.cmake b/src/3rd_party-static/gmock-1.7.0/gtest/cmake/internal_utils.cmake
index 8cb21894ce..82ad7f9c4e 100644
--- a/src/3rd_party-static/gmock-1.7.0/gtest/cmake/internal_utils.cmake
+++ b/src/3rd_party-static/gmock-1.7.0/gtest/cmake/internal_utils.cmake
@@ -187,7 +187,7 @@ function(cxx_executable name dir libs)
 endfunction()
 
 # Sets PYTHONINTERP_FOUND and PYTHON_EXECUTABLE.
-find_package(PythonInterp)
+find_package(PythonInterp 3.5)
 
 # cxx_test_with_flags(name cxx_flags libs srcs...)
 #
diff --git a/src/3rd_party-static/jsoncpp b/src/3rd_party-static/jsoncpp
new file mode 160000
+Subproject 9e0d70aa66e6ba993dd05723ca64c26ab00f357
diff --git a/src/3rd_party-static/jsoncpp/AUTHORS b/src/3rd_party-static/jsoncpp/AUTHORS
deleted file mode 100644
index 333e120d6e..0000000000
--- a/src/3rd_party-static/jsoncpp/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Baptiste Lepilleur <blep@users.sourceforge.net>

diff --git a/src/3rd_party-static/jsoncpp/LICENSE b/src/3rd_party-static/jsoncpp/LICENSE
deleted file mode 100644
index ca2bfe1a03..0000000000
--- a/src/3rd_party-static/jsoncpp/LICENSE
+++ /dev/null
@@ -1,55 +0,0 @@
-The JsonCpp library's source code, including accompanying documentation, 
-tests and demonstration applications, are licensed under the following
-conditions...
-
-The author (Baptiste Lepilleur) explicitly disclaims copyright in all 
-jurisdictions which recognize such a disclaimer. In such jurisdictions, 
-this software is released into the Public Domain.
-
-In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
-released under the terms of the MIT License (see below).
-
-In jurisdictions which recognize Public Domain property, the user of this 
-software may choose to accept it either as 1) Public Domain, 2) under the 
-conditions of the MIT License (see below), or 3) under the terms of dual 
-Public Domain/MIT License conditions described here, as they choose.
-
-The MIT License is about as close to Public Domain as a license can get, and is
-described in clear, concise terms at:
-
-   http://en.wikipedia.org/wiki/MIT_License
-   
-The full text of the MIT License follows:
-
-========================================================================
-Copyright (c) 2007-2010 Baptiste Lepilleur
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-========================================================================
-(END LICENSE TEXT)
-
-The MIT license is compatible with both the GPL and commercial
-software, affording one all of the rights of Public Domain with the
-minor nuisance of being required to keep the above copyright notice
-and license text in the source code. Note also that by accepting the
-Public Domain "license" you can re-license your copy using whatever
-license you like.
diff --git a/src/3rd_party-static/jsoncpp/NEWS.txt b/src/3rd_party-static/jsoncpp/NEWS.txt
deleted file mode 100644
index e53b8802c0..0000000000
--- a/src/3rd_party-static/jsoncpp/NEWS.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-  New in JsonCpp 0.6.0:
-  ---------------------
-
-* Compilation
-
-  - LD_LIBRARY_PATH and LIBRARY_PATH environment variables are now 
-    propagated to the build environment as this is required for some 
-    compiler installation.
-
-  - Added support for Microsoft Visual Studio 2008 (bug #2930462): 
-    The platform "msvc90" has been added.
-
-    Notes: you need to setup the environment by running vcvars32.bat 
-    (e.g. MSVC 2008 command prompt in start menu) before running scons.
-    
-  - Added support for amalgamated source and header generation (a la sqlite).
-    Refer to README.txt section "Generating amalgamated source and header"
-    for detail.
-    
-* Value
-
-  - Removed experimental ValueAllocator, it caused static 
-    initialization/destruction order issues (bug #2934500). 
-    The DefaultValueAllocator has been inlined in code.
-    
-  - Added support for 64 bits integer:
-  
-    Types Json::Int64 and Json::UInt64 have been added. They are aliased
-	to 64 bits integers on system that support them (based on __int64 on 
-	Microsoft Visual Studio platform, and long long on other platforms).
-	
-	Types Json::LargestInt and Json::LargestUInt have been added. They are
-	aliased to the largest integer type supported: 
-	either Json::Int/Json::UInt or Json::Int64/Json::UInt64 respectively.
-	
-	Json::Value::asInt() and Json::Value::asUInt() still returns plain
-	"int" based types, but asserts if an attempt is made to retrieve
-	a 64 bits value that can not represented as the return type.
-	
-	Json::Value::asInt64() and Json::Value::asUInt64() have been added
-	to obtain the 64 bits integer value.
-	
-	Json::Value::asLargestInt() and Json::Value::asLargestUInt() returns
-	the integer as a LargestInt/LargestUInt respectively. Those functions
-	functions are typically used when implementing writer.
-	
-	The reader attempts to read number as 64 bits integer, and fall back
-	to reading a double if the number is not in the range of 64 bits 
-	integer.
-    
-    Warning: Json::Value::asInt() and Json::Value::asUInt() now returns
-    long long. This changes break code that was passing the return value
-    to *printf() function.
-  
-    Support for 64 bits integer can be disabled by defining the macro 
-	JSON_NO_INT64 (uncomment it in json/config.h for example), though
-	it should have no impact on existing usage.
-    
-  - The type Json::ArrayIndex is used for indexes of a JSON value array. It
-    is an unsigned int (typically 32 bits).
-	
-  - Array index can be passed as int to operator[], allowing use of literal:
-    Json::Value array;
-	array.append( 1234 );
-	int value = array[0].asInt();  // did not compile previously
-
-  - Added float Json::Value::asFloat() to obtain a floating point value as a
-    float (avoid lost of precision warning caused by used of asDouble() 
-    to initialize a float).
-
-* Reader
-
-  - Renamed Reader::getFormatedErrorMessages() to getFormattedErrorMessages.
-    Bug #3023708 (Formatted has 2 't'). The old member function is deprecated
-    but still present for backward compatibility.
-    
-* Tests
-
-  - Added test to ensure that the escape sequence "\/" is corrected handled 
-    by the parser.
-
-* Bug fixes
-
-  - Bug #3139677: JSON [1 2 3] was incorrectly parsed as [1, 3]. Error is now 
-    correctly detected.
-    
-  - Bug #3139678: stack buffer overflow when parsing a double with a
-    length of 32 characters.
-	
-  - Fixed Value::operator <= implementation (had the semantic of operator >=).
-    Found when addigin unit tests for comparison operators.
-    
-  - Value::compare() is now const and has an actual implementation with
-    unit tests.
-    
-* License
-  
-  - See file LICENSE for details. Basically JsonCpp is now licensed under 
-    MIT license, or public domain if desired and recognized in your jurisdiction.
-    Thanks to Stephan G. Beal [http://wanderinghorse.net/home/stephan/]) who
-	helped figuring out the solution to the public domain issue.
diff --git a/src/3rd_party-static/jsoncpp/README.txt b/src/3rd_party-static/jsoncpp/README.txt
deleted file mode 100644
index 51a098a810..0000000000
--- a/src/3rd_party-static/jsoncpp/README.txt
+++ /dev/null
@@ -1,172 +0,0 @@
-* Introduction:
-  =============
-
-JSON (JavaScript Object Notation) is a lightweight data-interchange format. 
-It can represent integer, real number, string, an ordered sequence of 
-value, and a collection of name/value pairs.
-
-JsonCpp (http://jsoncpp.sourceforge.net/) is a simple API to manipulate 
-JSON value, handle serialization and unserialization to string.
-
-It can also preserve existing comment in unserialization/serialization steps,
-making it a convenient format to store user input files.
-
-Unserialization parsing is user friendly and provides precise error reports.
-
-
-* Building/Testing:
-  =================
-
-JsonCpp uses Scons (http://www.scons.org) as a build system. Scons requires
-python to be installed (http://www.python.org).
-
-You download scons-local distribution from the following url:
-http://sourceforge.net/projects/scons/files/scons-local/1.2.0/
-
-Unzip it in the directory where you found this README file. scons.py Should be 
-at the same level as README.
-
-python scons.py platform=PLTFRM [TARGET]
-where PLTFRM may be one of:
-	suncc Sun C++ (Solaris)
-	vacpp Visual Age C++ (AIX)
-	mingw 
-	msvc6 Microsoft Visual Studio 6 service pack 5-6
-	msvc70 Microsoft Visual Studio 2002
-	msvc71 Microsoft Visual Studio 2003
-	msvc80 Microsoft Visual Studio 2005
-	msvc90 Microsoft Visual Studio 2008
-	linux-gcc Gnu C++ (linux, also reported to work for Mac OS X)
-
-Notes: if you are building with Microsoft Visual Studio 2008, you need to 
-setup the environment by running vcvars32.bat (e.g. MSVC 2008 command prompt)
-before running scons.
-	
-Adding platform is fairly simple. You need to change the Sconstruct file 
-to do so.
-	
-and TARGET may be:
-	check: build library and run unit tests.
-
-    
-* Running the test manually:
-  ==========================
-
-Notes that test can be run by scons using the 'check' target (see above).
-
-You need to run test manually only if you are troubleshooting an issue.
-
-In the instruction below, replace "path to jsontest.exe" with the path
-of the 'jsontest' executable that was compiled on your platform.
-  
-cd test
-# This will run the Reader/Writer tests
-python runjsontests.py "path to jsontest.exe"
-
-# This will run the Reader/Writer tests, using JSONChecker test suite
-# (http://www.json.org/JSON_checker/).
-# Notes: not all tests pass: JsonCpp is too lenient (for example,
-# it allows an integer to start with '0'). The goal is to improve
-# strict mode parsing to get all tests to pass.
-python runjsontests.py --with-json-checker "path to jsontest.exe"
-
-# This will run the unit tests (mostly Value)
-python rununittests.py "path to test_lib_json.exe"
-
-You can run the tests using valgrind:
-python rununittests.py --valgrind "path to test_lib_json.exe"
-
-
-* Building the documentation:
-  ===========================
-
-Run the python script doxybuild.py from the top directory:
-
-python doxybuild.py --open --with-dot
-
-See doxybuild.py --help for options. 
-
-Notes that the documentation is also available for download as a tarball. 
-The documentation of the latest release is available online at:
-http://jsoncpp.sourceforge.net/
-
-* Generating amalgamated source and header
-  ========================================
-
-JsonCpp is provided with a script to generate a single header and a single
-source file to ease inclusion in an existing project.
-
-The amalgamated source can be generated at any time by running the following
-command from the top-directory (requires python 2.6):
-
-python amalgamate.py
-
-It is possible to specify header name. See -h options for detail. By default,
-the following files are generated:
-- dist/jsoncpp.cpp: source file that need to be added to your project
-- dist/json/json.h: header file corresponding to use in your project. It is
-equivalent to including json/json.h in non-amalgamated source. This header
-only depends on standard headers. 
-- dist/json/json-forwards.h: header the provides forward declaration
-of all JsonCpp types. This typically what should be included in headers to
-speed-up compilation.
-
-The amalgamated sources are generated by concatenating JsonCpp source in the
-correct order and defining macro JSON_IS_AMALGAMATION to prevent inclusion
-of other headers.
-
-* Using json-cpp in your project:
-  ===============================
-
-include/ should be added to your compiler include path. jsoncpp headers 
-should be included as follow:
-
-#include <json/json.h>
-  
-
-* Adding a reader/writer test:
-  ============================
-
-To add a test, you need to create two files in test/data:
-- a TESTNAME.json file, that contains the input document in JSON format.
-- a TESTNAME.expected file, that contains a flatened representation of 
-  the input document.
-  
-TESTNAME.expected file format:
-- each line represents a JSON element of the element tree represented 
-  by the input document.
-- each line has two parts: the path to access the element separated from
-  the element value by '='. Array and object values are always empty 
-  (e.g. represented by either [] or {}).
-- element path: '.' represented the root element, and is used to separate 
-  object members. [N] is used to specify the value of an array element
-  at index N.
-See test_complex_01.json and test_complex_01.expected to better understand
-element path.
-
-
-* Understanding reader/writer test output:
-  ========================================
-
-When a test is run, output files are generated aside the input test files. 
-Below is a short description of the content of each file:
-
-- test_complex_01.json: input JSON document
-- test_complex_01.expected: flattened JSON element tree used to check if 
-    parsing was corrected.
-
-- test_complex_01.actual: flattened JSON element tree produced by 
-    jsontest.exe from reading test_complex_01.json
-- test_complex_01.rewrite: JSON document written by jsontest.exe using the
-    Json::Value parsed from test_complex_01.json and serialized using
-    Json::StyledWritter.
-- test_complex_01.actual-rewrite: flattened JSON element tree produced by 
-    jsontest.exe from reading test_complex_01.rewrite.
-test_complex_01.process-output: jsontest.exe output, typically useful to
-    understand parsing error.
-
-* License
-  =======
-  
-See file LICENSE for details. Basically JsonCpp is licensed under 
-MIT license, or public domain if desired and recognized in your jurisdiction.
diff --git a/src/3rd_party-static/jsoncpp/SConstruct b/src/3rd_party-static/jsoncpp/SConstruct
deleted file mode 100644
index e78a5e922b..0000000000
--- a/src/3rd_party-static/jsoncpp/SConstruct
+++ /dev/null
@@ -1,248 +0,0 @@
-"""

-Notes: 

-- shared library support is buggy: it assumes that a static and dynamic library can be build from the same object files. This is not true on many platforms. For this reason it is only enabled on linux-gcc at the current time.

-

-To add a platform:

-- add its name in options allowed_values below

-- add tool initialization for this platform. Search for "if platform == 'suncc'" as an example.

-"""

-

-import os

-import os.path

-import sys

-

-JSONCPP_VERSION = open(File('#version').abspath,'rt').read().strip()

-DIST_DIR = '#dist'

-

-options = Variables()

-options.Add( EnumVariable('platform',

-                        'Platform (compiler/stl) used to build the project',

-                        'msvc71',

-                        allowed_values='suncc vacpp mingw msvc6 msvc7 msvc71 msvc80 msvc90 linux-gcc'.split(),

-                        ignorecase=2) )

-

-try:

-    platform = ARGUMENTS['platform']

-    if platform == 'linux-gcc':

-        CXX = 'g++' # not quite right, but env is not yet available.

-        import commands

-        version = commands.getoutput('%s -dumpversion' %CXX)

-        platform = 'linux-gcc-%s' %version

-        print "Using platform '%s'" %platform

-        LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')

-        LD_LIBRARY_PATH = "%s:libs/%s" %(LD_LIBRARY_PATH, platform)

-        os.environ['LD_LIBRARY_PATH'] = LD_LIBRARY_PATH

-        print "LD_LIBRARY_PATH =", LD_LIBRARY_PATH

-except KeyError:

-    print 'You must specify a "platform"'

-    sys.exit(2)

-

-print "Building using PLATFORM =", platform

-

-rootbuild_dir = Dir('#buildscons')

-build_dir = os.path.join( '#buildscons', platform )

-bin_dir = os.path.join( '#bin', platform )

-lib_dir = os.path.join( '#libs', platform )

-sconsign_dir_path = Dir(build_dir).abspath

-sconsign_path = os.path.join( sconsign_dir_path, '.sconsign.dbm' )

-

-# Ensure build directory exist (SConsignFile fail otherwise!)

-if not os.path.exists( sconsign_dir_path ):

-    os.makedirs( sconsign_dir_path )

-

-# Store all dependencies signature in a database

-SConsignFile( sconsign_path )

-

-def make_environ_vars():

-	"""Returns a dictionnary with environment variable to use when compiling."""

-	# PATH is required to find the compiler

-	# TEMP is required for at least mingw

-    # LD_LIBRARY_PATH & co is required on some system for the compiler

-	vars = {}

-	for name in ('PATH', 'TEMP', 'TMP', 'LD_LIBRARY_PATH', 'LIBRARY_PATH'):

-		if name in os.environ:

-			vars[name] = os.environ[name]

-	return vars

-	

-

-env = Environment( ENV = make_environ_vars(),

-                   toolpath = ['scons-tools'],

-                   tools=[] ) #, tools=['default'] )

-

-if platform == 'suncc':

-    env.Tool( 'sunc++' )

-    env.Tool( 'sunlink' )

-    env.Tool( 'sunar' )

-    env.Append( CCFLAGS = ['-mt'] )

-elif platform == 'vacpp':

-    env.Tool( 'default' )

-    env.Tool( 'aixcc' )

-    env['CXX'] = 'xlC_r'   #scons does not pick-up the correct one !

-    # using xlC_r ensure multi-threading is enabled:

-    # http://publib.boulder.ibm.com/infocenter/pseries/index.jsp?topic=/com.ibm.vacpp7a.doc/compiler/ref/cuselect.htm

-    env.Append( CCFLAGS = '-qrtti=all',

-                LINKFLAGS='-bh:5' )  # -bh:5 remove duplicate symbol warning

-elif platform == 'msvc6':

-    env['MSVS_VERSION']='6.0'

-    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:

-        env.Tool( tool )

-    env['CXXFLAGS']='-GR -GX /nologo /MT'

-elif platform == 'msvc70':

-    env['MSVS_VERSION']='7.0'

-    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:

-        env.Tool( tool )

-    env['CXXFLAGS']='-GR -GX /nologo /MT'

-elif platform == 'msvc71':

-    env['MSVS_VERSION']='7.1'

-    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:

-        env.Tool( tool )

-    env['CXXFLAGS']='-GR -GX /nologo /MT'

-elif platform == 'msvc80':

-    env['MSVS_VERSION']='8.0'

-    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:

-        env.Tool( tool )

-    env['CXXFLAGS']='-GR -EHsc /nologo /MT'

-elif platform == 'msvc90':

-    env['MSVS_VERSION']='9.0'

-    # Scons 1.2 fails to detect the correct location of the platform SDK.

-    # So we propagate those from the environment. This requires that the

-    # user run vcvars32.bat before compiling.

-    if 'INCLUDE' in os.environ:

-        env['ENV']['INCLUDE'] = os.environ['INCLUDE']

-    if 'LIB' in os.environ:

-        env['ENV']['LIB'] = os.environ['LIB']

-    for tool in ['msvc', 'msvs', 'mslink', 'masm', 'mslib']:

-        env.Tool( tool )

-    env['CXXFLAGS']='-GR -EHsc /nologo /MT'

-elif platform == 'mingw':

-    env.Tool( 'mingw' )

-    env.Append( CPPDEFINES=[ "WIN32", "NDEBUG", "_MT" ] )

-elif platform.startswith('linux-gcc'):

-    env.Tool( 'default' )

-    env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )

-    env['SHARED_LIB_ENABLED'] = True

-else:

-    print "UNSUPPORTED PLATFORM."

-    env.Exit(1)

-

-env.Tool('targz')

-env.Tool('srcdist')

-env.Tool('globtool')

-

-env.Append( CPPPATH = ['#include'],

-            LIBPATH = lib_dir )

-short_platform = platform

-if short_platform.startswith('msvc'):

-    short_platform = short_platform[2:]

-# Notes: on Windows you need to rebuild the source for each variant

-# Build script does not support that yet so we only build static libraries.

-# This also fails on AIX because both dynamic and static library ends with

-# extension .a.

-env['SHARED_LIB_ENABLED'] = env.get('SHARED_LIB_ENABLED', False)

-env['LIB_PLATFORM'] = short_platform

-env['LIB_LINK_TYPE'] = 'lib'    # static

-env['LIB_CRUNTIME'] = 'mt'

-env['LIB_NAME_SUFFIX'] = '${LIB_PLATFORM}_${LIB_LINK_TYPE}${LIB_CRUNTIME}'  # must match autolink naming convention

-env['JSONCPP_VERSION'] = JSONCPP_VERSION

-env['BUILD_DIR'] = env.Dir(build_dir)

-env['ROOTBUILD_DIR'] = env.Dir(rootbuild_dir)

-env['DIST_DIR'] = DIST_DIR

-if 'TarGz' in env['BUILDERS']:

-	class SrcDistAdder:

-		def __init__( self, env ):

-			self.env = env

-		def __call__( self, *args, **kw ):

-			apply( self.env.SrcDist, (self.env['SRCDIST_TARGET'],) + args, kw )

-	env['SRCDIST_BUILDER'] = env.TarGz

-else: # If tarfile module is missing

-	class SrcDistAdder:

-		def __init__( self, env ):

-			pass

-		def __call__( self, *args, **kw ):

-			pass

-env['SRCDIST_ADD'] = SrcDistAdder( env )

-env['SRCDIST_TARGET'] = os.path.join( DIST_DIR, 'jsoncpp-src-%s.tar.gz' % env['JSONCPP_VERSION'] )

-                      

-env_testing = env.Clone( )

-env_testing.Append( LIBS = ['json_${LIB_NAME_SUFFIX}'] )

-

-def buildJSONExample( env, target_sources, target_name ):

-    env = env.Clone()

-    env.Append( CPPPATH = ['#'] )

-    exe = env.Program( target=target_name,

-                       source=target_sources )

-    env['SRCDIST_ADD']( source=[target_sources] )

-    global bin_dir

-    return env.Install( bin_dir, exe )

-

-def buildJSONTests( env, target_sources, target_name ):

-    jsontests_node = buildJSONExample( env, target_sources, target_name )

-    check_alias_target = env.Alias( 'check', jsontests_node, RunJSONTests( jsontests_node, jsontests_node ) )

-    env.AlwaysBuild( check_alias_target )

-

-def buildUnitTests( env, target_sources, target_name ):

-    jsontests_node = buildJSONExample( env, target_sources, target_name )

-    check_alias_target = env.Alias( 'check', jsontests_node, 

-                                    RunUnitTests( jsontests_node, jsontests_node ) )

-    env.AlwaysBuild( check_alias_target )

-

-def buildLibrary( env, target_sources, target_name ):

-    static_lib = env.StaticLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',

-                                    source=target_sources )

-    global lib_dir

-    env.Install( lib_dir, static_lib )

-    if env['SHARED_LIB_ENABLED']:

-        shared_lib = env.SharedLibrary( target=target_name + '_${LIB_NAME_SUFFIX}',

-                                        source=target_sources )

-        env.Install( lib_dir, shared_lib )

-    env['SRCDIST_ADD']( source=[target_sources] )

-

-Export( 'env env_testing buildJSONExample buildLibrary buildJSONTests buildUnitTests' )

-

-def buildProjectInDirectory( target_directory ):

-    global build_dir

-    target_build_dir = os.path.join( build_dir, target_directory )

-    target = os.path.join( target_directory, 'sconscript' )

-    SConscript( target, build_dir=target_build_dir, duplicate=0 )

-    env['SRCDIST_ADD']( source=[target] )

-

-

-def runJSONTests_action( target, source = None, env = None ):

-    # Add test scripts to python path

-    jsontest_path = Dir( '#test' ).abspath

-    sys.path.insert( 0, jsontest_path )

-    data_path = os.path.join( jsontest_path, 'data' )

-    import runjsontests

-    return runjsontests.runAllTests( os.path.abspath(source[0].path), data_path )

-

-def runJSONTests_string( target, source = None, env = None ):

-    return 'RunJSONTests("%s")' % source[0]

-

-import SCons.Action

-ActionFactory = SCons.Action.ActionFactory

-RunJSONTests = ActionFactory(runJSONTests_action, runJSONTests_string )

-

-def runUnitTests_action( target, source = None, env = None ):

-    # Add test scripts to python path

-    jsontest_path = Dir( '#test' ).abspath

-    sys.path.insert( 0, jsontest_path )

-    import rununittests

-    return rununittests.runAllTests( os.path.abspath(source[0].path) )

-

-def runUnitTests_string( target, source = None, env = None ):

-    return 'RunUnitTests("%s")' % source[0]

-

-RunUnitTests = ActionFactory(runUnitTests_action, runUnitTests_string )

-

-env.Alias( 'check' )

-

-srcdist_cmd = env['SRCDIST_ADD']( source = """

-    AUTHORS README.txt SConstruct

-    """.split() )

-env.Alias( 'src-dist', srcdist_cmd )

-

-buildProjectInDirectory( 'src/jsontestrunner' )

-buildProjectInDirectory( 'src/lib_json' )

-buildProjectInDirectory( 'src/test_lib_json' )

-#print env.Dump()

-

diff --git a/src/3rd_party-static/jsoncpp/amalgamate.py b/src/3rd_party-static/jsoncpp/amalgamate.py
deleted file mode 100644
index 6e3b11a0af..0000000000
--- a/src/3rd_party-static/jsoncpp/amalgamate.py
+++ /dev/null
@@ -1,147 +0,0 @@
-"""Amalgate json-cpp library sources into a single source and header file.
-
-Requires Python 2.6
-
-Example of invocation (must be invoked from json-cpp top directory):
-python amalgate.py
-"""
-import os
-import os.path
-import sys
-
-class AmalgamationFile:
-    def __init__( self, top_dir ):
-        self.top_dir = top_dir
-        self.blocks = []
-
-    def add_text( self, text ):
-        if not text.endswith( '\n' ):
-            text += '\n'
-        self.blocks.append( text )
-
-    def add_file( self, relative_input_path, wrap_in_comment=False ):
-        def add_marker( prefix ):
-            self.add_text( '' )
-            self.add_text( '// ' + '/'*70 )
-            self.add_text( '// %s of content of file: %s' % (prefix, relative_input_path.replace('\\','/')) )
-            self.add_text( '// ' + '/'*70 )
-            self.add_text( '' )
-        add_marker( 'Beginning' )
-        f = open( os.path.join( self.top_dir, relative_input_path ), 'rt' )
-        content = f.read()
-        if wrap_in_comment:
-            content = '/*\n' + content + '\n*/'
-        self.add_text( content )
-        f.close()
-        add_marker( 'End' )
-        self.add_text( '\n\n\n\n' )
-
-    def get_value( self ):
-        return ''.join( self.blocks ).replace('\r\n','\n')
-
-    def write_to( self, output_path ):
-        output_dir = os.path.dirname( output_path )
-        if output_dir and not os.path.isdir( output_dir ):
-            os.makedirs( output_dir )
-        f = open( output_path, 'wb' )
-        f.write( self.get_value() )
-        f.close()
-
-def amalgamate_source( source_top_dir=None,
-                       target_source_path=None,
-                       header_include_path=None ):
-    """Produces amalgated source.
-       Parameters:
-           source_top_dir: top-directory
-           target_source_path: output .cpp path
-           header_include_path: generated header path relative to target_source_path.
-    """
-    print 'Amalgating header...'
-    header = AmalgamationFile( source_top_dir )
-    header.add_text( '/// Json-cpp amalgated header (http://jsoncpp.sourceforge.net/).' )
-    header.add_text( '/// It is intented to be used with #include <%s>' % header_include_path )
-    header.add_file( 'LICENSE', wrap_in_comment=True )
-    header.add_text( '#ifndef JSON_AMALGATED_H_INCLUDED' )
-    header.add_text( '# define JSON_AMALGATED_H_INCLUDED' )
-    header.add_text( '/// If defined, indicates that the source file is amalgated' )
-    header.add_text( '/// to prevent private header inclusion.' )
-    header.add_text( '#define JSON_IS_AMALGATED' )
-    header.add_file( 'include/json/config.h' )
-    header.add_file( 'include/json/forwards.h' )
-    header.add_file( 'include/json/features.h' )
-    header.add_file( 'include/json/value.h' )
-    header.add_file( 'include/json/reader.h' )
-    header.add_file( 'include/json/writer.h' )
-    header.add_text( '#endif //ifndef JSON_AMALGATED_H_INCLUDED' )
-
-    target_header_path = os.path.join( os.path.dirname(target_source_path), header_include_path )
-    print 'Writing amalgated header to %r' % target_header_path
-    header.write_to( target_header_path )
-
-    base, ext = os.path.splitext( header_include_path )
-    forward_header_include_path = base + '-forwards' + ext
-    print 'Amalgating forward header...'
-    header = AmalgamationFile( source_top_dir )
-    header.add_text( '/// Json-cpp amalgated forward header (http://jsoncpp.sourceforge.net/).' )
-    header.add_text( '/// It is intented to be used with #include <%s>' % forward_header_include_path )
-    header.add_text( '/// This header provides forward declaration for all JsonCpp types.' )
-    header.add_file( 'LICENSE', wrap_in_comment=True )
-    header.add_text( '#ifndef JSON_FORWARD_AMALGATED_H_INCLUDED' )
-    header.add_text( '# define JSON_FORWARD_AMALGATED_H_INCLUDED' )
-    header.add_text( '/// If defined, indicates that the source file is amalgated' )
-    header.add_text( '/// to prevent private header inclusion.' )
-    header.add_text( '#define JSON_IS_AMALGATED' )
-    header.add_file( 'include/json/config.h' )
-    header.add_file( 'include/json/forwards.h' )
-    header.add_text( '#endif //ifndef JSON_FORWARD_AMALGATED_H_INCLUDED' )
-
-    target_forward_header_path = os.path.join( os.path.dirname(target_source_path),
-                                               forward_header_include_path )
-    print 'Writing amalgated forward header to %r' % target_forward_header_path
-    header.write_to( target_forward_header_path )
-
-    print 'Amalgating source...'
-    source = AmalgamationFile( source_top_dir )
-    source.add_text( '/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).' )
-    source.add_text( '/// It is intented to be used with #include <%s>' % header_include_path )
-    source.add_file( 'LICENSE', wrap_in_comment=True )
-    source.add_text( '' )
-    source.add_text( '#include <%s>' % header_include_path )
-    source.add_text( '' )
-    source.add_file( 'src/lib_json\json_tool.h' )
-    source.add_file( 'src/lib_json\json_reader.cpp' )
-    source.add_file( 'src/lib_json\json_batchallocator.h' )
-    source.add_file( 'src/lib_json\json_valueiterator.inl' )
-    source.add_file( 'src/lib_json\json_value.cpp' )
-    source.add_file( 'src/lib_json\json_writer.cpp' )
-
-    print 'Writing amalgated source to %r' % target_source_path
-    source.write_to( target_source_path )
-
-def main():
-    usage = """%prog [options]
-Generate a single amalgated source and header file from the sources.
-"""
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = False
-    parser.add_option('-s', '--source', dest="target_source_path", action='store', default='dist/jsoncpp.cpp',
-        help="""Output .cpp source path. [Default: %default]""")
-    parser.add_option('-i', '--include', dest="header_include_path", action='store', default='json/json.h',
-        help="""Header include path. Used to include the header from the amalgated source file. [Default: %default]""")
-    parser.add_option('-t', '--top-dir', dest="top_dir", action='store', default=os.getcwd(),
-        help="""Source top-directory. [Default: %default]""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-
-    msg = amalgamate_source( source_top_dir=options.top_dir,
-                             target_source_path=options.target_source_path,
-                             header_include_path=options.header_include_path )
-    if msg:
-        sys.stderr.write( msg + '\n' )
-        sys.exit( 1 )
-    else:
-        print 'Source succesfully amalagated'
- 
-if __name__ == '__main__':
-    main()
diff --git a/src/3rd_party-static/jsoncpp/devtools/__init__.py b/src/3rd_party-static/jsoncpp/devtools/__init__.py
deleted file mode 100644
index 15c796c7e5..0000000000
--- a/src/3rd_party-static/jsoncpp/devtools/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# module
diff --git a/src/3rd_party-static/jsoncpp/devtools/antglob.py b/src/3rd_party-static/jsoncpp/devtools/antglob.py
deleted file mode 100644
index 30837b576c..0000000000
--- a/src/3rd_party-static/jsoncpp/devtools/antglob.py
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-# Baptiste Lepilleur, 2009
-
-from dircache import listdir
-import re
-import fnmatch
-import os.path
-
-
-# These fnmatch expressions are used by default to prune the directory tree
-# while doing the recursive traversal in the glob_impl method of glob function.
-prune_dirs = '.git .bzr .hg .svn _MTN _darcs CVS SCCS '
-
-# These fnmatch expressions are used by default to exclude files and dirs
-# while doing the recursive traversal in the glob_impl method of glob function.
-##exclude_pats = prune_pats + '*~ #*# .#* %*% ._* .gitignore .cvsignore vssver.scc .DS_Store'.split()
-
-# These ant_glob expressions are used by default to exclude files and dirs and also prune the directory tree
-# while doing the recursive traversal in the glob_impl method of glob function.
-default_excludes = '''
-**/*~
-**/#*#
-**/.#*
-**/%*%
-**/._*
-**/CVS
-**/CVS/**
-**/.cvsignore
-**/SCCS
-**/SCCS/**
-**/vssver.scc
-**/.svn
-**/.svn/**
-**/.git
-**/.git/**
-**/.gitignore
-**/.bzr
-**/.bzr/**
-**/.hg
-**/.hg/**
-**/_MTN
-**/_MTN/**
-**/_darcs
-**/_darcs/**
-**/.DS_Store '''
-
-DIR = 1
-FILE = 2
-DIR_LINK = 4
-FILE_LINK = 8
-LINKS = DIR_LINK | FILE_LINK
-ALL_NO_LINK = DIR | FILE
-ALL = DIR | FILE | LINKS
-
-_ANT_RE = re.compile( r'(/\*\*/)|(\*\*/)|(/\*\*)|(\*)|(/)|([^\*/]*)' )
-
-def ant_pattern_to_re( ant_pattern ):
-    """Generates a regular expression from the ant pattern.
-    Matching convention:
-    **/a: match 'a', 'dir/a', 'dir1/dir2/a'
-    a/**/b: match 'a/b', 'a/c/b', 'a/d/c/b'
-    *.py: match 'script.py' but not 'a/script.py'
-    """
-    rex = ['^']
-    next_pos = 0
-    sep_rex = r'(?:/|%s)' % re.escape( os.path.sep )
-##    print 'Converting', ant_pattern
-    for match in _ANT_RE.finditer( ant_pattern ):
-##        print 'Matched', match.group()
-##        print match.start(0), next_pos
-        if match.start(0) != next_pos:
-            raise ValueError( "Invalid ant pattern" )
-        if match.group(1): # /**/
-            rex.append( sep_rex + '(?:.*%s)?' % sep_rex )
-        elif match.group(2): # **/
-            rex.append( '(?:.*%s)?' % sep_rex )
-        elif match.group(3): # /**
-            rex.append( sep_rex + '.*' )
-        elif match.group(4): # *
-            rex.append( '[^/%s]*' % re.escape(os.path.sep) )
-        elif match.group(5): # /
-            rex.append( sep_rex )
-        else: # somepath
-            rex.append( re.escape(match.group(6)) )
-        next_pos = match.end()
-    rex.append('$')
-    return re.compile( ''.join( rex ) )
-
-def _as_list( l ):
-    if isinstance(l, basestring):
-        return l.split()
-    return l
-
-def glob(dir_path,
-         includes = '**/*',
-         excludes = default_excludes,
-         entry_type = FILE,
-         prune_dirs = prune_dirs,
-         max_depth = 25):
-    include_filter = [ant_pattern_to_re(p) for p in _as_list(includes)]
-    exclude_filter = [ant_pattern_to_re(p) for p in _as_list(excludes)]
-    prune_dirs = [p.replace('/',os.path.sep) for p in _as_list(prune_dirs)]
-    dir_path = dir_path.replace('/',os.path.sep)
-    entry_type_filter = entry_type
-
-    def is_pruned_dir( dir_name ):
-        for pattern in prune_dirs:
-            if fnmatch.fnmatch( dir_name, pattern ):
-                return True
-        return False
-
-    def apply_filter( full_path, filter_rexs ):
-        """Return True if at least one of the filter regular expression match full_path."""
-        for rex in filter_rexs:
-            if rex.match( full_path ):
-                return True
-        return False
-
-    def glob_impl( root_dir_path ):
-        child_dirs = [root_dir_path]
-        while child_dirs:
-            dir_path = child_dirs.pop()
-            for entry in listdir( dir_path ):
-                full_path = os.path.join( dir_path, entry )
-##                print 'Testing:', full_path,
-                is_dir = os.path.isdir( full_path )
-                if is_dir and not is_pruned_dir( entry ): # explore child directory ?
-##                    print '===> marked for recursion',
-                    child_dirs.append( full_path )
-                included = apply_filter( full_path, include_filter )
-                rejected = apply_filter( full_path, exclude_filter )
-                if not included or rejected: # do not include entry ?
-##                    print '=> not included or rejected'
-                    continue
-                link = os.path.islink( full_path )
-                is_file = os.path.isfile( full_path )
-                if not is_file and not is_dir:
-##                    print '=> unknown entry type'
-                    continue
-                if link:
-                    entry_type = is_file and FILE_LINK or DIR_LINK
-                else:
-                    entry_type = is_file and FILE or DIR
-##                print '=> type: %d' % entry_type, 
-                if (entry_type & entry_type_filter) != 0:
-##                    print ' => KEEP'
-                    yield os.path.join( dir_path, entry )
-##                else:
-##                    print ' => TYPE REJECTED'
-    return list( glob_impl( dir_path ) )
-
-
-if __name__ == "__main__":
-    import unittest
-
-    class AntPatternToRETest(unittest.TestCase):
-##        def test_conversion( self ):
-##            self.assertEqual( '^somepath$', ant_pattern_to_re( 'somepath' ).pattern )
-
-        def test_matching( self ):
-            test_cases = [ ( 'path',
-                             ['path'],
-                             ['somepath', 'pathsuffix', '/path', '/path'] ),
-                           ( '*.py',
-                             ['source.py', 'source.ext.py', '.py'],
-                             ['path/source.py', '/.py', 'dir.py/z', 'z.pyc', 'z.c'] ),
-                           ( '**/path',
-                             ['path', '/path', '/a/path', 'c:/a/path', '/a/b/path', '//a/path', '/a/path/b/path'],
-                             ['path/', 'a/path/b', 'dir.py/z', 'somepath', 'pathsuffix', 'a/somepath'] ),
-                           ( 'path/**',
-                             ['path/a', 'path/path/a', 'path//'],
-                             ['path', 'somepath/a', 'a/path', 'a/path/a', 'pathsuffix/a'] ),
-                           ( '/**/path',
-                             ['/path', '/a/path', '/a/b/path/path', '/path/path'],
-                             ['path', 'path/', 'a/path', '/pathsuffix', '/somepath'] ),
-                           ( 'a/b',
-                             ['a/b'],
-                             ['somea/b', 'a/bsuffix', 'a/b/c'] ),
-                           ( '**/*.py',
-                             ['script.py', 'src/script.py', 'a/b/script.py', '/a/b/script.py'],
-                             ['script.pyc', 'script.pyo', 'a.py/b'] ),
-                           ( 'src/**/*.py',
-                             ['src/a.py', 'src/dir/a.py'],
-                             ['a/src/a.py', '/src/a.py'] ),
-                           ]
-            for ant_pattern, accepted_matches, rejected_matches in list(test_cases):
-                def local_path( paths ):
-                    return [ p.replace('/',os.path.sep) for p in paths ]
-                test_cases.append( (ant_pattern, local_path(accepted_matches), local_path( rejected_matches )) )
-            for ant_pattern, accepted_matches, rejected_matches in test_cases:
-                rex = ant_pattern_to_re( ant_pattern )
-                print 'ant_pattern:', ant_pattern, ' => ', rex.pattern
-                for accepted_match in accepted_matches:
-                    print 'Accepted?:', accepted_match
-                    self.assert_( rex.match( accepted_match ) is not None )
-                for rejected_match in rejected_matches:
-                    print 'Rejected?:', rejected_match
-                    self.assert_( rex.match( rejected_match ) is None )
-
-    unittest.main()
diff --git a/src/3rd_party-static/jsoncpp/devtools/fixeol.py b/src/3rd_party-static/jsoncpp/devtools/fixeol.py
deleted file mode 100644
index 4fed6ce4b0..0000000000
--- a/src/3rd_party-static/jsoncpp/devtools/fixeol.py
+++ /dev/null
@@ -1,63 +0,0 @@
-import os.path
-
-def fix_source_eol( path, is_dry_run = True, verbose = True, eol = '\n' ):
-    """Makes sure that all sources have the specified eol sequence (default: unix)."""
-    if not os.path.isfile( path ):
-        raise ValueError( 'Path "%s" is not a file' % path )
-    try:
-        f = open(path, 'rb')
-    except IOError, msg:
-        print >> sys.stderr, "%s: I/O Error: %s" % (file, str(msg))
-        return False
-    try:
-        raw_lines = f.readlines()
-    finally:
-        f.close()
-    fixed_lines = [line.rstrip('\r\n') + eol for line in raw_lines]
-    if raw_lines != fixed_lines:
-        print '%s =>' % path,
-        if not is_dry_run:
-            f = open(path, "wb")
-            try:
-                f.writelines(fixed_lines)
-            finally:
-                f.close()
-        if verbose:
-            print is_dry_run and ' NEED FIX' or ' FIXED'
-    return True
-##    
-##    
-##
-##def _do_fix( is_dry_run = True ):
-##    from waftools import antglob
-##    python_sources = antglob.glob( '.',
-##        includes = '**/*.py **/wscript **/wscript_build',
-##        excludes = antglob.default_excludes + './waf.py',
-##        prune_dirs = antglob.prune_dirs + 'waf-* ./build' )
-##    for path in python_sources:
-##        _fix_python_source( path, is_dry_run )
-##
-##    cpp_sources = antglob.glob( '.',
-##        includes = '**/*.cpp **/*.h **/*.inl',
-##        prune_dirs = antglob.prune_dirs + 'waf-* ./build' )
-##    for path in cpp_sources:
-##        _fix_source_eol( path, is_dry_run )
-##
-##
-##def dry_fix(context):
-##    _do_fix( is_dry_run = True )
-##
-##def fix(context):
-##    _do_fix( is_dry_run = False )
-##
-##def shutdown():
-##    pass
-##
-##def check(context):
-##    # Unit tests are run when "check" target is used
-##    ut = UnitTest.unit_test()
-##    ut.change_to_testfile_dir = True
-##    ut.want_to_see_test_output = True
-##    ut.want_to_see_test_error = True
-##    ut.run()
-##    ut.print_results()
diff --git a/src/3rd_party-static/jsoncpp/devtools/licenseupdater.py b/src/3rd_party-static/jsoncpp/devtools/licenseupdater.py
deleted file mode 100644
index 866eada226..0000000000
--- a/src/3rd_party-static/jsoncpp/devtools/licenseupdater.py
+++ /dev/null
@@ -1,93 +0,0 @@
-"""Updates the license text in source file.
-"""
-
-# An existing license is found if the file starts with the string below,
-# and ends with the first blank line.
-LICENSE_BEGIN = "// Copyright "
-
-BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-""".replace('\r\n','\n')
-
-def update_license( path, dry_run, show_diff ):
-    """Update the license statement in the specified file.
-    Parameters:
-      path: path of the C++ source file to update.
-      dry_run: if True, just print the path of the file that would be updated,
-               but don't change it.
-      show_diff: if True, print the path of the file that would be modified,
-                 as well as the change made to the file. 
-    """
-    with open( path, 'rt' ) as fin:
-        original_text = fin.read().replace('\r\n','\n')
-        newline = fin.newlines and fin.newlines[0] or '\n'
-    if not original_text.startswith( LICENSE_BEGIN ):
-        # No existing license found => prepend it
-        new_text = BRIEF_LICENSE + original_text
-    else:
-        license_end_index = original_text.index( '\n\n' ) # search first blank line
-        new_text = BRIEF_LICENSE + original_text[license_end_index+2:]
-    if original_text != new_text:
-        if not dry_run:
-            with open( path, 'wb' ) as fout:
-                fout.write( new_text.replace('\n', newline ) )
-        print 'Updated', path
-        if show_diff:
-            import difflib
-            print '\n'.join( difflib.unified_diff( original_text.split('\n'),
-                                                   new_text.split('\n') ) )
-        return True
-    return False
-
-def update_license_in_source_directories( source_dirs, dry_run, show_diff ):
-    """Updates license text in C++ source files found in directory source_dirs.
-    Parameters:
-      source_dirs: list of directory to scan for C++ sources. Directories are
-                   scanned recursively.
-      dry_run: if True, just print the path of the file that would be updated,
-               but don't change it.
-      show_diff: if True, print the path of the file that would be modified,
-                 as well as the change made to the file. 
-    """
-    from devtools import antglob
-    prune_dirs = antglob.prune_dirs + 'scons-local* ./build* ./libs ./dist'
-    for source_dir in source_dirs:
-        cpp_sources = antglob.glob( source_dir,
-            includes = '''**/*.h **/*.cpp **/*.inl''',
-            prune_dirs = prune_dirs )
-        for source in cpp_sources:
-            update_license( source, dry_run, show_diff )
-
-def main():
-    usage = """%prog DIR [DIR2...]
-Updates license text in sources of the project in source files found
-in the directory specified on the command-line.
-
-Example of call:
-python devtools\licenseupdater.py include src -n --diff
-=> Show change that would be made to the sources.
-
-python devtools\licenseupdater.py include src
-=> Update license statement on all sources in directories include/ and src/.
-"""
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = False
-    parser.add_option('-n', '--dry-run', dest="dry_run", action='store_true', default=False,
-        help="""Only show what files are updated, do not update the files""")
-    parser.add_option('--diff', dest="show_diff", action='store_true', default=False,
-        help="""On update, show change made to the file.""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-    update_license_in_source_directories( args, options.dry_run, options.show_diff )
-    print 'Done'
-
-if __name__ == '__main__':
-    import sys
-    import os.path
-    sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-    main()
-
diff --git a/src/3rd_party-static/jsoncpp/devtools/tarball.py b/src/3rd_party-static/jsoncpp/devtools/tarball.py
deleted file mode 100644
index ccbda39425..0000000000
--- a/src/3rd_party-static/jsoncpp/devtools/tarball.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import os.path
-import gzip
-import tarfile
-
-TARGZ_DEFAULT_COMPRESSION_LEVEL = 9
-
-def make_tarball(tarball_path, sources, base_dir, prefix_dir=''):
-    """Parameters:
-    tarball_path: output path of the .tar.gz file
-    sources: list of sources to include in the tarball, relative to the current directory
-    base_dir: if a source file is in a sub-directory of base_dir, then base_dir is stripped
-        from path in the tarball.
-    prefix_dir: all files stored in the tarball be sub-directory of prefix_dir. Set to ''
-        to make them child of root.
-    """
-    base_dir = os.path.normpath( os.path.abspath( base_dir ) )
-    def archive_name( path ):
-        """Makes path relative to base_dir."""
-        path = os.path.normpath( os.path.abspath( path ) )
-        common_path = os.path.commonprefix( (base_dir, path) )
-        archive_name = path[len(common_path):]
-        if os.path.isabs( archive_name ):
-            archive_name = archive_name[1:]
-        return os.path.join( prefix_dir, archive_name )
-    def visit(tar, dirname, names):
-        for name in names:
-            path = os.path.join(dirname, name)
-            if os.path.isfile(path):
-                path_in_tar = archive_name(path)
-                tar.add(path, path_in_tar )
-    compression = TARGZ_DEFAULT_COMPRESSION_LEVEL
-    tar = tarfile.TarFile.gzopen( tarball_path, 'w', compresslevel=compression )
-    try:
-        for source in sources:
-            source_path = source
-            if os.path.isdir( source ):
-                os.path.walk(source_path, visit, tar)
-            else:
-                path_in_tar = archive_name(source_path)
-                tar.add(source_path, path_in_tar )      # filename, arcname
-    finally:
-        tar.close()
-
-def decompress( tarball_path, base_dir ):
-    """Decompress the gzipped tarball into directory base_dir.
-    """
-    # !!! This class method is not documented in the online doc
-    # nor is bz2open!
-    tar = tarfile.TarFile.gzopen(tarball_path, mode='r')
-    try:
-        tar.extractall( base_dir )
-    finally:
-        tar.close()
diff --git a/src/3rd_party-static/jsoncpp/doc/doxyfile.in b/src/3rd_party-static/jsoncpp/doc/doxyfile.in
deleted file mode 100644
index 48861d2385..0000000000
--- a/src/3rd_party-static/jsoncpp/doc/doxyfile.in
+++ /dev/null
@@ -1,1534 +0,0 @@
-# Doxyfile 1.5.9
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file 
-# that follow. The default is UTF-8 which is also the encoding used for all 
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
-# iconv built into libc) for the transcoding. See 
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
-# by quotes) that should identify the project.
-
-PROJECT_NAME           = "JsonCpp"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
-# This could be handy for archiving the generated documentation or 
-# if some version control system is used.
-
-PROJECT_NUMBER         = %JSONCPP_VERSION%
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
-# base path where the generated documentation will be put. 
-# If a relative path is entered, it will be relative to the location 
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = %DOC_TOPDIR%
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
-# 4096 sub-directories (in 2 levels) under the output directory of each output 
-# format and will distribute the generated files over these directories. 
-# Enabling this option can be useful when feeding doxygen a huge amount of 
-# source files, where putting all generated files in the same directory would 
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS         = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
-# documentation generated by doxygen is written. Doxygen will use this 
-# information to generate all constant output in the proper language. 
-# The default language is English, other supported languages are: 
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
-# include brief member descriptions after the members that are listed in 
-# the file and class documentation (similar to JavaDoc). 
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
-# the brief description of a member or function before the detailed description. 
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator 
-# that is used to form the text in various listings. Each string 
-# in this list, if found as the leading text of the brief description, will be 
-# stripped from the text and the result after processing the whole list, is 
-# used as the annotated text. Otherwise, the brief description is used as-is. 
-# If left blank, the following values are used ("$name" is automatically 
-# replaced with the name of the entity): "The $name class" "The $name widget" 
-# "The $name file" "is" "provides" "specifies" "contains" 
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
-# Doxygen will generate a detailed section even if there is only a brief 
-# description.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
-# inherited members of a class in the documentation of that class as if those 
-# members were ordinary class members. Constructors, destructors and assignment 
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
-# path before files name in the file list and in the header files. If set 
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES        = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
-# can be used to strip a user-defined part of the path. Stripping is 
-# only done if one of the specified strings matches the left-hand part of 
-# the path. The tag can be used to show relative paths in the file list. 
-# If left blank the directory from which doxygen is run is used as the 
-# path to strip.
-
-STRIP_FROM_PATH        = %TOPDIR%
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
-# the path mentioned in the documentation of a class, which tells 
-# the reader which header file to include in order to use a class. 
-# If left blank only the name of the header file containing the class 
-# definition is used. Otherwise one should specify the include paths that 
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH    = %TOPDIR%/include
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
-# (but less readable) file names. This can be useful is your file systems 
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
-# will interpret the first line (until the first dot) of a JavaDoc-style 
-# comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like regular Qt-style comments 
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF      = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
-# interpret the first line (until the first dot) of a Qt-style 
-# comment as the brief description. If set to NO, the comments 
-# will behave just like regular Qt-style comments (thus requiring 
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
-# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
-# comments) as a brief description. This used to be the default behaviour. 
-# The new default is to treat a multi-line C++ comment block as a detailed 
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
-# member inherits the documentation from any documented member that it 
-# re-implements.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
-# a new page for each member. If set to NO, the documentation of a member will 
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE               = 3
-
-# This tag can be used to specify a number of aliases that acts 
-# as commands in the documentation. An alias has the form "name=value". 
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
-# put the command \sideeffect (or @sideeffect) in the documentation, which 
-# will result in a user-defined paragraph with heading "Side Effects:". 
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES                = "testCaseSetup=\link CppUT::TestCase::setUp() setUp()\endlink" \
-                         "testCaseRun=\link CppUT::TestCase::run() run()\endlink" \
-                         "testCaseTearDown=\link CppUT::TestCase::tearDown() tearDown()\endlink" \
-                         "json_ref=<a HREF='http://www.json.org/'>JSON (JavaScript Object Notation)</a>"
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
-# sources only. Doxygen will then generate output that is more tailored for C. 
-# For instance, some of the names that are used will be different. The list 
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Java. For instance, namespaces will be presented as packages, qualified 
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
-# sources only. Doxygen will then generate output that is more tailored for 
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
-# sources. Doxygen will then generate output that is tailored for 
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses. 
-# With this tag you can assign which parser to use for a given extension. 
-# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
-# The format is ext=language, where ext is a file extension, and language is one of 
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING      = 
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
-# to include (a tag file for) the STL sources as input, then you should 
-# set this tag to YES in order to let doxygen match functions declarations and 
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
-# func(std::string) {}). This also make the inheritance and collaboration 
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to 
-# enable parsing support.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
-# Doxygen will parse them like normal C++ but will assume all classes use public 
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter 
-# and setter methods for a property. Setting this option to YES (the default) 
-# will make doxygen to replace the get and set methods by a property in the 
-# documentation. This will only work if the methods are indeed getting or 
-# setting a simple type. If this is not the case, or you want to show the 
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
-# the same type (for instance a group of public functions) to be put as a 
-# subgroup of that type (e.g. under the Public Functions section). Set it to 
-# NO to prevent subgrouping. Alternatively, this can be done per class using 
-# the \nosubgrouping command.
-
-SUBGROUPING            = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
-# is documented as struct, union, or enum with the name of the typedef. So 
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
-# with name TypeT. When disabled the typedef will appear as a member of a file, 
-# namespace, or class. And the struct will be named TypeS. This can typically 
-# be useful for C code in case the coding convention dictates that all compound 
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
-# documentation are documented, even if no documentation was available. 
-# Private class members and static file members will be hidden unless 
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
-# will be included in the documentation.
-
-EXTRACT_PRIVATE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file 
-# will be included in the documentation.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
-# defined locally in source files will be included in the documentation. 
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES  = NO
-
-# This flag is only useful for Objective-C code. When set to YES local 
-# methods, which are defined in the implementation section but not in 
-# the interface are included in the documentation. 
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be 
-# extracted and appear in the documentation as a namespace called 
-# 'anonymous_namespace{file}', where file will be replaced with the base 
-# name of the file that contains the anonymous namespace. By default 
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
-# undocumented members of documented classes, files or namespaces. 
-# If set to NO (the default) these members will be included in the 
-# various overviews, but no documentation section is generated. 
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
-# undocumented classes that are normally visible in the class hierarchy. 
-# If set to NO (the default) these classes will be included in the various 
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
-# friend (class|struct|union) declarations. 
-# If set to NO (the default) these declarations will be included in the 
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
-# documentation blocks found inside the body of a function. 
-# If set to NO (the default) these blocks will be appended to the 
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation 
-# that is typed after a \internal command is included. If the tag is set 
-# to NO (the default) then the documentation will be excluded. 
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS          = YES
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
-# file names in lower-case letters. If set to YES upper-case letters are also 
-# allowed. This is useful if you have classes or files whose names only differ 
-# in case and if your file system supports case sensitive file names. Windows 
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
-# will show members with their full class and namespace scopes in the 
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
-# will put a list of the files that are included by a file in the documentation 
-# of that file.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
-# is inserted in the documentation for inline members.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
-# will sort the (detailed) documentation of file and class members 
-# alphabetically by member name. If set to NO the members will appear in 
-# declaration order.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
-# brief documentation of file, namespace and class members alphabetically 
-# by member name. If set to NO (the default) the members will appear in 
-# declaration order.
-
-SORT_BRIEF_DOCS        = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
-# hierarchy of group names into alphabetical order. If set to NO (the default) 
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
-# sorted by fully-qualified names, including namespaces. If set to 
-# NO (the default), the class list will be sorted only by class name, 
-# not including the namespace part. 
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
-# Note: This option applies only to the class list, not to the 
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME     = YES
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or 
-# disable (NO) the todo list. This list is created by putting \todo 
-# commands in the documentation.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or 
-# disable (NO) the test list. This list is created by putting \test 
-# commands in the documentation.
-
-GENERATE_TESTLIST      = NO
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or 
-# disable (NO) the bug list. This list is created by putting \bug 
-# commands in the documentation.
-
-GENERATE_BUGLIST       = NO
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
-# disable (NO) the deprecated list. This list is created by putting 
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional 
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS       = 
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
-# the initial value of a variable or define consists of for it to appear in 
-# the documentation. If the initializer consists of more lines than specified 
-# here it will be hidden. Use a value of 0 to hide initializers completely. 
-# The appearance of the initializer of individual variables and defines in the 
-# documentation can be controlled using \showinitializer or \hideinitializer 
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
-# at the bottom of the documentation of classes and structs. If set to YES the 
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES        = YES
-
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
-# This will remove the Files entry from the Quick Index and from the 
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
-# Namespaces page. 
-# This will remove the Namespaces entry from the Quick Index 
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
-# doxygen should invoke to get the current version for each file (typically from 
-# the version control system). Doxygen will invoke the program by executing (via 
-# popen()) the command <command> <input-file>, where <command> is the value of 
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
-# provided by doxygen. Whatever the program writes to standard output 
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER    = 
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
-# doxygen. The layout file controls the global structure of the generated output files 
-# in an output format independent way. The create the layout file that represents 
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
-# of the layout file.
-
-LAYOUT_FILE            = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated 
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are 
-# generated by doxygen. Possible values are YES and NO. If left blank 
-# NO is used.
-
-WARNINGS               = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
-# potential errors in the documentation, such as not documenting some 
-# parameters in a documented function, or documenting parameters that 
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for 
-# functions that are documented, but have no documentation for their parameters 
-# or return value. If set to NO (the default) doxygen will only warn about 
-# wrong or incomplete parameter documentation, but not about the absence of 
-# documentation.
-
-WARN_NO_PARAMDOC       = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that 
-# doxygen can produce. The string should contain the $file, $line, and $text 
-# tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text. Optionally the format may contain 
-# $version, which will be replaced by the version of the file (if it could 
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning 
-# and error messages should be written. If left blank the output is written 
-# to stderr.
-
-WARN_LOGFILE           = %WARNING_LOG_PATH%
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain 
-# documented source files. You may enter file names like "myfile.cpp" or 
-# directories like "/usr/src/myproject". Separate the files or directories 
-# with spaces.
-
-INPUT                  = ../include ../src/lib_json .
-
-# This tag can be used to specify the character encoding of the source files 
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
-# also the default input encoding. Doxygen uses libiconv (or the iconv built 
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
-# the list of possible encodings.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the 
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS          = *.h \
-                         *.cpp \
-                         *.inl \
-                         *.dox
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
-# should be searched for input files as well. Possible values are YES and NO. 
-# If left blank NO is used.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should 
-# excluded from the INPUT source files. This way you can easily exclude a 
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE                = 
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
-# directories that are symbolic links (a Unix filesystem feature) are excluded 
-# from the input.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the 
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories. Note that the wildcards are matched 
-# against the file with absolute path, so to exclude all test directories 
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       = 
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
-# (namespaces, classes, functions, etc.) that should be excluded from the 
-# output. The symbol name can be a fully qualified name, a word, or if the 
-# wildcard * is used, a substring. Examples: ANamespace, AClass, 
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS        = 
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or 
-# directories that contain example code fragments that are included (see 
-# the \include command).
-
-EXAMPLE_PATH           = 
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-# and *.h) to filter out the source-files in the directories. If left 
-# blank all files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
-# searched for input files to be used with the \include or \dontinclude 
-# commands irrespective of the value of the RECURSIVE tag. 
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or 
-# directories that contain image that are included in the documentation (see 
-# the \image command).
-
-IMAGE_PATH             = 
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should 
-# invoke to filter for each input file. Doxygen will invoke the filter program 
-# by executing (via popen()) the command <filter> <input-file>, where <filter> 
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
-# input file. Doxygen will then use the output that the filter program writes 
-# to standard output. 
-# If FILTER_PATTERNS is specified, this tag will be 
-# ignored.
-
-INPUT_FILTER           = 
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
-# basis. 
-# Doxygen will compare the file name with each pattern and apply the 
-# filter if there is a match. 
-# The filters are a list of the form: 
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
-# is applied to all files.
-
-FILTER_PATTERNS        = 
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
-# INPUT_FILTER) will be used to filter the input files when producing source 
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES    = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources. 
-# Note: To get rid of all source code in the generated output, make sure also 
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body 
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
-# doxygen to hide any special comment blocks from generated source code 
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES 
-# then for each documented function all documented 
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES 
-# then for each documented function all documented entities 
-# called/used by that function will be listed.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
-# link to the source code. 
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code 
-# will point to the HTML generated by the htags(1) tool instead of doxygen 
-# built-in source browser. The htags tool is part of GNU's global source 
-# tagging system (see http://www.gnu.org/software/global/global.html). You 
-# will need version 4.8.6 or higher.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
-# will generate a verbatim copy of the header file for each class for 
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
-# of all compounds will be generated. Enable this if the project 
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX     = NO
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all 
-# classes will be put under the same header in the alphabetical index. 
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
-# generate HTML output.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT            = %HTML_OUTPUT%
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard header.
-
-HTML_HEADER            = header.html
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
-# each generated HTML page. If it is left blank doxygen will generate a 
-# standard footer.
-
-HTML_FOOTER            = footer.html
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
-# style sheet that is used by each HTML page. It can be used to 
-# fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet. Note that doxygen will try to copy 
-# the style sheet file to the HTML output directory, so don't put your own 
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET        = 
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
-# documentation will contain sections that can be hidden and shown after the 
-# page has loaded. For this to work a browser that supports 
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files 
-# will be generated that can be used as input for Apple's Xcode 3 
-# integrated development environment, introduced with OSX 10.5 (Leopard). 
-# To create a documentation set, doxygen will generate a Makefile in the 
-# HTML output directory. Running make will produce the docset in that 
-# directory and running "make install" will install the docset in 
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
-# it at startup. 
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET        = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
-# feed. A documentation feed provides an umbrella under which multiple 
-# documentation sets from a single provider (such as a company or product suite) 
-# can be grouped.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
-# should uniquely identify the documentation set bundle. This should be a 
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
-# will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP      = %HTML_HELP%
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
-# be used to specify the file name of the resulting .chm file. You 
-# can add a path in front of the file if the result should not be 
-# written to the html output directory.
-
-CHM_FILE               = jsoncpp-%JSONCPP_VERSION%.chm
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
-# be used to specify the location (absolute path including file name) of 
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION           = "c:\Program Files\HTML Help Workshop\hhc.exe"
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
-# controls if a separate .chi index file is generated (YES) or that 
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI           = YES
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
-# content.
-
-CHM_INDEX_ENCODING     = 
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
-# controls whether a binary table of contents is generated (YES) or a 
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC             = YES
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members 
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND             = YES
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
-# are set, an additional index file will be generated that can be used as input for 
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
-# HTML documentation.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
-# be used to specify the file name of the resulting .qch file. 
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE               = 
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE          = 
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
-# Qt Help Project output. For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
-# For more information please see 
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME   = 
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS  = 
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
-# filter section matches. 
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS  = 
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
-# be used to specify the location of Qt's qhelpgenerator. 
-# If non-empty doxygen will try to run qhelpgenerator on the generated 
-# .qhp file.
-
-QHG_LOCATION           = 
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
-# top of each HTML page. The value NO (the default) enables the index and 
-# the value YES disables it.
-
-DISABLE_INDEX          = NO
-
-# This tag can be used to set the number of enum values (range [1..20]) 
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
-# structure should be generated to display hierarchical information. 
-# If the tag value is set to FRAME, a side panel will be generated 
-# containing a tree-like index structure (just like the one that 
-# is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature. Other possible values 
-# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list; 
-# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
-# disables this behavior completely. For backwards compatibility with previous 
-# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
-# respectively.
-
-GENERATE_TREEVIEW      = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
-# used to set the initial width (in pixels) of the frame in which the tree 
-# is shown.
-
-TREEVIEW_WIDTH         = 250
-
-# Use this tag to change the font size of Latex formulas included 
-# as images in the HTML documentation. The default is 10. Note that 
-# when you change the font size after a successful doxygen run you need 
-# to manually remove any form_*.png images from the HTML output directory 
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE       = 10
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
-# generate Latex output.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
-# generate index for LaTeX. If left blank `makeindex' will be used as the 
-# default command name.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
-# LaTeX documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used 
-# by the printer. Possible values are: a4, a4wide, letter, legal and 
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE             = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES         = 
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
-# the generated latex document. The header should contain everything until 
-# the first chapter. If it is left blank doxygen will generate a 
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER           = 
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
-# contain links (just like the HTML output) instead of page references 
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
-# plain latex in the generated Makefile. Set this option to YES to get a 
-# higher quality PDF documentation.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
-# command to the generated LaTeX files. This will instruct LaTeX to keep 
-# running if errors occur, instead of asking the user for help. 
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE        = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
-# include the index chapters (such as File Index, Compound Index, etc.) 
-# in the output.
-
-LATEX_HIDE_INDICES     = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimized for Word 97 and may not look very pretty with 
-# other RTF readers or editors.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
-# RTF documents. This may be useful for small projects and may help to 
-# save some trees in general.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
-# will contain hyperlink fields. The RTF file will 
-# contain links (just like the HTML output) instead of page references. 
-# This makes the output suitable for online browsing using WORD or other 
-# programs which support those fields. 
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assignments. You only have to provide 
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE    = 
-
-# Set optional variables used in the generation of an rtf document. 
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
-# generate man pages
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to 
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION          = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
-# then it will generate one additional man file for each entity 
-# documented in the real man page(s). These additional files 
-# only source the real man page, but without them the man command 
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will 
-# generate an XML file that captures the structure of 
-# the code including all documentation.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT             = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
-# dump the program listings (including syntax highlighting 
-# and cross-referencing information) to the XML output. Note that 
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
-# generate an AutoGen Definitions (see autogen.sf.net) file 
-# that captures the structure of the code including all 
-# documentation. Note that this feature is still experimental 
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
-# generate a Perl module file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
-# nicely formatted so it can be parsed by a human reader. 
-# This is useful 
-# if you want to understand what is going on. 
-# On the other hand, if this 
-# tag is set to NO the size of the Perl module output will be much smaller 
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file 
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
-# This is useful so different doxyrules.make files included by the same 
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
-# evaluate all C-preprocessor directives found in the sources and include 
-# files.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
-# names in the source code. If set to NO (the default) only conditional 
-# compilation will be performed. Macro expansion can be done in a controlled 
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
-# then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that 
-# contain include files that are not input files but should be processed by 
-# the preprocessor.
-
-INCLUDE_PATH           = ../include
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
-# patterns (like *.h and *.hpp) to filter out the header-files in the 
-# directories. If left blank, the patterns specified with FILE_PATTERNS will 
-# be used.
-
-INCLUDE_FILE_PATTERNS  = *.h
-
-# The PREDEFINED tag can be used to specify one or more macro names that 
-# are defined before the preprocessor is started (similar to the -D option of 
-# gcc). The argument of the tag is a list of macros of the form: name 
-# or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed. To prevent a macro definition from being 
-# undefined via #undef or recursively expanded use the := operator 
-# instead of the = operator.
-
-PREDEFINED             = "_MSC_VER=1400" \
-                         _CPPRTTI \
-                         _WIN32 \
-                         JSONCPP_DOC_EXCLUDE_IMPLEMENTATION \
-                         JSON_VALUE_USE_INTERNAL_MAP
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
-# this tag can be used to specify a list of macro names that should be expanded. 
-# The macro definition that is found in the sources will be used. 
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED      = 
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
-# doxygen's preprocessor will remove all function-like macros that are alone 
-# on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse 
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. 
-# Optionally an initial location of the external documentation 
-# can be added for each tagfile. The format of a tag file without 
-# this location is as follows: 
-#  
-# TAGFILES = file1 file2 ... 
-# Adding location for the tag files is done as follows: 
-#  
-# TAGFILES = file1=loc1 "file2 = loc2" ... 
-# where "loc1" and "loc2" can be relative or absolute paths or 
-# URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links. 
-# Note that each tag file must have a unique name 
-# (where the name does NOT include the path) 
-# If a tag file is not located in the directory in which doxygen 
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES               = 
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE       = 
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
-# in the class index. If set to NO only the inherited external classes 
-# will be listed.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
-# in the modules index. If set to NO, only the current project's groups will 
-# be listed.
-
-EXTERNAL_GROUPS        = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script 
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
-# or super classes. Setting the tag to NO turns the diagrams off. Note that 
-# this option is superseded by the HAVE_DOT option below. This is only a 
-# fallback. It is recommended to install and use dot, since it yields more 
-# powerful graphs.
-
-CLASS_DIAGRAMS         = NO
-
-# You can define message sequence charts within doxygen comments using the \msc 
-# command. Doxygen will then run the mscgen tool (see 
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
-# the mscgen tool resides. If left empty the tool is assumed to be found in the 
-# default search path.
-
-MSCGEN_PATH            = 
-
-# If set to YES, the inheritance and collaboration graphs will hide 
-# inheritance and usage relations if the target is undocumented 
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS   = NO
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz, a graph visualization 
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT               = %HAVE_DOT%
-
-# By default doxygen will write a font called FreeSans.ttf to the output 
-# directory and reference it in all dot files that doxygen generates. This 
-# font does not include all possible unicode characters however, so when you need 
-# these (or just want a differently looking font) you can specify the font name 
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
-# which can be done by putting it in a standard location or by setting the 
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
-# containing the font.
-
-DOT_FONTNAME           = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
-# The default size is 10pt.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the output directory to look for the 
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
-# different font using DOT_FONTNAME you can set the path where dot 
-# can find it using this tag.
-
-DOT_FONTPATH           = 
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect inheritance relations. Setting this tag to YES will force the 
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for each documented class showing the direct and 
-# indirect implementation dependencies (inheritance, containment, and 
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similar to the OMG's Unified Modeling 
-# Language.
-
-UML_LOOK               = %UML_LOOK%
-
-# If set to YES, the inheritance and collaboration graphs will show the 
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
-# tags are set to YES then doxygen will generate a graph for each documented 
-# file showing the direct and indirect include dependencies of the file with 
-# other documented files.
-
-INCLUDE_GRAPH          = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
-# documented header file showing the documented files that directly or 
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
-# doxygen will generate a call dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable call graphs 
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
-# doxygen will generate a caller dependency graph for every global function 
-# or class method. Note that enabling this option will significantly increase 
-# the time of a run. So in most cases it will be better to enable caller 
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH           = YES
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
-# then doxygen will show the dependencies a directory has on other directories 
-# in a graphical way. The dependency relations are determined by the #include 
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif 
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT       = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH               = %DOT_PATH%
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that 
-# contain dot files that are included in the documentation (see the 
-# \dotfile command).
-
-DOTFILE_DIRS           = 
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
-# nodes that will be shown in the graph. If the number of nodes in a graph 
-# becomes larger than this value, doxygen will truncate the graph, which is 
-# visualized by representing a node as a red box. Note that doxygen if the 
-# number of direct children of the root node in a graph is already larger than 
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES    = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-# graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes 
-# that lay further from the root node will be omitted. Note that setting this 
-# option to 1 or 2 may greatly reduce the computation time needed for large 
-# code bases. Also note that the size of a graph can be further restricted by 
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH    = 1000
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
-# background. This is disabled by default, because dot on Windows does not 
-# seem to support this out of the box. Warning: Depending on the platform used, 
-# enabling this option may lead to badly anti-aliased labels on the edges of 
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
-# files in one run (i.e. multiple -o and -T options on the command line). This 
-# makes dot run faster, but since only newer versions of dot (>1.8.10) 
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS      = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
-# generate a legend page explaining the meaning of the various boxes and 
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
-# remove the intermediate dot files that are used to generate 
-# the various graphs.
-
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Options related to the search engine
-#---------------------------------------------------------------------------
-
-# The SEARCHENGINE tag specifies whether or not a search engine should be 
-# used. If set to NO the values of all tags below this one will be ignored.
-
-SEARCHENGINE           = NO
diff --git a/src/3rd_party-static/jsoncpp/doc/footer.html b/src/3rd_party-static/jsoncpp/doc/footer.html
deleted file mode 100644
index a61d9528a1..0000000000
--- a/src/3rd_party-static/jsoncpp/doc/footer.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<hr>
-<table width="100%">
-  <tr>
-    <td width="10%" align="left" valign="center">
-      <a href="http://sourceforge.net"> 
-      <img
-      src="http://sourceforge.net/sflogo.php?group_id=144446"
-      width="88" height="31" border="0" alt="SourceForge Logo"></a>
-    </td>
-    <td width="20%" align="left" valign="center">
-      hosts this site.
-    </td>
-    <td>
-    </td>
-    <td align="right" valign="center">
-      Send comments to:<br>
-      <a href="mailto:jsoncpp-devel@lists.sourceforge.net">Json-cpp Developers</a>
-    </td>
-  </tr>
-</table>
-
-</body> 
-</html>
diff --git a/src/3rd_party-static/jsoncpp/doc/header.html b/src/3rd_party-static/jsoncpp/doc/header.html
deleted file mode 100644
index 1a6ad6120a..0000000000
--- a/src/3rd_party-static/jsoncpp/doc/header.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html>
-<head>
-<title>
-JsonCpp - JSON data format manipulation library
-</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-<link href="tabs.css" rel="stylesheet" type="text/css">
-</head>
-
-<body bgcolor="#ffffff"> 
-<table width="100%">
-  <tr>
-    <td width="40%" align="left" valign="center">
-      <a href="http://sourceforge.net/projects/jsoncpp/">
-      JsonCpp project page
-      </a>
-    </td>
-    <td width="40%" align="right" valign="center">
-      <a href="http://jsoncpp.sourceforge.net">JsonCpp home page</a>
-    </td>
-  </tr>
-</table>
-
-<hr>
diff --git a/src/3rd_party-static/jsoncpp/doc/jsoncpp.dox b/src/3rd_party-static/jsoncpp/doc/jsoncpp.dox
deleted file mode 100644
index 97cc108d33..0000000000
--- a/src/3rd_party-static/jsoncpp/doc/jsoncpp.dox
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
-\mainpage
-\section _intro Introduction
-
-<a HREF="http://www.json.org/">JSON (JavaScript Object Notation)</a>
- is a lightweight data-interchange format. 
-It can represent integer, real number, string, an ordered sequence of value, and
-a collection of name/value pairs.
-
-Here is an example of JSON data:
-\verbatim
-// Configuration options
-{
-    // Default encoding for text
-    "encoding" : "UTF-8",
-    
-    // Plug-ins loaded at start-up
-    "plug-ins" : [
-        "python",
-        "c++",
-        "ruby"
-        ],
-        
-    // Tab indent size
-    "indent" : { "length" : 3, "use_space": true }
-}
-\endverbatim
-
-\section _features Features
-- read and write JSON document
-- attach C and C++ style comments to element during parsing
-- rewrite JSON document preserving original comments
-
-Notes: Comments used to be supported in JSON but where removed for 
-portability (C like comments are not supported in Python). Since
-comments are useful in configuration/input file, this feature was
-preserved.
-
-\section _example Code example
-
-\code
-Json::Value root;   // will contains the root value after parsing.
-Json::Reader reader;
-bool parsingSuccessful = reader.parse( config_doc, root );
-if ( !parsingSuccessful )
-{
-    // report to the user the failure and their locations in the document.
-    std::cout  << "Failed to parse configuration\n"
-               << reader.getFormattedErrorMessages();
-    return;
-}
-
-// Get the value of the member of root named 'encoding', return 'UTF-8' if there is no
-// such member.
-std::string encoding = root.get("encoding", "UTF-8" ).asString();
-// Get the value of the member of root named 'encoding', return a 'null' value if
-// there is no such member.
-const Json::Value plugins = root["plug-ins"];
-for ( int index = 0; index < plugins.size(); ++index )  // Iterates over the sequence elements.
-   loadPlugIn( plugins[index].asString() );
-   
-setIndentLength( root["indent"].get("length", 3).asInt() );
-setIndentUseSpace( root["indent"].get("use_space", true).asBool() );
-
-// ...
-// At application shutdown to make the new configuration document:
-// Since Json::Value has implicit constructor for all value types, it is not
-// necessary to explicitly construct the Json::Value object:
-root["encoding"] = getCurrentEncoding();
-root["indent"]["length"] = getCurrentIndentLength();
-root["indent"]["use_space"] = getCurrentIndentUseSpace();
-
-Json::StyledWriter writer;
-// Make a new JSON document for the configuration. Preserve original comments.
-std::string outputConfig = writer.write( root );
-
-// You can also use streams.  This will put the contents of any JSON
-// stream at a particular sub-value, if you'd like.
-std::cin >> root["subtree"];
-
-// And you can write to a stream, using the StyledWriter automatically.
-std::cout << root;
-\endcode
-
-\section _pbuild Build instructions
-The build instructions are located in the file 
-<a HREF="README.txt">README.txt</a> in the top-directory of the project.
-
-Permanent link to the latest revision of the file in subversion: 
-<a HREF="http://jsoncpp.svn.sourceforge.net/viewvc/jsoncpp/trunk/jsoncpp/README.txt?view=markup">latest README.txt</a>
-
-\section _pdownload Download
-The sources can be downloaded from 
-<a HREF="http://sourceforge.net/projects/jsoncpp/files/">SourceForge download page</a>.
-
-The latest version of the source is available in the project's subversion repository: 
-<a HREF="http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/">
-http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/</a>
-
-To checkout the source, see the following 
-<a HREF="http://sourceforge.net/scm/?type=svn&group_id=144446">instructions</a>.
-
-\section _news What's New?
-The description of latest changes can be found in 
-<a HREF="NEWS.txt">NEWS.txt</a> in the top-directory of the project.
-
-Permanent link to the latest revision of the file in subversion: 
-<a HREF="http://svn.sourceforge.net/viewcvs.cgi/jsoncpp/README.txt?view=markup">latest NEWS.txt</a>
-
-\section _plinks Project links
-- <a HREF="http://jsoncpp.sourceforge.net">json-cpp home</a>
-- <a HREF="http://www.sourceforge.net/projects/jsoncpp/">json-cpp sourceforge project</a>
-
-\section _rlinks Related links
-- <a HREF="http://www.json.org/">JSON</a> Specification and alternate language implementations.
-- <a HREF="http://www.yaml.org/">YAML</a> A data format designed for human readability.
-- <a HREF="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode FAQ</a>.
-
-\section _license License
-See file <a HREF="LICENSE">LICENSE</a> in the top-directory of the project.
-
-Basically JsonCpp is licensed under MIT license, or public domain if desired 
-and recognized in your jurisdiction.
-
-\author Baptiste Lepilleur <blep@users.sourceforge.net>
-*/
diff --git a/src/3rd_party-static/jsoncpp/doc/readme.txt b/src/3rd_party-static/jsoncpp/doc/readme.txt
deleted file mode 100644
index 0e42cdfb4c..0000000000
--- a/src/3rd_party-static/jsoncpp/doc/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-The documentation is generated using doxygen (http://www.doxygen.org).
diff --git a/src/3rd_party-static/jsoncpp/doc/roadmap.dox b/src/3rd_party-static/jsoncpp/doc/roadmap.dox
deleted file mode 100644
index e6fc17aa68..0000000000
--- a/src/3rd_party-static/jsoncpp/doc/roadmap.dox
+++ /dev/null
@@ -1,37 +0,0 @@
-/*! \page roadmap JsonCpp roadmap
-  \section ms_release Makes JsonCpp ready for release
-  - Build system clean-up:
-	- Fix build on Windows (shared-library build is broken)
-	- Add enable/disable flag for static and shared library build
-	- Enhance help
-  - Platform portability check: (Notes: was ok on last check)
-	- linux/gcc, 
-	- solaris/cc, 
-	- windows/msvc678, 
-	- aix/vacpp
-  - Add JsonCpp version to header as numeric for use in preprocessor test
-  - Remove buggy experimental hash stuff
-  \section ms_strict Adds a strict mode to reader/parser
-	Strict JSON support as specific in RFC 4627 (http://www.ietf.org/rfc/rfc4627.txt?number=4627).
-	- Enforce only object or array as root element
-	- Disable comment support
-    - Get jsonchecker failing tests to pass in strict mode
-  \section ms_writer Writter control
-    Provides more control to determine how specific items are serialized when JSON allow choice:
-	- Optionally allow escaping of non-ASCII characters using unicode escape sequence "\\u".
-	- Optionally allow escaping of "/" using "\/".
-  \section ms_separation Expose json reader/writer API that do not impose using Json::Value.
-	Some typical use-case involve an application specific structure to/from a JSON document.
-    - Event base parser to allow unserializing a Json document directly in datastructure instead of
-      using the intermediate Json::Value.
-    - Stream based parser to serialized a Json document without using Json::Value as input.
-	- Performance oriented parser/writer:
-		- Provides an event based parser. Should allow pulling & skipping events for ease of use.
-		- Provides a JSON document builder: fast only.
-  \section ms_perfo Performance tuning
-    - Provides support for static property name definition avoiding allocation 
-    - Static property dictionnary can be provided to JSON reader
-    - Performance scenario & benchmarking
-  \section testing Testing
-    - Adds more tests for unicode parsing (e.g. including surrogate and error detection).
-*/
diff --git a/src/3rd_party-static/jsoncpp/doxybuild.py b/src/3rd_party-static/jsoncpp/doxybuild.py
deleted file mode 100644
index 03ad68df02..0000000000
--- a/src/3rd_party-static/jsoncpp/doxybuild.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""Script to generate doxygen documentation.
-"""
-
-import re
-import os
-import os.path
-import sys
-import shutil
-from devtools import tarball
-
-def find_program(*filenames):
-    """find a program in folders path_lst, and sets env[var]
-    @param filenames: a list of possible names of the program to search for
-    @return: the full path of the filename if found, or '' if filename could not be found
-"""
-    paths = os.environ.get('PATH', '').split(os.pathsep)
-    suffixes = ('win32' in sys.platform ) and '.exe .com .bat .cmd' or ''
-    for filename in filenames:
-        for name in [filename+ext for ext in suffixes.split()]:
-            for directory in paths:
-                full_path = os.path.join(directory, name)
-                if os.path.isfile(full_path):
-                    return full_path
-    return ''
-
-def do_subst_in_file(targetfile, sourcefile, dict):
-    """Replace all instances of the keys of dict with their values.
-    For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'},
-    then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
-    """
-    try:
-        f = open(sourcefile, 'rb')
-        contents = f.read()
-        f.close()
-    except:
-        print "Can't read source file %s"%sourcefile
-        raise
-    for (k,v) in dict.items():
-        v = v.replace('\\','\\\\') 
-        contents = re.sub(k, v, contents)
-    try:
-        f = open(targetfile, 'wb')
-        f.write(contents)
-        f.close()
-    except:
-        print "Can't write target file %s"%targetfile
-        raise
-
-def run_doxygen(doxygen_path, config_file, working_dir, is_silent):
-    config_file = os.path.abspath( config_file )
-    doxygen_path = doxygen_path
-    old_cwd = os.getcwd()
-    try:
-        os.chdir( working_dir )
-        cmd = [doxygen_path, config_file]
-        print 'Running:', ' '.join( cmd )
-        try:
-            import subprocess
-        except:
-            if os.system( ' '.join( cmd ) ) != 0:
-                print 'Documentation generation failed'
-                return False
-        else:
-            if is_silent:
-                process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
-            else:
-                process = subprocess.Popen( cmd )
-            stdout, _ = process.communicate()
-            if process.returncode:
-                print 'Documentation generation failed:'
-                print stdout
-                return False
-        return True
-    finally:
-        os.chdir( old_cwd )
-
-def build_doc( options,  make_release=False ):
-    if make_release:
-        options.make_tarball = True
-        options.with_dot = True
-        options.with_html_help = True
-        options.with_uml_look = True
-        options.open = False
-        options.silent = True
-
-    version = open('version','rt').read().strip()
-    output_dir = 'dist/doxygen' # relative to doc/doxyfile location.
-    if not os.path.isdir( output_dir ):
-        os.makedirs( output_dir )
-    top_dir = os.path.abspath( '.' )
-    html_output_dirname = 'jsoncpp-api-html-' + version
-    tarball_path = os.path.join( 'dist', html_output_dirname + '.tar.gz' )
-    warning_log_path = os.path.join( output_dir, '../jsoncpp-doxygen-warning.log' )
-    html_output_path = os.path.join( output_dir, html_output_dirname )
-    def yesno( bool ):
-        return bool and 'YES' or 'NO'
-    subst_keys = {
-        '%JSONCPP_VERSION%': version,
-        '%DOC_TOPDIR%': '',
-        '%TOPDIR%': top_dir,
-        '%HTML_OUTPUT%': os.path.join( '..', output_dir, html_output_dirname ),
-        '%HAVE_DOT%': yesno(options.with_dot),
-        '%DOT_PATH%': os.path.split(options.dot_path)[0],
-        '%HTML_HELP%': yesno(options.with_html_help),
-        '%UML_LOOK%': yesno(options.with_uml_look),
-        '%WARNING_LOG_PATH%': os.path.join( '..', warning_log_path )
-        }
-
-    if os.path.isdir( output_dir ):
-        print 'Deleting directory:', output_dir
-        shutil.rmtree( output_dir )
-    if not os.path.isdir( output_dir ):
-        os.makedirs( output_dir )
-
-    do_subst_in_file( 'doc/doxyfile', 'doc/doxyfile.in', subst_keys )
-    ok = run_doxygen( options.doxygen_path, 'doc/doxyfile', 'doc', is_silent=options.silent )
-    if not options.silent:
-        print open(warning_log_path, 'rb').read()
-    index_path = os.path.abspath(os.path.join(subst_keys['%HTML_OUTPUT%'], 'index.html'))
-    print 'Generated documentation can be found in:'
-    print index_path
-    if options.open:
-        import webbrowser
-        webbrowser.open( 'file://' + index_path )
-    if options.make_tarball:
-        print 'Generating doc tarball to', tarball_path
-        tarball_sources = [
-            output_dir,
-            'README.txt',
-            'LICENSE',
-            'NEWS.txt',
-            'version'
-            ]
-        tarball_basedir = os.path.join( output_dir, html_output_dirname )
-        tarball.make_tarball( tarball_path, tarball_sources, tarball_basedir, html_output_dirname )
-    return tarball_path, html_output_dirname
-
-def main():
-    usage = """%prog
-    Generates doxygen documentation in build/doxygen.
-    Optionaly makes a tarball of the documentation to dist/.
-
-    Must be started in the project top directory.    
-    """
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = False
-    parser.add_option('--with-dot', dest="with_dot", action='store_true', default=False,
-        help="""Enable usage of DOT to generate collaboration diagram""")
-    parser.add_option('--dot', dest="dot_path", action='store', default=find_program('dot'),
-        help="""Path to GraphViz dot tool. Must be full qualified path. [Default: %default]""")
-    parser.add_option('--doxygen', dest="doxygen_path", action='store', default=find_program('doxygen'),
-        help="""Path to Doxygen tool. [Default: %default]""")
-    parser.add_option('--with-html-help', dest="with_html_help", action='store_true', default=False,
-        help="""Enable generation of Microsoft HTML HELP""")
-    parser.add_option('--no-uml-look', dest="with_uml_look", action='store_false', default=True,
-        help="""Generates DOT graph without UML look [Default: False]""")
-    parser.add_option('--open', dest="open", action='store_true', default=False,
-        help="""Open the HTML index in the web browser after generation""")
-    parser.add_option('--tarball', dest="make_tarball", action='store_true', default=False,
-        help="""Generates a tarball of the documentation in dist/ directory""")
-    parser.add_option('-s', '--silent', dest="silent", action='store_true', default=False,
-        help="""Hides doxygen output""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-    build_doc( options )
-
-if __name__ == '__main__':
-    main()
diff --git a/src/3rd_party-static/jsoncpp/include/json/autolink.h b/src/3rd_party-static/jsoncpp/include/json/autolink.h
deleted file mode 100644
index 02328d1f1a..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/autolink.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_AUTOLINK_H_INCLUDED
-# define JSON_AUTOLINK_H_INCLUDED
-
-# include "config.h"
-
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/cpptl_autolink.h>
-# endif
-
-# if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)  &&  !defined(JSON_IN_CPPTL)
-#  define CPPTL_AUTOLINK_NAME "json"
-#  undef CPPTL_AUTOLINK_DLL
-#  ifdef JSON_DLL
-#   define CPPTL_AUTOLINK_DLL
-#  endif
-#  include "autolink.h"
-# endif
-
-#endif // JSON_AUTOLINK_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/config.h b/src/3rd_party-static/jsoncpp/include/json/config.h
deleted file mode 100644
index 7609d45e7a..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/config.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_CONFIG_H_INCLUDED
-# define JSON_CONFIG_H_INCLUDED
-
-/// If defined, indicates that json library is embedded in CppTL library.
-//# define JSON_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-//#  define JSON_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of std::map
-/// as Value container.
-//#  define JSON_USE_CPPTL_SMALLMAP 1
-/// If defined, indicates that Json specific container should be used
-/// (hash table & simple deque container with customizable allocator).
-/// THIS FEATURE IS STILL EXPERIMENTAL! There is know bugs: See #3177332
-//#  define JSON_VALUE_USE_INTERNAL_MAP 1
-/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
-/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
-/// as if it was a POD) that may cause some validation tool to report errors.
-/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
-//#  define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
-
-/// If defined, indicates that Json use exception to report invalid type manipulation
-/// instead of C assert macro.
-# define JSON_USE_EXCEPTION 1
-
-/// If defined, indicates that the source file is amalgated
-/// to prevent private header inclusion.
-/// Remarks: it is automatically defined in the generated amalgated header.
-// #define JSON_IS_AMALGAMATION
-
-
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/config.h>
-#  ifndef JSON_USE_CPPTL
-#   define JSON_USE_CPPTL 1
-#  endif
-# endif
-
-# ifdef JSON_IN_CPPTL
-#  define JSON_API CPPTL_API
-# elif defined(JSON_DLL_BUILD)
-#  define JSON_API __declspec(dllexport)
-# elif defined(JSON_DLL)
-#  define JSON_API __declspec(dllimport)
-# else
-#  define JSON_API
-# endif
-
-// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for integer
-// Storages, and 64 bits integer support is disabled.
-// #define JSON_NO_INT64 1
-
-#if defined(_MSC_VER)  &&  _MSC_VER <= 1200 // MSVC 6
-// Microsoft Visual Studio 6 only support conversion from __int64 to double
-// (no conversion from unsigned __int64).
-#define JSON_USE_INT64_DOUBLE_CONVERSION 1
-#endif // if defined(_MSC_VER)  &&  _MSC_VER < 1200 // MSVC 6
-
-#if defined(_MSC_VER)  &&  _MSC_VER >= 1500 // MSVC 2008
-/// Indicates that the following function is deprecated.
-# define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
-#endif
-
-#if !defined(JSONCPP_DEPRECATED)
-# define JSONCPP_DEPRECATED(message)
-#endif // if !defined(JSONCPP_DEPRECATED)
-
-namespace Json {
-   typedef int Int;
-   typedef unsigned int UInt;
-# if defined(JSON_NO_INT64)
-   typedef int LargestInt;
-   typedef unsigned int LargestUInt;
-#  undef JSON_HAS_INT64
-# else // if defined(JSON_NO_INT64)
-   // For Microsoft Visual use specific types as long long is not supported
-#  if defined(_MSC_VER) // Microsoft Visual Studio
-   typedef __int64 Int64;
-   typedef unsigned __int64 UInt64;
-#  else // if defined(_MSC_VER) // Other platforms, use long long
-   typedef long long int Int64;
-   typedef unsigned long long int UInt64;
-#  endif // if defined(_MSC_VER)
-   typedef Int64 LargestInt;
-   typedef UInt64 LargestUInt;
-#  define JSON_HAS_INT64
-# endif // if defined(JSON_NO_INT64)
-} // end namespace Json
-
-
-#endif // JSON_CONFIG_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/features.h b/src/3rd_party-static/jsoncpp/include/json/features.h
deleted file mode 100644
index 4353278446..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/features.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-# define CPPTL_JSON_FEATURES_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-   /** \brief Configuration passed to reader and writer.
-    * This configuration object can be used to force the Reader or Writer
-    * to behave in a standard conforming way.
-    */
-   class JSON_API Features
-   {
-   public:
-      /** \brief A configuration that allows all features and assumes all strings are UTF-8.
-       * - C & C++ comments are allowed
-       * - Root object can be any JSON value
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features all();
-
-      /** \brief A configuration that is strictly compatible with the JSON specification.
-       * - Comments are forbidden.
-       * - Root object must be either an array or an object value.
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features strictMode();
-
-      /** \brief Initialize the configuration like JsonConfig::allFeatures;
-       */
-      Features();
-
-      /// \c true if comments are allowed. Default: \c true.
-      bool allowComments_;
-
-      /// \c true if root must be either an array or an object value. Default: \c false.
-      bool strictRoot_;
-   };
-
-} // namespace Json
-
-#endif // CPPTL_JSON_FEATURES_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/forwards.h b/src/3rd_party-static/jsoncpp/include/json/forwards.h
deleted file mode 100644
index ab863da853..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/forwards.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_FORWARDS_H_INCLUDED
-# define JSON_FORWARDS_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-   // writer.h
-   class FastWriter;
-   class StyledWriter;
-
-   // reader.h
-   class Reader;
-
-   // features.h
-   class Features;
-
-   // value.h
-   typedef unsigned int ArrayIndex;
-   class StaticString;
-   class Path;
-   class PathArgument;
-   class Value;
-   class ValueIteratorBase;
-   class ValueIterator;
-   class ValueConstIterator;
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   class ValueMapAllocator;
-   class ValueInternalLink;
-   class ValueInternalArray;
-   class ValueInternalMap;
-#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-} // namespace Json
-
-
-#endif // JSON_FORWARDS_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/json.h b/src/3rd_party-static/jsoncpp/include/json/json.h
deleted file mode 100644
index da5fc967eb..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/json.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_JSON_H_INCLUDED
-# define JSON_JSON_H_INCLUDED
-
-# include "autolink.h"
-# include "value.h"
-# include "reader.h"
-# include "writer.h"
-# include "features.h"
-
-#endif // JSON_JSON_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/reader.h b/src/3rd_party-static/jsoncpp/include/json/reader.h
deleted file mode 100644
index 0a324dfc5c..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/reader.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_READER_H_INCLUDED
-# define CPPTL_JSON_READER_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include "features.h"
-# include "value.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-# include <deque>
-# include <stack>
-# include <string>
-# include <iostream>
-
-namespace Json {
-
-   /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
-    *
-    */
-   class JSON_API Reader
-   {
-   public:
-      typedef char Char;
-      typedef const Char *Location;
-
-      /** \brief Constructs a Reader allowing all features
-       * for parsing.
-       */
-      Reader();
-
-      /** \brief Constructs a Reader allowing the specified feature set
-       * for parsing.
-       */
-      Reader( const Features &features );
-
-      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const std::string &document, 
-                  Value &root,
-                  bool collectComments = true );
-
-      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param beginDoc Pointer on the beginning of the UTF-8 encoded string of the document to read.
-       * \param endDoc Pointer on the end of the UTF-8 encoded string of the document to read. 
-       \               Must be >= beginDoc.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const char *beginDoc, const char *endDoc, 
-                  Value &root,
-                  bool collectComments = true );
-
-      /// \brief Parse from input stream.
-      /// \see Json::operator>>(std::istream&, Json::Value&).
-      bool parse( std::istream &is,
-                  Value &root,
-                  bool collectComments = true );
-
-      /** \brief Returns a user friendly string that list errors in the parsed document.
-       * \return Formatted error message with the list of errors with their location in 
-       *         the parsed document. An empty string is returned if no error occurred
-       *         during parsing.
-       * \deprecated Use getFormattedErrorMessages() instead (typo fix).
-       */
-      JSONCPP_DEPRECATED("Use getFormattedErrorMessages instead") 
-      std::string getFormatedErrorMessages() const;
-
-      /** \brief Returns a user friendly string that list errors in the parsed document.
-       * \return Formatted error message with the list of errors with their location in 
-       *         the parsed document. An empty string is returned if no error occurred
-       *         during parsing.
-       */
-      std::string getFormattedErrorMessages() const;
-
-   private:
-      enum TokenType
-      {
-         tokenEndOfStream = 0,
-         tokenObjectBegin,
-         tokenObjectEnd,
-         tokenArrayBegin,
-         tokenArrayEnd,
-         tokenString,
-         tokenNumber,
-         tokenTrue,
-         tokenFalse,
-         tokenNull,
-         tokenArraySeparator,
-         tokenMemberSeparator,
-         tokenComment,
-         tokenError
-      };
-
-      class Token
-      {
-      public:
-         TokenType type_;
-         Location start_;
-         Location end_;
-      };
-
-      class ErrorInfo
-      {
-      public:
-         Token token_;
-         std::string message_;
-         Location extra_;
-      };
-
-      typedef std::deque<ErrorInfo> Errors;
-
-      bool expectToken( TokenType type, Token &token, const char *message );
-      bool readToken( Token &token );
-      void skipSpaces();
-      bool match( Location pattern, 
-                  int patternLength );
-      bool readComment();
-      bool readCStyleComment();
-      bool readCppStyleComment();
-      bool readString();
-      void readNumber();
-      bool readValue();
-      bool readObject( Token &token );
-      bool readArray( Token &token );
-      bool decodeNumber( Token &token );
-      bool decodeString( Token &token );
-      bool decodeString( Token &token, std::string &decoded );
-      bool decodeDouble( Token &token );
-      bool decodeUnicodeCodePoint( Token &token, 
-                                   Location &current, 
-                                   Location end, 
-                                   unsigned int &unicode );
-      bool decodeUnicodeEscapeSequence( Token &token, 
-                                        Location &current, 
-                                        Location end, 
-                                        unsigned int &unicode );
-      bool addError( const std::string &message, 
-                     Token &token,
-                     Location extra = 0 );
-      bool recoverFromError( TokenType skipUntilToken );
-      bool addErrorAndRecover( const std::string &message, 
-                               Token &token,
-                               TokenType skipUntilToken );
-      void skipUntilSpace();
-      Value &currentValue();
-      Char getNextChar();
-      void getLocationLineAndColumn( Location location,
-                                     int &line,
-                                     int &column ) const;
-      std::string getLocationLineAndColumn( Location location ) const;
-      void addComment( Location begin, 
-                       Location end, 
-                       CommentPlacement placement );
-      void skipCommentTokens( Token &token );
-   
-      typedef std::stack<Value *> Nodes;
-      Nodes nodes_;
-      Errors errors_;
-      std::string document_;
-      Location begin_;
-      Location end_;
-      Location current_;
-      Location lastValueEnd_;
-      Value *lastValue_;
-      std::string commentsBefore_;
-      Features features_;
-      bool collectComments_;
-   };
-
-   /** \brief Read from 'sin' into 'root'.
-
-    Always keep comments from the input JSON.
-
-    This can be used to read a file into a particular sub-object.
-    For example:
-    \code
-    Json::Value root;
-    cin >> root["dir"]["file"];
-    cout << root;
-    \endcode
-    Result:
-    \verbatim
-    {
-    "dir": {
-        "file": {
-        // The input stream JSON would be nested here.
-        }
-    }
-    }
-    \endverbatim
-    \throw std::exception on parse error.
-    \see Json::operator<<()
-   */
-   std::istream& operator>>( std::istream&, Value& );
-
-} // namespace Json
-
-#endif // CPPTL_JSON_READER_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/value.h b/src/3rd_party-static/jsoncpp/include/json/value.h
deleted file mode 100644
index 32e3455ec6..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/value.h
+++ /dev/null
@@ -1,1103 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_H_INCLUDED
-# define CPPTL_JSON_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-# include <string>
-# include <vector>
-
-# ifndef JSON_USE_CPPTL_SMALLMAP
-#  include <map>
-# else
-#  include <cpptl/smallmap.h>
-# endif
-# ifdef JSON_USE_CPPTL
-#  include <cpptl/forwards.h>
-# endif
-
-/** \brief JSON (JavaScript Object Notation).
- */
-namespace Json {
-
-   /** \brief Type of the value held by a Value object.
-    */
-   enum ValueType
-   {
-      nullValue = 0, ///< 'null' value
-      intValue,      ///< signed integer value
-      uintValue,     ///< unsigned integer value
-      realValue,     ///< double value
-      stringValue,   ///< UTF-8 string value
-      booleanValue,  ///< bool value
-      arrayValue,    ///< array value (ordered list)
-      objectValue    ///< object value (collection of name/value pairs).
-   };
-
-   enum CommentPlacement
-   {
-      commentBefore = 0,        ///< a comment placed on the line before a value
-      commentAfterOnSameLine,   ///< a comment just after a value on the same line
-      commentAfter,             ///< a comment on the line after a value (only make sense for root value)
-      numberOfCommentPlacement
-   };
-
-//# ifdef JSON_USE_CPPTL
-//   typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
-//   typedef CppTL::AnyEnumerator<const Value &> EnumValues;
-//# endif
-
-   /** \brief Lightweight wrapper to tag static string.
-    *
-    * Value constructor and objectValue member assignement takes advantage of the
-    * StaticString and avoid the cost of string duplication when storing the
-    * string or the member name.
-    *
-    * Example of usage:
-    * \code
-    * Json::Value aValue( StaticString("some text") );
-    * Json::Value object;
-    * static const StaticString code("code");
-    * object[code] = 1234;
-    * \endcode
-    */
-   class JSON_API StaticString
-   {
-   public:
-      explicit StaticString( const char *czstring )
-         : str_( czstring )
-      {
-      }
-
-      operator const char *() const
-      {
-         return str_;
-      }
-
-      const char *c_str() const
-      {
-         return str_;
-      }
-
-   private:
-      const char *str_;
-   };
-
-   /** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
-    *
-    * This class is a discriminated union wrapper that can represents a:
-    * - signed integer [range: Value::minInt - Value::maxInt]
-    * - unsigned integer (range: 0 - Value::maxUInt)
-    * - double
-    * - UTF-8 string
-    * - boolean
-    * - 'null'
-    * - an ordered list of Value
-    * - collection of name/value pairs (javascript object)
-    *
-    * The type of the held value is represented by a #ValueType and 
-    * can be obtained using type().
-    *
-    * values of an #objectValue or #arrayValue can be accessed using operator[]() methods. 
-    * Non const methods will automatically create the a #nullValue element 
-    * if it does not exist. 
-    * The sequence of an #arrayValue will be automatically resize and initialized 
-    * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
-    *
-    * The get() methods can be used to obtanis default value in the case the required element
-    * does not exist.
-    *
-    * It is possible to iterate over the list of a #objectValue values using 
-    * the getMemberNames() method.
-    */
-   class JSON_API Value 
-   {
-      friend class ValueIteratorBase;
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      friend class ValueInternalLink;
-      friend class ValueInternalMap;
-# endif
-   public:
-      typedef std::vector<std::string> Members;
-      typedef ValueIterator iterator;
-      typedef ValueConstIterator const_iterator;
-      typedef Json::UInt UInt;
-      typedef Json::Int Int;
-# if defined(JSON_HAS_INT64)
-      typedef Json::UInt64 UInt64;
-      typedef Json::Int64 Int64;
-#endif // defined(JSON_HAS_INT64)
-      typedef Json::LargestInt LargestInt;
-      typedef Json::LargestUInt LargestUInt;
-      typedef Json::ArrayIndex ArrayIndex;
-
-      static const Value null;
-      /// Minimum signed integer value that can be stored in a Json::Value.
-      static const LargestInt minLargestInt;
-      /// Maximum signed integer value that can be stored in a Json::Value.
-      static const LargestInt maxLargestInt;
-      /// Maximum unsigned integer value that can be stored in a Json::Value.
-      static const LargestUInt maxLargestUInt;
-
-      /// Minimum signed int value that can be stored in a Json::Value.
-      static const Int minInt;
-      /// Maximum signed int value that can be stored in a Json::Value.
-      static const Int maxInt;
-      /// Maximum unsigned int value that can be stored in a Json::Value.
-      static const UInt maxUInt;
-
-      /// Minimum signed 64 bits int value that can be stored in a Json::Value.
-      static const Int64 minInt64;
-      /// Maximum signed 64 bits int value that can be stored in a Json::Value.
-      static const Int64 maxInt64;
-      /// Maximum unsigned 64 bits int value that can be stored in a Json::Value.
-      static const UInt64 maxUInt64;
-
-   private:
-#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-# ifndef JSON_VALUE_USE_INTERNAL_MAP
-      class CZString 
-      {
-      public:
-         enum DuplicationPolicy 
-         {
-            noDuplication = 0,
-            duplicate,
-            duplicateOnCopy
-         };
-         CZString( ArrayIndex index );
-         CZString( const char *cstr, DuplicationPolicy allocate );
-         CZString( const CZString &other );
-         ~CZString();
-         CZString &operator =( const CZString &other );
-         bool operator<( const CZString &other ) const;
-         bool operator==( const CZString &other ) const;
-         ArrayIndex index() const;
-         const char *c_str() const;
-         bool isStaticString() const;
-      private:
-         void swap( CZString &other );
-         const char *cstr_;
-         ArrayIndex index_;
-      };
-
-   public:
-#  ifndef JSON_USE_CPPTL_SMALLMAP
-      typedef std::map<CZString, Value> ObjectValues;
-#  else
-      typedef CppTL::SmallMap<CZString, Value> ObjectValues;
-#  endif // ifndef JSON_USE_CPPTL_SMALLMAP
-# endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
-#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-   public:
-      /** \brief Create a default Value of the given type.
-
-        This is a very useful constructor.
-        To create an empty array, pass arrayValue.
-        To create an empty object, pass objectValue.
-        Another Value can then be set to this one by assignment.
-    This is useful since clear() and resize() will not alter types.
-
-        Examples:
-    \code
-    Json::Value null_value; // null
-    Json::Value arr_value(Json::arrayValue); // []
-    Json::Value obj_value(Json::objectValue); // {}
-    \endcode
-      */
-      Value( ValueType type = nullValue );
-      Value( Int value );
-      Value( UInt value );
-#if defined(JSON_HAS_INT64)
-      Value( Int64 value );
-      Value( UInt64 value );
-#endif // if defined(JSON_HAS_INT64)
-      Value( double value );
-      Value( const char *value );
-      Value( const char *beginValue, const char *endValue );
-      /** \brief Constructs a value from a static string.
-
-       * Like other value string constructor but do not duplicate the string for
-       * internal storage. The given string must remain alive after the call to this
-       * constructor.
-       * Example of usage:
-       * \code
-       * Json::Value aValue( StaticString("some text") );
-       * \endcode
-       */
-      Value( const StaticString &value );
-      Value( const std::string &value );
-# ifdef JSON_USE_CPPTL
-      Value( const CppTL::ConstString &value );
-# endif
-      Value( bool value );
-      Value( const Value &other );
-      ~Value();
-
-      Value &operator=( const Value &other );
-      /// Swap values.
-      /// \note Currently, comments are intentionally not swapped, for
-      /// both logic and efficiency.
-      void swap( Value &other );
-
-      ValueType type() const;
-
-      bool operator <( const Value &other ) const;
-      bool operator <=( const Value &other ) const;
-      bool operator >=( const Value &other ) const;
-      bool operator >( const Value &other ) const;
-
-      bool operator ==( const Value &other ) const;
-      bool operator !=( const Value &other ) const;
-
-      int compare( const Value &other ) const;
-
-      const char *asCString() const;
-      std::string asString() const;
-# ifdef JSON_USE_CPPTL
-      CppTL::ConstString asConstString() const;
-# endif
-      Int asInt() const;
-      UInt asUInt() const;
-      Int64 asInt64() const;
-      UInt64 asUInt64() const;
-      LargestInt asLargestInt() const;
-      LargestUInt asLargestUInt() const;
-      float asFloat() const;
-      double asDouble() const;
-      bool asBool() const;
-
-      bool isNull() const;
-      bool isBool() const;
-      bool isInt() const;
-      bool isUInt() const;
-      bool isIntegral() const;
-      bool isDouble() const;
-      bool isNumeric() const;
-      bool isString() const;
-      bool isArray() const;
-      bool isObject() const;
-
-      bool isConvertibleTo( ValueType other ) const;
-
-      /// Number of values in array or object
-      ArrayIndex size() const;
-
-      /// \brief Return true if empty array, empty object, or null;
-      /// otherwise, false.
-      bool empty() const;
-
-      /// Return isNull()
-      bool operator!() const;
-
-      /// Remove all object members and array elements.
-      /// \pre type() is arrayValue, objectValue, or nullValue
-      /// \post type() is unchanged
-      void clear();
-
-      /// Resize the array to size elements. 
-      /// New elements are initialized to null.
-      /// May only be called on nullValue or arrayValue.
-      /// \pre type() is arrayValue or nullValue
-      /// \post type() is arrayValue
-      void resize( ArrayIndex size );
-
-      /// Access an array element (zero based index ).
-      /// If the array contains less than index element, then null value are inserted
-      /// in the array so that its size is index+1.
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      Value &operator[]( ArrayIndex index );
-
-      /// Access an array element (zero based index ).
-      /// If the array contains less than index element, then null value are inserted
-      /// in the array so that its size is index+1.
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      Value &operator[]( int index );
-
-      /// Access an array element (zero based index )
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      const Value &operator[]( ArrayIndex index ) const;
-
-      /// Access an array element (zero based index )
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      const Value &operator[]( int index ) const;
-
-      /// If the array contains at least index+1 elements, returns the element value, 
-      /// otherwise returns defaultValue.
-      Value get( ArrayIndex index, 
-                 const Value &defaultValue ) const;
-      /// Return true if index < size().
-      bool isValidIndex( ArrayIndex index ) const;
-      /// \brief Append value to array at the end.
-      ///
-      /// Equivalent to jsonvalue[jsonvalue.size()] = value;
-      Value &append( const Value &value );
-
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const char *key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const char *key ) const;
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const std::string &key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const std::string &key ) const;
-      /** \brief Access an object value by name, create a null member if it does not exist.
-
-       * If the object as no entry for that name, then the member name used to store
-       * the new entry is not duplicated.
-       * Example of use:
-       * \code
-       * Json::Value object;
-       * static const StaticString code("code");
-       * object[code] = 1234;
-       * \endcode
-       */
-      Value &operator[]( const StaticString &key );
-# ifdef JSON_USE_CPPTL
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const CppTL::ConstString &key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const CppTL::ConstString &key ) const;
-# endif
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const char *key, 
-                 const Value &defaultValue ) const;
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const std::string &key,
-                 const Value &defaultValue ) const;
-# ifdef JSON_USE_CPPTL
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const CppTL::ConstString &key,
-                 const Value &defaultValue ) const;
-# endif
-      /// \brief Remove and return the named member.  
-      ///
-      /// Do nothing if it did not exist.
-      /// \return the removed Value, or null.
-      /// \pre type() is objectValue or nullValue
-      /// \post type() is unchanged
-      Value removeMember( const char* key );
-      /// Same as removeMember(const char*)
-      Value removeMember( const std::string &key );
-
-      /// Return true if the object has a member named key.
-      bool isMember( const char *key ) const;
-      /// Return true if the object has a member named key.
-      bool isMember( const std::string &key ) const;
-# ifdef JSON_USE_CPPTL
-      /// Return true if the object has a member named key.
-      bool isMember( const CppTL::ConstString &key ) const;
-# endif
-
-      /// \brief Return a list of the member names.
-      ///
-      /// If null, return an empty list.
-      /// \pre type() is objectValue or nullValue
-      /// \post if type() was nullValue, it remains nullValue
-      Members getMemberNames() const;
-
-//# ifdef JSON_USE_CPPTL
-//      EnumMemberNames enumMemberNames() const;
-//      EnumValues enumValues() const;
-//# endif
-
-      /// Comments must be //... or /* ... */
-      void setComment( const char *comment,
-                       CommentPlacement placement );
-      /// Comments must be //... or /* ... */
-      void setComment( const std::string &comment,
-                       CommentPlacement placement );
-      bool hasComment( CommentPlacement placement ) const;
-      /// Include delimiters and embedded newlines.
-      std::string getComment( CommentPlacement placement ) const;
-
-      std::string toStyledString() const;
-
-      const_iterator begin() const;
-      const_iterator end() const;
-
-      iterator begin();
-      iterator end();
-
-   private:
-      Value &resolveReference( const char *key, 
-                               bool isStatic );
-
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      inline bool isItemAvailable() const
-      {
-         return itemIsUsed_ == 0;
-      }
-
-      inline void setItemUsed( bool isUsed = true )
-      {
-         itemIsUsed_ = isUsed ? 1 : 0;
-      }
-
-      inline bool isMemberNameStatic() const
-      {
-         return memberNameIsStatic_ == 0;
-      }
-
-      inline void setMemberNameIsStatic( bool isStatic )
-      {
-         memberNameIsStatic_ = isStatic ? 1 : 0;
-      }
-# endif // # ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-   private:
-      struct CommentInfo
-      {
-         CommentInfo();
-         ~CommentInfo();
-
-         void setComment( const char *text );
-
-         char *comment_;
-      };
-
-      //struct MemberNamesTransform
-      //{
-      //   typedef const char *result_type;
-      //   const char *operator()( const CZString &name ) const
-      //   {
-      //      return name.c_str();
-      //   }
-      //};
-
-      union ValueHolder
-      {
-         LargestInt int_;
-         LargestUInt uint_;
-         double real_;
-         bool bool_;
-         char *string_;
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-         ValueInternalArray *array_;
-         ValueInternalMap *map_;
-#else
-         ObjectValues *map_;
-# endif
-      } value_;
-      ValueType type_ : 8;
-      int allocated_ : 1;     // Notes: if declared as bool, bitfield is useless.
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      unsigned int itemIsUsed_ : 1;      // used by the ValueInternalMap container.
-      int memberNameIsStatic_ : 1;       // used by the ValueInternalMap container.
-# endif
-      CommentInfo *comments_;
-   };
-
-
-   /** \brief Experimental and untested: represents an element of the "path" to access a node.
-    */
-   class PathArgument
-   {
-   public:
-      friend class Path;
-
-      PathArgument();
-      PathArgument( ArrayIndex index );
-      PathArgument( const char *key );
-      PathArgument( const std::string &key );
-
-   private:
-      enum Kind
-      {
-         kindNone = 0,
-         kindIndex,
-         kindKey
-      };
-      std::string key_;
-      ArrayIndex index_;
-      Kind kind_;
-   };
-
-   /** \brief Experimental and untested: represents a "path" to access a node.
-    *
-    * Syntax:
-    * - "." => root node
-    * - ".[n]" => elements at index 'n' of root node (an array value)
-    * - ".name" => member named 'name' of root node (an object value)
-    * - ".name1.name2.name3"
-    * - ".[0][1][2].name1[3]"
-    * - ".%" => member name is provided as parameter
-    * - ".[%]" => index is provied as parameter
-    */
-   class Path
-   {
-   public:
-      Path( const std::string &path,
-            const PathArgument &a1 = PathArgument(),
-            const PathArgument &a2 = PathArgument(),
-            const PathArgument &a3 = PathArgument(),
-            const PathArgument &a4 = PathArgument(),
-            const PathArgument &a5 = PathArgument() );
-
-      const Value &resolve( const Value &root ) const;
-      Value resolve( const Value &root, 
-                     const Value &defaultValue ) const;
-      /// Creates the "path" to access the specified node and returns a reference on the node.
-      Value &make( Value &root ) const;
-
-   private:
-      typedef std::vector<const PathArgument *> InArgs;
-      typedef std::vector<PathArgument> Args;
-
-      void makePath( const std::string &path,
-                     const InArgs &in );
-      void addPathInArg( const std::string &path, 
-                         const InArgs &in, 
-                         InArgs::const_iterator &itInArg, 
-                         PathArgument::Kind kind );
-      void invalidPath( const std::string &path, 
-                        int location );
-
-      Args args_;
-   };
-
-
-
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   /** \brief Allocator to customize Value internal map.
-    * Below is an example of a simple implementation (default implementation actually
-    * use memory pool for speed).
-    * \code
-      class DefaultValueMapAllocator : public ValueMapAllocator
-      {
-      public: // overridden from ValueMapAllocator
-         virtual ValueInternalMap *newMap()
-         {
-            return new ValueInternalMap();
-         }
-
-         virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-         {
-            return new ValueInternalMap( other );
-         }
-
-         virtual void destructMap( ValueInternalMap *map )
-         {
-            delete map;
-         }
-
-         virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-         {
-            return new ValueInternalLink[size];
-         }
-
-         virtual void releaseMapBuckets( ValueInternalLink *links )
-         {
-            delete [] links;
-         }
-
-         virtual ValueInternalLink *allocateMapLink()
-         {
-            return new ValueInternalLink();
-         }
-
-         virtual void releaseMapLink( ValueInternalLink *link )
-         {
-            delete link;
-         }
-      };
-    * \endcode
-    */ 
-   class JSON_API ValueMapAllocator
-   {
-   public:
-      virtual ~ValueMapAllocator();
-      virtual ValueInternalMap *newMap() = 0;
-      virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other ) = 0;
-      virtual void destructMap( ValueInternalMap *map ) = 0;
-      virtual ValueInternalLink *allocateMapBuckets( unsigned int size ) = 0;
-      virtual void releaseMapBuckets( ValueInternalLink *links ) = 0;
-      virtual ValueInternalLink *allocateMapLink() = 0;
-      virtual void releaseMapLink( ValueInternalLink *link ) = 0;
-   };
-
-   /** \brief ValueInternalMap hash-map bucket chain link (for internal use only).
-    * \internal previous_ & next_ allows for bidirectional traversal.
-    */
-   class JSON_API ValueInternalLink
-   {
-   public:
-      enum { itemPerLink = 6 };  // sizeof(ValueInternalLink) = 128 on 32 bits architecture.
-      enum InternalFlags { 
-         flagAvailable = 0,
-         flagUsed = 1
-      };
-
-      ValueInternalLink();
-
-      ~ValueInternalLink();
-
-      Value items_[itemPerLink];
-      char *keys_[itemPerLink];
-      ValueInternalLink *previous_;
-      ValueInternalLink *next_;
-   };
-
-
-   /** \brief A linked page based hash-table implementation used internally by Value.
-    * \internal ValueInternalMap is a tradional bucket based hash-table, with a linked
-    * list in each bucket to handle collision. There is an addional twist in that
-    * each node of the collision linked list is a page containing a fixed amount of
-    * value. This provides a better compromise between memory usage and speed.
-    * 
-    * Each bucket is made up of a chained list of ValueInternalLink. The last
-    * link of a given bucket can be found in the 'previous_' field of the following bucket.
-    * The last link of the last bucket is stored in tailLink_ as it has no following bucket.
-    * Only the last link of a bucket may contains 'available' item. The last link always
-    * contains at least one element unless is it the bucket one very first link.
-    */
-   class JSON_API ValueInternalMap
-   {
-      friend class ValueIteratorBase;
-      friend class Value;
-   public:
-      typedef unsigned int HashKey;
-      typedef unsigned int BucketIndex;
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-      struct IteratorState
-      {
-         IteratorState() 
-            : map_(0)
-            , link_(0)
-            , itemIndex_(0)
-            , bucketIndex_(0) 
-         {
-         }
-         ValueInternalMap *map_;
-         ValueInternalLink *link_;
-         BucketIndex itemIndex_;
-         BucketIndex bucketIndex_;
-      };
-# endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-      ValueInternalMap();
-      ValueInternalMap( const ValueInternalMap &other );
-      ValueInternalMap &operator =( const ValueInternalMap &other );
-      ~ValueInternalMap();
-
-      void swap( ValueInternalMap &other );
-
-      BucketIndex size() const;
-
-      void clear();
-
-      bool reserveDelta( BucketIndex growth );
-
-      bool reserve( BucketIndex newItemCount );
-
-      const Value *find( const char *key ) const;
-
-      Value *find( const char *key );
-
-      Value &resolveReference( const char *key, 
-                               bool isStatic );
-
-      void remove( const char *key );
-
-      void doActualRemove( ValueInternalLink *link, 
-                           BucketIndex index,
-                           BucketIndex bucketIndex );
-
-      ValueInternalLink *&getLastLinkInBucket( BucketIndex bucketIndex );
-
-      Value &setNewItem( const char *key, 
-                         bool isStatic, 
-                         ValueInternalLink *link, 
-                         BucketIndex index );
-
-      Value &unsafeAdd( const char *key, 
-                        bool isStatic, 
-                        HashKey hashedKey );
-
-      HashKey hash( const char *key ) const;
-
-      int compare( const ValueInternalMap &other ) const;
-
-   private:
-      void makeBeginIterator( IteratorState &it ) const;
-      void makeEndIterator( IteratorState &it ) const;
-      static bool equals( const IteratorState &x, const IteratorState &other );
-      static void increment( IteratorState &iterator );
-      static void incrementBucket( IteratorState &iterator );
-      static void decrement( IteratorState &iterator );
-      static const char *key( const IteratorState &iterator );
-      static const char *key( const IteratorState &iterator, bool &isStatic );
-      static Value &value( const IteratorState &iterator );
-      static int distance( const IteratorState &x, const IteratorState &y );
-
-   private:
-      ValueInternalLink *buckets_;
-      ValueInternalLink *tailLink_;
-      BucketIndex bucketsSize_;
-      BucketIndex itemCount_;
-   };
-
-   /** \brief A simplified deque implementation used internally by Value.
-   * \internal
-   * It is based on a list of fixed "page", each page contains a fixed number of items.
-   * Instead of using a linked-list, a array of pointer is used for fast item look-up.
-   * Look-up for an element is as follow:
-   * - compute page index: pageIndex = itemIndex / itemsPerPage
-   * - look-up item in page: pages_[pageIndex][itemIndex % itemsPerPage]
-   *
-   * Insertion is amortized constant time (only the array containing the index of pointers
-   * need to be reallocated when items are appended).
-   */
-   class JSON_API ValueInternalArray
-   {
-      friend class Value;
-      friend class ValueIteratorBase;
-   public:
-      enum { itemsPerPage = 8 };    // should be a power of 2 for fast divide and modulo.
-      typedef Value::ArrayIndex ArrayIndex;
-      typedef unsigned int PageIndex;
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-      struct IteratorState // Must be a POD
-      {
-         IteratorState() 
-            : array_(0)
-            , currentPageIndex_(0)
-            , currentItemIndex_(0) 
-         {
-         }
-         ValueInternalArray *array_;
-         Value **currentPageIndex_;
-         unsigned int currentItemIndex_;
-      };
-# endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-      ValueInternalArray();
-      ValueInternalArray( const ValueInternalArray &other );
-      ValueInternalArray &operator =( const ValueInternalArray &other );
-      ~ValueInternalArray();
-      void swap( ValueInternalArray &other );
-
-      void clear();
-      void resize( ArrayIndex newSize );
-
-      Value &resolveReference( ArrayIndex index );
-
-      Value *find( ArrayIndex index ) const;
-
-      ArrayIndex size() const;
-
-      int compare( const ValueInternalArray &other ) const;
-
-   private:
-      static bool equals( const IteratorState &x, const IteratorState &other );
-      static void increment( IteratorState &iterator );
-      static void decrement( IteratorState &iterator );
-      static Value &dereference( const IteratorState &iterator );
-      static Value &unsafeDereference( const IteratorState &iterator );
-      static int distance( const IteratorState &x, const IteratorState &y );
-      static ArrayIndex indexOf( const IteratorState &iterator );
-      void makeBeginIterator( IteratorState &it ) const;
-      void makeEndIterator( IteratorState &it ) const;
-      void makeIterator( IteratorState &it, ArrayIndex index ) const;
-
-      void makeIndexValid( ArrayIndex index );
-
-      Value **pages_;
-      ArrayIndex size_;
-      PageIndex pageCount_;
-   };
-
-   /** \brief Experimental: do not use. Allocator to customize Value internal array.
-    * Below is an example of a simple implementation (actual implementation use
-    * memory pool).
-      \code
-class DefaultValueArrayAllocator : public ValueArrayAllocator
-{
-public: // overridden from ValueArrayAllocator
-   virtual ~DefaultValueArrayAllocator()
-   {
-   }
-
-   virtual ValueInternalArray *newArray()
-   {
-      return new ValueInternalArray();
-   }
-
-   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-   {
-      return new ValueInternalArray( other );
-   }
-
-   virtual void destruct( ValueInternalArray *array )
-   {
-      delete array;
-   }
-
-   virtual void reallocateArrayPageIndex( Value **&indexes, 
-                                          ValueInternalArray::PageIndex &indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount )
-   {
-      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-      if ( minNewIndexCount > newIndexCount )
-         newIndexCount = minNewIndexCount;
-      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-      if ( !newIndexes )
-         throw std::bad_alloc();
-      indexCount = newIndexCount;
-      indexes = static_cast<Value **>( newIndexes );
-   }
-   virtual void releaseArrayPageIndex( Value **indexes, 
-                                       ValueInternalArray::PageIndex indexCount )
-   {
-      if ( indexes )
-         free( indexes );
-   }
-
-   virtual Value *allocateArrayPage()
-   {
-      return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
-   }
-
-   virtual void releaseArrayPage( Value *value )
-   {
-      if ( value )
-         free( value );
-   }
-};
-      \endcode
-    */ 
-   class JSON_API ValueArrayAllocator
-   {
-   public:
-      virtual ~ValueArrayAllocator();
-      virtual ValueInternalArray *newArray() = 0;
-      virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other ) = 0;
-      virtual void destructArray( ValueInternalArray *array ) = 0;
-      /** \brief Reallocate array page index.
-       * Reallocates an array of pointer on each page.
-       * \param indexes [input] pointer on the current index. May be \c NULL.
-       *                [output] pointer on the new index of at least 
-       *                         \a minNewIndexCount pages. 
-       * \param indexCount [input] current number of pages in the index.
-       *                   [output] number of page the reallocated index can handle.
-       *                            \b MUST be >= \a minNewIndexCount.
-       * \param minNewIndexCount Minimum number of page the new index must be able to
-       *                         handle.
-       */
-      virtual void reallocateArrayPageIndex( Value **&indexes, 
-                                             ValueInternalArray::PageIndex &indexCount,
-                                             ValueInternalArray::PageIndex minNewIndexCount ) = 0;
-      virtual void releaseArrayPageIndex( Value **indexes, 
-                                          ValueInternalArray::PageIndex indexCount ) = 0;
-      virtual Value *allocateArrayPage() = 0;
-      virtual void releaseArrayPage( Value *value ) = 0;
-   };
-#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-
-   /** \brief base class for Value iterators.
-    *
-    */
-   class ValueIteratorBase
-   {
-   public:
-      typedef unsigned int size_t;
-      typedef int difference_type;
-      typedef ValueIteratorBase SelfType;
-
-      ValueIteratorBase();
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-      explicit ValueIteratorBase( const Value::ObjectValues::iterator &current );
-#else
-      ValueIteratorBase( const ValueInternalArray::IteratorState &state );
-      ValueIteratorBase( const ValueInternalMap::IteratorState &state );
-#endif
-
-      bool operator ==( const SelfType &other ) const
-      {
-         return isEqual( other );
-      }
-
-      bool operator !=( const SelfType &other ) const
-      {
-         return !isEqual( other );
-      }
-
-      difference_type operator -( const SelfType &other ) const
-      {
-         return computeDistance( other );
-      }
-
-      /// Return either the index or the member name of the referenced value as a Value.
-      Value key() const;
-
-      /// Return the index of the referenced Value. -1 if it is not an arrayValue.
-      UInt index() const;
-
-      /// Return the member name of the referenced Value. "" if it is not an objectValue.
-      const char *memberName() const;
-
-   protected:
-      Value &deref() const;
-
-      void increment();
-
-      void decrement();
-
-      difference_type computeDistance( const SelfType &other ) const;
-
-      bool isEqual( const SelfType &other ) const;
-
-      void copy( const SelfType &other );
-
-   private:
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-      Value::ObjectValues::iterator current_;
-      // Indicates that iterator is for a null value.
-      bool isNull_;
-#else
-      union
-      {
-         ValueInternalArray::IteratorState array_;
-         ValueInternalMap::IteratorState map_;
-      } iterator_;
-      bool isArray_;
-#endif
-   };
-
-   /** \brief const iterator for object and array value.
-    *
-    */
-   class ValueConstIterator : public ValueIteratorBase
-   {
-      friend class Value;
-   public:
-      typedef unsigned int size_t;
-      typedef int difference_type;
-      typedef const Value &reference;
-      typedef const Value *pointer;
-      typedef ValueConstIterator SelfType;
-
-      ValueConstIterator();
-   private:
-      /*! \internal Use by Value to create an iterator.
-       */
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-      explicit ValueConstIterator( const Value::ObjectValues::iterator &current );
-#else
-      ValueConstIterator( const ValueInternalArray::IteratorState &state );
-      ValueConstIterator( const ValueInternalMap::IteratorState &state );
-#endif
-   public:
-      SelfType &operator =( const ValueIteratorBase &other );
-
-      SelfType operator++( int )
-      {
-         SelfType temp( *this );
-         ++*this;
-         return temp;
-      }
-
-      SelfType operator--( int )
-      {
-         SelfType temp( *this );
-         --*this;
-         return temp;
-      }
-
-      SelfType &operator--()
-      {
-         decrement();
-         return *this;
-      }
-
-      SelfType &operator++()
-      {
-         increment();
-         return *this;
-      }
-
-      reference operator *() const
-      {
-         return deref();
-      }
-   };
-
-
-   /** \brief Iterator for object and array value.
-    */
-   class ValueIterator : public ValueIteratorBase
-   {
-      friend class Value;
-   public:
-      typedef unsigned int size_t;
-      typedef int difference_type;
-      typedef Value &reference;
-      typedef Value *pointer;
-      typedef ValueIterator SelfType;
-
-      ValueIterator();
-      ValueIterator( const ValueConstIterator &other );
-      ValueIterator( const ValueIterator &other );
-   private:
-      /*! \internal Use by Value to create an iterator.
-       */
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-      explicit ValueIterator( const Value::ObjectValues::iterator &current );
-#else
-      ValueIterator( const ValueInternalArray::IteratorState &state );
-      ValueIterator( const ValueInternalMap::IteratorState &state );
-#endif
-   public:
-
-      SelfType &operator =( const SelfType &other );
-
-      SelfType operator++( int )
-      {
-         SelfType temp( *this );
-         ++*this;
-         return temp;
-      }
-
-      SelfType operator--( int )
-      {
-         SelfType temp( *this );
-         --*this;
-         return temp;
-      }
-
-      SelfType &operator--()
-      {
-         decrement();
-         return *this;
-      }
-
-      SelfType &operator++()
-      {
-         increment();
-         return *this;
-      }
-
-      reference operator *() const
-      {
-         return deref();
-      }
-   };
-
-
-} // namespace Json
-
-
-#endif // CPPTL_JSON_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/include/json/writer.h b/src/3rd_party-static/jsoncpp/include/json/writer.h
deleted file mode 100644
index 478936365a..0000000000
--- a/src/3rd_party-static/jsoncpp/include/json/writer.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_WRITER_H_INCLUDED
-# define JSON_WRITER_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include "value.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-# include <vector>
-# include <string>
-# include <iostream>
-
-namespace Json {
-
-   class Value;
-
-   /** \brief Abstract class for writers.
-    */
-   class JSON_API Writer
-   {
-   public:
-      virtual ~Writer();
-
-      virtual std::string write( const Value &root ) = 0;
-   };
-
-   /** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
-    *
-    * The JSON document is written in a single line. It is not intended for 'human' consumption,
-    * but may be usefull to support feature such as RPC where bandwith is limited.
-    * \sa Reader, Value
-    */
-   class JSON_API FastWriter : public Writer
-   {
-   public:
-      FastWriter();
-      virtual ~FastWriter(){}
-
-      void enableYAMLCompatibility();
-
-   public: // overridden from Writer
-      virtual std::string write( const Value &root );
-
-   private:
-      void writeValue( const Value &value );
-
-      std::string document_;
-      bool yamlCompatiblityEnabled_;
-   };
-
-   /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
-    *
-    * The rules for line break and indent are as follow:
-    * - Object value:
-    *     - if empty then print {} without indent and line break
-    *     - if not empty the print '{', line break & indent, print one value per line
-    *       and then unindent and line break and print '}'.
-    * - Array value:
-    *     - if empty then print [] without indent and line break
-    *     - if the array contains no object value, empty array or some other value types,
-    *       and all the values fit on one lines, then print the array on a single line.
-    *     - otherwise, it the values do not fit on one line, or the array contains
-    *       object or non empty array, then print one value per line.
-    *
-    * If the Value have comments then they are outputed according to their #CommentPlacement.
-    *
-    * \sa Reader, Value, Value::setComment()
-    */
-   class JSON_API StyledWriter: public Writer
-   {
-   public:
-      StyledWriter();
-      virtual ~StyledWriter(){}
-
-   public: // overridden from Writer
-      /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-       * \param root Value to serialize.
-       * \return String containing the JSON document that represents the root value.
-       */
-      virtual std::string write( const Value &root );
-
-   private:
-      void writeValue( const Value &value );
-      void writeArrayValue( const Value &value );
-      bool isMultineArray( const Value &value );
-      void pushValue( const std::string &value );
-      void writeIndent();
-      void writeWithIndent( const std::string &value );
-      void indent();
-      void unindent();
-      void writeCommentBeforeValue( const Value &root );
-      void writeCommentAfterValueOnSameLine( const Value &root );
-      bool hasCommentForValue( const Value &value );
-      static std::string normalizeEOL( const std::string &text );
-
-      typedef std::vector<std::string> ChildValues;
-
-      ChildValues childValues_;
-      std::string document_;
-      std::string indentString_;
-      int rightMargin_;
-      int indentSize_;
-      bool addChildValues_;
-   };
-
-   /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
-        to a stream rather than to a string.
-    *
-    * The rules for line break and indent are as follow:
-    * - Object value:
-    *     - if empty then print {} without indent and line break
-    *     - if not empty the print '{', line break & indent, print one value per line
-    *       and then unindent and line break and print '}'.
-    * - Array value:
-    *     - if empty then print [] without indent and line break
-    *     - if the array contains no object value, empty array or some other value types,
-    *       and all the values fit on one lines, then print the array on a single line.
-    *     - otherwise, it the values do not fit on one line, or the array contains
-    *       object or non empty array, then print one value per line.
-    *
-    * If the Value have comments then they are outputed according to their #CommentPlacement.
-    *
-    * \param indentation Each level will be indented by this amount extra.
-    * \sa Reader, Value, Value::setComment()
-    */
-   class JSON_API StyledStreamWriter
-   {
-   public:
-      StyledStreamWriter( std::string indentation="\t" );
-      ~StyledStreamWriter(){}
-
-   public:
-      /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-       * \param out Stream to write to. (Can be ostringstream, e.g.)
-       * \param root Value to serialize.
-       * \note There is no point in deriving from Writer, since write() should not return a value.
-       */
-      void write( std::ostream &out, const Value &root );
-
-   private:
-      void writeValue( const Value &value );
-      void writeArrayValue( const Value &value );
-      bool isMultineArray( const Value &value );
-      void pushValue( const std::string &value );
-      void writeIndent();
-      void writeWithIndent( const std::string &value );
-      void indent();
-      void unindent();
-      void writeCommentBeforeValue( const Value &root );
-      void writeCommentAfterValueOnSameLine( const Value &root );
-      bool hasCommentForValue( const Value &value );
-      static std::string normalizeEOL( const std::string &text );
-
-      typedef std::vector<std::string> ChildValues;
-
-      ChildValues childValues_;
-      std::ostream* document_;
-      std::string indentString_;
-      int rightMargin_;
-      std::string indentation_;
-      bool addChildValues_;
-   };
-
-# if defined(JSON_HAS_INT64)
-   std::string JSON_API valueToString( Int value );
-   std::string JSON_API valueToString( UInt value );
-# endif // if defined(JSON_HAS_INT64)
-   std::string JSON_API valueToString( LargestInt value );
-   std::string JSON_API valueToString( LargestUInt value );
-   std::string JSON_API valueToString( double value );
-   std::string JSON_API valueToString( bool value );
-   std::string JSON_API valueToQuotedString( const char *value );
-
-   /// \brief Output using the StyledStreamWriter.
-   /// \see Json::operator>>()
-   std::ostream& operator<<( std::ostream&, const Value &root );
-
-} // namespace Json
-
-
-
-#endif // JSON_WRITER_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/makefiles/vs71/jsoncpp.sln b/src/3rd_party-static/jsoncpp/makefiles/vs71/jsoncpp.sln
deleted file mode 100644
index 5bfa366547..0000000000
--- a/src/3rd_party-static/jsoncpp/makefiles/vs71/jsoncpp.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		dummy = dummy

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

diff --git a/src/3rd_party-static/jsoncpp/makefiles/vs71/jsontest.vcproj b/src/3rd_party-static/jsoncpp/makefiles/vs71/jsontest.vcproj
deleted file mode 100644
index 99a4dd6971..0000000000
--- a/src/3rd_party-static/jsoncpp/makefiles/vs71/jsontest.vcproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="jsontest"

-	ProjectGUID="{25AF2DD2-D396-4668-B188-488C33B8E620}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="../../build/vs71/debug/jsontest"

-			IntermediateDirectory="../../build/vs71/debug/jsontest"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/jsontest.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/jsontest.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="../../build/vs71/release/jsontest"

-			IntermediateDirectory="../../build/vs71/release/jsontest"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/jsontest.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\src\jsontestrunner\main.cpp">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/src/3rd_party-static/jsoncpp/makefiles/vs71/lib_json.vcproj b/src/3rd_party-static/jsoncpp/makefiles/vs71/lib_json.vcproj
deleted file mode 100644
index 2d7bf99164..0000000000
--- a/src/3rd_party-static/jsoncpp/makefiles/vs71/lib_json.vcproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="lib_json"

-	ProjectGUID="{B84F7231-16CE-41D8-8C08-7B523FF4225B}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="../../build/vs71/debug/lib_json"

-			IntermediateDirectory="../../build/vs71/debug/lib_json"

-			ConfigurationType="4"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"

-				StringPooling="TRUE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				EnableFunctionLevelLinking="TRUE"

-				DisableLanguageExtensions="TRUE"

-				ForceConformanceInForLoopScope="FALSE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/json_vc71_libmtd.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="../../build/vs71/release/lib_json"

-			IntermediateDirectory="../../build/vs71/release/lib_json"

-			ConfigurationType="4"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				GlobalOptimizations="TRUE"

-				EnableIntrinsicFunctions="TRUE"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="0"

-				EnableFunctionLevelLinking="TRUE"

-				DisableLanguageExtensions="TRUE"

-				ForceConformanceInForLoopScope="FALSE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				AssemblerOutput="4"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLibrarianTool"

-				OutputFile="$(OutDir)/json_vc71_libmt.lib"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="dummy|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="2"

-			CharacterSet="2"

-			WholeProgramOptimization="TRUE">

-			<Tool

-				Name="VCCLCompilerTool"

-				GlobalOptimizations="TRUE"

-				EnableIntrinsicFunctions="TRUE"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"

-				StringPooling="TRUE"

-				RuntimeLibrary="4"

-				EnableFunctionLevelLinking="TRUE"

-				DisableLanguageExtensions="TRUE"

-				ForceConformanceInForLoopScope="FALSE"

-				RuntimeTypeInfo="TRUE"

-				UsePrecompiledHeader="0"

-				AssemblerOutput="4"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				GenerateDebugInformation="TRUE"

-				SubSystem="2"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\include\json\autolink.h">

-		</File>

-		<File

-			RelativePath="..\..\include\json\config.h">

-		</File>

-		<File

-			RelativePath="..\..\include\json\features.h">

-		</File>

-		<File

-			RelativePath="..\..\include\json\forwards.h">

-		</File>

-		<File

-			RelativePath="..\..\include\json\json.h">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_batchallocator.h">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_internalarray.inl">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_internalmap.inl">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_reader.cpp">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_value.cpp">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_valueiterator.inl">

-		</File>

-		<File

-			RelativePath="..\..\src\lib_json\json_writer.cpp">

-		</File>

-		<File

-			RelativePath="..\..\include\json\reader.h">

-		</File>

-		<File

-			RelativePath="..\..\include\json\value.h">

-		</File>

-		<File

-			RelativePath="..\..\include\json\writer.h">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/src/3rd_party-static/jsoncpp/makefiles/vs71/test_lib_json.vcproj b/src/3rd_party-static/jsoncpp/makefiles/vs71/test_lib_json.vcproj
deleted file mode 100644
index df36700bdc..0000000000
--- a/src/3rd_party-static/jsoncpp/makefiles/vs71/test_lib_json.vcproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="test_lib_json"

-	ProjectGUID="{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"

-	RootNamespace="test_lib_json"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="../../build/vs71/debug/test_lib_json"

-			IntermediateDirectory="../../build/vs71/debug/test_lib_json"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/test_lib_json.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/test_lib_json.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				Description="Running all unit tests"

-				CommandLine="$(TargetPath)"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="../../build/vs71/release/test_lib_json"

-			IntermediateDirectory="../../build/vs71/release/test_lib_json"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/test_lib_json.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				Description="Running all unit tests"

-				CommandLine="$(TargetPath)"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\src\test_lib_json\jsontest.cpp">

-		</File>

-		<File

-			RelativePath="..\..\src\test_lib_json\jsontest.h">

-		</File>

-		<File

-			RelativePath="..\..\src\test_lib_json\main.cpp">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/src/3rd_party-static/jsoncpp/makerelease.py b/src/3rd_party-static/jsoncpp/makerelease.py
deleted file mode 100644
index 6b8eec3070..0000000000
--- a/src/3rd_party-static/jsoncpp/makerelease.py
+++ /dev/null
@@ -1,380 +0,0 @@
-"""Tag the sandbox for release, make source and doc tarballs.
-
-Requires Python 2.6
-
-Example of invocation (use to test the script):
-python makerelease.py --platform=msvc6,msvc71,msvc80,msvc90,mingw -ublep 0.6.0 0.7.0-dev
-
-When testing this script:
-python makerelease.py --force --retag --platform=msvc6,msvc71,msvc80,mingw -ublep test-0.6.0 test-0.6.1-dev
-
-Example of invocation when doing a release:
-python makerelease.py 0.5.0 0.6.0-dev
-"""
-import os.path
-import subprocess
-import sys
-import doxybuild
-import subprocess
-import xml.etree.ElementTree as ElementTree
-import shutil
-import urllib2
-import tempfile
-import os
-import time
-from devtools import antglob, fixeol, tarball
-import amalgamate
-
-SVN_ROOT = 'https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/'
-SVN_TAG_ROOT = SVN_ROOT + 'tags/jsoncpp'
-SCONS_LOCAL_URL = 'http://sourceforge.net/projects/scons/files/scons-local/1.2.0/scons-local-1.2.0.tar.gz/download'
-SOURCEFORGE_PROJECT = 'jsoncpp'
-
-def set_version( version ):
-    with open('version','wb') as f:
-        f.write( version.strip() )
-
-def rmdir_if_exist( dir_path ):
-    if os.path.isdir( dir_path ):
-        shutil.rmtree( dir_path )
-
-class SVNError(Exception):
-    pass
-
-def svn_command( command, *args ):
-    cmd = ['svn', '--non-interactive', command] + list(args)
-    print 'Running:', ' '.join( cmd )
-    process = subprocess.Popen( cmd,
-                                stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT )
-    stdout = process.communicate()[0]
-    if process.returncode:
-        error = SVNError( 'SVN command failed:\n' + stdout )
-        error.returncode = process.returncode
-        raise error
-    return stdout
-
-def check_no_pending_commit():
-    """Checks that there is no pending commit in the sandbox."""
-    stdout = svn_command( 'status', '--xml' )
-    etree = ElementTree.fromstring( stdout )
-    msg = []
-    for entry in etree.getiterator( 'entry' ):
-        path = entry.get('path')
-        status = entry.find('wc-status').get('item')
-        if status != 'unversioned' and path != 'version':
-            msg.append( 'File "%s" has pending change (status="%s")' % (path, status) )
-    if msg:
-        msg.insert(0, 'Pending change to commit found in sandbox. Commit them first!' )
-    return '\n'.join( msg )
-
-def svn_join_url( base_url, suffix ):
-    if not base_url.endswith('/'):
-        base_url += '/'
-    if suffix.startswith('/'):
-        suffix = suffix[1:]
-    return base_url + suffix
-
-def svn_check_if_tag_exist( tag_url ):
-    """Checks if a tag exist.
-    Returns: True if the tag exist, False otherwise.
-    """
-    try:
-        list_stdout = svn_command( 'list', tag_url )
-    except SVNError, e:
-        if e.returncode != 1 or not str(e).find('tag_url'):
-            raise e
-        # otherwise ignore error, meaning tag does not exist
-        return False
-    return True
-
-def svn_commit( message ):
-    """Commit the sandbox, providing the specified comment.
-    """
-    svn_command( 'ci', '-m', message )
-
-def svn_tag_sandbox( tag_url, message ):
-    """Makes a tag based on the sandbox revisions.
-    """
-    svn_command( 'copy', '-m', message, '.', tag_url )
-
-def svn_remove_tag( tag_url, message ):
-    """Removes an existing tag.
-    """
-    svn_command( 'delete', '-m', message, tag_url )
-
-def svn_export( tag_url, export_dir ):
-    """Exports the tag_url revision to export_dir.
-       Target directory, including its parent is created if it does not exist.
-       If the directory export_dir exist, it is deleted before export proceed.
-    """
-    rmdir_if_exist( export_dir )
-    svn_command( 'export', tag_url, export_dir )
-
-def fix_sources_eol( dist_dir ):
-    """Set file EOL for tarball distribution.
-    """
-    print 'Preparing exported source file EOL for distribution...'
-    prune_dirs = antglob.prune_dirs + 'scons-local* ./build* ./libs ./dist'
-    win_sources = antglob.glob( dist_dir, 
-        includes = '**/*.sln **/*.vcproj',
-        prune_dirs = prune_dirs )
-    unix_sources = antglob.glob( dist_dir,
-        includes = '''**/*.h **/*.cpp **/*.inl **/*.txt **/*.dox **/*.py **/*.html **/*.in
-        sconscript *.json *.expected AUTHORS LICENSE''',
-        excludes = antglob.default_excludes + 'scons.py sconsign.py scons-*',
-        prune_dirs = prune_dirs )
-    for path in win_sources:
-        fixeol.fix_source_eol( path, is_dry_run = False, verbose = True, eol = '\r\n' )
-    for path in unix_sources:
-        fixeol.fix_source_eol( path, is_dry_run = False, verbose = True, eol = '\n' )
-
-def download( url, target_path ):
-    """Download file represented by url to target_path.
-    """
-    f = urllib2.urlopen( url )
-    try:
-        data = f.read()
-    finally:
-        f.close()
-    fout = open( target_path, 'wb' )
-    try:
-        fout.write( data )
-    finally:
-        fout.close()
-
-def check_compile( distcheck_top_dir, platform ):
-    cmd = [sys.executable, 'scons.py', 'platform=%s' % platform, 'check']
-    print 'Running:', ' '.join( cmd )
-    log_path = os.path.join( distcheck_top_dir, 'build-%s.log' % platform )
-    flog = open( log_path, 'wb' )
-    try:
-        process = subprocess.Popen( cmd,
-                                    stdout=flog,
-                                    stderr=subprocess.STDOUT,
-                                    cwd=distcheck_top_dir )
-        stdout = process.communicate()[0]
-        status = (process.returncode == 0)
-    finally:
-        flog.close()
-    return (status, log_path)
-
-def write_tempfile( content, **kwargs ):
-    fd, path = tempfile.mkstemp( **kwargs )
-    f = os.fdopen( fd, 'wt' )
-    try:
-        f.write( content )
-    finally:
-        f.close()
-    return path
-
-class SFTPError(Exception):
-    pass
-
-def run_sftp_batch( userhost, sftp, batch, retry=0 ):
-    path = write_tempfile( batch, suffix='.sftp', text=True )
-    # psftp -agent -C blep,jsoncpp@web.sourceforge.net -batch -b batch.sftp -bc
-    cmd = [sftp, '-agent', '-C', '-batch', '-b', path, '-bc', userhost]
-    error = None
-    for retry_index in xrange(0, max(1,retry)):
-        heading = retry_index == 0 and 'Running:' or 'Retrying:'
-        print heading, ' '.join( cmd )
-        process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
-        stdout = process.communicate()[0]
-        if process.returncode != 0:
-            error = SFTPError( 'SFTP batch failed:\n' + stdout )
-        else:
-            break
-    if error:
-        raise error
-    return stdout
-
-def sourceforge_web_synchro( sourceforge_project, doc_dir,
-                             user=None, sftp='sftp' ):
-    """Notes: does not synchronize sub-directory of doc-dir.
-    """
-    userhost = '%s,%s@web.sourceforge.net' % (user, sourceforge_project)
-    stdout = run_sftp_batch( userhost, sftp, """
-cd htdocs
-dir
-exit
-""" )
-    existing_paths = set()
-    collect = 0
-    for line in stdout.split('\n'):
-        line = line.strip()
-        if not collect and line.endswith('> dir'):
-            collect = True
-        elif collect and line.endswith('> exit'):
-            break
-        elif collect == 1:
-            collect = 2
-        elif collect == 2:
-            path = line.strip().split()[-1:]
-            if path and path[0] not in ('.', '..'):
-                existing_paths.add( path[0] )
-    upload_paths = set( [os.path.basename(p) for p in antglob.glob( doc_dir )] )
-    paths_to_remove = existing_paths - upload_paths
-    if paths_to_remove:
-        print 'Removing the following file from web:'
-        print '\n'.join( paths_to_remove )
-        stdout = run_sftp_batch( userhost, sftp, """cd htdocs
-rm %s
-exit""" % ' '.join(paths_to_remove) )
-    print 'Uploading %d files:' % len(upload_paths)
-    batch_size = 10
-    upload_paths = list(upload_paths)
-    start_time = time.time()
-    for index in xrange(0,len(upload_paths),batch_size):
-        paths = upload_paths[index:index+batch_size]
-        file_per_sec = (time.time() - start_time) / (index+1)
-        remaining_files = len(upload_paths) - index
-        remaining_sec = file_per_sec * remaining_files
-        print '%d/%d, ETA=%.1fs' % (index+1, len(upload_paths), remaining_sec)
-        run_sftp_batch( userhost, sftp, """cd htdocs
-lcd %s
-mput %s
-exit""" % (doc_dir, ' '.join(paths) ), retry=3 )
-
-def sourceforge_release_tarball( sourceforge_project, paths, user=None, sftp='sftp' ):
-    userhost = '%s,%s@frs.sourceforge.net' % (user, sourceforge_project)
-    run_sftp_batch( userhost, sftp, """
-mput %s
-exit
-""" % (' '.join(paths),) )
-
-
-def main():
-    usage = """%prog release_version next_dev_version
-Update 'version' file to release_version and commit.
-Generates the document tarball.
-Tags the sandbox revision with release_version.
-Update 'version' file to next_dev_version and commit.
-
-Performs an svn export of tag release version, and build a source tarball.    
-
-Must be started in the project top directory.
-
-Warning: --force should only be used when developping/testing the release script.
-"""
-    from optparse import OptionParser
-    parser = OptionParser(usage=usage)
-    parser.allow_interspersed_args = False
-    parser.add_option('--dot', dest="dot_path", action='store', default=doxybuild.find_program('dot'),
-        help="""Path to GraphViz dot tool. Must be full qualified path. [Default: %default]""")
-    parser.add_option('--doxygen', dest="doxygen_path", action='store', default=doxybuild.find_program('doxygen'),
-        help="""Path to Doxygen tool. [Default: %default]""")
-    parser.add_option('--force', dest="ignore_pending_commit", action='store_true', default=False,
-        help="""Ignore pending commit. [Default: %default]""")
-    parser.add_option('--retag', dest="retag_release", action='store_true', default=False,
-        help="""Overwrite release existing tag if it exist. [Default: %default]""")
-    parser.add_option('-p', '--platforms', dest="platforms", action='store', default='',
-        help="""Comma separated list of platform passed to scons for build check.""")
-    parser.add_option('--no-test', dest="no_test", action='store_true', default=False,
-        help="""Skips build check.""")
-    parser.add_option('--no-web', dest="no_web", action='store_true', default=False,
-        help="""Do not update web site.""")
-    parser.add_option('-u', '--upload-user', dest="user", action='store',
-                      help="""Sourceforge user for SFTP documentation upload.""")
-    parser.add_option('--sftp', dest='sftp', action='store', default=doxybuild.find_program('psftp', 'sftp'),
-                      help="""Path of the SFTP compatible binary used to upload the documentation.""")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-
-    if len(args) != 2:
-        parser.error( 'release_version missing on command-line.' )
-    release_version = args[0]
-    next_version = args[1]
-
-    if not options.platforms and not options.no_test:
-        parser.error( 'You must specify either --platform or --no-test option.' )
-
-    if options.ignore_pending_commit:
-        msg = ''
-    else:
-        msg = check_no_pending_commit()
-    if not msg:
-        print 'Setting version to', release_version
-        set_version( release_version )
-        svn_commit( 'Release ' + release_version )
-        tag_url = svn_join_url( SVN_TAG_ROOT, release_version )
-        if svn_check_if_tag_exist( tag_url ):
-            if options.retag_release:
-                svn_remove_tag( tag_url, 'Overwriting previous tag' )
-            else:
-                print 'Aborting, tag %s already exist. Use --retag to overwrite it!' % tag_url
-                sys.exit( 1 )
-        svn_tag_sandbox( tag_url, 'Release ' + release_version )
-
-        print 'Generated doxygen document...'
-##        doc_dirname = r'jsoncpp-api-html-0.5.0'
-##        doc_tarball_path = r'e:\prg\vc\Lib\jsoncpp-trunk\dist\jsoncpp-api-html-0.5.0.tar.gz'
-        doc_tarball_path, doc_dirname = doxybuild.build_doc( options, make_release=True )
-        doc_distcheck_dir = 'dist/doccheck'
-        tarball.decompress( doc_tarball_path, doc_distcheck_dir )
-        doc_distcheck_top_dir = os.path.join( doc_distcheck_dir, doc_dirname )
-        
-        export_dir = 'dist/export'
-        svn_export( tag_url, export_dir )
-        fix_sources_eol( export_dir )
-        
-        source_dir = 'jsoncpp-src-' + release_version
-        source_tarball_path = 'dist/%s.tar.gz' % source_dir
-        print 'Generating source tarball to', source_tarball_path
-        tarball.make_tarball( source_tarball_path, [export_dir], export_dir, prefix_dir=source_dir )
-
-        amalgamation_tarball_path = 'dist/%s-amalgamation.tar.gz' % source_dir
-        print 'Generating amalgamation source tarball to', amalgamation_tarball_path
-        amalgamation_dir = 'dist/amalgamation'
-        amalgamate.amalgamate_source( export_dir, '%s/jsoncpp.cpp' % amalgamation_dir, 'json/json.h' )
-        amalgamation_source_dir = 'jsoncpp-src-amalgamation' + release_version
-        tarball.make_tarball( amalgamation_tarball_path, [amalgamation_dir],
-                              amalgamation_dir, prefix_dir=amalgamation_source_dir )
-
-        # Decompress source tarball, download and install scons-local
-        distcheck_dir = 'dist/distcheck'
-        distcheck_top_dir = distcheck_dir + '/' + source_dir
-        print 'Decompressing source tarball to', distcheck_dir
-        rmdir_if_exist( distcheck_dir )
-        tarball.decompress( source_tarball_path, distcheck_dir )
-        scons_local_path = 'dist/scons-local.tar.gz'
-        print 'Downloading scons-local to', scons_local_path
-        download( SCONS_LOCAL_URL, scons_local_path )
-        print 'Decompressing scons-local to', distcheck_top_dir
-        tarball.decompress( scons_local_path, distcheck_top_dir )
-
-        # Run compilation
-        print 'Compiling decompressed tarball'
-        all_build_status = True
-        for platform in options.platforms.split(','):
-            print 'Testing platform:', platform
-            build_status, log_path = check_compile( distcheck_top_dir, platform )
-            print 'see build log:', log_path
-            print build_status and '=> ok' or '=> FAILED'
-            all_build_status = all_build_status and build_status
-        if not build_status:
-            print 'Testing failed on at least one platform, aborting...'
-            svn_remove_tag( tag_url, 'Removing tag due to failed testing' )
-            sys.exit(1)
-        if options.user:
-            if not options.no_web:
-                print 'Uploading documentation using user', options.user
-                sourceforge_web_synchro( SOURCEFORGE_PROJECT, doc_distcheck_top_dir, user=options.user, sftp=options.sftp )
-                print 'Completed documentation upload'
-            print 'Uploading source and documentation tarballs for release using user', options.user
-            sourceforge_release_tarball( SOURCEFORGE_PROJECT,
-                                         [source_tarball_path, doc_tarball_path],
-                                         user=options.user, sftp=options.sftp )
-            print 'Source and doc release tarballs uploaded'
-        else:
-            print 'No upload user specified. Web site and download tarbal were not uploaded.'
-            print 'Tarball can be found at:', doc_tarball_path
-
-        # Set next version number and commit            
-        set_version( next_version )
-        svn_commit( 'Released ' + release_version )
-    else:
-        sys.stderr.write( msg + '\n' )
- 
-if __name__ == '__main__':
-    main()
diff --git a/src/3rd_party-static/jsoncpp/scons-tools/globtool.py b/src/3rd_party-static/jsoncpp/scons-tools/globtool.py
deleted file mode 100644
index 811140e8aa..0000000000
--- a/src/3rd_party-static/jsoncpp/scons-tools/globtool.py
+++ /dev/null
@@ -1,53 +0,0 @@
-import fnmatch
-import os
-
-def generate( env ): 
-   def Glob( env, includes = None, excludes = None, dir = '.' ):
-      """Adds Glob( includes = Split( '*' ), excludes = None, dir = '.')
-       helper function to environment.
-
-       Glob both the file-system files.
-
-       includes: list of file name pattern included in the return list when matched.
-       excludes: list of file name pattern exluced from the return list.
-
-       Example:
-       sources = env.Glob( ("*.cpp", '*.h'), "~*.cpp", "#src" )
-      """
-      def filterFilename(path):
-         abs_path = os.path.join( dir, path )
-         if not os.path.isfile(abs_path):
-            return 0
-         fn = os.path.basename(path)
-         match = 0
-         for include in includes:
-            if fnmatch.fnmatchcase( fn, include ):
-               match = 1
-               break
-         if match == 1 and not excludes is None:
-            for exclude in excludes:
-               if fnmatch.fnmatchcase( fn, exclude ):
-                  match = 0
-                  break
-         return match
-      if includes is None:
-         includes = ('*',)
-      elif type(includes) in ( type(''), type(u'') ):
-         includes = (includes,)
-      if type(excludes) in ( type(''), type(u'') ):
-         excludes = (excludes,)
-      dir = env.Dir(dir).abspath
-      paths = os.listdir( dir )
-      def makeAbsFileNode( path ):
-         return env.File( os.path.join( dir, path ) )
-      nodes = filter( filterFilename, paths )
-      return map( makeAbsFileNode, nodes )
-
-   from SCons.Script import Environment
-   Environment.Glob = Glob
-
-def exists(env):
-    """
-    Tool always exists.
-    """
-    return True
diff --git a/src/3rd_party-static/jsoncpp/scons-tools/srcdist.py b/src/3rd_party-static/jsoncpp/scons-tools/srcdist.py
deleted file mode 100644
index 864ff40815..0000000000
--- a/src/3rd_party-static/jsoncpp/scons-tools/srcdist.py
+++ /dev/null
@@ -1,179 +0,0 @@
-import os
-import os.path
-from fnmatch import fnmatch
-import targz
-
-##def DoxyfileParse(file_contents):
-##   """
-##   Parse a Doxygen source file and return a dictionary of all the values.
-##   Values will be strings and lists of strings.
-##   """
-##   data = {}
-##
-##   import shlex
-##   lex = shlex.shlex(instream = file_contents, posix = True)
-##   lex.wordchars += "*+./-:"
-##   lex.whitespace = lex.whitespace.replace("\n", "")
-##   lex.escape = ""
-##
-##   lineno = lex.lineno
-##   last_backslash_lineno = lineno
-##   token = lex.get_token()
-##   key = token   # the first token should be a key
-##   last_token = ""
-##   key_token = False
-##   next_key = False
-##   new_data = True
-##
-##   def append_data(data, key, new_data, token):
-##      if new_data or len(data[key]) == 0:
-##         data[key].append(token)
-##      else:
-##         data[key][-1] += token
-##
-##   while token:
-##      if token in ['\n']:
-##         if last_token not in ['\\']:
-##            key_token = True
-##      elif token in ['\\']:
-##         pass
-##      elif key_token:
-##         key = token
-##         key_token = False
-##      else:
-##         if token == "+=":
-##            if not data.has_key(key):
-##               data[key] = list()
-##         elif token == "=":
-##            data[key] = list()
-##         else:
-##            append_data( data, key, new_data, token )
-##            new_data = True
-##
-##      last_token = token
-##      token = lex.get_token()
-##      
-##      if last_token == '\\' and token != '\n':
-##         new_data = False
-##         append_data( data, key, new_data, '\\' )
-##
-##   # compress lists of len 1 into single strings
-##   for (k, v) in data.items():
-##      if len(v) == 0:
-##         data.pop(k)
-##
-##      # items in the following list will be kept as lists and not converted to strings
-##      if k in ["INPUT", "FILE_PATTERNS", "EXCLUDE_PATTERNS"]:
-##         continue
-##
-##      if len(v) == 1:
-##         data[k] = v[0]
-##
-##   return data
-##
-##def DoxySourceScan(node, env, path):
-##   """
-##   Doxygen Doxyfile source scanner.  This should scan the Doxygen file and add
-##   any files used to generate docs to the list of source files.
-##   """
-##   default_file_patterns = [
-##      '*.c', '*.cc', '*.cxx', '*.cpp', '*.c++', '*.java', '*.ii', '*.ixx',
-##      '*.ipp', '*.i++', '*.inl', '*.h', '*.hh ', '*.hxx', '*.hpp', '*.h++',
-##      '*.idl', '*.odl', '*.cs', '*.php', '*.php3', '*.inc', '*.m', '*.mm',
-##      '*.py',
-##   ]
-##
-##   default_exclude_patterns = [
-##      '*~',
-##   ]
-##
-##   sources = []
-##
-##   data = DoxyfileParse(node.get_contents())
-##
-##   if data.get("RECURSIVE", "NO") == "YES":
-##      recursive = True
-##   else:
-##      recursive = False
-##
-##   file_patterns = data.get("FILE_PATTERNS", default_file_patterns)
-##   exclude_patterns = data.get("EXCLUDE_PATTERNS", default_exclude_patterns)
-##
-##   for node in data.get("INPUT", []):
-##      if os.path.isfile(node):
-##         sources.add(node)
-##      elif os.path.isdir(node):
-##         if recursive:
-##            for root, dirs, files in os.walk(node):
-##               for f in files:
-##                  filename = os.path.join(root, f)
-##
-##                  pattern_check = reduce(lambda x, y: x or bool(fnmatch(filename, y)), file_patterns, False)
-##                  exclude_check = reduce(lambda x, y: x and fnmatch(filename, y), exclude_patterns, True)
-##
-##                  if pattern_check and not exclude_check:
-##                     sources.append(filename)
-##         else:
-##            for pattern in file_patterns:
-##               sources.extend(glob.glob("/".join([node, pattern])))
-##   sources = map( lambda path: env.File(path), sources )
-##   return sources
-##
-##
-##def DoxySourceScanCheck(node, env):
-##   """Check if we should scan this file"""
-##   return os.path.isfile(node.path)
-
-def srcDistEmitter(source, target, env):
-##   """Doxygen Doxyfile emitter"""
-##   # possible output formats and their default values and output locations
-##   output_formats = {
-##      "HTML": ("YES", "html"),
-##      "LATEX": ("YES", "latex"),
-##      "RTF": ("NO", "rtf"),
-##      "MAN": ("YES", "man"),
-##      "XML": ("NO", "xml"),
-##   }
-##
-##   data = DoxyfileParse(source[0].get_contents())
-##
-##   targets = []
-##   out_dir = data.get("OUTPUT_DIRECTORY", ".")
-##
-##   # add our output locations
-##   for (k, v) in output_formats.items():
-##      if data.get("GENERATE_" + k, v[0]) == "YES":
-##         targets.append(env.Dir( os.path.join(out_dir, data.get(k + "_OUTPUT", v[1]))) )
-##
-##   # don't clobber targets
-##   for node in targets:
-##      env.Precious(node)
-##
-##   # set up cleaning stuff
-##   for node in targets:
-##      env.Clean(node, node)
-##
-##   return (targets, source)
-   return (target,source)
-
-def generate(env):
-   """
-   Add builders and construction variables for the
-   SrcDist tool.
-   """
-##   doxyfile_scanner = env.Scanner(
-##      DoxySourceScan,
-##      "DoxySourceScan",
-##      scan_check = DoxySourceScanCheck,
-##   )
-
-   if targz.exists(env):
-      srcdist_builder = targz.makeBuilder( srcDistEmitter )
-
-      env['BUILDERS']['SrcDist'] = srcdist_builder
-
-def exists(env):
-   """
-   Make sure srcdist exists.
-   """
-   return targz.exists(env)
diff --git a/src/3rd_party-static/jsoncpp/scons-tools/substinfile.py b/src/3rd_party-static/jsoncpp/scons-tools/substinfile.py
deleted file mode 100644
index 4d305851bb..0000000000
--- a/src/3rd_party-static/jsoncpp/scons-tools/substinfile.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import re
-from SCons.Script import *  # the usual scons stuff you get in a SConscript
-
-def generate(env):
-    """
-    Add builders and construction variables for the
-    SubstInFile tool.
-
-    Adds SubstInFile builder, which substitutes the keys->values of SUBST_DICT
-    from the source to the target.
-    The values of SUBST_DICT first have any construction variables expanded
-    (its keys are not expanded).
-    If a value of SUBST_DICT is a python callable function, it is called and
-    the result is expanded as the value.
-    If there's more than one source and more than one target, each target gets
-    substituted from the corresponding source.
-    """
-    def do_subst_in_file(targetfile, sourcefile, dict):
-        """Replace all instances of the keys of dict with their values.
-        For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'},
-        then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
-        """
-        try:
-            f = open(sourcefile, 'rb')
-            contents = f.read()
-            f.close()
-        except:
-            raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile
-        for (k,v) in dict.items():
-            contents = re.sub(k, v, contents)
-        try:
-            f = open(targetfile, 'wb')
-            f.write(contents)
-            f.close()
-        except:
-            raise SCons.Errors.UserError, "Can't write target file %s"%targetfile
-        return 0 # success
-
-    def subst_in_file(target, source, env):
-        if not env.has_key('SUBST_DICT'):
-            raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set."
-        d = dict(env['SUBST_DICT']) # copy it
-        for (k,v) in d.items():
-            if callable(v):
-                d[k] = env.subst(v()).replace('\\','\\\\')
-            elif SCons.Util.is_String(v):
-                d[k] = env.subst(v).replace('\\','\\\\')
-            else:
-                raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v))
-        for (t,s) in zip(target, source):
-            return do_subst_in_file(str(t), str(s), d)
-
-    def subst_in_file_string(target, source, env):
-        """This is what gets printed on the console."""
-        return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t))
-                          for (t,s) in zip(target, source)])
-
-    def subst_emitter(target, source, env):
-        """Add dependency from substituted SUBST_DICT to target.
-        Returns original target, source tuple unchanged.
-        """
-        d = env['SUBST_DICT'].copy() # copy it
-        for (k,v) in d.items():
-            if callable(v):
-                d[k] = env.subst(v())
-            elif SCons.Util.is_String(v):
-                d[k]=env.subst(v)
-        Depends(target, SCons.Node.Python.Value(d))
-        return target, source
-
-##    env.Append(TOOLS = 'substinfile')       # this should be automaticaly done by Scons ?!?
-    subst_action = SCons.Action.Action( subst_in_file, subst_in_file_string )
-    env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emitter)
-
-def exists(env):
-    """
-    Make sure tool exists.
-    """
-    return True
diff --git a/src/3rd_party-static/jsoncpp/scons-tools/targz.py b/src/3rd_party-static/jsoncpp/scons-tools/targz.py
deleted file mode 100644
index f5432003df..0000000000
--- a/src/3rd_party-static/jsoncpp/scons-tools/targz.py
+++ /dev/null
@@ -1,82 +0,0 @@
-"""tarball
-
-Tool-specific initialization for tarball.
-
-"""
-
-## Commands to tackle a command based implementation:
-##to unpack on the fly...
-##gunzip < FILE.tar.gz | tar xvf -
-##to pack on the fly...
-##tar cvf - FILE-LIST | gzip -c > FILE.tar.gz 
-
-import os.path
-
-import SCons.Builder
-import SCons.Node.FS
-import SCons.Util
-
-try:
-    import gzip
-    import tarfile
-    internal_targz = 1
-except ImportError:
-    internal_targz = 0
-
-TARGZ_DEFAULT_COMPRESSION_LEVEL = 9
-
-if internal_targz:
-    def targz(target, source, env):
-        def archive_name( path ):
-            path = os.path.normpath( os.path.abspath( path ) )
-            common_path = os.path.commonprefix( (base_dir, path) )
-            archive_name = path[len(common_path):]
-            return archive_name
-            
-        def visit(tar, dirname, names):
-            for name in names:
-                path = os.path.join(dirname, name)
-                if os.path.isfile(path):
-                    tar.add(path, archive_name(path) )
-        compression = env.get('TARGZ_COMPRESSION_LEVEL',TARGZ_DEFAULT_COMPRESSION_LEVEL)
-        base_dir = os.path.normpath( env.get('TARGZ_BASEDIR', env.Dir('.')).abspath )
-        target_path = str(target[0])
-        fileobj = gzip.GzipFile( target_path, 'wb', compression )
-        tar = tarfile.TarFile(os.path.splitext(target_path)[0], 'w', fileobj)
-        for source in source:
-            source_path = str(source)
-            if source.isdir():
-                os.path.walk(source_path, visit, tar)
-            else:
-                tar.add(source_path, archive_name(source_path) )      # filename, arcname
-        tar.close()
-
-    targzAction = SCons.Action.Action(targz, varlist=['TARGZ_COMPRESSION_LEVEL','TARGZ_BASEDIR'])
-
-    def makeBuilder( emitter = None ):
-        return SCons.Builder.Builder(action = SCons.Action.Action('$TARGZ_COM', '$TARGZ_COMSTR'),
-                                     source_factory = SCons.Node.FS.Entry,
-                                     source_scanner = SCons.Defaults.DirScanner,
-                                     suffix = '$TARGZ_SUFFIX',
-                                     multi = 1)
-    TarGzBuilder = makeBuilder()
-
-    def generate(env):
-        """Add Builders and construction variables for zip to an Environment.
-           The following environnement variables may be set:
-           TARGZ_COMPRESSION_LEVEL: integer, [0-9]. 0: no compression, 9: best compression (same as gzip compression level).
-           TARGZ_BASEDIR: base-directory used to determine archive name (this allow archive name to be relative
-                          to something other than top-dir).
-        """
-        env['BUILDERS']['TarGz'] = TarGzBuilder
-        env['TARGZ_COM'] = targzAction
-        env['TARGZ_COMPRESSION_LEVEL'] = TARGZ_DEFAULT_COMPRESSION_LEVEL # range 0-9
-        env['TARGZ_SUFFIX']  = '.tar.gz'
-        env['TARGZ_BASEDIR'] = env.Dir('.')     # Sources archive name are made relative to that directory.
-else:
-    def generate(env):
-        pass
-
-
-def exists(env):
-    return internal_targz
diff --git a/src/3rd_party-static/jsoncpp/src/jsontestrunner/main.cpp b/src/3rd_party-static/jsoncpp/src/jsontestrunner/main.cpp
deleted file mode 100644
index dfb6150e06..0000000000
--- a/src/3rd_party-static/jsoncpp/src/jsontestrunner/main.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-/* This executable is used for testing parser/writer using real JSON files.
- */
-
-
-#include <json/json.h>
-#include <algorithm> // sort
-#include <stdio.h>
-
-#if defined(_MSC_VER)  &&  _MSC_VER >= 1310
-# pragma warning( disable: 4996 )     // disable fopen deprecation warning
-#endif
-
-static std::string
-readInputTestFile( const char *path )
-{
-   FILE *file = fopen( path, "rb" );
-   if ( !file )
-      return std::string("");
-   fseek( file, 0, SEEK_END );
-   long size = ftell( file );
-   fseek( file, 0, SEEK_SET );
-   std::string text;
-   char *buffer = new char[size+1];
-   buffer[size] = 0;
-   if ( fread( buffer, 1, size, file ) == (unsigned long)size )
-      text = buffer;
-   fclose( file );
-   delete[] buffer;
-   return text;
-}
-
-
-static void
-printValueTree( FILE *fout, Json::Value &value, const std::string &path = "." )
-{
-   switch ( value.type() )
-   {
-   case Json::nullValue:
-      fprintf( fout, "%s=null\n", path.c_str() );
-      break;
-   case Json::intValue:
-      fprintf( fout, "%s=%s\n", path.c_str(), Json::valueToString( value.asLargestInt() ).c_str() );
-      break;
-   case Json::uintValue:
-      fprintf( fout, "%s=%s\n", path.c_str(), Json::valueToString( value.asLargestUInt() ).c_str() );
-      break;
-   case Json::realValue:
-      fprintf( fout, "%s=%.16g\n", path.c_str(), value.asDouble() );
-      break;
-   case Json::stringValue:
-      fprintf( fout, "%s=\"%s\"\n", path.c_str(), value.asString().c_str() );
-      break;
-   case Json::booleanValue:
-      fprintf( fout, "%s=%s\n", path.c_str(), value.asBool() ? "true" : "false" );
-      break;
-   case Json::arrayValue:
-      {
-         fprintf( fout, "%s=[]\n", path.c_str() );
-         int size = value.size();
-         for ( int index =0; index < size; ++index )
-         {
-            static char buffer[16];
-            sprintf( buffer, "[%d]", index );
-            printValueTree( fout, value[index], path + buffer );
-         }
-      }
-      break;
-   case Json::objectValue:
-      {
-         fprintf( fout, "%s={}\n", path.c_str() );
-         Json::Value::Members members( value.getMemberNames() );
-         std::sort( members.begin(), members.end() );
-         std::string suffix = *(path.end()-1) == '.' ? "" : ".";
-         for ( Json::Value::Members::iterator it = members.begin(); 
-               it != members.end(); 
-               ++it )
-         {
-            const std::string &name = *it;
-            printValueTree( fout, value[name], path + suffix + name );
-         }
-      }
-      break;
-   default:
-      break;
-   }
-}
-
-
-static int
-parseAndSaveValueTree( const std::string &input, 
-                       const std::string &actual,
-                       const std::string &kind,
-                       Json::Value &root,
-                       const Json::Features &features,
-                       bool parseOnly )
-{
-   Json::Reader reader( features );
-   bool parsingSuccessful = reader.parse( input, root );
-   if ( !parsingSuccessful )
-   {
-      printf( "Failed to parse %s file: \n%s\n", 
-              kind.c_str(),
-              reader.getFormattedErrorMessages().c_str() );
-      return 1;
-   }
-
-   if ( !parseOnly )
-   {
-      FILE *factual = fopen( actual.c_str(), "wt" );
-      if ( !factual )
-      {
-         printf( "Failed to create %s actual file.\n", kind.c_str() );
-         return 2;
-      }
-      printValueTree( factual, root );
-      fclose( factual );
-   }
-   return 0;
-}
-
-
-static int
-rewriteValueTree( const std::string &rewritePath, 
-                  const Json::Value &root, 
-                  std::string &rewrite )
-{
-   //Json::FastWriter writer;
-   //writer.enableYAMLCompatibility();
-   Json::StyledWriter writer;
-   rewrite = writer.write( root );
-   FILE *fout = fopen( rewritePath.c_str(), "wt" );
-   if ( !fout )
-   {
-      printf( "Failed to create rewrite file: %s\n", rewritePath.c_str() );
-      return 2;
-   }
-   fprintf( fout, "%s\n", rewrite.c_str() );
-   fclose( fout );
-   return 0;
-}
-
-
-static std::string
-removeSuffix( const std::string &path, 
-              const std::string &extension )
-{
-   if ( extension.length() >= path.length() )
-      return std::string("");
-   std::string suffix = path.substr( path.length() - extension.length() );
-   if ( suffix != extension )
-      return std::string("");
-   return path.substr( 0, path.length() - extension.length() );
-}
-
-
-static void
-printConfig()
-{
-   // Print the configuration used to compile JsonCpp
-#if defined(JSON_NO_INT64)
-   printf( "JSON_NO_INT64=1\n" );
-#else
-   printf( "JSON_NO_INT64=0\n" );
-#endif
-}
-
-
-static int 
-printUsage( const char *argv[] )
-{
-   printf( "Usage: %s [--strict] input-json-file", argv[0] );
-   return 3;
-}
-
-
-int
-parseCommandLine( int argc, const char *argv[], 
-                  Json::Features &features, std::string &path,
-                  bool &parseOnly )
-{
-   parseOnly = false;
-   if ( argc < 2 )
-   {
-      return printUsage( argv );
-   }
-
-   int index = 1;
-   if ( std::string(argv[1]) == "--json-checker" )
-   {
-      features = Json::Features::strictMode();
-      parseOnly = true;
-      ++index;
-   }
-
-   if ( std::string(argv[1]) == "--json-config" )
-   {
-      printConfig();
-      return 3;
-   }
-
-   if ( index == argc  ||  index + 1 < argc )
-   {
-      return printUsage( argv );
-   }
-
-   path = argv[index];
-   return 0;
-}
-
-
-int main( int argc, const char *argv[] )
-{
-   std::string path;
-   Json::Features features;
-   bool parseOnly;
-   int exitCode = parseCommandLine( argc, argv, features, path, parseOnly );
-   if ( exitCode != 0 )
-   {
-      return exitCode;
-   }
-
-   try
-   {
-      std::string input = readInputTestFile( path.c_str() );
-      if ( input.empty() )
-      {
-         printf( "Failed to read input or empty input: %s\n", path.c_str() );
-         return 3;
-      }
-
-      std::string basePath = removeSuffix( argv[1], ".json" );
-      if ( !parseOnly  &&  basePath.empty() )
-      {
-         printf( "Bad input path. Path does not end with '.expected':\n%s\n", path.c_str() );
-         return 3;
-      }
-
-      std::string actualPath = basePath + ".actual";
-      std::string rewritePath = basePath + ".rewrite";
-      std::string rewriteActualPath = basePath + ".actual-rewrite";
-
-      Json::Value root;
-      exitCode = parseAndSaveValueTree( input, actualPath, "input", root, features, parseOnly );
-      if ( exitCode == 0  &&  !parseOnly )
-      {
-         std::string rewrite;
-         exitCode = rewriteValueTree( rewritePath, root, rewrite );
-         if ( exitCode == 0 )
-         {
-            Json::Value rewriteRoot;
-            exitCode = parseAndSaveValueTree( rewrite, rewriteActualPath, 
-               "rewrite", rewriteRoot, features, parseOnly );
-         }
-      }
-   }
-   catch ( const std::exception &e )
-   {
-      printf( "Unhandled exception:\n%s\n", e.what() );
-      exitCode = 1;
-   }
-
-   return exitCode;
-}
-
diff --git a/src/3rd_party-static/jsoncpp/src/jsontestrunner/sconscript b/src/3rd_party-static/jsoncpp/src/jsontestrunner/sconscript
deleted file mode 100644
index 180c8ec358..0000000000
--- a/src/3rd_party-static/jsoncpp/src/jsontestrunner/sconscript
+++ /dev/null
@@ -1,9 +0,0 @@
-Import( 'env_testing buildJSONTests' )

-

-buildJSONTests( env_testing, Split( """

-    main.cpp

-     """ ),

-    'jsontestrunner' )

-

-# For 'check' to work, 'libs' must be built first.

-env_testing.Depends('jsontestrunner', '#libs')

diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_batchallocator.h b/src/3rd_party-static/jsoncpp/src/lib_json/json_batchallocator.h
deleted file mode 100644
index 173e2ed257..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_batchallocator.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
-# define JSONCPP_BATCHALLOCATOR_H_INCLUDED
-
-# include <stdlib.h>
-# include <assert.h>
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-namespace Json {
-
-/* Fast memory allocator.
- *
- * This memory allocator allocates memory for a batch of object (specified by
- * the page size, the number of object in each page).
- *
- * It does not allow the destruction of a single object. All the allocated objects
- * can be destroyed at once. The memory can be either released or reused for future
- * allocation.
- * 
- * The in-place new operator must be used to construct the object using the pointer
- * returned by allocate.
- */
-template<typename AllocatedType
-        ,const unsigned int objectPerAllocation>
-class BatchAllocator
-{
-public:
-   typedef AllocatedType Type;
-
-   BatchAllocator( unsigned int objectsPerPage = 255 )
-      : freeHead_( 0 )
-      , objectsPerPage_( objectsPerPage )
-   {
-//      printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
-      assert( sizeof(AllocatedType) * objectPerAllocation >= sizeof(AllocatedType *) ); // We must be able to store a slist in the object free space.
-      assert( objectsPerPage >= 16 );
-      batches_ = allocateBatch( 0 );   // allocated a dummy page
-      currentBatch_ = batches_;
-   }
-
-   ~BatchAllocator()
-   {
-      for ( BatchInfo *batch = batches_; batch;  )
-      {
-         BatchInfo *nextBatch = batch->next_;
-         free( batch );
-         batch = nextBatch;
-      }
-   }
-
-   /// allocate space for an array of objectPerAllocation object.
-   /// @warning it is the responsability of the caller to call objects constructors.
-   AllocatedType *allocate()
-   {
-      if ( freeHead_ ) // returns node from free list.
-      {
-         AllocatedType *object = freeHead_;
-         freeHead_ = *(AllocatedType **)object;
-         return object;
-      }
-      if ( currentBatch_->used_ == currentBatch_->end_ )
-      {
-         currentBatch_ = currentBatch_->next_;
-         while ( currentBatch_  &&  currentBatch_->used_ == currentBatch_->end_ )
-            currentBatch_ = currentBatch_->next_;
-
-         if ( !currentBatch_  ) // no free batch found, allocate a new one
-         { 
-            currentBatch_ = allocateBatch( objectsPerPage_ );
-            currentBatch_->next_ = batches_; // insert at the head of the list
-            batches_ = currentBatch_;
-         }
-      }
-      AllocatedType *allocated = currentBatch_->used_;
-      currentBatch_->used_ += objectPerAllocation;
-      return allocated;
-   }
-
-   /// Release the object.
-   /// @warning it is the responsability of the caller to actually destruct the object.
-   void release( AllocatedType *object )
-   {
-      assert( object != 0 );
-      *(AllocatedType **)object = freeHead_;
-      freeHead_ = object;
-   }
-
-private:
-   struct BatchInfo
-   {
-      BatchInfo *next_;
-      AllocatedType *used_;
-      AllocatedType *end_;
-      AllocatedType buffer_[objectPerAllocation];
-   };
-
-   // disabled copy constructor and assignement operator.
-   BatchAllocator( const BatchAllocator & );
-   void operator =( const BatchAllocator &);
-
-   static BatchInfo *allocateBatch( unsigned int objectsPerPage )
-   {
-      const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType)* objectPerAllocation
-                                + sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
-      BatchInfo *batch = static_cast<BatchInfo*>( malloc( mallocSize ) );
-      batch->next_ = 0;
-      batch->used_ = batch->buffer_;
-      batch->end_ = batch->buffer_ + objectsPerPage;
-      return batch;
-   }
-
-   BatchInfo *batches_;
-   BatchInfo *currentBatch_;
-   /// Head of a single linked list within the allocated space of freeed object
-   AllocatedType *freeHead_;
-   unsigned int objectsPerPage_;
-};
-
-
-} // namespace Json
-
-# endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
-
-#endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
-
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_internalarray.inl b/src/3rd_party-static/jsoncpp/src/lib_json/json_internalarray.inl
deleted file mode 100644
index 3a532ad759..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_internalarray.inl
+++ /dev/null
@@ -1,456 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-// included by json_value.cpp
-
-namespace Json {
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueInternalArray
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueArrayAllocator::~ValueArrayAllocator()
-{
-}
-
-// //////////////////////////////////////////////////////////////////
-// class DefaultValueArrayAllocator
-// //////////////////////////////////////////////////////////////////
-#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-class DefaultValueArrayAllocator : public ValueArrayAllocator
-{
-public: // overridden from ValueArrayAllocator
-   virtual ~DefaultValueArrayAllocator()
-   {
-   }
-
-   virtual ValueInternalArray *newArray()
-   {
-      return new ValueInternalArray();
-   }
-
-   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-   {
-      return new ValueInternalArray( other );
-   }
-
-   virtual void destructArray( ValueInternalArray *array )
-   {
-      delete array;
-   }
-
-   virtual void reallocateArrayPageIndex( Value **&indexes, 
-                                          ValueInternalArray::PageIndex &indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount )
-   {
-      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-      if ( minNewIndexCount > newIndexCount )
-         newIndexCount = minNewIndexCount;
-      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-      if ( !newIndexes )
-         throw std::bad_alloc();
-      indexCount = newIndexCount;
-      indexes = static_cast<Value **>( newIndexes );
-   }
-   virtual void releaseArrayPageIndex( Value **indexes, 
-                                       ValueInternalArray::PageIndex indexCount )
-   {
-      if ( indexes )
-         free( indexes );
-   }
-
-   virtual Value *allocateArrayPage()
-   {
-      return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
-   }
-
-   virtual void releaseArrayPage( Value *value )
-   {
-      if ( value )
-         free( value );
-   }
-};
-
-#else // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-/// @todo make this thread-safe (lock when accessign batch allocator)
-class DefaultValueArrayAllocator : public ValueArrayAllocator
-{
-public: // overridden from ValueArrayAllocator
-   virtual ~DefaultValueArrayAllocator()
-   {
-   }
-
-   virtual ValueInternalArray *newArray()
-   {
-      ValueInternalArray *array = arraysAllocator_.allocate();
-      new (array) ValueInternalArray(); // placement new
-      return array;
-   }
-
-   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-   {
-      ValueInternalArray *array = arraysAllocator_.allocate();
-      new (array) ValueInternalArray( other ); // placement new
-      return array;
-   }
-
-   virtual void destructArray( ValueInternalArray *array )
-   {
-      if ( array )
-      {
-         array->~ValueInternalArray();
-         arraysAllocator_.release( array );
-      }
-   }
-
-   virtual void reallocateArrayPageIndex( Value **&indexes, 
-                                          ValueInternalArray::PageIndex &indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount )
-   {
-      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-      if ( minNewIndexCount > newIndexCount )
-         newIndexCount = minNewIndexCount;
-      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-      if ( !newIndexes )
-         throw std::bad_alloc();
-      indexCount = newIndexCount;
-      indexes = static_cast<Value **>( newIndexes );
-   }
-   virtual void releaseArrayPageIndex( Value **indexes, 
-                                       ValueInternalArray::PageIndex indexCount )
-   {
-      if ( indexes )
-         free( indexes );
-   }
-
-   virtual Value *allocateArrayPage()
-   {
-      return static_cast<Value *>( pagesAllocator_.allocate() );
-   }
-
-   virtual void releaseArrayPage( Value *value )
-   {
-      if ( value )
-         pagesAllocator_.release( value );
-   }
-private:
-   BatchAllocator<ValueInternalArray,1> arraysAllocator_;
-   BatchAllocator<Value,ValueInternalArray::itemsPerPage> pagesAllocator_;
-};
-#endif // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-
-static ValueArrayAllocator *&arrayAllocator()
-{
-   static DefaultValueArrayAllocator defaultAllocator;
-   static ValueArrayAllocator *arrayAllocator = &defaultAllocator;
-   return arrayAllocator;
-}
-
-static struct DummyArrayAllocatorInitializer {
-   DummyArrayAllocatorInitializer() 
-   {
-      arrayAllocator();      // ensure arrayAllocator() statics are initialized before main().
-   }
-} dummyArrayAllocatorInitializer;
-
-// //////////////////////////////////////////////////////////////////
-// class ValueInternalArray
-// //////////////////////////////////////////////////////////////////
-bool 
-ValueInternalArray::equals( const IteratorState &x, 
-                            const IteratorState &other )
-{
-   return x.array_ == other.array_  
-          &&  x.currentItemIndex_ == other.currentItemIndex_  
-          &&  x.currentPageIndex_ == other.currentPageIndex_;
-}
-
-
-void 
-ValueInternalArray::increment( IteratorState &it )
-{
-   JSON_ASSERT_MESSAGE( it.array_  &&
-      (it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
-      != it.array_->size_,
-      "ValueInternalArray::increment(): moving iterator beyond end" );
-   ++(it.currentItemIndex_);
-   if ( it.currentItemIndex_ == itemsPerPage )
-   {
-      it.currentItemIndex_ = 0;
-      ++(it.currentPageIndex_);
-   }
-}
-
-
-void 
-ValueInternalArray::decrement( IteratorState &it )
-{
-   JSON_ASSERT_MESSAGE( it.array_  &&  it.currentPageIndex_ == it.array_->pages_ 
-                        &&  it.currentItemIndex_ == 0,
-      "ValueInternalArray::decrement(): moving iterator beyond end" );
-   if ( it.currentItemIndex_ == 0 )
-   {
-      it.currentItemIndex_ = itemsPerPage-1;
-      --(it.currentPageIndex_);
-   }
-   else
-   {
-      --(it.currentItemIndex_);
-   }
-}
-
-
-Value &
-ValueInternalArray::unsafeDereference( const IteratorState &it )
-{
-   return (*(it.currentPageIndex_))[it.currentItemIndex_];
-}
-
-
-Value &
-ValueInternalArray::dereference( const IteratorState &it )
-{
-   JSON_ASSERT_MESSAGE( it.array_  &&
-      (it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
-      < it.array_->size_,
-      "ValueInternalArray::dereference(): dereferencing invalid iterator" );
-   return unsafeDereference( it );
-}
-
-void 
-ValueInternalArray::makeBeginIterator( IteratorState &it ) const
-{
-   it.array_ = const_cast<ValueInternalArray *>( this );
-   it.currentItemIndex_ = 0;
-   it.currentPageIndex_ = pages_;
-}
-
-
-void 
-ValueInternalArray::makeIterator( IteratorState &it, ArrayIndex index ) const
-{
-   it.array_ = const_cast<ValueInternalArray *>( this );
-   it.currentItemIndex_ = index % itemsPerPage;
-   it.currentPageIndex_ = pages_ + index / itemsPerPage;
-}
-
-
-void 
-ValueInternalArray::makeEndIterator( IteratorState &it ) const
-{
-   makeIterator( it, size_ );
-}
-
-
-ValueInternalArray::ValueInternalArray()
-   : pages_( 0 )
-   , size_( 0 )
-   , pageCount_( 0 )
-{
-}
-
-
-ValueInternalArray::ValueInternalArray( const ValueInternalArray &other )
-   : pages_( 0 )
-   , pageCount_( 0 )
-   , size_( other.size_ )
-{
-   PageIndex minNewPages = other.size_ / itemsPerPage;
-   arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
-   JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, 
-                        "ValueInternalArray::reserve(): bad reallocation" );
-   IteratorState itOther;
-   other.makeBeginIterator( itOther );
-   Value *value;
-   for ( ArrayIndex index = 0; index < size_; ++index, increment(itOther) )
-   {
-      if ( index % itemsPerPage == 0 )
-      {
-         PageIndex pageIndex = index / itemsPerPage;
-         value = arrayAllocator()->allocateArrayPage();
-         pages_[pageIndex] = value;
-      }
-      new (value) Value( dereference( itOther ) );
-   }
-}
-
-
-ValueInternalArray &
-ValueInternalArray::operator =( const ValueInternalArray &other )
-{
-   ValueInternalArray temp( other );
-   swap( temp );
-   return *this;
-}
-
-
-ValueInternalArray::~ValueInternalArray()
-{
-   // destroy all constructed items
-   IteratorState it;
-   IteratorState itEnd;
-   makeBeginIterator( it);
-   makeEndIterator( itEnd );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      Value *value = &dereference(it);
-      value->~Value();
-   }
-   // release all pages
-   PageIndex lastPageIndex = size_ / itemsPerPage;
-   for ( PageIndex pageIndex = 0; pageIndex < lastPageIndex; ++pageIndex )
-      arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
-   // release pages index
-   arrayAllocator()->releaseArrayPageIndex( pages_, pageCount_ );
-}
-
-
-void 
-ValueInternalArray::swap( ValueInternalArray &other )
-{
-   Value **tempPages = pages_;
-   pages_ = other.pages_;
-   other.pages_ = tempPages;
-   ArrayIndex tempSize = size_;
-   size_ = other.size_;
-   other.size_ = tempSize;
-   PageIndex tempPageCount = pageCount_;
-   pageCount_ = other.pageCount_;
-   other.pageCount_ = tempPageCount;
-}
-
-void 
-ValueInternalArray::clear()
-{
-   ValueInternalArray dummy;
-   swap( dummy );
-}
-
-
-void 
-ValueInternalArray::resize( ArrayIndex newSize )
-{
-   if ( newSize == 0 )
-      clear();
-   else if ( newSize < size_ )
-   {
-      IteratorState it;
-      IteratorState itEnd;
-      makeIterator( it, newSize );
-      makeIterator( itEnd, size_ );
-      for ( ; !equals(it,itEnd); increment(it) )
-      {
-         Value *value = &dereference(it);
-         value->~Value();
-      }
-      PageIndex pageIndex = (newSize + itemsPerPage - 1) / itemsPerPage;
-      PageIndex lastPageIndex = size_ / itemsPerPage;
-      for ( ; pageIndex < lastPageIndex; ++pageIndex )
-         arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
-      size_ = newSize;
-   }
-   else if ( newSize > size_ )
-      resolveReference( newSize );
-}
-
-
-void 
-ValueInternalArray::makeIndexValid( ArrayIndex index )
-{
-   // Need to enlarge page index ?
-   if ( index >= pageCount_ * itemsPerPage )
-   {
-      PageIndex minNewPages = (index + 1) / itemsPerPage;
-      arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
-      JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, "ValueInternalArray::reserve(): bad reallocation" );
-   }
-
-   // Need to allocate new pages ?
-   ArrayIndex nextPageIndex = 
-      (size_ % itemsPerPage) != 0 ? size_ - (size_%itemsPerPage) + itemsPerPage
-                                  : size_;
-   if ( nextPageIndex <= index )
-   {
-      PageIndex pageIndex = nextPageIndex / itemsPerPage;
-      PageIndex pageToAllocate = (index - nextPageIndex) / itemsPerPage + 1;
-      for ( ; pageToAllocate-- > 0; ++pageIndex )
-         pages_[pageIndex] = arrayAllocator()->allocateArrayPage();
-   }
-
-   // Initialize all new entries
-   IteratorState it;
-   IteratorState itEnd;
-   makeIterator( it, size_ );
-   size_ = index + 1;
-   makeIterator( itEnd, size_ );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      Value *value = &dereference(it);
-      new (value) Value(); // Construct a default value using placement new
-   }
-}
-
-Value &
-ValueInternalArray::resolveReference( ArrayIndex index )
-{
-   if ( index >= size_ )
-      makeIndexValid( index );
-   return pages_[index/itemsPerPage][index%itemsPerPage];
-}
-
-Value *
-ValueInternalArray::find( ArrayIndex index ) const
-{
-   if ( index >= size_ )
-      return 0;
-   return &(pages_[index/itemsPerPage][index%itemsPerPage]);
-}
-
-ValueInternalArray::ArrayIndex 
-ValueInternalArray::size() const
-{
-   return size_;
-}
-
-int 
-ValueInternalArray::distance( const IteratorState &x, const IteratorState &y )
-{
-   return indexOf(y) - indexOf(x);
-}
-
-
-ValueInternalArray::ArrayIndex 
-ValueInternalArray::indexOf( const IteratorState &iterator )
-{
-   if ( !iterator.array_ )
-      return ArrayIndex(-1);
-   return ArrayIndex(
-      (iterator.currentPageIndex_ - iterator.array_->pages_) * itemsPerPage 
-      + iterator.currentItemIndex_ );
-}
-
-
-int 
-ValueInternalArray::compare( const ValueInternalArray &other ) const
-{
-   int sizeDiff( size_ - other.size_ );
-   if ( sizeDiff != 0 )
-      return sizeDiff;
-   
-   for ( ArrayIndex index =0; index < size_; ++index )
-   {
-      int diff = pages_[index/itemsPerPage][index%itemsPerPage].compare( 
-         other.pages_[index/itemsPerPage][index%itemsPerPage] );
-      if ( diff != 0 )
-         return diff;
-   }
-   return 0;
-}
-
-} // namespace Json
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_internalmap.inl b/src/3rd_party-static/jsoncpp/src/lib_json/json_internalmap.inl
deleted file mode 100644
index f2fa160655..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_internalmap.inl
+++ /dev/null
@@ -1,615 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-// included by json_value.cpp
-
-namespace Json {
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueInternalMap
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-/** \internal MUST be safely initialized using memset( this, 0, sizeof(ValueInternalLink) );
-   * This optimization is used by the fast allocator.
-   */
-ValueInternalLink::ValueInternalLink()
-   : previous_( 0 )
-   , next_( 0 )
-{
-}
-
-ValueInternalLink::~ValueInternalLink()
-{ 
-   for ( int index =0; index < itemPerLink; ++index )
-   {
-      if ( !items_[index].isItemAvailable() )
-      {
-         if ( !items_[index].isMemberNameStatic() )
-            free( keys_[index] );
-      }
-      else
-         break;
-   }
-}
-
-
-
-ValueMapAllocator::~ValueMapAllocator()
-{
-}
-
-#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-class DefaultValueMapAllocator : public ValueMapAllocator
-{
-public: // overridden from ValueMapAllocator
-   virtual ValueInternalMap *newMap()
-   {
-      return new ValueInternalMap();
-   }
-
-   virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-   {
-      return new ValueInternalMap( other );
-   }
-
-   virtual void destructMap( ValueInternalMap *map )
-   {
-      delete map;
-   }
-
-   virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-   {
-      return new ValueInternalLink[size];
-   }
-
-   virtual void releaseMapBuckets( ValueInternalLink *links )
-   {
-      delete [] links;
-   }
-
-   virtual ValueInternalLink *allocateMapLink()
-   {
-      return new ValueInternalLink();
-   }
-
-   virtual void releaseMapLink( ValueInternalLink *link )
-   {
-      delete link;
-   }
-};
-#else
-/// @todo make this thread-safe (lock when accessign batch allocator)
-class DefaultValueMapAllocator : public ValueMapAllocator
-{
-public: // overridden from ValueMapAllocator
-   virtual ValueInternalMap *newMap()
-   {
-      ValueInternalMap *map = mapsAllocator_.allocate();
-      new (map) ValueInternalMap(); // placement new
-      return map;
-   }
-
-   virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-   {
-      ValueInternalMap *map = mapsAllocator_.allocate();
-      new (map) ValueInternalMap( other ); // placement new
-      return map;
-   }
-
-   virtual void destructMap( ValueInternalMap *map )
-   {
-      if ( map )
-      {
-         map->~ValueInternalMap();
-         mapsAllocator_.release( map );
-      }
-   }
-
-   virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-   {
-      return new ValueInternalLink[size];
-   }
-
-   virtual void releaseMapBuckets( ValueInternalLink *links )
-   {
-      delete [] links;
-   }
-
-   virtual ValueInternalLink *allocateMapLink()
-   {
-      ValueInternalLink *link = linksAllocator_.allocate();
-      memset( link, 0, sizeof(ValueInternalLink) );
-      return link;
-   }
-
-   virtual void releaseMapLink( ValueInternalLink *link )
-   {
-      link->~ValueInternalLink();
-      linksAllocator_.release( link );
-   }
-private:
-   BatchAllocator<ValueInternalMap,1> mapsAllocator_;
-   BatchAllocator<ValueInternalLink,1> linksAllocator_;
-};
-#endif
-
-static ValueMapAllocator *&mapAllocator()
-{
-   static DefaultValueMapAllocator defaultAllocator;
-   static ValueMapAllocator *mapAllocator = &defaultAllocator;
-   return mapAllocator;
-}
-
-static struct DummyMapAllocatorInitializer {
-   DummyMapAllocatorInitializer() 
-   {
-      mapAllocator();      // ensure mapAllocator() statics are initialized before main().
-   }
-} dummyMapAllocatorInitializer;
-
-
-
-// h(K) = value * K >> w ; with w = 32 & K prime w.r.t. 2^32.
-
-/*
-use linked list hash map. 
-buckets array is a container.
-linked list element contains 6 key/values. (memory = (16+4) * 6 + 4 = 124)
-value have extra state: valid, available, deleted
-*/
-
-
-ValueInternalMap::ValueInternalMap()
-   : buckets_( 0 )
-   , tailLink_( 0 )
-   , bucketsSize_( 0 )
-   , itemCount_( 0 )
-{
-}
-
-
-ValueInternalMap::ValueInternalMap( const ValueInternalMap &other )
-   : buckets_( 0 )
-   , tailLink_( 0 )
-   , bucketsSize_( 0 )
-   , itemCount_( 0 )
-{
-   reserve( other.itemCount_ );
-   IteratorState it;
-   IteratorState itEnd;
-   other.makeBeginIterator( it );
-   other.makeEndIterator( itEnd );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      bool isStatic;
-      const char *memberName = key( it, isStatic );
-      const Value &aValue = value( it );
-      resolveReference(memberName, isStatic) = aValue;
-   }
-}
-
-
-ValueInternalMap &
-ValueInternalMap::operator =( const ValueInternalMap &other )
-{
-   ValueInternalMap dummy( other );
-   swap( dummy );
-   return *this;
-}
-
-
-ValueInternalMap::~ValueInternalMap()
-{
-   if ( buckets_ )
-   {
-      for ( BucketIndex bucketIndex =0; bucketIndex < bucketsSize_; ++bucketIndex )
-      {
-         ValueInternalLink *link = buckets_[bucketIndex].next_;
-         while ( link )
-         {
-            ValueInternalLink *linkToRelease = link;
-            link = link->next_;
-            mapAllocator()->releaseMapLink( linkToRelease );
-         }
-      }
-      mapAllocator()->releaseMapBuckets( buckets_ );
-   }
-}
-
-
-void 
-ValueInternalMap::swap( ValueInternalMap &other )
-{
-   ValueInternalLink *tempBuckets = buckets_;
-   buckets_ = other.buckets_;
-   other.buckets_ = tempBuckets;
-   ValueInternalLink *tempTailLink = tailLink_;
-   tailLink_ = other.tailLink_;
-   other.tailLink_ = tempTailLink;
-   BucketIndex tempBucketsSize = bucketsSize_;
-   bucketsSize_ = other.bucketsSize_;
-   other.bucketsSize_ = tempBucketsSize;
-   BucketIndex tempItemCount = itemCount_;
-   itemCount_ = other.itemCount_;
-   other.itemCount_ = tempItemCount;
-}
-
-
-void 
-ValueInternalMap::clear()
-{
-   ValueInternalMap dummy;
-   swap( dummy );
-}
-
-
-ValueInternalMap::BucketIndex 
-ValueInternalMap::size() const
-{
-   return itemCount_;
-}
-
-bool 
-ValueInternalMap::reserveDelta( BucketIndex growth )
-{
-   return reserve( itemCount_ + growth );
-}
-
-bool 
-ValueInternalMap::reserve( BucketIndex newItemCount )
-{
-   if ( !buckets_  &&  newItemCount > 0 )
-   {
-      buckets_ = mapAllocator()->allocateMapBuckets( 1 );
-      bucketsSize_ = 1;
-      tailLink_ = &buckets_[0];
-   }
-//   BucketIndex idealBucketCount = (newItemCount + ValueInternalLink::itemPerLink) / ValueInternalLink::itemPerLink;
-   return true;
-}
-
-
-const Value *
-ValueInternalMap::find( const char *key ) const
-{
-   if ( !bucketsSize_ )
-      return 0;
-   HashKey hashedKey = hash( key );
-   BucketIndex bucketIndex = hashedKey % bucketsSize_;
-   for ( const ValueInternalLink *current = &buckets_[bucketIndex]; 
-         current != 0; 
-         current = current->next_ )
-   {
-      for ( BucketIndex index=0; index < ValueInternalLink::itemPerLink; ++index )
-      {
-         if ( current->items_[index].isItemAvailable() )
-            return 0;
-         if ( strcmp( key, current->keys_[index] ) == 0 )
-            return &current->items_[index];
-      }
-   }
-   return 0;
-}
-
-
-Value *
-ValueInternalMap::find( const char *key )
-{
-   const ValueInternalMap *constThis = this;
-   return const_cast<Value *>( constThis->find( key ) );
-}
-
-
-Value &
-ValueInternalMap::resolveReference( const char *key,
-                                    bool isStatic )
-{
-   HashKey hashedKey = hash( key );
-   if ( bucketsSize_ )
-   {
-      BucketIndex bucketIndex = hashedKey % bucketsSize_;
-      ValueInternalLink **previous = 0;
-      BucketIndex index;
-      for ( ValueInternalLink *current = &buckets_[bucketIndex]; 
-            current != 0; 
-            previous = &current->next_, current = current->next_ )
-      {
-         for ( index=0; index < ValueInternalLink::itemPerLink; ++index )
-         {
-            if ( current->items_[index].isItemAvailable() )
-               return setNewItem( key, isStatic, current, index );
-            if ( strcmp( key, current->keys_[index] ) == 0 )
-               return current->items_[index];
-         }
-      }
-   }
-
-   reserveDelta( 1 );
-   return unsafeAdd( key, isStatic, hashedKey );
-}
-
-
-void 
-ValueInternalMap::remove( const char *key )
-{
-   HashKey hashedKey = hash( key );
-   if ( !bucketsSize_ )
-      return;
-   BucketIndex bucketIndex = hashedKey % bucketsSize_;
-   for ( ValueInternalLink *link = &buckets_[bucketIndex]; 
-         link != 0; 
-         link = link->next_ )
-   {
-      BucketIndex index;
-      for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
-      {
-         if ( link->items_[index].isItemAvailable() )
-            return;
-         if ( strcmp( key, link->keys_[index] ) == 0 )
-         {
-            doActualRemove( link, index, bucketIndex );
-            return;
-         }
-      }
-   }
-}
-
-void 
-ValueInternalMap::doActualRemove( ValueInternalLink *link, 
-                                  BucketIndex index,
-                                  BucketIndex bucketIndex )
-{
-   // find last item of the bucket and swap it with the 'removed' one.
-   // set removed items flags to 'available'.
-   // if last page only contains 'available' items, then desallocate it (it's empty)
-   ValueInternalLink *&lastLink = getLastLinkInBucket( index );
-   BucketIndex lastItemIndex = 1; // a link can never be empty, so start at 1
-   for ( ;   
-         lastItemIndex < ValueInternalLink::itemPerLink; 
-         ++lastItemIndex ) // may be optimized with dicotomic search
-   {
-      if ( lastLink->items_[lastItemIndex].isItemAvailable() )
-         break;
-   }
-   
-   BucketIndex lastUsedIndex = lastItemIndex - 1;
-   Value *valueToDelete = &link->items_[index];
-   Value *valueToPreserve = &lastLink->items_[lastUsedIndex];
-   if ( valueToDelete != valueToPreserve )
-      valueToDelete->swap( *valueToPreserve );
-   if ( lastUsedIndex == 0 )  // page is now empty
-   {  // remove it from bucket linked list and delete it.
-      ValueInternalLink *linkPreviousToLast = lastLink->previous_;
-      if ( linkPreviousToLast != 0 )   // can not deleted bucket link.
-      {
-         mapAllocator()->releaseMapLink( lastLink );
-         linkPreviousToLast->next_ = 0;
-         lastLink = linkPreviousToLast;
-      }
-   }
-   else
-   {
-      Value dummy;
-      valueToPreserve->swap( dummy ); // restore deleted to default Value.
-      valueToPreserve->setItemUsed( false );
-   }
-   --itemCount_;
-}
-
-
-ValueInternalLink *&
-ValueInternalMap::getLastLinkInBucket( BucketIndex bucketIndex )
-{
-   if ( bucketIndex == bucketsSize_ - 1 )
-      return tailLink_;
-   ValueInternalLink *&previous = buckets_[bucketIndex+1].previous_;
-   if ( !previous )
-      previous = &buckets_[bucketIndex];
-   return previous;
-}
-
-
-Value &
-ValueInternalMap::setNewItem( const char *key, 
-                              bool isStatic,
-                              ValueInternalLink *link, 
-                              BucketIndex index )
-{
-   char *duplicatedKey = makeMemberName( key );
-   ++itemCount_;
-   link->keys_[index] = duplicatedKey;
-   link->items_[index].setItemUsed();
-   link->items_[index].setMemberNameIsStatic( isStatic );
-   return link->items_[index]; // items already default constructed.
-}
-
-
-Value &
-ValueInternalMap::unsafeAdd( const char *key, 
-                             bool isStatic, 
-                             HashKey hashedKey )
-{
-   JSON_ASSERT_MESSAGE( bucketsSize_ > 0, "ValueInternalMap::unsafeAdd(): internal logic error." );
-   BucketIndex bucketIndex = hashedKey % bucketsSize_;
-   ValueInternalLink *&previousLink = getLastLinkInBucket( bucketIndex );
-   ValueInternalLink *link = previousLink;
-   BucketIndex index;
-   for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
-   {
-      if ( link->items_[index].isItemAvailable() )
-         break;
-   }
-   if ( index == ValueInternalLink::itemPerLink ) // need to add a new page
-   {
-      ValueInternalLink *newLink = mapAllocator()->allocateMapLink();
-      index = 0;
-      link->next_ = newLink;
-      previousLink = newLink;
-      link = newLink;
-   }
-   return setNewItem( key, isStatic, link, index );
-}
-
-
-ValueInternalMap::HashKey 
-ValueInternalMap::hash( const char *key ) const
-{
-   HashKey hash = 0;
-   while ( *key )
-      hash += *key++ * 37;
-   return hash;
-}
-
-
-int 
-ValueInternalMap::compare( const ValueInternalMap &other ) const
-{
-   int sizeDiff( itemCount_ - other.itemCount_ );
-   if ( sizeDiff != 0 )
-      return sizeDiff;
-   // Strict order guaranty is required. Compare all keys FIRST, then compare values.
-   IteratorState it;
-   IteratorState itEnd;
-   makeBeginIterator( it );
-   makeEndIterator( itEnd );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      if ( !other.find( key( it ) ) )
-         return 1;
-   }
-
-   // All keys are equals, let's compare values
-   makeBeginIterator( it );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      const Value *otherValue = other.find( key( it ) );
-      int valueDiff = value(it).compare( *otherValue );
-      if ( valueDiff != 0 )
-         return valueDiff;
-   }
-   return 0;
-}
-
-
-void 
-ValueInternalMap::makeBeginIterator( IteratorState &it ) const
-{
-   it.map_ = const_cast<ValueInternalMap *>( this );
-   it.bucketIndex_ = 0;
-   it.itemIndex_ = 0;
-   it.link_ = buckets_;
-}
-
-
-void 
-ValueInternalMap::makeEndIterator( IteratorState &it ) const
-{
-   it.map_ = const_cast<ValueInternalMap *>( this );
-   it.bucketIndex_ = bucketsSize_;
-   it.itemIndex_ = 0;
-   it.link_ = 0;
-}
-
-
-bool 
-ValueInternalMap::equals( const IteratorState &x, const IteratorState &other )
-{
-   return x.map_ == other.map_  
-          &&  x.bucketIndex_ == other.bucketIndex_  
-          &&  x.link_ == other.link_
-          &&  x.itemIndex_ == other.itemIndex_;
-}
-
-
-void 
-ValueInternalMap::incrementBucket( IteratorState &iterator )
-{
-   ++iterator.bucketIndex_;
-   JSON_ASSERT_MESSAGE( iterator.bucketIndex_ <= iterator.map_->bucketsSize_,
-      "ValueInternalMap::increment(): attempting to iterate beyond end." );
-   if ( iterator.bucketIndex_ == iterator.map_->bucketsSize_ )
-      iterator.link_ = 0;
-   else
-      iterator.link_ = &(iterator.map_->buckets_[iterator.bucketIndex_]);
-   iterator.itemIndex_ = 0;
-}
-
-
-void 
-ValueInternalMap::increment( IteratorState &iterator )
-{
-   JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterator using invalid iterator." );
-   ++iterator.itemIndex_;
-   if ( iterator.itemIndex_ == ValueInternalLink::itemPerLink )
-   {
-      JSON_ASSERT_MESSAGE( iterator.link_ != 0,
-         "ValueInternalMap::increment(): attempting to iterate beyond end." );
-      iterator.link_ = iterator.link_->next_;
-      if ( iterator.link_ == 0 )
-         incrementBucket( iterator );
-   }
-   else if ( iterator.link_->items_[iterator.itemIndex_].isItemAvailable() )
-   {
-      incrementBucket( iterator );
-   }
-}
-
-
-void 
-ValueInternalMap::decrement( IteratorState &iterator )
-{
-   if ( iterator.itemIndex_ == 0 )
-   {
-      JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterate using invalid iterator." );
-      if ( iterator.link_ == &iterator.map_->buckets_[iterator.bucketIndex_] )
-      {
-         JSON_ASSERT_MESSAGE( iterator.bucketIndex_ > 0, "Attempting to iterate beyond beginning." );
-         --(iterator.bucketIndex_);
-      }
-      iterator.link_ = iterator.link_->previous_;
-      iterator.itemIndex_ = ValueInternalLink::itemPerLink - 1;
-   }
-}
-
-
-const char *
-ValueInternalMap::key( const IteratorState &iterator )
-{
-   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
-   return iterator.link_->keys_[iterator.itemIndex_];
-}
-
-const char *
-ValueInternalMap::key( const IteratorState &iterator, bool &isStatic )
-{
-   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
-   isStatic = iterator.link_->items_[iterator.itemIndex_].isMemberNameStatic();
-   return iterator.link_->keys_[iterator.itemIndex_];
-}
-
-
-Value &
-ValueInternalMap::value( const IteratorState &iterator )
-{
-   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
-   return iterator.link_->items_[iterator.itemIndex_];
-}
-
-
-int 
-ValueInternalMap::distance( const IteratorState &x, const IteratorState &y )
-{
-   int offset = 0;
-   IteratorState it = x;
-   while ( !equals( it, y ) )
-      increment( it );
-   return offset;
-}
-
-} // namespace Json
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_reader.cpp b/src/3rd_party-static/jsoncpp/src/lib_json/json_reader.cpp
deleted file mode 100644
index d0abe34811..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_reader.cpp
+++ /dev/null
@@ -1,884 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include <json/reader.h>
-# include <json/value.h>
-# include "json_tool.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <utility>
-#include <cstdio>
-#include <cassert>
-#include <cstring>
-#include <iostream>
-#include <stdexcept>
-
-#if _MSC_VER >= 1400 // VC++ 8.0
-#pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
-#endif
-
-namespace Json {
-
-// Implementation of class Features
-// ////////////////////////////////
-
-Features::Features()
-   : allowComments_( true )
-   , strictRoot_( false )
-{
-}
-
-
-Features 
-Features::all()
-{
-   return Features();
-}
-
-
-Features 
-Features::strictMode()
-{
-   Features features;
-   features.allowComments_ = false;
-   features.strictRoot_ = true;
-   return features;
-}
-
-// Implementation of class Reader
-// ////////////////////////////////
-
-
-static inline bool 
-in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4 )
-{
-   return c == c1  ||  c == c2  ||  c == c3  ||  c == c4;
-}
-
-static inline bool 
-in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5 )
-{
-   return c == c1  ||  c == c2  ||  c == c3  ||  c == c4  ||  c == c5;
-}
-
-
-static bool 
-containsNewLine( Reader::Location begin, 
-                 Reader::Location end )
-{
-   for ( ;begin < end; ++begin )
-      if ( *begin == '\n'  ||  *begin == '\r' )
-         return true;
-   return false;
-}
-
-
-// Class Reader
-// //////////////////////////////////////////////////////////////////
-
-Reader::Reader()
-   : features_( Features::all() )
-{
-}
-
-
-Reader::Reader( const Features &features )
-   : features_( features )
-{
-}
-
-
-bool
-Reader::parse( const std::string &document, 
-               Value &root,
-               bool collectComments )
-{
-   document_ = document;
-   const char *begin = document_.c_str();
-   const char *end = begin + document_.length();
-   return parse( begin, end, root, collectComments );
-}
-
-
-bool
-Reader::parse( std::istream& sin,
-               Value &root,
-               bool collectComments )
-{
-   //std::istream_iterator<char> begin(sin);
-   //std::istream_iterator<char> end;
-   // Those would allow streamed input from a file, if parse() were a
-   // template function.
-
-   // Since std::string is reference-counted, this at least does not
-   // create an extra copy.
-   std::string doc;
-   std::getline(sin, doc, (char)EOF);
-   return parse( doc, root, collectComments );
-}
-
-bool 
-Reader::parse( const char *beginDoc, const char *endDoc, 
-               Value &root,
-               bool collectComments )
-{
-   if ( !features_.allowComments_ )
-   {
-      collectComments = false;
-   }
-
-   begin_ = beginDoc;
-   end_ = endDoc;
-   collectComments_ = collectComments;
-   current_ = begin_;
-   lastValueEnd_ = 0;
-   lastValue_ = 0;
-   commentsBefore_ = "";
-   errors_.clear();
-   while ( !nodes_.empty() )
-      nodes_.pop();
-   nodes_.push( &root );
-   
-   bool successful = readValue();
-   Token token;
-   skipCommentTokens( token );
-   if ( collectComments_  &&  !commentsBefore_.empty() )
-      root.setComment( commentsBefore_, commentAfter );
-   if ( features_.strictRoot_ )
-   {
-      if ( !root.isArray()  &&  !root.isObject() )
-      {
-         // Set error location to start of doc, ideally should be first token found in doc
-         token.type_ = tokenError;
-         token.start_ = beginDoc;
-         token.end_ = endDoc;
-         addError( "A valid JSON document must be either an array or an object value.",
-                   token );
-         return false;
-      }
-   }
-   return successful;
-}
-
-
-bool
-Reader::readValue()
-{
-   Token token;
-   skipCommentTokens( token );
-   bool successful = true;
-
-   if ( collectComments_  &&  !commentsBefore_.empty() )
-   {
-      currentValue().setComment( commentsBefore_, commentBefore );
-      commentsBefore_ = "";
-   }
-
-
-   switch ( token.type_ )
-   {
-   case tokenObjectBegin:
-      successful = readObject( token );
-      break;
-   case tokenArrayBegin:
-      successful = readArray( token );
-      break;
-   case tokenNumber:
-      successful = decodeNumber( token );
-      break;
-   case tokenString:
-      successful = decodeString( token );
-      break;
-   case tokenTrue:
-      currentValue() = true;
-      break;
-   case tokenFalse:
-      currentValue() = false;
-      break;
-   case tokenNull:
-      currentValue() = Value();
-      break;
-   default:
-      return addError( "Syntax error: value, object or array expected.", token );
-   }
-
-   if ( collectComments_ )
-   {
-      lastValueEnd_ = current_;
-      lastValue_ = &currentValue();
-   }
-
-   return successful;
-}
-
-
-void 
-Reader::skipCommentTokens( Token &token )
-{
-   if ( features_.allowComments_ )
-   {
-      do
-      {
-         readToken( token );
-      }
-      while ( token.type_ == tokenComment );
-   }
-   else
-   {
-      readToken( token );
-   }
-}
-
-
-bool 
-Reader::expectToken( TokenType type, Token &token, const char *message )
-{
-   readToken( token );
-   if ( token.type_ != type )
-      return addError( message, token );
-   return true;
-}
-
-
-bool 
-Reader::readToken( Token &token )
-{
-   skipSpaces();
-   token.start_ = current_;
-   Char c = getNextChar();
-   bool ok = true;
-   switch ( c )
-   {
-   case '{':
-      token.type_ = tokenObjectBegin;
-      break;
-   case '}':
-      token.type_ = tokenObjectEnd;
-      break;
-   case '[':
-      token.type_ = tokenArrayBegin;
-      break;
-   case ']':
-      token.type_ = tokenArrayEnd;
-      break;
-   case '"':
-      token.type_ = tokenString;
-      ok = readString();
-      break;
-   case '/':
-      token.type_ = tokenComment;
-      ok = readComment();
-      break;
-   case '0':
-   case '1':
-   case '2':
-   case '3':
-   case '4':
-   case '5':
-   case '6':
-   case '7':
-   case '8':
-   case '9':
-   case '-':
-      token.type_ = tokenNumber;
-      readNumber();
-      break;
-   case 'T':
-   case 't':
-      token.type_ = tokenTrue;
-      ok = match( "rue", 3 );
-      break;
-   case 'F':
-   case 'f':
-      token.type_ = tokenFalse;
-      ok = match( "alse", 4 );
-      break;
-   case 'N':
-   case 'n':
-      token.type_ = tokenNull;
-      ok = match( "ull", 3 );
-      break;
-   case ',':
-      token.type_ = tokenArraySeparator;
-      break;
-   case ':':
-      token.type_ = tokenMemberSeparator;
-      break;
-   case 0:
-      token.type_ = tokenEndOfStream;
-      break;
-   default:
-      ok = false;
-      break;
-   }
-   if ( !ok )
-      token.type_ = tokenError;
-   token.end_ = current_;
-   return true;
-}
-
-
-void 
-Reader::skipSpaces()
-{
-   while ( current_ != end_ )
-   {
-      Char c = *current_;
-      if ( c == ' '  ||  c == '\t'  ||  c == '\r'  ||  c == '\n' )
-         ++current_;
-      else
-         break;
-   }
-}
-
-
-bool 
-Reader::match( Location pattern, 
-               int patternLength )
-{
-   if ( end_ - current_ < patternLength )
-      return false;
-   int index = patternLength;
-   while ( index-- )
-      if ( current_[index] != pattern[index] )
-         return false;
-   current_ += patternLength;
-   return true;
-}
-
-
-bool
-Reader::readComment()
-{
-   Location commentBegin = current_ - 1;
-   Char c = getNextChar();
-   bool successful = false;
-   if ( c == '*' )
-      successful = readCStyleComment();
-   else if ( c == '/' )
-      successful = readCppStyleComment();
-   if ( !successful )
-      return false;
-
-   if ( collectComments_ )
-   {
-      CommentPlacement placement = commentBefore;
-      if ( lastValueEnd_  &&  !containsNewLine( lastValueEnd_, commentBegin ) )
-      {
-         if ( c != '*'  ||  !containsNewLine( commentBegin, current_ ) )
-            placement = commentAfterOnSameLine;
-      }
-
-      addComment( commentBegin, current_, placement );
-   }
-   return true;
-}
-
-
-void 
-Reader::addComment( Location begin, 
-                    Location end, 
-                    CommentPlacement placement )
-{
-   assert( collectComments_ );
-   if ( placement == commentAfterOnSameLine )
-   {
-      assert( lastValue_ != 0 );
-      lastValue_->setComment( std::string( begin, end ), placement );
-   }
-   else
-   {
-      if ( !commentsBefore_.empty() )
-         commentsBefore_ += "\n";
-      commentsBefore_ += std::string( begin, end );
-   }
-}
-
-
-bool 
-Reader::readCStyleComment()
-{
-   while ( current_ != end_ )
-   {
-      Char c = getNextChar();
-      if ( c == '*'  &&  *current_ == '/' )
-         break;
-   }
-   return getNextChar() == '/';
-}
-
-
-bool 
-Reader::readCppStyleComment()
-{
-   while ( current_ != end_ )
-   {
-      Char c = getNextChar();
-      if (  c == '\r'  ||  c == '\n' )
-         break;
-   }
-   return true;
-}
-
-
-void 
-Reader::readNumber()
-{
-   while ( current_ != end_ )
-   {
-      if ( !(*current_ >= '0'  &&  *current_ <= '9')  &&
-           !in( *current_, '.', 'e', 'E', '+', '-' ) )
-         break;
-      ++current_;
-   }
-}
-
-bool
-Reader::readString()
-{
-   Char c = 0;
-   while ( current_ != end_ )
-   {
-      c = getNextChar();
-      if ( c == '\\' )
-         getNextChar();
-      else if ( c == '"' )
-         break;
-   }
-   return c == '"';
-}
-
-
-bool 
-Reader::readObject( Token &/*tokenStart*/ )
-{
-   Token tokenName;
-   std::string name;
-   currentValue() = Value( objectValue );
-   while ( readToken( tokenName ) )
-   {
-      bool initialTokenOk = true;
-      while ( tokenName.type_ == tokenComment  &&  initialTokenOk )
-         initialTokenOk = readToken( tokenName );
-      if  ( !initialTokenOk )
-         break;
-      if ( tokenName.type_ == tokenObjectEnd  &&  name.empty() )  // empty object
-         return true;
-      if ( tokenName.type_ != tokenString )
-         break;
-      
-      name = "";
-      if ( !decodeString( tokenName, name ) )
-         return recoverFromError( tokenObjectEnd );
-
-      Token colon;
-      if ( !readToken( colon ) ||  colon.type_ != tokenMemberSeparator )
-      {
-         return addErrorAndRecover( "Missing ':' after object member name", 
-                                    colon, 
-                                    tokenObjectEnd );
-      }
-      Value &value = currentValue()[ name ];
-      nodes_.push( &value );
-      bool ok = readValue();
-      nodes_.pop();
-      if ( !ok ) // error already set
-         return recoverFromError( tokenObjectEnd );
-
-      Token comma;
-      if ( !readToken( comma )
-            ||  ( comma.type_ != tokenObjectEnd  &&  
-                  comma.type_ != tokenArraySeparator &&
-                  comma.type_ != tokenComment ) )
-      {
-         return addErrorAndRecover( "Missing ',' or '}' in object declaration", 
-                                    comma, 
-                                    tokenObjectEnd );
-      }
-      bool finalizeTokenOk = true;
-      while ( comma.type_ == tokenComment &&
-              finalizeTokenOk )
-         finalizeTokenOk = readToken( comma );
-      if ( comma.type_ == tokenObjectEnd )
-         return true;
-   }
-   return addErrorAndRecover( "Missing '}' or object member name", 
-                              tokenName, 
-                              tokenObjectEnd );
-}
-
-
-bool 
-Reader::readArray( Token &/*tokenStart*/ )
-{
-   currentValue() = Value( arrayValue );
-   skipSpaces();
-   if ( *current_ == ']' ) // empty array
-   {
-      Token endArray;
-      readToken( endArray );
-      return true;
-   }
-   int index = 0;
-   for (;;)
-   {
-      Value &value = currentValue()[ index++ ];
-      nodes_.push( &value );
-      bool ok = readValue();
-      nodes_.pop();
-      if ( !ok ) // error already set
-         return recoverFromError( tokenArrayEnd );
-
-      Token token;
-      // Accept Comment after last item in the array.
-      ok = readToken( token );
-      while ( token.type_ == tokenComment  &&  ok )
-      {
-         ok = readToken( token );
-      }
-      bool badTokenType = ( token.type_ != tokenArraySeparator  &&
-                            token.type_ != tokenArrayEnd );
-      if ( !ok  ||  badTokenType )
-      {
-         return addErrorAndRecover( "Missing ',' or ']' in array declaration", 
-                                    token, 
-                                    tokenArrayEnd );
-      }
-      if ( token.type_ == tokenArrayEnd )
-         break;
-   }
-   return true;
-}
-
-
-bool 
-Reader::decodeNumber( Token &token )
-{
-   bool isDouble = false;
-   for ( Location inspect = token.start_; inspect != token.end_; ++inspect )
-   {
-      isDouble = isDouble  
-                 ||  in( *inspect, '.', 'e', 'E', '+' )  
-                 ||  ( *inspect == '-'  &&  inspect != token.start_ );
-   }
-   if ( isDouble )
-      return decodeDouble( token );
-   // Attempts to parse the number as an integer. If the number is
-   // larger than the maximum supported value of an integer then
-   // we decode the number as a double.
-   Location current = token.start_;
-   bool isNegative = *current == '-';
-   if ( isNegative )
-      ++current;
-   Value::LargestUInt maxIntegerValue = isNegative ? Value::LargestUInt(-Value::minLargestInt) 
-                                                   : Value::maxLargestUInt;
-   Value::LargestUInt threshold = maxIntegerValue / 10;
-   Value::UInt lastDigitThreshold = Value::UInt( maxIntegerValue % 10 );
-   assert(lastDigitThreshold <= 9 );
-   Value::LargestUInt value = 0;
-   while ( current < token.end_ )
-   {
-      Char c = *current++;
-      if ( c < '0'  ||  c > '9' )
-         return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
-      Value::UInt digit(c - '0');
-      if ( value >= threshold )
-      {
-         // If the current digit is not the last one, or if it is
-         // greater than the last digit of the maximum integer value,
-         // the parse the number as a double.
-         if ( current != token.end_  ||  digit > lastDigitThreshold )
-         {
-            return decodeDouble( token );
-         }
-      }
-      value = value * 10 + digit;
-   }
-   if ( isNegative )
-      currentValue() = -Value::LargestInt( value );
-   else if ( value <= Value::LargestUInt(Value::maxInt) )
-      currentValue() = Value::LargestInt( value );
-   else
-      currentValue() = value;
-   return true;
-}
-
-
-bool 
-Reader::decodeDouble( Token &token )
-{
-   double value = 0;
-   const int bufferSize = 32;
-   int count;
-   int length = int(token.end_ - token.start_);
-   if ( length <= bufferSize )
-   {
-      Char buffer[bufferSize+1];
-      memcpy( buffer, token.start_, length );
-      buffer[length] = 0;
-      count = sscanf( buffer, "%lf", &value );
-   }
-   else
-   {
-      std::string buffer( token.start_, token.end_ );
-      count = sscanf( buffer.c_str(), "%lf", &value );
-   }
-
-   if ( count != 1 )
-      return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
-   currentValue() = value;
-   return true;
-}
-
-
-bool 
-Reader::decodeString( Token &token )
-{
-   std::string decoded;
-   if ( !decodeString( token, decoded ) )
-      return false;
-   currentValue() = decoded;
-   return true;
-}
-
-
-bool 
-Reader::decodeString( Token &token, std::string &decoded )
-{
-   decoded.reserve( token.end_ - token.start_ - 2 );
-   Location current = token.start_ + 1; // skip '"'
-   Location end = token.end_ - 1;      // do not include '"'
-   while ( current != end )
-   {
-      Char c = *current++;
-      if ( c == '"' )
-         break;
-      else if ( c == '\\' )
-      {
-         if ( current == end )
-            return addError( "Empty escape sequence in string", token, current );
-         Char escape = *current++;
-         switch ( escape )
-         {
-         case '"': decoded += '"'; break;
-         case '\'': decoded += '\''; break;
-         case '/': decoded += '/'; break;
-         case '\\': decoded += '\\'; break;
-         case 'b': decoded += '\b'; break;
-         case 'f': decoded += '\f'; break;
-         case 'n': decoded += '\n'; break;
-         case 'r': decoded += '\r'; break;
-         case 't': decoded += '\t'; break;
-         case 'u':
-            {
-               unsigned int unicode;
-               if ( !decodeUnicodeCodePoint( token, current, end, unicode ) )
-                  return false;
-               decoded += codePointToUTF8(unicode);
-            }
-            break;
-         default:
-            return addError( "Bad escape sequence in string", token, current );
-         }
-      }
-      else
-      {
-         decoded += c;
-      }
-   }
-   return true;
-}
-
-bool
-Reader::decodeUnicodeCodePoint( Token &token, 
-                                     Location &current, 
-                                     Location end, 
-                                     unsigned int &unicode )
-{
-
-   if ( !decodeUnicodeEscapeSequence( token, current, end, unicode ) )
-      return false;
-   if (unicode >= 0xD800 && unicode <= 0xDBFF)
-   {
-      // surrogate pairs
-      if (end - current < 6)
-         return addError( "additional six characters expected to parse unicode surrogate pair.", token, current );
-      unsigned int surrogatePair;
-      if (*(current++) == '\\' && *(current++)== 'u')
-      {
-         if (decodeUnicodeEscapeSequence( token, current, end, surrogatePair ))
-         {
-            unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
-         } 
-         else
-            return false;
-      } 
-      else
-         return addError( "expecting another \\u token to begin the second half of a unicode surrogate pair", token, current );
-   }
-   return true;
-}
-
-bool 
-Reader::decodeUnicodeEscapeSequence( Token &token, 
-                                     Location &current, 
-                                     Location end, 
-                                     unsigned int &unicode )
-{
-   if ( end - current < 4 )
-      return addError( "Bad unicode escape sequence in string: four digits expected.", token, current );
-   unicode = 0;
-   for ( int index =0; index < 4; ++index )
-   {
-      Char c = *current++;
-      unicode *= 16;
-      if ( c >= '0'  &&  c <= '9' )
-         unicode += c - '0';
-      else if ( c >= 'a'  &&  c <= 'f' )
-         unicode += c - 'a' + 10;
-      else if ( c >= 'A'  &&  c <= 'F' )
-         unicode += c - 'A' + 10;
-      else
-         return addError( "Bad unicode escape sequence in string: hexadecimal digit expected.", token, current );
-   }
-   return true;
-}
-
-
-bool 
-Reader::addError( const std::string &message, 
-                  Token &token,
-                  Location extra )
-{
-   ErrorInfo info;
-   info.token_ = token;
-   info.message_ = message;
-   info.extra_ = extra;
-   errors_.push_back( info );
-   return false;
-}
-
-
-bool 
-Reader::recoverFromError( TokenType skipUntilToken )
-{
-   int errorCount = int(errors_.size());
-   Token skip;
-   for (;;)
-   {
-      if ( !readToken(skip) )
-         errors_.resize( errorCount ); // discard errors caused by recovery
-      if ( skip.type_ == skipUntilToken  ||  skip.type_ == tokenEndOfStream )
-         break;
-   }
-   errors_.resize( errorCount );
-   return false;
-}
-
-
-bool 
-Reader::addErrorAndRecover( const std::string &message, 
-                            Token &token,
-                            TokenType skipUntilToken )
-{
-   addError( message, token );
-   return recoverFromError( skipUntilToken );
-}
-
-
-Value &
-Reader::currentValue()
-{
-   return *(nodes_.top());
-}
-
-
-Reader::Char 
-Reader::getNextChar()
-{
-   if ( current_ == end_ )
-      return 0;
-   return *current_++;
-}
-
-
-void 
-Reader::getLocationLineAndColumn( Location location,
-                                  int &line,
-                                  int &column ) const
-{
-   Location current = begin_;
-   Location lastLineStart = current;
-   line = 0;
-   while ( current < location  &&  current != end_ )
-   {
-      Char c = *current++;
-      if ( c == '\r' )
-      {
-         if ( *current == '\n' )
-            ++current;
-         lastLineStart = current;
-         ++line;
-      }
-      else if ( c == '\n' )
-      {
-         lastLineStart = current;
-         ++line;
-      }
-   }
-   // column & line start at 1
-   column = int(location - lastLineStart) + 1;
-   ++line;
-}
-
-
-std::string
-Reader::getLocationLineAndColumn( Location location ) const
-{
-   int line, column;
-   getLocationLineAndColumn( location, line, column );
-   char buffer[18+16+16+1];
-   sprintf( buffer, "Line %d, Column %d", line, column );
-   return buffer;
-}
-
-
-// Deprecated. Preserved for backward compatibility
-std::string 
-Reader::getFormatedErrorMessages() const
-{
-    return getFormattedErrorMessages();
-}
-
-
-std::string 
-Reader::getFormattedErrorMessages() const
-{
-   std::string formattedMessage;
-   for ( Errors::const_iterator itError = errors_.begin();
-         itError != errors_.end();
-         ++itError )
-   {
-      const ErrorInfo &error = *itError;
-      formattedMessage += "* " + getLocationLineAndColumn( error.token_.start_ ) + "\n";
-      formattedMessage += "  " + error.message_ + "\n";
-      if ( error.extra_ )
-         formattedMessage += "See " + getLocationLineAndColumn( error.extra_ ) + " for detail.\n";
-   }
-   return formattedMessage;
-}
-
-
-std::istream& operator>>( std::istream &sin, Value &root )
-{
-    Json::Reader reader;
-    bool ok = reader.parse(sin, root, true);
-    //JSON_ASSERT( ok );
-    if (!ok) throw std::runtime_error(reader.getFormattedErrorMessages());
-    return sin;
-}
-
-
-} // namespace Json
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_tool.h b/src/3rd_party-static/jsoncpp/src/lib_json/json_tool.h
deleted file mode 100644
index 658031bbba..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_tool.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-# define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-
-/* This header provides common string manipulation support, such as UTF-8,
- * portable conversion from/to string...
- *
- * It is an internal header that must not be exposed.
- */
-
-namespace Json {
-
-/// Converts a unicode code-point to UTF-8.
-static inline std::string 
-codePointToUTF8(unsigned int cp)
-{
-   std::string result;
-   
-   // based on description from http://en.wikipedia.org/wiki/UTF-8
-
-   if (cp <= 0x7f) 
-   {
-      result.resize(1);
-      result[0] = static_cast<char>(cp);
-   } 
-   else if (cp <= 0x7FF) 
-   {
-      result.resize(2);
-      result[1] = static_cast<char>(0x80 | (0x3f & cp));
-      result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
-   } 
-   else if (cp <= 0xFFFF) 
-   {
-      result.resize(3);
-      result[2] = static_cast<char>(0x80 | (0x3f & cp));
-      result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
-      result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
-   }
-   else if (cp <= 0x10FFFF) 
-   {
-      result.resize(4);
-      result[3] = static_cast<char>(0x80 | (0x3f & cp));
-      result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-      result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
-      result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
-   }
-
-   return result;
-}
-
-
-/// Returns true if ch is a control character (in range [0,32[).
-static inline bool 
-isControlCharacter(char ch)
-{
-   return ch > 0 && ch <= 0x1F;
-}
-
-
-enum { 
-   /// Constant that specify the size of the buffer that must be passed to uintToString.
-   uintToStringBufferSize = 3*sizeof(LargestUInt)+1 
-};
-
-// Defines a char buffer for use with uintToString().
-typedef char UIntToStringBuffer[uintToStringBufferSize];
-
-
-/** Converts an unsigned integer to string.
- * @param value Unsigned interger to convert to string
- * @param current Input/Output string buffer. 
- *        Must have at least uintToStringBufferSize chars free.
- */
-static inline void 
-uintToString( LargestUInt value, 
-              char *&current )
-{
-   *--current = 0;
-   do
-   {
-      *--current = char(value % 10) + '0';
-      value /= 10;
-   }
-   while ( value != 0 );
-}
-
-} // namespace Json {
-
-#endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_value.cpp b/src/3rd_party-static/jsoncpp/src/lib_json/json_value.cpp
deleted file mode 100644
index d063c369a3..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_value.cpp
+++ /dev/null
@@ -1,1830 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include <json/value.h>
-# include <json/writer.h>
-# ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-#  include "json_batchallocator.h"
-# endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <iostream>
-#include <utility>
-#include <stdexcept>
-#include <cstring>
-#include <cassert>
-#ifdef JSON_USE_CPPTL
-# include <cpptl/conststring.h>
-#endif
-#include <cstddef>    // size_t
-
-#define JSON_ASSERT_UNREACHABLE assert( false )
-#define JSON_ASSERT( condition ) assert( condition );  // @todo <= change this into an exception throw
-#define JSON_FAIL_MESSAGE( message ) throw std::runtime_error( message );
-#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) JSON_FAIL_MESSAGE( message )
-
-namespace Json {
-
-const Value Value::null;
-const Int Value::minInt = Int( ~(UInt(-1)/2) );
-const Int Value::maxInt = Int( UInt(-1)/2 );
-const UInt Value::maxUInt = UInt(-1);
-const Int64 Value::minInt64 = Int64( ~(UInt64(-1)/2) );
-const Int64 Value::maxInt64 = Int64( UInt64(-1)/2 );
-const UInt64 Value::maxUInt64 = UInt64(-1);
-const LargestInt Value::minLargestInt = LargestInt( ~(LargestUInt(-1)/2) );
-const LargestInt Value::maxLargestInt = LargestInt( LargestUInt(-1)/2 );
-const LargestUInt Value::maxLargestUInt = LargestUInt(-1);
-
-
-/// Unknown size marker
-static const unsigned int unknown = (unsigned)-1;
-
-
-/** Duplicates the specified string value.
- * @param value Pointer to the string to duplicate. Must be zero-terminated if
- *              length is "unknown".
- * @param length Length of the value. if equals to unknown, then it will be
- *               computed using strlen(value).
- * @return Pointer on the duplicate instance of string.
- */
-static inline char *
-duplicateStringValue( const char *value, 
-                      unsigned int length = unknown )
-{
-   if ( length == unknown )
-      length = (unsigned int)strlen(value);
-   char *newString = static_cast<char *>( malloc( length + 1 ) );
-   JSON_ASSERT_MESSAGE( newString != 0, "Failed to allocate string value buffer" );
-   memcpy( newString, value, length );
-   newString[length] = 0;
-   return newString;
-}
-
-
-/** Free the string duplicated by duplicateStringValue().
- */
-static inline void 
-releaseStringValue( char *value )
-{
-   if ( value )
-      free( value );
-}
-
-} // namespace Json
-
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// ValueInternals...
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-#if !defined(JSON_IS_AMALGAMATION)
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-#  include "json_internalarray.inl"
-#  include "json_internalmap.inl"
-# endif // JSON_VALUE_USE_INTERNAL_MAP
-
-# include "json_valueiterator.inl"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::CommentInfo
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-
-Value::CommentInfo::CommentInfo()
-   : comment_( 0 )
-{
-}
-
-Value::CommentInfo::~CommentInfo()
-{
-   if ( comment_ )
-      releaseStringValue( comment_ );
-}
-
-
-void 
-Value::CommentInfo::setComment( const char *text )
-{
-   if ( comment_ )
-      releaseStringValue( comment_ );
-   JSON_ASSERT( text != 0 );
-   JSON_ASSERT_MESSAGE( text[0]=='\0' || text[0]=='/', "Comments must start with /");
-   // It seems that /**/ style comments are acceptable as well.
-   comment_ = duplicateStringValue( text );
-}
-
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::CZString
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-# ifndef JSON_VALUE_USE_INTERNAL_MAP
-
-// Notes: index_ indicates if the string was allocated when
-// a string is stored.
-
-Value::CZString::CZString( ArrayIndex index )
-   : cstr_( 0 )
-   , index_( index )
-{
-}
-
-Value::CZString::CZString( const char *cstr, DuplicationPolicy allocate )
-   : cstr_( allocate == duplicate ? duplicateStringValue(cstr) 
-                                  : cstr )
-   , index_( allocate )
-{
-}
-
-Value::CZString::CZString( const CZString &other )
-: cstr_( other.index_ != noDuplication &&  other.cstr_ != 0
-                ?  duplicateStringValue( other.cstr_ )
-                : other.cstr_ )
-   , index_( other.cstr_ ? (other.index_ == noDuplication ? noDuplication : duplicate)
-                         : other.index_ )
-{
-}
-
-Value::CZString::~CZString()
-{
-   if ( cstr_  &&  index_ == duplicate )
-      releaseStringValue( const_cast<char *>( cstr_ ) );
-}
-
-void 
-Value::CZString::swap( CZString &other )
-{
-   std::swap( cstr_, other.cstr_ );
-   std::swap( index_, other.index_ );
-}
-
-Value::CZString &
-Value::CZString::operator =( const CZString &other )
-{
-   CZString temp( other );
-   swap( temp );
-   return *this;
-}
-
-bool 
-Value::CZString::operator<( const CZString &other ) const 
-{
-   if ( cstr_ )
-      return strcmp( cstr_, other.cstr_ ) < 0;
-   return index_ < other.index_;
-}
-
-bool 
-Value::CZString::operator==( const CZString &other ) const 
-{
-   if ( cstr_ )
-      return strcmp( cstr_, other.cstr_ ) == 0;
-   return index_ == other.index_;
-}
-
-
-ArrayIndex 
-Value::CZString::index() const
-{
-   return index_;
-}
-
-
-const char *
-Value::CZString::c_str() const
-{
-   return cstr_;
-}
-
-bool 
-Value::CZString::isStaticString() const
-{
-   return index_ == noDuplication;
-}
-
-#endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
-
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::Value
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-/*! \internal Default constructor initialization must be equivalent to:
- * memset( this, 0, sizeof(Value) )
- * This optimization is used in ValueInternalMap fast allocator.
- */
-Value::Value( ValueType type )
-   : type_( type )
-   , allocated_( 0 )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   switch ( type )
-   {
-   case nullValue:
-      break;
-   case intValue:
-   case uintValue:
-      value_.int_ = 0;
-      break;
-   case realValue:
-      value_.real_ = 0.0;
-      break;
-   case stringValue:
-      value_.string_ = 0;
-      break;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      value_.map_ = new ObjectValues();
-      break;
-#else
-   case arrayValue:
-      value_.array_ = arrayAllocator()->newArray();
-      break;
-   case objectValue:
-      value_.map_ = mapAllocator()->newMap();
-      break;
-#endif
-   case booleanValue:
-      value_.bool_ = false;
-      break;
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-}
-
-
-#if defined(JSON_HAS_INT64)
-Value::Value( UInt value )
-   : type_( uintValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.uint_ = value;
-}
-
-Value::Value( Int value )
-   : type_( intValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.int_ = value;
-}
-
-#endif // if defined(JSON_HAS_INT64)
-
-
-Value::Value( Int64 value )
-   : type_( intValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.int_ = value;
-}
-
-
-Value::Value( UInt64 value )
-   : type_( uintValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.uint_ = value;
-}
-
-Value::Value( double value )
-   : type_( realValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.real_ = value;
-}
-
-Value::Value( const char *value )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.string_ = duplicateStringValue( value );
-}
-
-
-Value::Value( const char *beginValue, 
-              const char *endValue )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.string_ = duplicateStringValue( beginValue, 
-                                          (unsigned int)(endValue - beginValue) );
-}
-
-
-Value::Value( const std::string &value )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.string_ = duplicateStringValue( value.c_str(), 
-                                          (unsigned int)value.length() );
-
-}
-
-Value::Value( const StaticString &value )
-   : type_( stringValue )
-   , allocated_( false )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.string_ = const_cast<char *>( value.c_str() );
-}
-
-
-# ifdef JSON_USE_CPPTL
-Value::Value( const CppTL::ConstString &value )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.string_ = duplicateStringValue( value, value.length() );
-}
-# endif
-
-Value::Value( bool value )
-   : type_( booleanValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   value_.bool_ = value;
-}
-
-
-Value::Value( const Value &other )
-   : type_( other.type_ )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
-#endif
-{
-   switch ( type_ )
-   {
-   case nullValue:
-   case intValue:
-   case uintValue:
-   case realValue:
-   case booleanValue:
-      value_ = other.value_;
-      break;
-   case stringValue:
-      if ( other.value_.string_ )
-      {
-         value_.string_ = duplicateStringValue( other.value_.string_ );
-         allocated_ = true;
-      }
-      else
-         value_.string_ = 0;
-      break;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      value_.map_ = new ObjectValues( *other.value_.map_ );
-      break;
-#else
-   case arrayValue:
-      value_.array_ = arrayAllocator()->newArrayCopy( *other.value_.array_ );
-      break;
-   case objectValue:
-      value_.map_ = mapAllocator()->newMapCopy( *other.value_.map_ );
-      break;
-#endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   if ( other.comments_ )
-   {
-      comments_ = new CommentInfo[numberOfCommentPlacement];
-      for ( int comment =0; comment < numberOfCommentPlacement; ++comment )
-      {
-         const CommentInfo &otherComment = other.comments_[comment];
-         if ( otherComment.comment_ )
-            comments_[comment].setComment( otherComment.comment_ );
-      }
-   }
-}
-
-
-Value::~Value()
-{
-   switch ( type_ )
-   {
-   case nullValue:
-   case intValue:
-   case uintValue:
-   case realValue:
-   case booleanValue:
-      break;
-   case stringValue:
-      if ( allocated_ )
-         releaseStringValue( value_.string_ );
-      break;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      delete value_.map_;
-      break;
-#else
-   case arrayValue:
-      arrayAllocator()->destructArray( value_.array_ );
-      break;
-   case objectValue:
-      mapAllocator()->destructMap( value_.map_ );
-      break;
-#endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-
-   if ( comments_ )
-      delete[] comments_;
-}
-
-Value &
-Value::operator=( const Value &other )
-{
-   Value temp( other );
-   swap( temp );
-   return *this;
-}
-
-void 
-Value::swap( Value &other )
-{
-   ValueType temp = type_;
-   type_ = other.type_;
-   other.type_ = temp;
-   std::swap( value_, other.value_ );
-   int temp2 = allocated_;
-   allocated_ = other.allocated_;
-   other.allocated_ = temp2;
-}
-
-ValueType 
-Value::type() const
-{
-   return type_;
-}
-
-
-int 
-Value::compare( const Value &other ) const
-{
-   if ( *this < other )
-      return -1;
-   if ( *this > other )
-      return 1;
-   return 0;
-}
-
-
-bool 
-Value::operator <( const Value &other ) const
-{
-   int typeDelta = type_ - other.type_;
-   if ( typeDelta )
-      return typeDelta < 0 ? true : false;
-   switch ( type_ )
-   {
-   case nullValue:
-      return false;
-   case intValue:
-      return value_.int_ < other.value_.int_;
-   case uintValue:
-      return value_.uint_ < other.value_.uint_;
-   case realValue:
-      return value_.real_ < other.value_.real_;
-   case booleanValue:
-      return value_.bool_ < other.value_.bool_;
-   case stringValue:
-      return ( value_.string_ == 0  &&  other.value_.string_ )
-             || ( other.value_.string_  
-                  &&  value_.string_  
-                  && strcmp( value_.string_, other.value_.string_ ) < 0 );
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      {
-         int delta = int( value_.map_->size() - other.value_.map_->size() );
-         if ( delta )
-            return delta < 0;
-         return (*value_.map_) < (*other.value_.map_);
-      }
-#else
-   case arrayValue:
-      return value_.array_->compare( *(other.value_.array_) ) < 0;
-   case objectValue:
-      return value_.map_->compare( *(other.value_.map_) ) < 0;
-#endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return false;  // unreachable
-}
-
-bool 
-Value::operator <=( const Value &other ) const
-{
-   return !(other < *this);
-}
-
-bool 
-Value::operator >=( const Value &other ) const
-{
-   return !(*this < other);
-}
-
-bool 
-Value::operator >( const Value &other ) const
-{
-   return other < *this;
-}
-
-bool 
-Value::operator ==( const Value &other ) const
-{
-   //if ( type_ != other.type_ )
-   // GCC 2.95.3 says:
-   // attempt to take address of bit-field structure member `Json::Value::type_'
-   // Beats me, but a temp solves the problem.
-   int temp = other.type_;
-   if ( type_ != temp )
-      return false;
-   switch ( type_ )
-   {
-   case nullValue:
-      return true;
-   case intValue:
-      return value_.int_ == other.value_.int_;
-   case uintValue:
-      return value_.uint_ == other.value_.uint_;
-   case realValue:
-      return value_.real_ == other.value_.real_;
-   case booleanValue:
-      return value_.bool_ == other.value_.bool_;
-   case stringValue:
-      return ( value_.string_ == other.value_.string_ )
-             || ( other.value_.string_  
-                  &&  value_.string_  
-                  && strcmp( value_.string_, other.value_.string_ ) == 0 );
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      return value_.map_->size() == other.value_.map_->size()
-             && (*value_.map_) == (*other.value_.map_);
-#else
-   case arrayValue:
-      return value_.array_->compare( *(other.value_.array_) ) == 0;
-   case objectValue:
-      return value_.map_->compare( *(other.value_.map_) ) == 0;
-#endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return false;  // unreachable
-}
-
-bool 
-Value::operator !=( const Value &other ) const
-{
-   return !( *this == other );
-}
-
-const char *
-Value::asCString() const
-{
-   JSON_ASSERT( type_ == stringValue );
-   return value_.string_;
-}
-
-
-std::string 
-Value::asString() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return "";
-   case stringValue:
-      return value_.string_ ? value_.string_ : "";
-   case booleanValue:
-      return value_.bool_ ? "true" : "false";
-   case intValue:
-   case uintValue:
-     return valueToString(value_.int_);
-   case realValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to string" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return ""; // unreachable
-}
-
-# ifdef JSON_USE_CPPTL
-CppTL::ConstString 
-Value::asConstString() const
-{
-   return CppTL::ConstString( asString().c_str() );
-}
-# endif
-
-
-Value::Int 
-Value::asInt() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0;
-   case intValue:
-      JSON_ASSERT_MESSAGE( value_.int_ >= minInt  &&  value_.int_ <= maxInt, "unsigned integer out of signed int range" );
-      return Int(value_.int_);
-   case uintValue:
-      JSON_ASSERT_MESSAGE( value_.uint_ <= UInt(maxInt), "unsigned integer out of signed int range" );
-      return Int(value_.uint_);
-   case realValue:
-      JSON_ASSERT_MESSAGE( value_.real_ >= minInt  &&  value_.real_ <= maxInt, "Real out of signed integer range" );
-      return Int( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1 : 0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to int" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-
-Value::UInt 
-Value::asUInt() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0;
-   case intValue:
-      JSON_ASSERT_MESSAGE( value_.int_ >= 0, "Negative integer can not be converted to unsigned integer" );
-      JSON_ASSERT_MESSAGE( value_.int_ <= maxUInt, "signed integer out of UInt range" );
-      return UInt(value_.int_);
-   case uintValue:
-      JSON_ASSERT_MESSAGE( value_.uint_ <= maxUInt, "unsigned integer out of UInt range" );
-      return UInt(value_.uint_);
-   case realValue:
-      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ <= maxUInt,  "Real out of unsigned integer range" );
-      return UInt( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1 : 0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to uint" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-
-# if defined(JSON_HAS_INT64)
-
-Value::Int64
-Value::asInt64() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0;
-   case intValue:
-      return value_.int_;
-   case uintValue:
-      JSON_ASSERT_MESSAGE( value_.uint_ <= UInt64(maxInt64), "unsigned integer out of Int64 range" );
-      return value_.uint_;
-   case realValue:
-      JSON_ASSERT_MESSAGE( value_.real_ >= minInt64  &&  value_.real_ <= maxInt64, "Real out of Int64 range" );
-      return Int( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1 : 0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to Int64" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-
-Value::UInt64
-Value::asUInt64() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0;
-   case intValue:
-      JSON_ASSERT_MESSAGE( value_.int_ >= 0, "Negative integer can not be converted to UInt64" );
-      return value_.int_;
-   case uintValue:
-      return value_.uint_;
-   case realValue:
-      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ <= maxUInt64,  "Real out of UInt64 range" );
-      return UInt( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1 : 0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to UInt64" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-# endif // if defined(JSON_HAS_INT64)
-
-
-LargestInt 
-Value::asLargestInt() const
-{
-#if defined(JSON_NO_INT64)
-    return asInt();
-#else
-    return asInt64();
-#endif
-}
-
-
-LargestUInt 
-Value::asLargestUInt() const
-{
-#if defined(JSON_NO_INT64)
-    return asUInt();
-#else
-    return asUInt64();
-#endif
-}
-
-
-double 
-Value::asDouble() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0.0;
-   case intValue:
-      return static_cast<double>( value_.int_ );
-   case uintValue:
-#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-      return static_cast<double>( value_.uint_ );
-#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-      return static_cast<double>( Int(value_.uint_/2) ) * 2 + Int(value_.uint_ & 1);
-#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-   case realValue:
-      return value_.real_;
-   case booleanValue:
-      return value_.bool_ ? 1.0 : 0.0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to double" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-float
-Value::asFloat() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0.0f;
-   case intValue:
-      return static_cast<float>( value_.int_ );
-   case uintValue:
-#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-      return static_cast<float>( value_.uint_ );
-#else // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-      return static_cast<float>( Int(value_.uint_/2) ) * 2 + Int(value_.uint_ & 1);
-#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-   case realValue:
-      return static_cast<float>( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1.0f : 0.0f;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_FAIL_MESSAGE( "Type is not convertible to float" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0.0f; // unreachable;
-}
-
-bool 
-Value::asBool() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return false;
-   case intValue:
-   case uintValue:
-      return value_.int_ != 0;
-   case realValue:
-      return value_.real_ != 0.0;
-   case booleanValue:
-      return value_.bool_;
-   case stringValue:
-      return value_.string_  &&  value_.string_[0] != 0;
-   case arrayValue:
-   case objectValue:
-      return value_.map_->size() != 0;
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return false; // unreachable;
-}
-
-
-bool 
-Value::isConvertibleTo( ValueType other ) const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return true;
-   case intValue:
-      return ( other == nullValue  &&  value_.int_ == 0 )
-             || other == intValue
-             || ( other == uintValue  && value_.int_ >= 0 )
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case uintValue:
-      return ( other == nullValue  &&  value_.uint_ == 0 )
-             || ( other == intValue  && value_.uint_ <= (unsigned)maxInt )
-             || other == uintValue
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case realValue:
-      return ( other == nullValue  &&  value_.real_ == 0.0 )
-             || ( other == intValue  &&  value_.real_ >= minInt  &&  value_.real_ <= maxInt )
-             || ( other == uintValue  &&  value_.real_ >= 0  &&  value_.real_ <= maxUInt )
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case booleanValue:
-      return ( other == nullValue  &&  value_.bool_ == false )
-             || other == intValue
-             || other == uintValue
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case stringValue:
-      return other == stringValue
-             || ( other == nullValue  &&  (!value_.string_  ||  value_.string_[0] == 0) );
-   case arrayValue:
-      return other == arrayValue
-             ||  ( other == nullValue  &&  value_.map_->size() == 0 );
-   case objectValue:
-      return other == objectValue
-             ||  ( other == nullValue  &&  value_.map_->size() == 0 );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return false; // unreachable;
-}
-
-
-/// Number of values in array or object
-ArrayIndex 
-Value::size() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-   case intValue:
-   case uintValue:
-   case realValue:
-   case booleanValue:
-   case stringValue:
-      return 0;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:  // size of the array is highest index + 1
-      if ( !value_.map_->empty() )
-      {
-         ObjectValues::const_iterator itLast = value_.map_->end();
-         --itLast;
-         return (*itLast).first.index()+1;
-      }
-      return 0;
-   case objectValue:
-      return ArrayIndex( value_.map_->size() );
-#else
-   case arrayValue:
-      return Int( value_.array_->size() );
-   case objectValue:
-      return Int( value_.map_->size() );
-#endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-
-bool 
-Value::empty() const
-{
-   if ( isNull() || isArray() || isObject() )
-      return size() == 0u;
-   else
-      return false;
-}
-
-
-bool
-Value::operator!() const
-{
-   return isNull();
-}
-
-
-void 
-Value::clear()
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue  || type_ == objectValue );
-
-   switch ( type_ )
-   {
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      value_.map_->clear();
-      break;
-#else
-   case arrayValue:
-      value_.array_->clear();
-      break;
-   case objectValue:
-      value_.map_->clear();
-      break;
-#endif
-   default:
-      break;
-   }
-}
-
-void 
-Value::resize( ArrayIndex newSize )
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue );
-   if ( type_ == nullValue )
-      *this = Value( arrayValue );
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   ArrayIndex oldSize = size();
-   if ( newSize == 0 )
-      clear();
-   else if ( newSize > oldSize )
-      (*this)[ newSize - 1 ];
-   else
-   {
-      for ( ArrayIndex index = newSize; index < oldSize; ++index )
-      {
-         value_.map_->erase( index );
-      }
-      assert( size() == newSize );
-   }
-#else
-   value_.array_->resize( newSize );
-#endif
-}
-
-
-Value &
-Value::operator[]( ArrayIndex index )
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue );
-   if ( type_ == nullValue )
-      *this = Value( arrayValue );
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString key( index );
-   ObjectValues::iterator it = value_.map_->lower_bound( key );
-   if ( it != value_.map_->end()  &&  (*it).first == key )
-      return (*it).second;
-
-   ObjectValues::value_type defaultValue( key, null );
-   it = value_.map_->insert( it, defaultValue );
-   return (*it).second;
-#else
-   return value_.array_->resolveReference( index );
-#endif
-}
-
-
-Value &
-Value::operator[]( int index )
-{
-   JSON_ASSERT( index >= 0 );
-   return (*this)[ ArrayIndex(index) ];
-}
-
-
-const Value &
-Value::operator[]( ArrayIndex index ) const
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue );
-   if ( type_ == nullValue )
-      return null;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString key( index );
-   ObjectValues::const_iterator it = value_.map_->find( key );
-   if ( it == value_.map_->end() )
-      return null;
-   return (*it).second;
-#else
-   Value *value = value_.array_->find( index );
-   return value ? *value : null;
-#endif
-}
-
-
-const Value &
-Value::operator[]( int index ) const
-{
-   JSON_ASSERT( index >= 0 );
-   return (*this)[ ArrayIndex(index) ];
-}
-
-
-Value &
-Value::operator[]( const char *key )
-{
-   return resolveReference( key, false );
-}
-
-
-Value &
-Value::resolveReference( const char *key, 
-                         bool isStatic )
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-      *this = Value( objectValue );
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString actualKey( key, isStatic ? CZString::noDuplication 
-                                     : CZString::duplicateOnCopy );
-   ObjectValues::iterator it = value_.map_->lower_bound( actualKey );
-   if ( it != value_.map_->end()  &&  (*it).first == actualKey )
-      return (*it).second;
-
-   ObjectValues::value_type defaultValue( actualKey, null );
-   it = value_.map_->insert( it, defaultValue );
-   Value &value = (*it).second;
-   return value;
-#else
-   return value_.map_->resolveReference( key, isStatic );
-#endif
-}
-
-
-Value 
-Value::get( ArrayIndex index, 
-            const Value &defaultValue ) const
-{
-   const Value *value = &((*this)[index]);
-   return value == &null ? defaultValue : *value;
-}
-
-
-bool 
-Value::isValidIndex( ArrayIndex index ) const
-{
-   return index < size();
-}
-
-
-
-const Value &
-Value::operator[]( const char *key ) const
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-      return null;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString actualKey( key, CZString::noDuplication );
-   ObjectValues::const_iterator it = value_.map_->find( actualKey );
-   if ( it == value_.map_->end() )
-      return null;
-   return (*it).second;
-#else
-   const Value *value = value_.map_->find( key );
-   return value ? *value : null;
-#endif
-}
-
-
-Value &
-Value::operator[]( const std::string &key )
-{
-   return (*this)[ key.c_str() ];
-}
-
-
-const Value &
-Value::operator[]( const std::string &key ) const
-{
-   return (*this)[ key.c_str() ];
-}
-
-Value &
-Value::operator[]( const StaticString &key )
-{
-   return resolveReference( key, true );
-}
-
-
-# ifdef JSON_USE_CPPTL
-Value &
-Value::operator[]( const CppTL::ConstString &key )
-{
-   return (*this)[ key.c_str() ];
-}
-
-
-const Value &
-Value::operator[]( const CppTL::ConstString &key ) const
-{
-   return (*this)[ key.c_str() ];
-}
-# endif
-
-
-Value &
-Value::append( const Value &value )
-{
-   return (*this)[size()] = value;
-}
-
-
-Value 
-Value::get( const char *key, 
-            const Value &defaultValue ) const
-{
-   const Value *value = &((*this)[key]);
-   return value == &null ? defaultValue : *value;
-}
-
-
-Value 
-Value::get( const std::string &key,
-            const Value &defaultValue ) const
-{
-   return get( key.c_str(), defaultValue );
-}
-
-Value
-Value::removeMember( const char* key )
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-      return null;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString actualKey( key, CZString::noDuplication );
-   ObjectValues::iterator it = value_.map_->find( actualKey );
-   if ( it == value_.map_->end() )
-      return null;
-   Value old(it->second);
-   value_.map_->erase(it);
-   return old;
-#else
-   Value *value = value_.map_->find( key );
-   if (value){
-      Value old(*value);
-      value_.map_.remove( key );
-      return old;
-   } else {
-      return null;
-   }
-#endif
-}
-
-Value
-Value::removeMember( const std::string &key )
-{
-   return removeMember( key.c_str() );
-}
-
-# ifdef JSON_USE_CPPTL
-Value 
-Value::get( const CppTL::ConstString &key,
-            const Value &defaultValue ) const
-{
-   return get( key.c_str(), defaultValue );
-}
-# endif
-
-bool 
-Value::isMember( const char *key ) const
-{
-   const Value *value = &((*this)[key]);
-   return value != &null;
-}
-
-
-bool 
-Value::isMember( const std::string &key ) const
-{
-   return isMember( key.c_str() );
-}
-
-
-# ifdef JSON_USE_CPPTL
-bool 
-Value::isMember( const CppTL::ConstString &key ) const
-{
-   return isMember( key.c_str() );
-}
-#endif
-
-Value::Members 
-Value::getMemberNames() const
-{
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-       return Value::Members();
-   Members members;
-   members.reserve( value_.map_->size() );
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   ObjectValues::const_iterator it = value_.map_->begin();
-   ObjectValues::const_iterator itEnd = value_.map_->end();
-   for ( ; it != itEnd; ++it )
-      members.push_back( std::string( (*it).first.c_str() ) );
-#else
-   ValueInternalMap::IteratorState it;
-   ValueInternalMap::IteratorState itEnd;
-   value_.map_->makeBeginIterator( it );
-   value_.map_->makeEndIterator( itEnd );
-   for ( ; !ValueInternalMap::equals( it, itEnd ); ValueInternalMap::increment(it) )
-      members.push_back( std::string( ValueInternalMap::key( it ) ) );
-#endif
-   return members;
-}
-//
-//# ifdef JSON_USE_CPPTL
-//EnumMemberNames
-//Value::enumMemberNames() const
-//{
-//   if ( type_ == objectValue )
-//   {
-//      return CppTL::Enum::any(  CppTL::Enum::transform(
-//         CppTL::Enum::keys( *(value_.map_), CppTL::Type<const CZString &>() ),
-//         MemberNamesTransform() ) );
-//   }
-//   return EnumMemberNames();
-//}
-//
-//
-//EnumValues 
-//Value::enumValues() const
-//{
-//   if ( type_ == objectValue  ||  type_ == arrayValue )
-//      return CppTL::Enum::anyValues( *(value_.map_), 
-//                                     CppTL::Type<const Value &>() );
-//   return EnumValues();
-//}
-//
-//# endif
-
-
-bool
-Value::isNull() const
-{
-   return type_ == nullValue;
-}
-
-
-bool 
-Value::isBool() const
-{
-   return type_ == booleanValue;
-}
-
-
-bool 
-Value::isInt() const
-{
-   return type_ == intValue;
-}
-
-
-bool 
-Value::isUInt() const
-{
-   return type_ == uintValue;
-}
-
-
-bool 
-Value::isIntegral() const
-{
-   return type_ == intValue  
-          ||  type_ == uintValue  
-          ||  type_ == booleanValue;
-}
-
-
-bool 
-Value::isDouble() const
-{
-   return type_ == realValue;
-}
-
-
-bool 
-Value::isNumeric() const
-{
-   return isIntegral() || isDouble();
-}
-
-
-bool 
-Value::isString() const
-{
-   return type_ == stringValue;
-}
-
-
-bool 
-Value::isArray() const
-{
-   return type_ == nullValue  ||  type_ == arrayValue;
-}
-
-
-bool 
-Value::isObject() const
-{
-   return type_ == nullValue  ||  type_ == objectValue;
-}
-
-
-void 
-Value::setComment( const char *comment,
-                   CommentPlacement placement )
-{
-   if ( !comments_ )
-      comments_ = new CommentInfo[numberOfCommentPlacement];
-   comments_[placement].setComment( comment );
-}
-
-
-void 
-Value::setComment( const std::string &comment,
-                   CommentPlacement placement )
-{
-   setComment( comment.c_str(), placement );
-}
-
-
-bool 
-Value::hasComment( CommentPlacement placement ) const
-{
-   return comments_ != 0  &&  comments_[placement].comment_ != 0;
-}
-
-std::string 
-Value::getComment( CommentPlacement placement ) const
-{
-   if ( hasComment(placement) )
-      return comments_[placement].comment_;
-   return "";
-}
-
-
-std::string 
-Value::toStyledString() const
-{
-   StyledWriter writer;
-   return writer.write( *this );
-}
-
-
-Value::const_iterator 
-Value::begin() const
-{
-   switch ( type_ )
-   {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeBeginIterator( it );
-         return const_iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeBeginIterator( it );
-         return const_iterator( it );
-      }
-      break;
-#else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return const_iterator( value_.map_->begin() );
-      break;
-#endif
-   default:
-      break;
-   }
-   return const_iterator();
-}
-
-Value::const_iterator 
-Value::end() const
-{
-   switch ( type_ )
-   {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeEndIterator( it );
-         return const_iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeEndIterator( it );
-         return const_iterator( it );
-      }
-      break;
-#else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return const_iterator( value_.map_->end() );
-      break;
-#endif
-   default:
-      break;
-   }
-   return const_iterator();
-}
-
-
-Value::iterator 
-Value::begin()
-{
-   switch ( type_ )
-   {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeBeginIterator( it );
-         return iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeBeginIterator( it );
-         return iterator( it );
-      }
-      break;
-#else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return iterator( value_.map_->begin() );
-      break;
-#endif
-   default:
-      break;
-   }
-   return iterator();
-}
-
-Value::iterator 
-Value::end()
-{
-   switch ( type_ )
-   {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeEndIterator( it );
-         return iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeEndIterator( it );
-         return iterator( it );
-      }
-      break;
-#else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return iterator( value_.map_->end() );
-      break;
-#endif
-   default:
-      break;
-   }
-   return iterator();
-}
-
-
-// class PathArgument
-// //////////////////////////////////////////////////////////////////
-
-PathArgument::PathArgument()
-   : kind_( kindNone )
-{
-}
-
-
-PathArgument::PathArgument( ArrayIndex index )
-   : index_( index )
-   , kind_( kindIndex )
-{
-}
-
-
-PathArgument::PathArgument( const char *key )
-   : key_( key )
-   , kind_( kindKey )
-{
-}
-
-
-PathArgument::PathArgument( const std::string &key )
-   : key_( key.c_str() )
-   , kind_( kindKey )
-{
-}
-
-// class Path
-// //////////////////////////////////////////////////////////////////
-
-Path::Path( const std::string &path,
-            const PathArgument &a1,
-            const PathArgument &a2,
-            const PathArgument &a3,
-            const PathArgument &a4,
-            const PathArgument &a5 )
-{
-   InArgs in;
-   in.push_back( &a1 );
-   in.push_back( &a2 );
-   in.push_back( &a3 );
-   in.push_back( &a4 );
-   in.push_back( &a5 );
-   makePath( path, in );
-}
-
-
-void 
-Path::makePath( const std::string &path,
-                const InArgs &in )
-{
-   const char *current = path.c_str();
-   const char *end = current + path.length();
-   InArgs::const_iterator itInArg = in.begin();
-   while ( current != end )
-   {
-      if ( *current == '[' )
-      {
-         ++current;
-         if ( *current == '%' )
-            addPathInArg( path, in, itInArg, PathArgument::kindIndex );
-         else
-         {
-            ArrayIndex index = 0;
-            for ( ; current != end && *current >= '0'  &&  *current <= '9'; ++current )
-               index = index * 10 + ArrayIndex(*current - '0');
-            args_.push_back( index );
-         }
-         if ( current == end  ||  *current++ != ']' )
-            invalidPath( path, int(current - path.c_str()) );
-      }
-      else if ( *current == '%' )
-      {
-         addPathInArg( path, in, itInArg, PathArgument::kindKey );
-         ++current;
-      }
-      else if ( *current == '.' )
-      {
-         ++current;
-      }
-      else
-      {
-         const char *beginName = current;
-         while ( current != end  &&  !strchr( "[.", *current ) )
-            ++current;
-         args_.push_back( std::string( beginName, current ) );
-      }
-   }
-}
-
-
-void 
-Path::addPathInArg( const std::string &path, 
-                    const InArgs &in, 
-                    InArgs::const_iterator &itInArg, 
-                    PathArgument::Kind kind )
-{
-   if ( itInArg == in.end() )
-   {
-      // Error: missing argument %d
-   }
-   else if ( (*itInArg)->kind_ != kind )
-   {
-      // Error: bad argument type
-   }
-   else
-   {
-      args_.push_back( **itInArg );
-   }
-}
-
-
-void 
-Path::invalidPath( const std::string &path, 
-                   int location )
-{
-   // Error: invalid path.
-}
-
-
-const Value &
-Path::resolve( const Value &root ) const
-{
-   const Value *node = &root;
-   for ( Args::const_iterator it = args_.begin(); it != args_.end(); ++it )
-   {
-      const PathArgument &arg = *it;
-      if ( arg.kind_ == PathArgument::kindIndex )
-      {
-         if ( !node->isArray()  ||  node->isValidIndex( arg.index_ ) )
-         {
-            // Error: unable to resolve path (array value expected at position...
-         }
-         node = &((*node)[arg.index_]);
-      }
-      else if ( arg.kind_ == PathArgument::kindKey )
-      {
-         if ( !node->isObject() )
-         {
-            // Error: unable to resolve path (object value expected at position...)
-         }
-         node = &((*node)[arg.key_]);
-         if ( node == &Value::null )
-         {
-            // Error: unable to resolve path (object has no member named '' at position...)
-         }
-      }
-   }
-   return *node;
-}
-
-
-Value 
-Path::resolve( const Value &root, 
-               const Value &defaultValue ) const
-{
-   const Value *node = &root;
-   for ( Args::const_iterator it = args_.begin(); it != args_.end(); ++it )
-   {
-      const PathArgument &arg = *it;
-      if ( arg.kind_ == PathArgument::kindIndex )
-      {
-         if ( !node->isArray()  ||  node->isValidIndex( arg.index_ ) )
-            return defaultValue;
-         node = &((*node)[arg.index_]);
-      }
-      else if ( arg.kind_ == PathArgument::kindKey )
-      {
-         if ( !node->isObject() )
-            return defaultValue;
-         node = &((*node)[arg.key_]);
-         if ( node == &Value::null )
-            return defaultValue;
-      }
-   }
-   return *node;
-}
-
-
-Value &
-Path::make( Value &root ) const
-{
-   Value *node = &root;
-   for ( Args::const_iterator it = args_.begin(); it != args_.end(); ++it )
-   {
-      const PathArgument &arg = *it;
-      if ( arg.kind_ == PathArgument::kindIndex )
-      {
-         if ( !node->isArray() )
-         {
-            // Error: node is not an array at position ...
-         }
-         node = &((*node)[arg.index_]);
-      }
-      else if ( arg.kind_ == PathArgument::kindKey )
-      {
-         if ( !node->isObject() )
-         {
-            // Error: node is not an object at position...
-         }
-         node = &((*node)[arg.key_]);
-      }
-   }
-   return *node;
-}
-
-
-} // namespace Json
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_valueiterator.inl b/src/3rd_party-static/jsoncpp/src/lib_json/json_valueiterator.inl
deleted file mode 100644
index 7457ca389e..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_valueiterator.inl
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-// included by json_value.cpp
-
-namespace Json {
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueIteratorBase
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueIteratorBase::ValueIteratorBase()
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   : current_()
-   , isNull_( true )
-{
-}
-#else
-   : isArray_( true )
-   , isNull_( true )
-{
-   iterator_.array_ = ValueInternalArray::IteratorState();
-}
-#endif
-
-
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueIteratorBase::ValueIteratorBase( const Value::ObjectValues::iterator &current )
-   : current_( current )
-   , isNull_( false )
-{
-}
-#else
-ValueIteratorBase::ValueIteratorBase( const ValueInternalArray::IteratorState &state )
-   : isArray_( true )
-{
-   iterator_.array_ = state;
-}
-
-
-ValueIteratorBase::ValueIteratorBase( const ValueInternalMap::IteratorState &state )
-   : isArray_( false )
-{
-   iterator_.map_ = state;
-}
-#endif
-
-Value &
-ValueIteratorBase::deref() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   return current_->second;
-#else
-   if ( isArray_ )
-      return ValueInternalArray::dereference( iterator_.array_ );
-   return ValueInternalMap::value( iterator_.map_ );
-#endif
-}
-
-
-void 
-ValueIteratorBase::increment()
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   ++current_;
-#else
-   if ( isArray_ )
-      ValueInternalArray::increment( iterator_.array_ );
-   ValueInternalMap::increment( iterator_.map_ );
-#endif
-}
-
-
-void 
-ValueIteratorBase::decrement()
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   --current_;
-#else
-   if ( isArray_ )
-      ValueInternalArray::decrement( iterator_.array_ );
-   ValueInternalMap::decrement( iterator_.map_ );
-#endif
-}
-
-
-ValueIteratorBase::difference_type 
-ValueIteratorBase::computeDistance( const SelfType &other ) const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-# ifdef JSON_USE_CPPTL_SMALLMAP
-   return current_ - other.current_;
-# else
-   // Iterator for null value are initialized using the default
-   // constructor, which initialize current_ to the default
-   // std::map::iterator. As begin() and end() are two instance 
-   // of the default std::map::iterator, they can not be compared.
-   // To allow this, we handle this comparison specifically.
-   if ( isNull_  &&  other.isNull_ )
-   {
-      return 0;
-   }
-
-
-   // Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
-   // which is the one used by default).
-   // Using a portable hand-made version for non random iterator instead:
-   //   return difference_type( std::distance( current_, other.current_ ) );
-   difference_type myDistance = 0;
-   for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
-   {
-      ++myDistance;
-   }
-   return myDistance;
-# endif
-#else
-   if ( isArray_ )
-      return ValueInternalArray::distance( iterator_.array_, other.iterator_.array_ );
-   return ValueInternalMap::distance( iterator_.map_, other.iterator_.map_ );
-#endif
-}
-
-
-bool 
-ValueIteratorBase::isEqual( const SelfType &other ) const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   if ( isNull_ )
-   {
-      return other.isNull_;
-   }
-   return current_ == other.current_;
-#else
-   if ( isArray_ )
-      return ValueInternalArray::equals( iterator_.array_, other.iterator_.array_ );
-   return ValueInternalMap::equals( iterator_.map_, other.iterator_.map_ );
-#endif
-}
-
-
-void 
-ValueIteratorBase::copy( const SelfType &other )
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   current_ = other.current_;
-#else
-   if ( isArray_ )
-      iterator_.array_ = other.iterator_.array_;
-   iterator_.map_ = other.iterator_.map_;
-#endif
-}
-
-
-Value 
-ValueIteratorBase::key() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const Value::CZString czstring = (*current_).first;
-   if ( czstring.c_str() )
-   {
-      if ( czstring.isStaticString() )
-         return Value( StaticString( czstring.c_str() ) );
-      return Value( czstring.c_str() );
-   }
-   return Value( czstring.index() );
-#else
-   if ( isArray_ )
-      return Value( ValueInternalArray::indexOf( iterator_.array_ ) );
-   bool isStatic;
-   const char *memberName = ValueInternalMap::key( iterator_.map_, isStatic );
-   if ( isStatic )
-      return Value( StaticString( memberName ) );
-   return Value( memberName );
-#endif
-}
-
-
-UInt 
-ValueIteratorBase::index() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const Value::CZString czstring = (*current_).first;
-   if ( !czstring.c_str() )
-      return czstring.index();
-   return Value::UInt( -1 );
-#else
-   if ( isArray_ )
-      return Value::UInt( ValueInternalArray::indexOf( iterator_.array_ ) );
-   return Value::UInt( -1 );
-#endif
-}
-
-
-const char *
-ValueIteratorBase::memberName() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const char *name = (*current_).first.c_str();
-   return name ? name : "";
-#else
-   if ( !isArray_ )
-      return ValueInternalMap::key( iterator_.map_ );
-   return "";
-#endif
-}
-
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueConstIterator
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueConstIterator::ValueConstIterator()
-{
-}
-
-
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueConstIterator::ValueConstIterator( const Value::ObjectValues::iterator &current )
-   : ValueIteratorBase( current )
-{
-}
-#else
-ValueConstIterator::ValueConstIterator( const ValueInternalArray::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-
-ValueConstIterator::ValueConstIterator( const ValueInternalMap::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-#endif
-
-ValueConstIterator &
-ValueConstIterator::operator =( const ValueIteratorBase &other )
-{
-   copy( other );
-   return *this;
-}
-
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueIterator
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueIterator::ValueIterator()
-{
-}
-
-
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueIterator::ValueIterator( const Value::ObjectValues::iterator &current )
-   : ValueIteratorBase( current )
-{
-}
-#else
-ValueIterator::ValueIterator( const ValueInternalArray::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-
-ValueIterator::ValueIterator( const ValueInternalMap::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-#endif
-
-ValueIterator::ValueIterator( const ValueConstIterator &other )
-   : ValueIteratorBase( other )
-{
-}
-
-ValueIterator::ValueIterator( const ValueIterator &other )
-   : ValueIteratorBase( other )
-{
-}
-
-ValueIterator &
-ValueIterator::operator =( const SelfType &other )
-{
-   copy( other );
-   return *this;
-}
-
-} // namespace Json
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/json_writer.cpp b/src/3rd_party-static/jsoncpp/src/lib_json/json_writer.cpp
deleted file mode 100644
index 1bda183fec..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/json_writer.cpp
+++ /dev/null
@@ -1,838 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#if !defined(JSON_IS_AMALGAMATION)
-# include <json/writer.h>
-# include "json_tool.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <utility>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <iostream>
-#include <sstream>
-#include <iomanip>
-
-#if _MSC_VER >= 1400 // VC++ 8.0
-#pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
-#endif
-
-namespace Json {
-
-static bool containsControlCharacter( const char* str )
-{
-   while ( *str ) 
-   {
-      if ( isControlCharacter( *(str++) ) )
-         return true;
-   }
-   return false;
-}
-
-
-std::string valueToString( LargestInt value )
-{
-   UIntToStringBuffer buffer;
-   char *current = buffer + sizeof(buffer);
-   bool isNegative = value < 0;
-   if ( isNegative )
-      value = -value;
-   uintToString( LargestUInt(value), current );
-   if ( isNegative )
-      *--current = '-';
-   assert( current >= buffer );
-   return current;
-}
-
-
-std::string valueToString( LargestUInt value )
-{
-   UIntToStringBuffer buffer;
-   char *current = buffer + sizeof(buffer);
-   uintToString( value, current );
-   assert( current >= buffer );
-   return current;
-}
-
-#if defined(JSON_HAS_INT64)
-
-std::string valueToString( Int value )
-{
-   return valueToString( LargestInt(value) );
-}
-
-
-std::string valueToString( UInt value )
-{
-   return valueToString( LargestUInt(value) );
-}
-
-#endif // # if defined(JSON_HAS_INT64)
-
-
-std::string valueToString( double value )
-{
-   char buffer[32];
-#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning. 
-   sprintf_s(buffer, sizeof(buffer), "%#.16g", value); 
-#else	
-   sprintf(buffer, "%#.16g", value); 
-#endif
-   char* ch = buffer + strlen(buffer) - 1;
-   if (*ch != '0') return buffer; // nothing to truncate, so save time
-   while(ch > buffer && *ch == '0'){
-     --ch;
-   }
-   char* last_nonzero = ch;
-   while(ch >= buffer){
-     switch(*ch){
-     case '0':
-     case '1':
-     case '2':
-     case '3':
-     case '4':
-     case '5':
-     case '6':
-     case '7':
-     case '8':
-     case '9':
-       --ch;
-       continue;
-     case '.':
-       // Truncate zeroes to save bytes in output, but keep one.
-       *(last_nonzero+2) = '\0';
-       return buffer;
-     default:
-       return buffer;
-     }
-   }
-   return buffer;
-}
-
-
-std::string valueToString( bool value )
-{
-   return value ? "true" : "false";
-}
-
-std::string valueToQuotedString( const char *value )
-{
-   // Not sure how to handle unicode...
-   if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
-      return std::string("\"") + value + "\"";
-   // We have to walk value and escape any special characters.
-   // Appending to std::string is not efficient, but this should be rare.
-   // (Note: forward slashes are *not* rare, but I am not escaping them.)
-   std::string::size_type maxsize = strlen(value)*2 + 3; // allescaped+quotes+NULL
-   std::string result;
-   result.reserve(maxsize); // to avoid lots of mallocs
-   result += "\"";
-   for (const char* c=value; *c != 0; ++c)
-   {
-      switch(*c)
-      {
-         case '\"':
-            result += "\\\"";
-            break;
-         case '\\':
-            result += "\\\\";
-            break;
-         case '\b':
-            result += "\\b";
-            break;
-         case '\f':
-            result += "\\f";
-            break;
-         case '\n':
-            result += "\\n";
-            break;
-         case '\r':
-            result += "\\r";
-            break;
-         case '\t':
-            result += "\\t";
-            break;
-         //case '/':
-            // Even though \/ is considered a legal escape in JSON, a bare
-            // slash is also legal, so I see no reason to escape it.
-            // (I hope I am not misunderstanding something.
-            // blep notes: actually escaping \/ may be useful in javascript to avoid </ 
-            // sequence.
-            // Should add a flag to allow this compatibility mode and prevent this 
-            // sequence from occurring.
-         default:
-            if ( isControlCharacter( *c ) )
-            {
-               std::ostringstream oss;
-               oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*c);
-               result += oss.str();
-            }
-            else
-            {
-               result += *c;
-            }
-            break;
-      }
-   }
-   result += "\"";
-   return result;
-}
-
-// Class Writer
-// //////////////////////////////////////////////////////////////////
-Writer::~Writer()
-{
-}
-
-
-// Class FastWriter
-// //////////////////////////////////////////////////////////////////
-
-FastWriter::FastWriter()
-   : yamlCompatiblityEnabled_( false )
-{
-}
-
-
-void 
-FastWriter::enableYAMLCompatibility()
-{
-   yamlCompatiblityEnabled_ = true;
-}
-
-
-std::string 
-FastWriter::write( const Value &root )
-{
-   document_ = "";
-   writeValue( root );
-   document_ += "\n";
-   return document_;
-}
-
-
-void 
-FastWriter::writeValue( const Value &value )
-{
-   switch ( value.type() )
-   {
-   case nullValue:
-      document_ += "null";
-      break;
-   case intValue:
-      document_ += valueToString( value.asLargestInt() );
-      break;
-   case uintValue:
-      document_ += valueToString( value.asLargestUInt() );
-      break;
-   case realValue:
-      document_ += valueToString( value.asDouble() );
-      break;
-   case stringValue:
-      document_ += valueToQuotedString( value.asCString() );
-      break;
-   case booleanValue:
-      document_ += valueToString( value.asBool() );
-      break;
-   case arrayValue:
-      {
-         document_ += "[";
-         int size = value.size();
-         for ( int index =0; index < size; ++index )
-         {
-            if ( index > 0 )
-               document_ += ",";
-            writeValue( value[index] );
-         }
-         document_ += "]";
-      }
-      break;
-   case objectValue:
-      {
-         Value::Members members( value.getMemberNames() );
-         document_ += "{";
-         for ( Value::Members::iterator it = members.begin(); 
-               it != members.end(); 
-               ++it )
-         {
-            const std::string &name = *it;
-            if ( it != members.begin() )
-               document_ += ",";
-            document_ += valueToQuotedString( name.c_str() );
-            document_ += yamlCompatiblityEnabled_ ? ": " 
-                                                  : ":";
-            writeValue( value[name] );
-         }
-         document_ += "}";
-      }
-      break;
-   }
-}
-
-
-// Class StyledWriter
-// //////////////////////////////////////////////////////////////////
-
-StyledWriter::StyledWriter()
-   : rightMargin_( 74 )
-   , indentSize_( 3 )
-{
-}
-
-
-std::string 
-StyledWriter::write( const Value &root )
-{
-   document_ = "";
-   addChildValues_ = false;
-   indentString_ = "";
-   writeCommentBeforeValue( root );
-   writeValue( root );
-   writeCommentAfterValueOnSameLine( root );
-   document_ += "\n";
-   return document_;
-}
-
-
-void 
-StyledWriter::writeValue( const Value &value )
-{
-   switch ( value.type() )
-   {
-   case nullValue:
-      pushValue( "null" );
-      break;
-   case intValue:
-      pushValue( valueToString( value.asLargestInt() ) );
-      break;
-   case uintValue:
-      pushValue( valueToString( value.asLargestUInt() ) );
-      break;
-   case realValue:
-      pushValue( valueToString( value.asDouble() ) );
-      break;
-   case stringValue:
-      pushValue( valueToQuotedString( value.asCString() ) );
-      break;
-   case booleanValue:
-      pushValue( valueToString( value.asBool() ) );
-      break;
-   case arrayValue:
-      writeArrayValue( value);
-      break;
-   case objectValue:
-      {
-         Value::Members members( value.getMemberNames() );
-         if ( members.empty() )
-            pushValue( "{}" );
-         else
-         {
-            writeWithIndent( "{" );
-            indent();
-            Value::Members::iterator it = members.begin();
-            for (;;)
-            {
-               const std::string &name = *it;
-               const Value &childValue = value[name];
-               writeCommentBeforeValue( childValue );
-               writeWithIndent( valueToQuotedString( name.c_str() ) );
-               document_ += " : ";
-               writeValue( childValue );
-               if ( ++it == members.end() )
-               {
-                  writeCommentAfterValueOnSameLine( childValue );
-                  break;
-               }
-               document_ += ",";
-               writeCommentAfterValueOnSameLine( childValue );
-            }
-            unindent();
-            writeWithIndent( "}" );
-         }
-      }
-      break;
-   }
-}
-
-
-void 
-StyledWriter::writeArrayValue( const Value &value )
-{
-   unsigned size = value.size();
-   if ( size == 0 )
-      pushValue( "[]" );
-   else
-   {
-      bool isArrayMultiLine = isMultineArray( value );
-      if ( isArrayMultiLine )
-      {
-         writeWithIndent( "[" );
-         indent();
-         bool hasChildValue = !childValues_.empty();
-         unsigned index =0;
-         for (;;)
-         {
-            const Value &childValue = value[index];
-            writeCommentBeforeValue( childValue );
-            if ( hasChildValue )
-               writeWithIndent( childValues_[index] );
-            else
-            {
-               writeIndent();
-               writeValue( childValue );
-            }
-            if ( ++index == size )
-            {
-               writeCommentAfterValueOnSameLine( childValue );
-               break;
-            }
-            document_ += ",";
-            writeCommentAfterValueOnSameLine( childValue );
-         }
-         unindent();
-         writeWithIndent( "]" );
-      }
-      else // output on a single line
-      {
-         assert( childValues_.size() == size );
-         document_ += "[ ";
-         for ( unsigned index =0; index < size; ++index )
-         {
-            if ( index > 0 )
-               document_ += ", ";
-            document_ += childValues_[index];
-         }
-         document_ += " ]";
-      }
-   }
-}
-
-
-bool 
-StyledWriter::isMultineArray( const Value &value )
-{
-   int size = value.size();
-   bool isMultiLine = size*3 >= rightMargin_ ;
-   childValues_.clear();
-   for ( int index =0; index < size  &&  !isMultiLine; ++index )
-   {
-      const Value &childValue = value[index];
-      isMultiLine = isMultiLine  ||
-                     ( (childValue.isArray()  ||  childValue.isObject())  &&  
-                        childValue.size() > 0 );
-   }
-   if ( !isMultiLine ) // check if line length > max line length
-   {
-      childValues_.reserve( size );
-      addChildValues_ = true;
-      int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
-      for ( int index =0; index < size  &&  !isMultiLine; ++index )
-      {
-         writeValue( value[index] );
-         lineLength += int( childValues_[index].length() );
-         isMultiLine = isMultiLine  &&  hasCommentForValue( value[index] );
-      }
-      addChildValues_ = false;
-      isMultiLine = isMultiLine  ||  lineLength >= rightMargin_;
-   }
-   return isMultiLine;
-}
-
-
-void 
-StyledWriter::pushValue( const std::string &value )
-{
-   if ( addChildValues_ )
-      childValues_.push_back( value );
-   else
-      document_ += value;
-}
-
-
-void 
-StyledWriter::writeIndent()
-{
-   if ( !document_.empty() )
-   {
-      char last = document_[document_.length()-1];
-      if ( last == ' ' )     // already indented
-         return;
-      if ( last != '\n' )    // Comments may add new-line
-         document_ += '\n';
-   }
-   document_ += indentString_;
-}
-
-
-void 
-StyledWriter::writeWithIndent( const std::string &value )
-{
-   writeIndent();
-   document_ += value;
-}
-
-
-void 
-StyledWriter::indent()
-{
-   indentString_ += std::string( indentSize_, ' ' );
-}
-
-
-void 
-StyledWriter::unindent()
-{
-   assert( int(indentString_.size()) >= indentSize_ );
-   indentString_.resize( indentString_.size() - indentSize_ );
-}
-
-
-void 
-StyledWriter::writeCommentBeforeValue( const Value &root )
-{
-   if ( !root.hasComment( commentBefore ) )
-      return;
-   document_ += normalizeEOL( root.getComment( commentBefore ) );
-   document_ += "\n";
-}
-
-
-void 
-StyledWriter::writeCommentAfterValueOnSameLine( const Value &root )
-{
-   if ( root.hasComment( commentAfterOnSameLine ) )
-      document_ += " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
-
-   if ( root.hasComment( commentAfter ) )
-   {
-      document_ += "\n";
-      document_ += normalizeEOL( root.getComment( commentAfter ) );
-      document_ += "\n";
-   }
-}
-
-
-bool 
-StyledWriter::hasCommentForValue( const Value &value )
-{
-   return value.hasComment( commentBefore )
-          ||  value.hasComment( commentAfterOnSameLine )
-          ||  value.hasComment( commentAfter );
-}
-
-
-std::string 
-StyledWriter::normalizeEOL( const std::string &text )
-{
-   std::string normalized;
-   normalized.reserve( text.length() );
-   const char *begin = text.c_str();
-   const char *end = begin + text.length();
-   const char *current = begin;
-   while ( current != end )
-   {
-      char c = *current++;
-      if ( c == '\r' ) // mac or dos EOL
-      {
-         if ( *current == '\n' ) // convert dos EOL
-            ++current;
-         normalized += '\n';
-      }
-      else // handle unix EOL & other char
-         normalized += c;
-   }
-   return normalized;
-}
-
-
-// Class StyledStreamWriter
-// //////////////////////////////////////////////////////////////////
-
-StyledStreamWriter::StyledStreamWriter( std::string indentation )
-   : document_(NULL)
-   , rightMargin_( 74 )
-   , indentation_( indentation )
-{
-}
-
-
-void
-StyledStreamWriter::write( std::ostream &out, const Value &root )
-{
-   document_ = &out;
-   addChildValues_ = false;
-   indentString_ = "";
-   writeCommentBeforeValue( root );
-   writeValue( root );
-   writeCommentAfterValueOnSameLine( root );
-   *document_ << "\n";
-   document_ = NULL; // Forget the stream, for safety.
-}
-
-
-void 
-StyledStreamWriter::writeValue( const Value &value )
-{
-   switch ( value.type() )
-   {
-   case nullValue:
-      pushValue( "null" );
-      break;
-   case intValue:
-      pushValue( valueToString( value.asLargestInt() ) );
-      break;
-   case uintValue:
-      pushValue( valueToString( value.asLargestUInt() ) );
-      break;
-   case realValue:
-      pushValue( valueToString( value.asDouble() ) );
-      break;
-   case stringValue:
-      pushValue( valueToQuotedString( value.asCString() ) );
-      break;
-   case booleanValue:
-      pushValue( valueToString( value.asBool() ) );
-      break;
-   case arrayValue:
-      writeArrayValue( value);
-      break;
-   case objectValue:
-      {
-         Value::Members members( value.getMemberNames() );
-         if ( members.empty() )
-            pushValue( "{}" );
-         else
-         {
-            writeWithIndent( "{" );
-            indent();
-            Value::Members::iterator it = members.begin();
-            for (;;)
-            {
-               const std::string &name = *it;
-               const Value &childValue = value[name];
-               writeCommentBeforeValue( childValue );
-               writeWithIndent( valueToQuotedString( name.c_str() ) );
-               *document_ << " : ";
-               writeValue( childValue );
-               if ( ++it == members.end() )
-               {
-                  writeCommentAfterValueOnSameLine( childValue );
-                  break;
-               }
-               *document_ << ",";
-               writeCommentAfterValueOnSameLine( childValue );
-            }
-            unindent();
-            writeWithIndent( "}" );
-         }
-      }
-      break;
-   }
-}
-
-
-void 
-StyledStreamWriter::writeArrayValue( const Value &value )
-{
-   unsigned size = value.size();
-   if ( size == 0 )
-      pushValue( "[]" );
-   else
-   {
-      bool isArrayMultiLine = isMultineArray( value );
-      if ( isArrayMultiLine )
-      {
-         writeWithIndent( "[" );
-         indent();
-         bool hasChildValue = !childValues_.empty();
-         unsigned index =0;
-         for (;;)
-         {
-            const Value &childValue = value[index];
-            writeCommentBeforeValue( childValue );
-            if ( hasChildValue )
-               writeWithIndent( childValues_[index] );
-            else
-            {
-               writeIndent();
-               writeValue( childValue );
-            }
-            if ( ++index == size )
-            {
-               writeCommentAfterValueOnSameLine( childValue );
-               break;
-            }
-            *document_ << ",";
-            writeCommentAfterValueOnSameLine( childValue );
-         }
-         unindent();
-         writeWithIndent( "]" );
-      }
-      else // output on a single line
-      {
-         assert( childValues_.size() == size );
-         *document_ << "[ ";
-         for ( unsigned index =0; index < size; ++index )
-         {
-            if ( index > 0 )
-               *document_ << ", ";
-            *document_ << childValues_[index];
-         }
-         *document_ << " ]";
-      }
-   }
-}
-
-
-bool 
-StyledStreamWriter::isMultineArray( const Value &value )
-{
-   int size = value.size();
-   bool isMultiLine = size*3 >= rightMargin_ ;
-   childValues_.clear();
-   for ( int index =0; index < size  &&  !isMultiLine; ++index )
-   {
-      const Value &childValue = value[index];
-      isMultiLine = isMultiLine  ||
-                     ( (childValue.isArray()  ||  childValue.isObject())  &&  
-                        childValue.size() > 0 );
-   }
-   if ( !isMultiLine ) // check if line length > max line length
-   {
-      childValues_.reserve( size );
-      addChildValues_ = true;
-      int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
-      for ( int index =0; index < size  &&  !isMultiLine; ++index )
-      {
-         writeValue( value[index] );
-         lineLength += int( childValues_[index].length() );
-         isMultiLine = isMultiLine  &&  hasCommentForValue( value[index] );
-      }
-      addChildValues_ = false;
-      isMultiLine = isMultiLine  ||  lineLength >= rightMargin_;
-   }
-   return isMultiLine;
-}
-
-
-void 
-StyledStreamWriter::pushValue( const std::string &value )
-{
-   if ( addChildValues_ )
-      childValues_.push_back( value );
-   else
-      *document_ << value;
-}
-
-
-void 
-StyledStreamWriter::writeIndent()
-{
-  /*
-    Some comments in this method would have been nice. ;-)
-
-   if ( !document_.empty() )
-   {
-      char last = document_[document_.length()-1];
-      if ( last == ' ' )     // already indented
-         return;
-      if ( last != '\n' )    // Comments may add new-line
-         *document_ << '\n';
-   }
-  */
-   *document_ << '\n' << indentString_;
-}
-
-
-void 
-StyledStreamWriter::writeWithIndent( const std::string &value )
-{
-   writeIndent();
-   *document_ << value;
-}
-
-
-void 
-StyledStreamWriter::indent()
-{
-   indentString_ += indentation_;
-}
-
-
-void 
-StyledStreamWriter::unindent()
-{
-   assert( indentString_.size() >= indentation_.size() );
-   indentString_.resize( indentString_.size() - indentation_.size() );
-}
-
-
-void 
-StyledStreamWriter::writeCommentBeforeValue( const Value &root )
-{
-   if ( !root.hasComment( commentBefore ) )
-      return;
-   *document_ << normalizeEOL( root.getComment( commentBefore ) );
-   *document_ << "\n";
-}
-
-
-void 
-StyledStreamWriter::writeCommentAfterValueOnSameLine( const Value &root )
-{
-   if ( root.hasComment( commentAfterOnSameLine ) )
-      *document_ << " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
-
-   if ( root.hasComment( commentAfter ) )
-   {
-      *document_ << "\n";
-      *document_ << normalizeEOL( root.getComment( commentAfter ) );
-      *document_ << "\n";
-   }
-}
-
-
-bool 
-StyledStreamWriter::hasCommentForValue( const Value &value )
-{
-   return value.hasComment( commentBefore )
-          ||  value.hasComment( commentAfterOnSameLine )
-          ||  value.hasComment( commentAfter );
-}
-
-
-std::string 
-StyledStreamWriter::normalizeEOL( const std::string &text )
-{
-   std::string normalized;
-   normalized.reserve( text.length() );
-   const char *begin = text.c_str();
-   const char *end = begin + text.length();
-   const char *current = begin;
-   while ( current != end )
-   {
-      char c = *current++;
-      if ( c == '\r' ) // mac or dos EOL
-      {
-         if ( *current == '\n' ) // convert dos EOL
-            ++current;
-         normalized += '\n';
-      }
-      else // handle unix EOL & other char
-         normalized += c;
-   }
-   return normalized;
-}
-
-
-std::ostream& operator<<( std::ostream &sout, const Value &root )
-{
-   Json::StyledStreamWriter writer;
-   writer.write(sout, root);
-   return sout;
-}
-
-
-} // namespace Json
diff --git a/src/3rd_party-static/jsoncpp/src/lib_json/sconscript b/src/3rd_party-static/jsoncpp/src/lib_json/sconscript
deleted file mode 100644
index f6520d185a..0000000000
--- a/src/3rd_party-static/jsoncpp/src/lib_json/sconscript
+++ /dev/null
@@ -1,8 +0,0 @@
-Import( 'env buildLibrary' )

-

-buildLibrary( env, Split( """

-    json_reader.cpp 

-    json_value.cpp 

-    json_writer.cpp

-     """ ),

-    'json' )

diff --git a/src/3rd_party-static/jsoncpp/src/test_lib_json/jsontest.cpp b/src/3rd_party-static/jsoncpp/src/test_lib_json/jsontest.cpp
deleted file mode 100644
index 02e7b21699..0000000000
--- a/src/3rd_party-static/jsoncpp/src/test_lib_json/jsontest.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#define _CRT_SECURE_NO_WARNINGS 1 // Prevents deprecation warning with MSVC
-#include "jsontest.h"
-#include <stdio.h>
-#include <string>
-
-#if defined(_MSC_VER)
-// Used to install a report hook that prevent dialog on assertion and error.
-# include <crtdbg.h>
-#endif // if defined(_MSC_VER)
-
-#if defined(_WIN32)
-// Used to prevent dialog on memory fault.
-// Limits headers included by Windows.h
-# define WIN32_LEAN_AND_MEAN
-# define NOSERVICE
-# define NOMCX
-# define NOIME
-# define NOSOUND
-# define NOCOMM
-# define NORPC
-# define NOGDI
-# define NOUSER
-# define NODRIVERS
-# define NOLOGERROR
-# define NOPROFILER
-# define NOMEMMGR
-# define NOLFILEIO
-# define NOOPENFILE
-# define NORESOURCE
-# define NOATOM
-# define NOLANGUAGE
-# define NOLSTRING
-# define NODBCS
-# define NOKEYBOARDINFO
-# define NOGDICAPMASKS
-# define NOCOLOR
-# define NOGDIOBJ
-# define NODRAWTEXT
-# define NOTEXTMETRIC
-# define NOSCALABLEFONT
-# define NOBITMAP
-# define NORASTEROPS
-# define NOMETAFILE
-# define NOSYSMETRICS
-# define NOSYSTEMPARAMSINFO
-# define NOMSG
-# define NOWINSTYLES
-# define NOWINOFFSETS
-# define NOSHOWWINDOW
-# define NODEFERWINDOWPOS
-# define NOVIRTUALKEYCODES
-# define NOKEYSTATES
-# define NOWH
-# define NOMENUS
-# define NOSCROLL
-# define NOCLIPBOARD
-# define NOICONS
-# define NOMB
-# define NOSYSCOMMANDS
-# define NOMDI
-# define NOCTLMGR
-# define NOWINMESSAGES
-# include <windows.h>
-#endif // if defined(_WIN32)
-
-namespace JsonTest {
-
-
-// class TestResult
-// //////////////////////////////////////////////////////////////////
-
-TestResult::TestResult()
-   : predicateId_( 1 )
-   , lastUsedPredicateId_( 0 )
-   , messageTarget_( 0 )
-{
-   // The root predicate has id 0
-   rootPredicateNode_.id_ = 0;
-   rootPredicateNode_.next_ = 0;
-   predicateStackTail_ = &rootPredicateNode_;
-}
-
-
-void 
-TestResult::setTestName( const std::string &name )
-{
-   name_ = name;
-}
-
-TestResult &
-TestResult::addFailure( const char *file, unsigned int line,
-                        const char *expr )
-{
-   /// Walks the PredicateContext stack adding them to failures_ if not already added.
-   unsigned int nestingLevel = 0;
-   PredicateContext *lastNode = rootPredicateNode_.next_;
-   for ( ; lastNode != 0; lastNode = lastNode->next_ )
-   {
-      if ( lastNode->id_ > lastUsedPredicateId_ ) // new PredicateContext
-      {
-         lastUsedPredicateId_ = lastNode->id_;
-         addFailureInfo( lastNode->file_, lastNode->line_, lastNode->expr_,
-                         nestingLevel );
-         // Link the PredicateContext to the failure for message target when 
-         // popping the PredicateContext.
-         lastNode->failure_ = &( failures_.back() );
-      }
-      ++nestingLevel;
-   }
-
-   // Adds the failed assertion
-   addFailureInfo( file, line, expr, nestingLevel );
-   messageTarget_ = &( failures_.back() );
-   return *this;
-}
-
-
-void 
-TestResult::addFailureInfo( const char *file, unsigned int line,
-                            const char *expr, unsigned int nestingLevel )
-{
-   Failure failure;
-   failure.file_ = file;
-   failure.line_ = line;
-   if ( expr )
-   {
-      failure.expr_ = expr;
-   }
-   failure.nestingLevel_ = nestingLevel;
-   failures_.push_back( failure );
-}
-
-
-TestResult &
-TestResult::popPredicateContext()
-{
-   PredicateContext *lastNode = &rootPredicateNode_;
-   while ( lastNode->next_ != 0  &&  lastNode->next_->next_ != 0 )
-   {
-      lastNode = lastNode->next_;
-   }
-   // Set message target to popped failure
-   PredicateContext *tail = lastNode->next_;
-   if ( tail != 0  &&  tail->failure_ != 0 )
-   {
-      messageTarget_ = tail->failure_;
-   }
-   // Remove tail from list
-   predicateStackTail_ = lastNode;
-   lastNode->next_ = 0;
-   return *this;
-}
-
-
-bool 
-TestResult::failed() const
-{
-   return !failures_.empty();
-}
-
-
-unsigned int 
-TestResult::getAssertionNestingLevel() const
-{
-   unsigned int level = 0;
-   const PredicateContext *lastNode = &rootPredicateNode_;
-   while ( lastNode->next_ != 0 )
-   {
-      lastNode = lastNode->next_;
-      ++level;
-   }
-   return level;
-}
-
-
-void 
-TestResult::printFailure( bool printTestName ) const
-{
-   if ( failures_.empty() )
-   {
-      return;
-   }
-
-   if ( printTestName )
-   {
-      printf( "* Detail of %s test failure:\n", name_.c_str() );
-   }
-
-   // Print in reverse to display the callstack in the right order
-   Failures::const_iterator itEnd = failures_.end();
-   for ( Failures::const_iterator it = failures_.begin(); it != itEnd; ++it )
-   {
-      const Failure &failure = *it;
-      std::string indent( failure.nestingLevel_ * 2, ' ' );
-      if ( failure.file_ )
-      {
-         printf( "%s%s(%d): ", indent.c_str(), failure.file_, failure.line_ );
-      }
-      if ( !failure.expr_.empty() )
-      {
-         printf( "%s\n", failure.expr_.c_str() );
-      }
-      else if ( failure.file_ )
-      {
-         printf( "\n" );
-      }
-      if ( !failure.message_.empty() )
-      {
-         std::string reindented = indentText( failure.message_, indent + "  " );
-         printf( "%s\n", reindented.c_str() );
-      }
-   }
-}
-
-
-std::string 
-TestResult::indentText( const std::string &text, 
-                        const std::string &indent )
-{
-   std::string reindented;
-   std::string::size_type lastIndex = 0;
-   while ( lastIndex < text.size() )
-   {
-      std::string::size_type nextIndex = text.find( '\n', lastIndex );
-      if ( nextIndex == std::string::npos )
-      {
-         nextIndex = text.size() - 1;
-      }
-      reindented += indent;
-      reindented += text.substr( lastIndex, nextIndex - lastIndex + 1 );
-      lastIndex = nextIndex + 1;
-   }
-   return reindented;
-}
-
-
-TestResult &
-TestResult::addToLastFailure( const std::string &message )
-{
-   if ( messageTarget_ != 0 )
-   {
-      messageTarget_->message_ += message;
-   }
-   return *this;
-}
-
-
-TestResult &
-TestResult::operator << ( bool value )
-{
-   return addToLastFailure( value ? "true" : "false" );
-}
-
-
-TestResult &
-TestResult::operator << ( int value )
-{
-   char buffer[32];
-   sprintf( buffer, "%d", value );
-   return addToLastFailure( buffer );
-}
-
-
-TestResult &
-TestResult::operator << ( unsigned int value )
-{
-   char buffer[32];
-   sprintf( buffer, "%u", value );
-   return addToLastFailure( buffer );
-}
-
-
-TestResult &
-TestResult::operator << ( double value )
-{
-   char buffer[32];
-   sprintf( buffer, "%16g", value );
-   return addToLastFailure( buffer );
-}
-
-
-TestResult &
-TestResult::operator << ( const char *value )
-{
-   return addToLastFailure( value ? value 
-                                  : "<NULL>" );
-}
-
-
-TestResult &
-TestResult::operator << ( const std::string &value )
-{
-   return addToLastFailure( value );
-}
-
-
-
-// class TestCase
-// //////////////////////////////////////////////////////////////////
-
-TestCase::TestCase()
-   : result_( 0 )
-{
-}
-
-
-TestCase::~TestCase()
-{
-}
-
-
-void 
-TestCase::run( TestResult &result )
-{
-   result_ = &result;
-   runTestCase();
-}
-
-
-
-// class Runner
-// //////////////////////////////////////////////////////////////////
-
-Runner::Runner()
-{
-}
-
-
-Runner &
-Runner::add( TestCaseFactory factory )
-{
-   tests_.push_back( factory );
-   return *this;
-}
-
-
-unsigned int 
-Runner::testCount() const
-{
-   return static_cast<unsigned int>( tests_.size() );
-}
-
-
-std::string 
-Runner::testNameAt( unsigned int index ) const
-{
-   TestCase *test = tests_[index]();
-   std::string name = test->testName();
-   delete test;
-   return name;
-}
-
-
-void 
-Runner::runTestAt( unsigned int index, TestResult &result ) const
-{
-   TestCase *test = tests_[index]();
-   result.setTestName( test->testName() );
-   printf( "Testing %s: ", test->testName() );
-   fflush( stdout );
-#if JSON_USE_EXCEPTION
-   try 
-   {
-#endif // if JSON_USE_EXCEPTION
-      test->run( result );
-#if JSON_USE_EXCEPTION
-   } 
-   catch ( const std::exception &e ) 
-   {
-      result.addFailure( __FILE__, __LINE__, 
-         "Unexpected exception caugth:" ) << e.what();
-   }
-#endif // if JSON_USE_EXCEPTION
-   delete test;
-   const char *status = result.failed() ? "FAILED" 
-                                        : "OK";
-   printf( "%s\n", status );
-   fflush( stdout );
-}
-
-
-bool 
-Runner::runAllTest( bool printSummary ) const
-{
-   unsigned int count = testCount();
-   std::deque<TestResult> failures;
-   for ( unsigned int index = 0; index < count; ++index )
-   {
-      TestResult result;
-      runTestAt( index, result );
-      if ( result.failed() )
-      {
-         failures.push_back( result );
-      }
-   }
-
-   if ( failures.empty() )
-   {
-      if ( printSummary )
-      {
-         printf( "All %d tests passed\n", count );
-      }
-      return true;
-   }
-   else
-   {
-      for ( unsigned int index = 0; index < failures.size(); ++index )
-      {
-         TestResult &result = failures[index];
-         result.printFailure( count > 1 );
-      }
-
-      if ( printSummary )
-      {
-         unsigned int failedCount = static_cast<unsigned int>( failures.size() );
-         unsigned int passedCount = count - failedCount;
-         printf( "%d/%d tests passed (%d failure(s))\n", passedCount, count, failedCount );
-      }
-      return false;
-   }
-}
-
-
-bool 
-Runner::testIndex( const std::string &testName, 
-                   unsigned int &indexOut ) const
-{
-   unsigned int count = testCount();
-   for ( unsigned int index = 0; index < count; ++index )
-   {
-      if ( testNameAt(index) == testName )
-      {
-         indexOut = index;
-         return true;
-      }
-   }
-   return false;
-}
-
-
-void 
-Runner::listTests() const
-{
-   unsigned int count = testCount();
-   for ( unsigned int index = 0; index < count; ++index )
-   {
-      printf( "%s\n", testNameAt( index ).c_str() );
-   }
-}
-
-
-int 
-Runner::runCommandLine( int argc, const char *argv[] ) const
-{
-   typedef std::deque<std::string> TestNames;
-   Runner subrunner;
-   for ( int index = 1; index < argc; ++index )
-   {
-      std::string opt = argv[index];
-      if ( opt == "--list-tests" )
-      {
-         listTests();
-         return 0;
-      }
-      else if ( opt == "--test-auto" )
-      {
-         preventDialogOnCrash();
-      }
-      else if ( opt == "--test" )
-      {
-         ++index;
-         if ( index < argc )
-         {
-            unsigned int testNameIndex;
-            if ( testIndex( argv[index], testNameIndex ) )
-            {
-               subrunner.add( tests_[testNameIndex] );
-            }
-            else
-            {
-               fprintf( stderr, "Test '%s' does not exist!\n", argv[index] );
-               return 2;
-            }
-         }
-         else
-         {
-            printUsage( argv[0] );
-            return 2;
-         }
-      }
-      else
-      {
-         printUsage( argv[0] );
-         return 2;
-      }
-   }
-   bool succeeded;
-   if ( subrunner.testCount() > 0 )
-   {
-      succeeded = subrunner.runAllTest( subrunner.testCount() > 1 );
-   }
-   else
-   {
-      succeeded = runAllTest( true );
-   }
-   return succeeded ? 0 
-                    : 1;
-}
-
-
-#if defined(_MSC_VER)
-// Hook MSVCRT assertions to prevent dialog from appearing
-static int 
-msvcrtSilentReportHook( int reportType, char *message, int *returnValue )
-{
-   // The default CRT handling of error and assertion is to display
-   // an error dialog to the user.
-   // Instead, when an error or an assertion occurs, we force the 
-   // application to terminate using abort() after display
-   // the message on stderr. 
-   if ( reportType == _CRT_ERROR  ||  
-        reportType == _CRT_ASSERT )
-   {
-      // calling abort() cause the ReportHook to be called
-      // The following is used to detect this case and let's the
-      // error handler fallback on its default behaviour (
-      // display a warning message)
-      static volatile bool isAborting = false;
-      if ( isAborting ) 
-      {
-         return TRUE;
-      }
-      isAborting = true;
-
-      fprintf( stderr, "CRT Error/Assert:\n%s\n", message );
-      fflush( stderr );
-      abort();
-   }
-   // Let's other reportType (_CRT_WARNING) be handled as they would by default
-   return FALSE;
-}
-#endif // if defined(_MSC_VER)
-
-
-void 
-Runner::preventDialogOnCrash()
-{
-#if defined(_MSC_VER)
-   // Install a hook to prevent MSVCRT error and assertion from
-   // popping a dialog.
-   _CrtSetReportHook( &msvcrtSilentReportHook );
-#endif // if defined(_MSC_VER)
-
-   // @todo investiguate this handler (for buffer overflow)
-   // _set_security_error_handler
-
-#if defined(_WIN32)
-   // Prevents the system from popping a dialog for debugging if the
-   // application fails due to invalid memory access.
-   SetErrorMode( SEM_FAILCRITICALERRORS 
-                 | SEM_NOGPFAULTERRORBOX 
-                 | SEM_NOOPENFILEERRORBOX );
-#endif // if defined(_WIN32)
-}
-
-void 
-Runner::printUsage( const char *appName )
-{
-   printf( 
-      "Usage: %s [options]\n"
-      "\n"
-      "If --test is not specified, then all the test cases be run.\n"
-      "\n"
-      "Valid options:\n"
-      "--list-tests: print the name of all test cases on the standard\n"
-      "              output and exit.\n"
-      "--test TESTNAME: executes the test case with the specified name.\n"
-      "                 May be repeated.\n"
-      "--test-auto: prevent dialog prompting for debugging on crash.\n"
-      , appName );
-}
-
-
-
-// Assertion functions
-// //////////////////////////////////////////////////////////////////
-
-TestResult &
-checkStringEqual( TestResult &result, 
-                  const std::string &expected, const std::string &actual,
-                  const char *file, unsigned int line, const char *expr )
-{
-   if ( expected != actual )
-   {
-      result.addFailure( file, line, expr );
-      result << "Expected: '" << expected << "'\n";
-      result << "Actual  : '" << actual << "'";
-   }
-   return result;
-}
-
-
-} // namespace JsonTest
diff --git a/src/3rd_party-static/jsoncpp/src/test_lib_json/jsontest.h b/src/3rd_party-static/jsoncpp/src/test_lib_json/jsontest.h
deleted file mode 100644
index 0d072382e1..0000000000
--- a/src/3rd_party-static/jsoncpp/src/test_lib_json/jsontest.h
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSONTEST_H_INCLUDED
-# define JSONTEST_H_INCLUDED
-
-# include <json/config.h>
-# include <stdio.h>
-# include <deque>
-# include <string>
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// Mini Unit Testing framework
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-
-
-/** \brief Unit testing framework.
- * \warning: all assertions are non-aborting, test case execution will continue
- *           even if an assertion namespace.
- *           This constraint is for portability: the framework needs to compile
- *           on Visual Studio 6 and must not require exception usage.
- */
-namespace JsonTest {
-
-
-   class Failure
-   {
-   public:
-      const char *file_;
-      unsigned int line_;
-      std::string expr_;
-      std::string message_;
-      unsigned int nestingLevel_;
-   };
-
-
-   /// Context used to create the assertion callstack on failure.
-   /// Must be a POD to allow inline initialisation without stepping 
-   /// into the debugger.
-   struct PredicateContext
-   {
-      typedef unsigned int Id;
-      Id id_;
-      const char *file_;
-      unsigned int line_;
-      const char *expr_;
-      PredicateContext *next_;
-      /// Related Failure, set when the PredicateContext is converted
-      /// into a Failure.
-      Failure *failure_;
-   };
-
-   class TestResult
-   {
-   public:
-      TestResult();
-
-      /// \internal Implementation detail for assertion macros
-      /// Not encapsulated to prevent step into when debugging failed assertions
-      /// Incremented by one on assertion predicate entry, decreased by one
-      /// by addPredicateContext().
-      PredicateContext::Id predicateId_;
-
-      /// \internal Implementation detail for predicate macros
-      PredicateContext *predicateStackTail_;
-
-      void setTestName( const std::string &name );
-
-      /// Adds an assertion failure.
-      TestResult &addFailure( const char *file, unsigned int line,
-                              const char *expr = 0 );
-
-      /// Removes the last PredicateContext added to the predicate stack
-      /// chained list.
-      /// Next messages will be targed at the PredicateContext that was removed.
-      TestResult &popPredicateContext();
-
-      bool failed() const;
-
-      void printFailure( bool printTestName ) const;
-
-      TestResult &operator << ( bool value );
-      TestResult &operator << ( int value );
-      TestResult &operator << ( unsigned int value );
-      TestResult &operator << ( double value );
-      TestResult &operator << ( const char *value );
-      TestResult &operator << ( const std::string &value );
-
-   private:
-      TestResult &addToLastFailure( const std::string &message );
-      unsigned int getAssertionNestingLevel() const;
-      /// Adds a failure or a predicate context
-      void addFailureInfo( const char *file, unsigned int line,
-                           const char *expr, unsigned int nestingLevel  );
-      static std::string indentText( const std::string &text, 
-                                     const std::string &indent );
-
-      typedef std::deque<Failure> Failures;
-      Failures failures_;
-      std::string name_;
-      PredicateContext rootPredicateNode_;
-      PredicateContext::Id lastUsedPredicateId_;
-      /// Failure which is the target of the messages added using operator <<
-      Failure *messageTarget_;
-   };
-
-
-   class TestCase
-   {
-   public:
-      TestCase();
-
-      virtual ~TestCase();
-
-      void run( TestResult &result );
-
-      virtual const char *testName() const = 0;
-
-   protected:
-      TestResult *result_;
-
-   private:
-      virtual void runTestCase() = 0;
-   };
-
-   /// Function pointer type for TestCase factory
-   typedef TestCase *(*TestCaseFactory)();
-
-   class Runner
-   {
-   public:
-      Runner();
-
-      /// Adds a test to the suite
-      Runner &add( TestCaseFactory factory );
-
-      /// Runs test as specified on the command-line
-      /// If no command-line arguments are provided, run all tests.
-      /// If --list-tests is provided, then print the list of all test cases
-      /// If --test <testname> is provided, then run test testname.
-      int runCommandLine( int argc, const char *argv[] ) const;
-
-      /// Runs all the test cases
-      bool runAllTest( bool printSummary ) const;
-
-      /// Returns the number of test case in the suite
-      unsigned int testCount() const;
-
-      /// Returns the name of the test case at the specified index
-      std::string testNameAt( unsigned int index ) const;
-
-      /// Runs the test case at the specified index using the specified TestResult
-      void runTestAt( unsigned int index, TestResult &result ) const;
-
-      static void printUsage( const char *appName );
-
-   private: // prevents copy construction and assignment
-      Runner( const Runner &other );
-      Runner &operator =( const Runner &other );
-
-   private:
-      void listTests() const;
-      bool testIndex( const std::string &testName, unsigned int &index ) const;
-      static void preventDialogOnCrash();
-
-   private:
-      typedef std::deque<TestCaseFactory> Factories;
-      Factories tests_;
-   };
-
-   template<typename T>
-   TestResult &
-   checkEqual( TestResult &result, const T &expected, const T &actual, 
-               const char *file, unsigned int line, const char *expr )
-   {
-      if ( expected != actual )
-      {
-         result.addFailure( file, line, expr );
-         result << "Expected: " << expected << "\n";
-         result << "Actual  : " << actual;
-      }
-      return result;
-   }
-
-   TestResult &
-   checkStringEqual( TestResult &result, 
-                     const std::string &expected, const std::string &actual,
-                     const char *file, unsigned int line, const char *expr );
-
-} // namespace JsonTest
-
-
-/// \brief Asserts that the given expression is true.
-/// JSONTEST_ASSERT( x == y ) << "x=" << x << ", y=" << y;
-/// JSONTEST_ASSERT( x == y );
-#define JSONTEST_ASSERT( expr )                                               \
-   if ( expr )                                                                \
-   {                                                                          \
-   }                                                                          \
-   else                                                                       \
-      result_->addFailure( __FILE__, __LINE__, #expr )
-
-/// \brief Asserts that the given predicate is true.
-/// The predicate may do other assertions and be a member function of the fixture.
-#define JSONTEST_ASSERT_PRED( expr )                                    \
-   {                                                                    \
-      JsonTest::PredicateContext _minitest_Context = {                  \
-         result_->predicateId_, __FILE__, __LINE__, #expr };            \
-      result_->predicateStackTail_->next_ = &_minitest_Context;         \
-      result_->predicateId_ += 1;                                       \
-      result_->predicateStackTail_ = &_minitest_Context;                \
-      (expr);                                                           \
-      result_->popPredicateContext();                                   \
-   }                                                                    \
-   *result_
-
-/// \brief Asserts that two values are equals.
-#define JSONTEST_ASSERT_EQUAL( expected, actual )          \
-   JsonTest::checkEqual( *result_, expected, actual,       \
-                         __FILE__, __LINE__,               \
-                         #expected " == " #actual )
-
-/// \brief Asserts that two values are equals.
-#define JSONTEST_ASSERT_STRING_EQUAL( expected, actual ) \
-   JsonTest::checkStringEqual( *result_,                 \
-      std::string(expected), std::string(actual),        \
-      #expected " == " #actual )
-
-/// \brief Begin a fixture test case.
-#define JSONTEST_FIXTURE( FixtureType, name )                  \
-   class Test##FixtureType##name : public FixtureType          \
-   {                                                           \
-   public:                                                     \
-      static JsonTest::TestCase *factory()                     \
-      {                                                        \
-         return new Test##FixtureType##name();                 \
-      }                                                        \
-   public: /* overidden from TestCase */                       \
-      virtual const char *testName() const                     \
-      {                                                        \
-         return #FixtureType "/" #name;                        \
-      }                                                        \
-      virtual void runTestCase();                              \
-   };                                                          \
-                                                               \
-   void Test##FixtureType##name::runTestCase()
-
-#define JSONTEST_FIXTURE_FACTORY( FixtureType, name ) \
-   &Test##FixtureType##name::factory
-
-#define JSONTEST_REGISTER_FIXTURE( runner, FixtureType, name ) \
-   (runner).add( JSONTEST_FIXTURE_FACTORY( FixtureType, name ) )
-
-#endif // ifndef JSONTEST_H_INCLUDED
diff --git a/src/3rd_party-static/jsoncpp/src/test_lib_json/main.cpp b/src/3rd_party-static/jsoncpp/src/test_lib_json/main.cpp
deleted file mode 100644
index 3275219658..0000000000
--- a/src/3rd_party-static/jsoncpp/src/test_lib_json/main.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#include <json/json.h>
-#include "jsontest.h"
-
-
-// TODO:
-// - boolean value returns that they are integral. Should not be.
-// - unsigned integer in integer range are not considered to be valid integer. Should check range.
-
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// Json Library test cases
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-
-struct ValueTest : JsonTest::TestCase
-{
-   Json::Value null_;
-   Json::Value emptyArray_;
-   Json::Value emptyObject_;
-   Json::Value integer_;
-   Json::Value unsignedInteger_;
-   Json::Value smallUnsignedInteger_;
-   Json::Value real_;
-   Json::Value float_;
-   Json::Value array1_;
-   Json::Value object1_;
-   Json::Value emptyString_;
-   Json::Value string1_;
-   Json::Value string_;
-   Json::Value true_;
-   Json::Value false_;
-
-
-   ValueTest()
-      : emptyArray_( Json::arrayValue )
-      , emptyObject_( Json::objectValue )
-      , integer_( 123456789 )
-      , smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) )
-      , unsignedInteger_( 34567890u )
-      , real_( 1234.56789 )
-	  , float_( 0.00390625f )
-      , emptyString_( "" )
-      , string1_( "a" )
-      , string_( "sometext with space" )
-      , true_( true )
-      , false_( false )
-   {
-      array1_.append( 1234 );
-      object1_["id"] = 1234;
-   }
-
-   struct IsCheck
-   {
-      /// Initialize all checks to \c false by default.
-      IsCheck();
-
-      bool isObject_;
-      bool isArray_;
-      bool isBool_;
-      bool isDouble_;
-      bool isInt_;
-      bool isUInt_;
-      bool isIntegral_;
-      bool isNumeric_;
-      bool isString_;
-      bool isNull_;
-   };
-
-   void checkConstMemberCount( const Json::Value &value, unsigned int expectedCount );
-
-   void checkMemberCount( Json::Value &value, unsigned int expectedCount );
-
-   void checkIs( const Json::Value &value, const IsCheck &check );
-
-   void checkIsLess( const Json::Value &x, const Json::Value &y );
-
-   void checkIsEqual( const Json::Value &x, const Json::Value &y );
-};
-
-
-JSONTEST_FIXTURE( ValueTest, size )
-{
-   JSONTEST_ASSERT_PRED( checkMemberCount(emptyArray_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(emptyObject_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(array1_, 1) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(object1_, 1) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(null_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(integer_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(real_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(emptyString_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(string_, 0) );
-   JSONTEST_ASSERT_PRED( checkMemberCount(true_, 0) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isObject )
-{
-   IsCheck checks;
-   checks.isObject_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( emptyObject_, checks ) );
-   JSONTEST_ASSERT_PRED( checkIs( object1_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isArray )
-{
-   IsCheck checks;
-   checks.isArray_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( emptyArray_, checks ) );
-   JSONTEST_ASSERT_PRED( checkIs( array1_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isNull )
-{
-   IsCheck checks;
-   checks.isNull_ = true;
-   checks.isObject_ = true;
-   checks.isArray_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( null_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isString )
-{
-   IsCheck checks;
-   checks.isString_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( emptyString_, checks ) );
-   JSONTEST_ASSERT_PRED( checkIs( string_, checks ) );
-   JSONTEST_ASSERT_PRED( checkIs( string1_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isBool )
-{
-   IsCheck checks;
-   checks.isBool_ = true;
-   checks.isIntegral_ = true;
-   checks.isNumeric_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( false_, checks ) );
-   JSONTEST_ASSERT_PRED( checkIs( true_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isDouble )
-{
-   IsCheck checks;
-   checks.isDouble_ = true;
-   checks.isNumeric_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( real_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isInt )
-{
-   IsCheck checks;
-   checks.isInt_ = true;
-   checks.isNumeric_ = true;
-   checks.isIntegral_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( integer_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, isUInt )
-{
-   IsCheck checks;
-   checks.isUInt_ = true;
-   checks.isNumeric_ = true;
-   checks.isIntegral_ = true;
-   JSONTEST_ASSERT_PRED( checkIs( unsignedInteger_, checks ) );
-   JSONTEST_ASSERT_PRED( checkIs( smallUnsignedInteger_, checks ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, accessArray )
-{
-	const unsigned int index0 = 0;
-	JSONTEST_ASSERT( Json::Value(1234) == array1_[index0] ) << "Json::Value::operator[ArrayIndex]";
-	JSONTEST_ASSERT( Json::Value(1234) == array1_[0] ) << "Json::Value::operator[int]";
-
-	const Json::Value &constArray = array1_;
-	JSONTEST_ASSERT( Json::Value(1234) == constArray[index0] ) << "Json::Value::operator[ArrayIndex] const";
-	JSONTEST_ASSERT( Json::Value(1234) == constArray[0] ) << "Json::Value::operator[int] const";
-}
-
-
-JSONTEST_FIXTURE( ValueTest, asFloat )
-{
-	JSONTEST_ASSERT_EQUAL( 0.00390625f, float_.asFloat() ) << "Json::Value::asFloat()";
-}
-
-void
-ValueTest::checkConstMemberCount( const Json::Value &value, unsigned int expectedCount )
-{
-   unsigned int count = 0;
-   Json::Value::const_iterator itEnd = value.end();
-   for ( Json::Value::const_iterator it = value.begin(); it != itEnd; ++it )
-   {
-      ++count;
-   }
-   JSONTEST_ASSERT_EQUAL( expectedCount, count ) << "Json::Value::const_iterator";
-}
-
-void
-ValueTest::checkMemberCount( Json::Value &value, unsigned int expectedCount )
-{
-   JSONTEST_ASSERT_EQUAL( expectedCount, value.size() );
-
-   unsigned int count = 0;
-   Json::Value::iterator itEnd = value.end();
-   for ( Json::Value::iterator it = value.begin(); it != itEnd; ++it )
-   {
-      ++count;
-   }
-   JSONTEST_ASSERT_EQUAL( expectedCount, count ) << "Json::Value::iterator";
-
-   JSONTEST_ASSERT_PRED( checkConstMemberCount(value, expectedCount) );
-}
-
-
-ValueTest::IsCheck::IsCheck()
-   : isObject_( false )
-   , isArray_( false )
-   , isBool_( false )
-   , isDouble_( false )
-   , isInt_( false )
-   , isUInt_( false )
-   , isIntegral_( false )
-   , isNumeric_( false )
-   , isString_( false )
-   , isNull_( false )
-{
-}
-
-
-void 
-ValueTest::checkIs( const Json::Value &value, const IsCheck &check )
-{
-   JSONTEST_ASSERT_EQUAL( check.isObject_, value.isObject() );
-   JSONTEST_ASSERT_EQUAL( check.isArray_, value.isArray() );
-   JSONTEST_ASSERT_EQUAL( check.isBool_, value.isBool() );
-   JSONTEST_ASSERT_EQUAL( check.isDouble_, value.isDouble() );
-   JSONTEST_ASSERT_EQUAL( check.isInt_, value.isInt() );
-   JSONTEST_ASSERT_EQUAL( check.isUInt_, value.isUInt() );
-   JSONTEST_ASSERT_EQUAL( check.isIntegral_, value.isIntegral() );
-   JSONTEST_ASSERT_EQUAL( check.isNumeric_, value.isNumeric() );
-   JSONTEST_ASSERT_EQUAL( check.isString_, value.isString() );
-   JSONTEST_ASSERT_EQUAL( check.isNull_, value.isNull() );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareNull )
-{
-    JSONTEST_ASSERT_PRED( checkIsEqual( Json::Value(), Json::Value() ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareInt )
-{
-    JSONTEST_ASSERT_PRED( checkIsLess( 0, 10 ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( 10, 10 ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( -10, -10 ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( -10, 0 ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareUInt )
-{
-    JSONTEST_ASSERT_PRED( checkIsLess( 0u, 10u ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( 0u, Json::Value::maxUInt ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( 10u, 10u ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareDouble )
-{
-    JSONTEST_ASSERT_PRED( checkIsLess( 0.0, 10.0 ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( 10.0, 10.0 ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( -10.0, -10.0 ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( -10.0, 0.0 ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareString )
-{
-    JSONTEST_ASSERT_PRED( checkIsLess( "", " " ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( "", "a" ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( "abcd", "zyui" ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( "abc", "abcd" ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( "abcd", "abcd" ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( " ", " " ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( "ABCD", "abcd" ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( "ABCD", "ABCD" ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareBoolean )
-{
-    JSONTEST_ASSERT_PRED( checkIsLess( false, true ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( false, false ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( true, true ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareArray )
-{
-    // array compare size then content
-    Json::Value emptyArray(Json::arrayValue);
-    Json::Value l1aArray;
-    l1aArray.append( 0 );
-    Json::Value l1bArray;
-    l1bArray.append( 10 );
-    Json::Value l2aArray;
-    l2aArray.append( 0 );
-    l2aArray.append( 0 );
-    Json::Value l2bArray;
-    l2bArray.append( 0 );
-    l2bArray.append( 10 );
-    JSONTEST_ASSERT_PRED( checkIsLess( emptyArray, l1aArray ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( emptyArray, l2aArray ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( l1aArray, l2aArray ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( l2aArray, l2bArray ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( emptyArray, Json::Value( emptyArray ) ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( l1aArray, Json::Value( l1aArray) ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( l2bArray, Json::Value( l2bArray) ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareObject )
-{
-    // object compare size then content
-    Json::Value emptyObject(Json::objectValue);
-    Json::Value l1aObject;
-    l1aObject["key1"] = 0;
-    Json::Value l1bObject;
-    l1aObject["key1"] = 10;
-    Json::Value l2aObject;
-    l2aObject["key1"] = 0;
-    l2aObject["key2"] = 0;
-    JSONTEST_ASSERT_PRED( checkIsLess( emptyObject, l1aObject ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( emptyObject, l2aObject ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( l1aObject, l2aObject ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( emptyObject, Json::Value( emptyObject ) ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( l1aObject, Json::Value( l1aObject ) ) );
-    JSONTEST_ASSERT_PRED( checkIsEqual( l2aObject, Json::Value( l2aObject ) ) );
-}
-
-
-JSONTEST_FIXTURE( ValueTest, compareType )
-{
-    // object of different type are ordered according to their type
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value(), Json::Value(1) ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value(1), Json::Value(1u) ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value(1u), Json::Value(1.0) ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value(1.0), Json::Value("a") ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value("a"), Json::Value(true) ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value(true), Json::Value(Json::arrayValue) ) );
-    JSONTEST_ASSERT_PRED( checkIsLess( Json::Value(Json::arrayValue), Json::Value(Json::objectValue) ) );
-}
-
-
-void 
-ValueTest::checkIsLess( const Json::Value &x, const Json::Value &y )
-{
-    JSONTEST_ASSERT( x < y );
-    JSONTEST_ASSERT( y > x );
-    JSONTEST_ASSERT( x <= y );
-    JSONTEST_ASSERT( y >= x );
-    JSONTEST_ASSERT( !(x == y) );
-    JSONTEST_ASSERT( !(y == x) );
-    JSONTEST_ASSERT( !(x >= y) );
-    JSONTEST_ASSERT( !(y <= x) );
-    JSONTEST_ASSERT( !(x > y) );
-    JSONTEST_ASSERT( !(y < x) );
-    JSONTEST_ASSERT( x.compare( y ) < 0 );
-    JSONTEST_ASSERT( y.compare( x ) >= 0 );
-}
-
-
-void 
-ValueTest::checkIsEqual( const Json::Value &x, const Json::Value &y )
-{
-    JSONTEST_ASSERT( x == y );
-    JSONTEST_ASSERT( y == x );
-    JSONTEST_ASSERT( x <= y );
-    JSONTEST_ASSERT( y <= x );
-    JSONTEST_ASSERT( x >= y );
-    JSONTEST_ASSERT( y >= x );
-    JSONTEST_ASSERT( !(x < y) );
-    JSONTEST_ASSERT( !(y < x) );
-    JSONTEST_ASSERT( !(x > y) );
-    JSONTEST_ASSERT( !(y > x) );
-    JSONTEST_ASSERT( x.compare( y ) == 0 );
-    JSONTEST_ASSERT( y.compare( x ) == 0 );
-}
-
-
-int main( int argc, const char *argv[] )
-{
-   JsonTest::Runner runner;
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, size );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isObject );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isArray );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isBool );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isInt );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isUInt );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isDouble );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isString );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isNull );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isNull );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, accessArray );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, asFloat );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareNull );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareInt );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareUInt );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareDouble );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareString );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareBoolean );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareArray );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareObject );
-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, compareType );
-   return runner.runCommandLine( argc, argv );
-}
diff --git a/src/3rd_party-static/jsoncpp/src/test_lib_json/sconscript b/src/3rd_party-static/jsoncpp/src/test_lib_json/sconscript
deleted file mode 100644
index 84f56b6a02..0000000000
--- a/src/3rd_party-static/jsoncpp/src/test_lib_json/sconscript
+++ /dev/null
@@ -1,10 +0,0 @@
-Import( 'env_testing buildUnitTests' )

-

-buildUnitTests( env_testing, Split( """

-    main.cpp

-    jsontest.cpp

-     """ ),

-    'test_lib_json' )

-

-# For 'check' to work, 'libs' must be built first.

-env_testing.Depends('test_lib_json', '#libs')

diff --git a/src/3rd_party-static/jsoncpp/test/cleantests.py b/src/3rd_party-static/jsoncpp/test/cleantests.py
deleted file mode 100644
index c38fd8ffdd..0000000000
--- a/src/3rd_party-static/jsoncpp/test/cleantests.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# removes all files created during testing
-import glob
-import os
-
-paths = []
-for pattern in [ '*.actual', '*.actual-rewrite', '*.rewrite', '*.process-output' ]:
-    paths += glob.glob( 'data/' + pattern )
-
-for path in paths:
-    os.unlink( path )
diff --git a/src/3rd_party-static/jsoncpp/test/data/fail_test_array_01.json b/src/3rd_party-static/jsoncpp/test/data/fail_test_array_01.json
deleted file mode 100644
index 900fcc2093..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/fail_test_array_01.json
+++ /dev/null
@@ -1 +0,0 @@
-[ 1 2 3]

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_array_01.expected
deleted file mode 100644
index 4aa8fb3379..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_01.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=[]

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_01.json b/src/3rd_party-static/jsoncpp/test/data/test_array_01.json
deleted file mode 100644
index 60b0742537..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_01.json
+++ /dev/null
@@ -1 +0,0 @@
-[]

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_array_02.expected
deleted file mode 100644
index 5b7c72af40..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_02.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=[]

-.[0]=1

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_02.json b/src/3rd_party-static/jsoncpp/test/data/test_array_02.json
deleted file mode 100644
index c02be12907..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_02.json
+++ /dev/null
@@ -1 +0,0 @@
-[1]

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_array_03.expected
deleted file mode 100644
index 0ba568e0d8..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_03.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-.=[]

-.[0]=1

-.[1]=2

-.[2]=3

-.[3]=4

-.[4]=5

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_03.json b/src/3rd_party-static/jsoncpp/test/data/test_array_03.json
deleted file mode 100644
index ac8f422f0a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_03.json
+++ /dev/null
@@ -1 +0,0 @@
-[ 1, 2 ,  3,4,5]

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_04.expected b/src/3rd_party-static/jsoncpp/test/data/test_array_04.expected
deleted file mode 100644
index db58c306a3..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_04.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-.=[]

-.[0]=1

-.[1]="abc"

-.[2]=12.3

-.[3]=-4

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_04.json b/src/3rd_party-static/jsoncpp/test/data/test_array_04.json
deleted file mode 100644
index 075547881e..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_04.json
+++ /dev/null
@@ -1 +0,0 @@
-[1, "abc" , 12.3, -4]

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_05.expected b/src/3rd_party-static/jsoncpp/test/data/test_array_05.expected
deleted file mode 100644
index 82ad48434f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_05.expected
+++ /dev/null
@@ -1,100 +0,0 @@
-.=[]

-.[0]=1

-.[1]=2

-.[2]=3

-.[3]=4

-.[4]=5

-.[5]=6

-.[6]=7

-.[7]=8

-.[8]=9

-.[9]=10

-.[10]=11

-.[11]=12

-.[12]=13

-.[13]=14

-.[14]=15

-.[15]=16

-.[16]=17

-.[17]=18

-.[18]=19

-.[19]=20

-.[20]=21

-.[21]=22

-.[22]=23

-.[23]=24

-.[24]=25

-.[25]=26

-.[26]=27

-.[27]=28

-.[28]=29

-.[29]=30

-.[30]=31

-.[31]=32

-.[32]=33

-.[33]=34

-.[34]=35

-.[35]=36

-.[36]=37

-.[37]=38

-.[38]=39

-.[39]=40

-.[40]=41

-.[41]=42

-.[42]=43

-.[43]=44

-.[44]=45

-.[45]=46

-.[46]=47

-.[47]=48

-.[48]=49

-.[49]=50

-.[50]=51

-.[51]=52

-.[52]=53

-.[53]=54

-.[54]=55

-.[55]=56

-.[56]=57

-.[57]=58

-.[58]=59

-.[59]=60

-.[60]=61

-.[61]=62

-.[62]=63

-.[63]=64

-.[64]=65

-.[65]=66

-.[66]=67

-.[67]=68

-.[68]=69

-.[69]=70

-.[70]=71

-.[71]=72

-.[72]=73

-.[73]=74

-.[74]=75

-.[75]=76

-.[76]=77

-.[77]=78

-.[78]=79

-.[79]=80

-.[80]=81

-.[81]=82

-.[82]=83

-.[83]=84

-.[84]=85

-.[85]=86

-.[86]=87

-.[87]=88

-.[88]=89

-.[89]=90

-.[90]=91

-.[91]=92

-.[92]=93

-.[93]=94

-.[94]=95

-.[95]=96

-.[96]=97

-.[97]=98

-.[98]=99

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_05.json b/src/3rd_party-static/jsoncpp/test/data/test_array_05.json
deleted file mode 100644
index 7809d6c9a1..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_05.json
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_06.expected b/src/3rd_party-static/jsoncpp/test/data/test_array_06.expected
deleted file mode 100644
index e087b6328a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_06.expected
+++ /dev/null
@@ -1,5 +0,0 @@
-.=[]

-.[0]="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"

-.[1]="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"

-.[2]="ccccccccccccccccccccccc"

-.[3]="dddddddddddddddddddddddddddddddddddddddddddddddddddd"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_array_06.json b/src/3rd_party-static/jsoncpp/test/data/test_array_06.json
deleted file mode 100644
index 9777a64084..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_array_06.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", 

-  "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",

-  "ccccccccccccccccccccccc",

-  "dddddddddddddddddddddddddddddddddddddddddddddddddddd" ]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_01.expected
deleted file mode 100644
index 0527387017..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_01.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=123456789

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_01.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_01.json
deleted file mode 100644
index 57cf9b9115..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_01.json
+++ /dev/null
@@ -1 +0,0 @@
-0123456789

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_02.expected
deleted file mode 100644
index 9040e845eb..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_02.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=-123456789

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_02.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_02.json
deleted file mode 100644
index fe84da4d15..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_02.json
+++ /dev/null
@@ -1 +0,0 @@
--0123456789

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_03.expected
deleted file mode 100644
index 494278df28..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_03.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-.=1.2345678

-

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_03.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_03.json
deleted file mode 100644
index feac15012c..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_03.json
+++ /dev/null
@@ -1,3 +0,0 @@
-1.2345678

-

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_04.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_04.expected
deleted file mode 100644
index 659f7440e9..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_04.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.="abcdef"

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_04.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_04.json
deleted file mode 100644
index 01374bd286..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_04.json
+++ /dev/null
@@ -1,2 +0,0 @@
-"abcdef"

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_05.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_05.expected
deleted file mode 100644
index cb1cdada81..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_05.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=null

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_05.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_05.json
deleted file mode 100644
index a6d4f5a687..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_05.json
+++ /dev/null
@@ -1,2 +0,0 @@
-null

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_06.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_06.expected
deleted file mode 100644
index 8b2273103d..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_06.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=true

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_06.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_06.json
deleted file mode 100644
index 5d967af031..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_06.json
+++ /dev/null
@@ -1,2 +0,0 @@
-true

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_07.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_07.expected
deleted file mode 100644
index 4979ed5049..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_07.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=false

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_07.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_07.json
deleted file mode 100644
index b7ee6c5b34..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_07.json
+++ /dev/null
@@ -1,2 +0,0 @@
-false

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_08.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_08.expected
deleted file mode 100644
index cb1cdada81..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_08.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=null

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_08.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_08.json
deleted file mode 100644
index fe107f47b9..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_08.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// C++ style comment

-null

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_09.expected b/src/3rd_party-static/jsoncpp/test/data/test_basic_09.expected
deleted file mode 100644
index cb1cdada81..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_09.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=null

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_basic_09.json b/src/3rd_party-static/jsoncpp/test/data/test_basic_09.json
deleted file mode 100644
index e0cb0890e4..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_basic_09.json
+++ /dev/null
@@ -1,4 +0,0 @@
-/* C style comment

- */

-null

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_comment_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_comment_01.expected
deleted file mode 100644
index 0b8f42d504..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_comment_01.expected
+++ /dev/null
@@ -1,8 +0,0 @@
-.={}

-.test=[]

-.test[0]={}

-.test[0].a="aaa"

-.test[1]={}

-.test[1].b="bbb"

-.test[2]={}

-.test[2].c="ccc"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_comment_01.json b/src/3rd_party-static/jsoncpp/test/data/test_comment_01.json
deleted file mode 100644
index 0de8f9cf73..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_comment_01.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{

-    "test":

-    [

-       { "a" : "aaa" }, // Comment for a

-       { "b" : "bbb" }, // Comment for b

-       { "c" : "ccc" } // Comment for c

-    ]

-}

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_complex_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_complex_01.expected
deleted file mode 100644
index 44e753bfde..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_complex_01.expected
+++ /dev/null
@@ -1,20 +0,0 @@
-.={}

-.attribute=[]

-.attribute[0]="random"

-.attribute[1]="short"

-.attribute[2]="bold"

-.attribute[3]=12

-.attribute[4]={}

-.attribute[4].height=7

-.attribute[4].width=64

-.count=1234

-.name={}

-.name.aka="T.E.S.T."

-.name.id=123987

-.test={}

-.test.1={}

-.test.1.2={}

-.test.1.2.3={}

-.test.1.2.3.coord=[]

-.test.1.2.3.coord[0]=1

-.test.1.2.3.coord[1]=2

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_complex_01.json b/src/3rd_party-static/jsoncpp/test/data/test_complex_01.json
deleted file mode 100644
index fb2f86c64b..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_complex_01.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 

-	"count" : 1234,

-	"name" : { "aka" : "T.E.S.T.", "id" : 123987 },

-	"attribute" : [ 

-		"random", 

-		"short", 

-		"bold", 

-		12, 

-		{ "height" : 7, "width" : 64 } 

-		],

-	"test": { "1" : 

-		{ "2" : 

-			{ "3" :  { "coord" : [ 1,2] } 

-			} 

-		}

-	}

-}

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_01.expected
deleted file mode 100644
index 24aa29e223..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_01.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=2147483647

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_01.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_01.json
deleted file mode 100644
index e82c7ad728..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_01.json
+++ /dev/null
@@ -1,2 +0,0 @@
-// Max signed integer

-2147483647

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_02.expected
deleted file mode 100644
index dab99eb8e9..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_02.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=-2147483648

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_02.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_02.json
deleted file mode 100644
index 548764eba3..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_02.json
+++ /dev/null
@@ -1,2 +0,0 @@
-// Min signed integer

--2147483648

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_03.expected
deleted file mode 100644
index dde326050f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_03.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=4294967295

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_03.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_03.json
deleted file mode 100644
index 18aeaf612a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_03.json
+++ /dev/null
@@ -1,2 +0,0 @@
-// Max unsigned integer

-4294967295

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_04.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_04.expected
deleted file mode 100644
index 8da90136bc..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_04.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=0

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_04.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_04.json
deleted file mode 100644
index 82024833a5..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_04.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// Min unsigned integer

-0

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_05.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_05.expected
deleted file mode 100644
index 238d1d6e17..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_05.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=1

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_05.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_05.json
deleted file mode 100644
index 4797790135..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_05.json
+++ /dev/null
@@ -1,2 +0,0 @@
-1

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_06_64bits.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_06_64bits.expected
deleted file mode 100644
index bc9520a1d8..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_06_64bits.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=9223372036854775808

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_06_64bits.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_06_64bits.json
deleted file mode 100644
index 360d66078a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_06_64bits.json
+++ /dev/null
@@ -1,2 +0,0 @@
-9223372036854775808

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_07_64bits.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_07_64bits.expected
deleted file mode 100644
index 39eb798db6..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_07_64bits.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=-9223372036854775808

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_07_64bits.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_07_64bits.json
deleted file mode 100644
index 11d8513cf2..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_07_64bits.json
+++ /dev/null
@@ -1,2 +0,0 @@
--9223372036854775808

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_08_64bits.expected b/src/3rd_party-static/jsoncpp/test/data/test_integer_08_64bits.expected
deleted file mode 100644
index 831f4325e2..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_08_64bits.expected
+++ /dev/null
@@ -1 +0,0 @@
-.=18446744073709551615

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_integer_08_64bits.json b/src/3rd_party-static/jsoncpp/test/data/test_integer_08_64bits.json
deleted file mode 100644
index 6e1fb04364..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_integer_08_64bits.json
+++ /dev/null
@@ -1,2 +0,0 @@
-18446744073709551615

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_large_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_large_01.expected
deleted file mode 100644
index ee2fafc010..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_large_01.expected
+++ /dev/null
@@ -1,2122 +0,0 @@
-.=[]
-.[0]=[]
-.[0][0]="A"
-.[0][1]=0
-.[0][2]=1
-.[0][3]=2
-.[0][4]=3
-.[0][5]=4
-.[0][6]=5
-.[0][7]=6
-.[0][8]=7
-.[0][9]=8
-.[0][10]=9
-.[0][11]=10
-.[0][12]=11
-.[0][13]=12
-.[0][14]=13
-.[0][15]=14
-.[0][16]=15
-.[0][17]=16
-.[0][18]=17
-.[0][19]=18
-.[0][20]=19
-.[0][21]=20
-.[0][22]=21
-.[0][23]=22
-.[0][24]=23
-.[0][25]=24
-.[0][26]=25
-.[0][27]=26
-.[0][28]=27
-.[0][29]=28
-.[0][30]=29
-.[0][31]=30
-.[0][32]=31
-.[0][33]=32
-.[0][34]=33
-.[0][35]=34
-.[0][36]=35
-.[0][37]=36
-.[0][38]=37
-.[0][39]=38
-.[0][40]=39
-.[0][41]=40
-.[0][42]=41
-.[0][43]=42
-.[0][44]=43
-.[0][45]=44
-.[0][46]=45
-.[0][47]=46
-.[0][48]=47
-.[0][49]=48
-.[0][50]=49
-.[0][51]=50
-.[0][52]=51
-.[0][53]=52
-.[0][54]=53
-.[0][55]=54
-.[0][56]=55
-.[0][57]=56
-.[0][58]=57
-.[0][59]=58
-.[0][60]=59
-.[0][61]=60
-.[0][62]=61
-.[0][63]=62
-.[0][64]=63
-.[0][65]=64
-.[0][66]=65
-.[0][67]=66
-.[0][68]=67
-.[0][69]=68
-.[0][70]=69
-.[0][71]=70
-.[0][72]=71
-.[0][73]=72
-.[0][74]=73
-.[0][75]=74
-.[0][76]=75
-.[0][77]=76
-.[0][78]=77
-.[0][79]=78
-.[0][80]=79
-.[0][81]=80
-.[0][82]=81
-.[0][83]=82
-.[0][84]=83
-.[0][85]=84
-.[0][86]=85
-.[0][87]=86
-.[0][88]=87
-.[0][89]=88
-.[0][90]=89
-.[0][91]=90
-.[0][92]=91
-.[0][93]=92
-.[0][94]=93
-.[0][95]=94
-.[0][96]=95
-.[0][97]=96
-.[0][98]=97
-.[0][99]=98
-.[0][100]=99
-.[0][101]=100
-.[0][102]=101
-.[0][103]=102
-.[0][104]=103
-.[0][105]=104
-.[0][106]=105
-.[0][107]=106
-.[0][108]=107
-.[0][109]=108
-.[0][110]=109
-.[0][111]=110
-.[0][112]=111
-.[0][113]=112
-.[0][114]=113
-.[0][115]=114
-.[0][116]=115
-.[0][117]=116
-.[0][118]=117
-.[0][119]=118
-.[0][120]=119
-.[0][121]=120
-.[0][122]=121
-.[0][123]=122
-.[0][124]=123
-.[0][125]=124
-.[0][126]=125
-.[0][127]=126
-.[0][128]=127
-.[0][129]=128
-.[0][130]=129
-.[0][131]=130
-.[0][132]=131
-.[0][133]=132
-.[0][134]=133
-.[0][135]=134
-.[0][136]=135
-.[0][137]=136
-.[0][138]=137
-.[0][139]=138
-.[0][140]=139
-.[0][141]=140
-.[0][142]=141
-.[0][143]=142
-.[0][144]=143
-.[0][145]=144
-.[0][146]=145
-.[0][147]=146
-.[0][148]=147
-.[0][149]=148
-.[0][150]=149
-.[0][151]=150
-.[0][152]=151
-.[0][153]=152
-.[0][154]=153
-.[0][155]=154
-.[0][156]=155
-.[0][157]=156
-.[0][158]=157
-.[0][159]=158
-.[0][160]=159
-.[0][161]=160
-.[0][162]=161
-.[0][163]=162
-.[0][164]=163
-.[0][165]=164
-.[0][166]=165
-.[0][167]=166
-.[0][168]=167
-.[0][169]=168
-.[0][170]=169
-.[0][171]=170
-.[0][172]=171
-.[0][173]=172
-.[0][174]=173
-.[0][175]=174
-.[0][176]=175
-.[0][177]=176
-.[0][178]=177
-.[0][179]=178
-.[0][180]=179
-.[0][181]=180
-.[0][182]=181
-.[0][183]=182
-.[0][184]=183
-.[0][185]=184
-.[0][186]=185
-.[0][187]=186
-.[0][188]=187
-.[0][189]=188
-.[0][190]=189
-.[0][191]=190
-.[0][192]=191
-.[0][193]=192
-.[0][194]=193
-.[0][195]=194
-.[0][196]=195
-.[0][197]=196
-.[0][198]=197
-.[0][199]=198
-.[0][200]=199
-.[0][201]=200
-.[0][202]=201
-.[0][203]=202
-.[0][204]=203
-.[0][205]=204
-.[0][206]=205
-.[0][207]=206
-.[0][208]=207
-.[0][209]=208
-.[0][210]=209
-.[0][211]=210
-.[0][212]=211
-.[0][213]=212
-.[0][214]=213
-.[0][215]=214
-.[0][216]=215
-.[0][217]=216
-.[0][218]=217
-.[0][219]=218
-.[0][220]=219
-.[0][221]=220
-.[0][222]=221
-.[0][223]=222
-.[0][224]=223
-.[0][225]=224
-.[0][226]=225
-.[0][227]=226
-.[0][228]=227
-.[0][229]=228
-.[0][230]=229
-.[0][231]=230
-.[0][232]=231
-.[0][233]=232
-.[0][234]=233
-.[0][235]=234
-.[0][236]=235
-.[0][237]=236
-.[0][238]=237
-.[0][239]=238
-.[0][240]=239
-.[0][241]=240
-.[0][242]=241
-.[0][243]=242
-.[0][244]=243
-.[0][245]=244
-.[0][246]=245
-.[0][247]=246
-.[0][248]=247
-.[0][249]=248
-.[0][250]=249
-.[0][251]=250
-.[0][252]=251
-.[0][253]=252
-.[0][254]=253
-.[0][255]=254
-.[0][256]=255
-.[0][257]=256
-.[0][258]=257
-.[0][259]=258
-.[0][260]=259
-.[0][261]=260
-.[0][262]=261
-.[0][263]=262
-.[0][264]=263
-.[0][265]=264
-.[0][266]=265
-.[0][267]=266
-.[0][268]=267
-.[0][269]=268
-.[0][270]=269
-.[0][271]=270
-.[0][272]=271
-.[0][273]=272
-.[0][274]=273
-.[0][275]=274
-.[0][276]=275
-.[0][277]=276
-.[0][278]=277
-.[0][279]=278
-.[0][280]=279
-.[0][281]=280
-.[0][282]=281
-.[0][283]=282
-.[0][284]=283
-.[0][285]=284
-.[0][286]=285
-.[0][287]=286
-.[0][288]=287
-.[0][289]=288
-.[0][290]=289
-.[0][291]=290
-.[0][292]=291
-.[0][293]=292
-.[0][294]=293
-.[0][295]=294
-.[0][296]=295
-.[0][297]=296
-.[0][298]=297
-.[0][299]=298
-.[0][300]=299
-.[0][301]=300
-.[0][302]=301
-.[0][303]=302
-.[0][304]=303
-.[0][305]=304
-.[0][306]=305
-.[0][307]=306
-.[0][308]=307
-.[0][309]=308
-.[0][310]=309
-.[0][311]=310
-.[0][312]=311
-.[0][313]=312
-.[0][314]=313
-.[0][315]=314
-.[0][316]=315
-.[0][317]=316
-.[0][318]=317
-.[0][319]=318
-.[0][320]=319
-.[0][321]=320
-.[0][322]=321
-.[0][323]=322
-.[0][324]=323
-.[0][325]=324
-.[0][326]=325
-.[0][327]=326
-.[0][328]=327
-.[0][329]=328
-.[0][330]=329
-.[0][331]=330
-.[0][332]=331
-.[0][333]=332
-.[0][334]=333
-.[0][335]=334
-.[0][336]=335
-.[0][337]=336
-.[0][338]=337
-.[0][339]=338
-.[0][340]=339
-.[0][341]=340
-.[0][342]=341
-.[0][343]=342
-.[0][344]=343
-.[0][345]=344
-.[0][346]=345
-.[0][347]=346
-.[0][348]=347
-.[0][349]=348
-.[0][350]=349
-.[0][351]=350
-.[0][352]=351
-.[0][353]=352
-.[0][354]=353
-.[0][355]=354
-.[0][356]=355
-.[0][357]=356
-.[0][358]=357
-.[0][359]=358
-.[0][360]=359
-.[0][361]=360
-.[0][362]=361
-.[0][363]=362
-.[0][364]=363
-.[0][365]=364
-.[0][366]=365
-.[0][367]=366
-.[0][368]=367
-.[0][369]=368
-.[0][370]=369
-.[0][371]=370
-.[0][372]=371
-.[0][373]=372
-.[0][374]=373
-.[0][375]=374
-.[0][376]=375
-.[0][377]=376
-.[0][378]=377
-.[0][379]=378
-.[0][380]=379
-.[0][381]=380
-.[0][382]=381
-.[0][383]=382
-.[0][384]=383
-.[0][385]=384
-.[0][386]=385
-.[0][387]=386
-.[0][388]=387
-.[0][389]=388
-.[0][390]=389
-.[0][391]=390
-.[0][392]=391
-.[0][393]=392
-.[0][394]=393
-.[0][395]=394
-.[0][396]=395
-.[0][397]=396
-.[0][398]=397
-.[0][399]=398
-.[0][400]=399
-.[0][401]=400
-.[0][402]=401
-.[0][403]=402
-.[0][404]=403
-.[0][405]=404
-.[0][406]=405
-.[0][407]=406
-.[0][408]=407
-.[0][409]=408
-.[0][410]=409
-.[0][411]=410
-.[0][412]=411
-.[0][413]=412
-.[0][414]=413
-.[0][415]=414
-.[0][416]=415
-.[0][417]=416
-.[0][418]=417
-.[0][419]=418
-.[0][420]=419
-.[0][421]=420
-.[0][422]=421
-.[0][423]=422
-.[0][424]=423
-.[0][425]=424
-.[0][426]=425
-.[0][427]=426
-.[0][428]=427
-.[0][429]=428
-.[0][430]=429
-.[0][431]=430
-.[0][432]=431
-.[0][433]=432
-.[0][434]=433
-.[0][435]=434
-.[0][436]=435
-.[0][437]=436
-.[0][438]=437
-.[0][439]=438
-.[0][440]=439
-.[0][441]=440
-.[0][442]=441
-.[0][443]=442
-.[0][444]=443
-.[0][445]=444
-.[0][446]=445
-.[0][447]=446
-.[0][448]=447
-.[0][449]=448
-.[0][450]=449
-.[0][451]=450
-.[0][452]=451
-.[0][453]=452
-.[0][454]=453
-.[0][455]=454
-.[0][456]=455
-.[0][457]=456
-.[0][458]=457
-.[0][459]=458
-.[0][460]=459
-.[0][461]=460
-.[0][462]=461
-.[0][463]=462
-.[0][464]=463
-.[0][465]=464
-.[0][466]=465
-.[0][467]=466
-.[0][468]=467
-.[0][469]=468
-.[0][470]=469
-.[0][471]=470
-.[0][472]=471
-.[0][473]=472
-.[0][474]=473
-.[0][475]=474
-.[0][476]=475
-.[0][477]=476
-.[0][478]=477
-.[0][479]=478
-.[0][480]=479
-.[0][481]=480
-.[0][482]=481
-.[0][483]=482
-.[0][484]=483
-.[0][485]=484
-.[0][486]=485
-.[0][487]=486
-.[0][488]=487
-.[0][489]=488
-.[0][490]=489
-.[0][491]=490
-.[0][492]=491
-.[0][493]=492
-.[0][494]=493
-.[0][495]=494
-.[0][496]=495
-.[0][497]=496
-.[0][498]=497
-.[0][499]=498
-.[0][500]=499
-.[0][501]=500
-.[0][502]=501
-.[0][503]=502
-.[0][504]=503
-.[0][505]=504
-.[0][506]=505
-.[0][507]=506
-.[0][508]=507
-.[0][509]=508
-.[0][510]=509
-.[0][511]=510
-.[0][512]=511
-.[0][513]=512
-.[0][514]=513
-.[0][515]=514
-.[0][516]=515
-.[0][517]=516
-.[0][518]=517
-.[0][519]=518
-.[0][520]=519
-.[0][521]=520
-.[0][522]=521
-.[0][523]=522
-.[0][524]=523
-.[0][525]=524
-.[0][526]=525
-.[0][527]=526
-.[0][528]=527
-.[0][529]=528
-.[0][530]=529
-.[0][531]=530
-.[0][532]=531
-.[0][533]=532
-.[0][534]=533
-.[0][535]=534
-.[0][536]=535
-.[0][537]=536
-.[0][538]=537
-.[0][539]=538
-.[0][540]=539
-.[0][541]=540
-.[0][542]=541
-.[0][543]=542
-.[0][544]=543
-.[0][545]=544
-.[0][546]=545
-.[0][547]=546
-.[0][548]=547
-.[0][549]=548
-.[0][550]=549
-.[0][551]=550
-.[0][552]=551
-.[0][553]=552
-.[0][554]=553
-.[0][555]=554
-.[0][556]=555
-.[0][557]=556
-.[0][558]=557
-.[0][559]=558
-.[0][560]=559
-.[0][561]=560
-.[0][562]=561
-.[0][563]=562
-.[0][564]=563
-.[0][565]=564
-.[0][566]=565
-.[0][567]=566
-.[0][568]=567
-.[0][569]=568
-.[0][570]=569
-.[0][571]=570
-.[0][572]=571
-.[0][573]=572
-.[0][574]=573
-.[0][575]=574
-.[0][576]=575
-.[0][577]=576
-.[0][578]=577
-.[0][579]=578
-.[0][580]=579
-.[0][581]=580
-.[0][582]=581
-.[0][583]=582
-.[0][584]=583
-.[0][585]=584
-.[0][586]=585
-.[0][587]=586
-.[0][588]=587
-.[0][589]=588
-.[0][590]=589
-.[0][591]=590
-.[0][592]=591
-.[0][593]=592
-.[0][594]=593
-.[0][595]=594
-.[0][596]=595
-.[0][597]=596
-.[0][598]=597
-.[0][599]=598
-.[0][600]=599
-.[0][601]=600
-.[0][602]=601
-.[0][603]=602
-.[0][604]=603
-.[0][605]=604
-.[0][606]=605
-.[0][607]=606
-.[0][608]=607
-.[0][609]=608
-.[0][610]=609
-.[0][611]=610
-.[0][612]=611
-.[0][613]=612
-.[0][614]=613
-.[0][615]=614
-.[0][616]=615
-.[0][617]=616
-.[0][618]=617
-.[0][619]=618
-.[0][620]=619
-.[0][621]=620
-.[0][622]=621
-.[0][623]=622
-.[0][624]=623
-.[0][625]=624
-.[0][626]=625
-.[0][627]=626
-.[0][628]=627
-.[0][629]=628
-.[0][630]=629
-.[0][631]=630
-.[0][632]=631
-.[0][633]=632
-.[0][634]=633
-.[0][635]=634
-.[0][636]=635
-.[0][637]=636
-.[0][638]=637
-.[0][639]=638
-.[0][640]=639
-.[0][641]=640
-.[0][642]=641
-.[0][643]=642
-.[0][644]=643
-.[0][645]=644
-.[0][646]=645
-.[0][647]=646
-.[0][648]=647
-.[0][649]=648
-.[0][650]=649
-.[0][651]=650
-.[0][652]=651
-.[0][653]=652
-.[0][654]=653
-.[0][655]=654
-.[0][656]=655
-.[0][657]=656
-.[0][658]=657
-.[0][659]=658
-.[0][660]=659
-.[0][661]=660
-.[0][662]=661
-.[0][663]=662
-.[0][664]=663
-.[0][665]=664
-.[0][666]=665
-.[0][667]=666
-.[0][668]=667
-.[0][669]=668
-.[0][670]=669
-.[0][671]=670
-.[0][672]=671
-.[0][673]=672
-.[0][674]=673
-.[0][675]=674
-.[0][676]=675
-.[0][677]=676
-.[0][678]=677
-.[0][679]=678
-.[0][680]=679
-.[0][681]=680
-.[0][682]=681
-.[0][683]=682
-.[0][684]=683
-.[0][685]=684
-.[0][686]=685
-.[0][687]=686
-.[0][688]=687
-.[0][689]=688
-.[0][690]=689
-.[0][691]=690
-.[0][692]=691
-.[0][693]=692
-.[0][694]=693
-.[0][695]=694
-.[0][696]=695
-.[0][697]=696
-.[0][698]=697
-.[0][699]=698
-.[0][700]=699
-.[0][701]=700
-.[0][702]=701
-.[0][703]=702
-.[0][704]=703
-.[0][705]=704
-.[0][706]=705
-.[0][707]=706
-.[0][708]=707
-.[0][709]=708
-.[0][710]=709
-.[0][711]=710
-.[0][712]=711
-.[0][713]=712
-.[0][714]=713
-.[0][715]=714
-.[0][716]=715
-.[0][717]=716
-.[0][718]=717
-.[0][719]=718
-.[0][720]=719
-.[0][721]=720
-.[0][722]=721
-.[0][723]=722
-.[0][724]=723
-.[0][725]=724
-.[0][726]=725
-.[0][727]=726
-.[0][728]=727
-.[0][729]=728
-.[0][730]=729
-.[0][731]=730
-.[0][732]=731
-.[0][733]=732
-.[0][734]=733
-.[0][735]=734
-.[0][736]=735
-.[0][737]=736
-.[0][738]=737
-.[0][739]=738
-.[0][740]=739
-.[0][741]=740
-.[0][742]=741
-.[0][743]=742
-.[0][744]=743
-.[0][745]=744
-.[0][746]=745
-.[0][747]=746
-.[0][748]=747
-.[0][749]=748
-.[0][750]=749
-.[0][751]=750
-.[0][752]=751
-.[0][753]=752
-.[0][754]=753
-.[0][755]=754
-.[0][756]=755
-.[0][757]=756
-.[0][758]=757
-.[0][759]=758
-.[0][760]=759
-.[0][761]=760
-.[0][762]=761
-.[0][763]=762
-.[0][764]=763
-.[0][765]=764
-.[0][766]=765
-.[0][767]=766
-.[0][768]=767
-.[0][769]=768
-.[0][770]=769
-.[0][771]=770
-.[0][772]=771
-.[0][773]=772
-.[0][774]=773
-.[0][775]=774
-.[0][776]=775
-.[0][777]=776
-.[0][778]=777
-.[0][779]=778
-.[0][780]=779
-.[0][781]=780
-.[0][782]=781
-.[0][783]=782
-.[0][784]=783
-.[0][785]=784
-.[0][786]=785
-.[0][787]=786
-.[0][788]=787
-.[0][789]=788
-.[0][790]=789
-.[0][791]=790
-.[0][792]=791
-.[0][793]=792
-.[0][794]=793
-.[0][795]=794
-.[0][796]=795
-.[0][797]=796
-.[0][798]=797
-.[0][799]=798
-.[0][800]=799
-.[0][801]=800
-.[0][802]=801
-.[0][803]=802
-.[0][804]=803
-.[0][805]=804
-.[0][806]=805
-.[0][807]=806
-.[0][808]=807
-.[0][809]=808
-.[0][810]=809
-.[0][811]=810
-.[0][812]=811
-.[0][813]=812
-.[0][814]=813
-.[0][815]=814
-.[0][816]=815
-.[0][817]=816
-.[0][818]=817
-.[0][819]=818
-.[0][820]=819
-.[0][821]=820
-.[0][822]=821
-.[0][823]=822
-.[0][824]=823
-.[0][825]=824
-.[0][826]=825
-.[0][827]=826
-.[0][828]=827
-.[0][829]=828
-.[0][830]=829
-.[0][831]=830
-.[0][832]=831
-.[0][833]=832
-.[0][834]=833
-.[0][835]=834
-.[0][836]=835
-.[0][837]=836
-.[0][838]=837
-.[0][839]=838
-.[0][840]=839
-.[0][841]=840
-.[0][842]=841
-.[0][843]=842
-.[0][844]=843
-.[0][845]=844
-.[0][846]=845
-.[0][847]=846
-.[0][848]=847
-.[0][849]=848
-.[0][850]=849
-.[0][851]=850
-.[0][852]=851
-.[0][853]=852
-.[0][854]=853
-.[0][855]=854
-.[0][856]=855
-.[0][857]=856
-.[0][858]=857
-.[0][859]=858
-.[0][860]=859
-.[0][861]=860
-.[0][862]=861
-.[0][863]=862
-.[0][864]=863
-.[0][865]=864
-.[0][866]=865
-.[0][867]=866
-.[0][868]=867
-.[0][869]=868
-.[0][870]=869
-.[0][871]=870
-.[0][872]=871
-.[0][873]=872
-.[0][874]=873
-.[0][875]=874
-.[0][876]=875
-.[0][877]=876
-.[0][878]=877
-.[0][879]=878
-.[0][880]=879
-.[0][881]=880
-.[0][882]=881
-.[0][883]=882
-.[0][884]=883
-.[0][885]=884
-.[0][886]=885
-.[0][887]=886
-.[0][888]=887
-.[0][889]=888
-.[0][890]=889
-.[0][891]=890
-.[0][892]=891
-.[0][893]=892
-.[0][894]=893
-.[0][895]=894
-.[0][896]=895
-.[0][897]=896
-.[0][898]=897
-.[0][899]=898
-.[0][900]=899
-.[0][901]=900
-.[0][902]=901
-.[0][903]=902
-.[0][904]=903
-.[0][905]=904
-.[0][906]=905
-.[0][907]=906
-.[0][908]=907
-.[0][909]=908
-.[0][910]=909
-.[0][911]=910
-.[0][912]=911
-.[0][913]=912
-.[0][914]=913
-.[0][915]=914
-.[0][916]=915
-.[0][917]=916
-.[0][918]=917
-.[0][919]=918
-.[0][920]=919
-.[0][921]=920
-.[0][922]=921
-.[0][923]=922
-.[0][924]=923
-.[0][925]=924
-.[0][926]=925
-.[0][927]=926
-.[0][928]=927
-.[0][929]=928
-.[0][930]=929
-.[0][931]=930
-.[0][932]=931
-.[0][933]=932
-.[0][934]=933
-.[0][935]=934
-.[0][936]=935
-.[0][937]=936
-.[0][938]=937
-.[0][939]=938
-.[0][940]=939
-.[0][941]=940
-.[0][942]=941
-.[0][943]=942
-.[0][944]=943
-.[0][945]=944
-.[0][946]=945
-.[0][947]=946
-.[0][948]=947
-.[0][949]=948
-.[0][950]=949
-.[0][951]=950
-.[0][952]=951
-.[0][953]=952
-.[0][954]=953
-.[0][955]=954
-.[0][956]=955
-.[0][957]=956
-.[0][958]=957
-.[0][959]=958
-.[0][960]=959
-.[0][961]=960
-.[0][962]=961
-.[0][963]=962
-.[0][964]=963
-.[0][965]=964
-.[0][966]=965
-.[0][967]=966
-.[0][968]=967
-.[0][969]=968
-.[0][970]=969
-.[0][971]=970
-.[0][972]=971
-.[0][973]=972
-.[0][974]=973
-.[0][975]=974
-.[0][976]=975
-.[0][977]=976
-.[0][978]=977
-.[0][979]=978
-.[0][980]=979
-.[0][981]=980
-.[0][982]=981
-.[0][983]=982
-.[0][984]=983
-.[0][985]=984
-.[0][986]=985
-.[0][987]=986
-.[0][988]=987
-.[0][989]=988
-.[0][990]=989
-.[0][991]=990
-.[0][992]=991
-.[0][993]=992
-.[0][994]=993
-.[0][995]=994
-.[0][996]=995
-.[0][997]=996
-.[0][998]=997
-.[0][999]=998
-.[0][1000]=999
-.[0][1001]=1000
-.[0][1002]=1001
-.[0][1003]=1002
-.[0][1004]=1003
-.[0][1005]=1004
-.[0][1006]=1005
-.[0][1007]=1006
-.[0][1008]=1007
-.[0][1009]=1008
-.[0][1010]=1009
-.[0][1011]=1010
-.[0][1012]=1011
-.[0][1013]=1012
-.[0][1014]=1013
-.[0][1015]=1014
-.[0][1016]=1015
-.[0][1017]=1016
-.[0][1018]=1017
-.[0][1019]=1018
-.[0][1020]=1019
-.[0][1021]=1020
-.[0][1022]=1021
-.[0][1023]=1022
-.[0][1024]=1023
-.[0][1025]=1024
-.[0][1026]=1025
-.[0][1027]=1026
-.[0][1028]=1027
-.[0][1029]=1028
-.[0][1030]=1029
-.[0][1031]=1030
-.[0][1032]=1031
-.[0][1033]=1032
-.[0][1034]=1033
-.[0][1035]=1034
-.[0][1036]=1035
-.[0][1037]=1036
-.[0][1038]=1037
-.[0][1039]=1038
-.[0][1040]=1039
-.[0][1041]=1040
-.[0][1042]=1041
-.[0][1043]=1042
-.[0][1044]=1043
-.[0][1045]=1044
-.[0][1046]=1045
-.[0][1047]=1046
-.[0][1048]=1047
-.[0][1049]=1048
-.[0][1050]=1049
-.[0][1051]=1050
-.[0][1052]=1051
-.[0][1053]=1052
-.[0][1054]=1053
-.[0][1055]=1054
-.[0][1056]=1055
-.[0][1057]=1056
-.[0][1058]=1057
-.[0][1059]=1058
-.[0][1060]=1059
-.[0][1061]=1060
-.[0][1062]=1061
-.[0][1063]=1062
-.[0][1064]=1063
-.[0][1065]=1064
-.[0][1066]=1065
-.[0][1067]=1066
-.[0][1068]=1067
-.[0][1069]=1068
-.[0][1070]=1069
-.[0][1071]=1070
-.[0][1072]=1071
-.[0][1073]=1072
-.[0][1074]=1073
-.[0][1075]=1074
-.[0][1076]=1075
-.[0][1077]=1076
-.[0][1078]=1077
-.[0][1079]=1078
-.[0][1080]=1079
-.[0][1081]=1080
-.[0][1082]=1081
-.[0][1083]=1082
-.[0][1084]=1083
-.[0][1085]=1084
-.[0][1086]=1085
-.[0][1087]=1086
-.[0][1088]=1087
-.[0][1089]=1088
-.[0][1090]=1089
-.[0][1091]=1090
-.[0][1092]=1091
-.[0][1093]=1092
-.[0][1094]=1093
-.[0][1095]=1094
-.[0][1096]=1095
-.[0][1097]=1096
-.[0][1098]=1097
-.[0][1099]=1098
-.[0][1100]=1099
-.[0][1101]=1100
-.[0][1102]=1101
-.[0][1103]=1102
-.[0][1104]=1103
-.[0][1105]=1104
-.[0][1106]=1105
-.[0][1107]=1106
-.[0][1108]=1107
-.[0][1109]=1108
-.[0][1110]=1109
-.[0][1111]=1110
-.[0][1112]=1111
-.[0][1113]=1112
-.[0][1114]=1113
-.[0][1115]=1114
-.[0][1116]=1115
-.[0][1117]=1116
-.[0][1118]=1117
-.[0][1119]=1118
-.[0][1120]=1119
-.[0][1121]=1120
-.[0][1122]=1121
-.[0][1123]=1122
-.[0][1124]=1123
-.[0][1125]=1124
-.[0][1126]=1125
-.[0][1127]=1126
-.[0][1128]=1127
-.[0][1129]=1128
-.[0][1130]=1129
-.[0][1131]=1130
-.[0][1132]=1131
-.[0][1133]=1132
-.[0][1134]=1133
-.[0][1135]=1134
-.[0][1136]=1135
-.[0][1137]=1136
-.[0][1138]=1137
-.[0][1139]=1138
-.[0][1140]=1139
-.[0][1141]=1140
-.[0][1142]=1141
-.[0][1143]=1142
-.[0][1144]=1143
-.[0][1145]=1144
-.[0][1146]=1145
-.[0][1147]=1146
-.[0][1148]=1147
-.[0][1149]=1148
-.[0][1150]=1149
-.[0][1151]=1150
-.[0][1152]=1151
-.[0][1153]=1152
-.[0][1154]=1153
-.[0][1155]=1154
-.[0][1156]=1155
-.[0][1157]=1156
-.[0][1158]=1157
-.[0][1159]=1158
-.[0][1160]=1159
-.[0][1161]=1160
-.[0][1162]=1161
-.[0][1163]=1162
-.[0][1164]=1163
-.[0][1165]=1164
-.[0][1166]=1165
-.[0][1167]=1166
-.[0][1168]=1167
-.[0][1169]=1168
-.[0][1170]=1169
-.[0][1171]=1170
-.[0][1172]=1171
-.[0][1173]=1172
-.[0][1174]=1173
-.[0][1175]=1174
-.[0][1176]=1175
-.[0][1177]=1176
-.[0][1178]=1177
-.[0][1179]=1178
-.[0][1180]=1179
-.[0][1181]=1180
-.[0][1182]=1181
-.[0][1183]=1182
-.[0][1184]=1183
-.[0][1185]=1184
-.[0][1186]=1185
-.[0][1187]=1186
-.[0][1188]=1187
-.[0][1189]=1188
-.[0][1190]=1189
-.[0][1191]=1190
-.[0][1192]=1191
-.[0][1193]=1192
-.[0][1194]=1193
-.[0][1195]=1194
-.[0][1196]=1195
-.[0][1197]=1196
-.[0][1198]=1197
-.[0][1199]=1198
-.[0][1200]=1199
-.[0][1201]=1200
-.[0][1202]=1201
-.[0][1203]=1202
-.[0][1204]=1203
-.[0][1205]=1204
-.[0][1206]=1205
-.[0][1207]=1206
-.[0][1208]=1207
-.[0][1209]=1208
-.[0][1210]=1209
-.[0][1211]=1210
-.[0][1212]=1211
-.[0][1213]=1212
-.[0][1214]=1213
-.[0][1215]=1214
-.[0][1216]=1215
-.[0][1217]=1216
-.[0][1218]=1217
-.[0][1219]=1218
-.[0][1220]=1219
-.[0][1221]=1220
-.[0][1222]=1221
-.[0][1223]=1222
-.[0][1224]=1223
-.[0][1225]=1224
-.[0][1226]=1225
-.[0][1227]=1226
-.[0][1228]=1227
-.[0][1229]=1228
-.[0][1230]=1229
-.[0][1231]=1230
-.[0][1232]=1231
-.[0][1233]=1232
-.[0][1234]=1233
-.[0][1235]=1234
-.[0][1236]=1235
-.[0][1237]=1236
-.[0][1238]=1237
-.[0][1239]=1238
-.[0][1240]=1239
-.[0][1241]=1240
-.[0][1242]=1241
-.[0][1243]=1242
-.[0][1244]=1243
-.[0][1245]=1244
-.[0][1246]=1245
-.[0][1247]=1246
-.[0][1248]=1247
-.[0][1249]=1248
-.[0][1250]=1249
-.[0][1251]=1250
-.[0][1252]=1251
-.[0][1253]=1252
-.[0][1254]=1253
-.[0][1255]=1254
-.[0][1256]=1255
-.[0][1257]=1256
-.[0][1258]=1257
-.[0][1259]=1258
-.[0][1260]=1259
-.[0][1261]=1260
-.[0][1262]=1261
-.[0][1263]=1262
-.[0][1264]=1263
-.[0][1265]=1264
-.[0][1266]=1265
-.[0][1267]=1266
-.[0][1268]=1267
-.[0][1269]=1268
-.[0][1270]=1269
-.[0][1271]=1270
-.[0][1272]=1271
-.[0][1273]=1272
-.[0][1274]=1273
-.[0][1275]=1274
-.[0][1276]=1275
-.[0][1277]=1276
-.[0][1278]=1277
-.[0][1279]=1278
-.[0][1280]=1279
-.[0][1281]=1280
-.[0][1282]=1281
-.[0][1283]=1282
-.[0][1284]=1283
-.[0][1285]=1284
-.[0][1286]=1285
-.[0][1287]=1286
-.[0][1288]=1287
-.[0][1289]=1288
-.[0][1290]=1289
-.[0][1291]=1290
-.[0][1292]=1291
-.[0][1293]=1292
-.[0][1294]=1293
-.[0][1295]=1294
-.[0][1296]=1295
-.[0][1297]=1296
-.[0][1298]=1297
-.[0][1299]=1298
-.[0][1300]=1299
-.[0][1301]=1300
-.[0][1302]=1301
-.[0][1303]=1302
-.[0][1304]=1303
-.[0][1305]=1304
-.[0][1306]=1305
-.[0][1307]=1306
-.[0][1308]=1307
-.[0][1309]=1308
-.[0][1310]=1309
-.[0][1311]=1310
-.[0][1312]=1311
-.[0][1313]=1312
-.[0][1314]=1313
-.[0][1315]=1314
-.[0][1316]=1315
-.[0][1317]=1316
-.[0][1318]=1317
-.[0][1319]=1318
-.[0][1320]=1319
-.[0][1321]=1320
-.[0][1322]=1321
-.[0][1323]=1322
-.[0][1324]=1323
-.[0][1325]=1324
-.[0][1326]=1325
-.[0][1327]=1326
-.[0][1328]=1327
-.[0][1329]=1328
-.[0][1330]=1329
-.[0][1331]=1330
-.[0][1332]=1331
-.[0][1333]=1332
-.[0][1334]=1333
-.[0][1335]=1334
-.[0][1336]=1335
-.[0][1337]=1336
-.[0][1338]=1337
-.[0][1339]=1338
-.[0][1340]=1339
-.[0][1341]=1340
-.[0][1342]=1341
-.[0][1343]=1342
-.[0][1344]=1343
-.[0][1345]=1344
-.[0][1346]=1345
-.[0][1347]=1346
-.[0][1348]=1347
-.[0][1349]=1348
-.[0][1350]=1349
-.[0][1351]=1350
-.[0][1352]=1351
-.[0][1353]=1352
-.[0][1354]=1353
-.[0][1355]=1354
-.[0][1356]=1355
-.[0][1357]=1356
-.[0][1358]=1357
-.[0][1359]=1358
-.[0][1360]=1359
-.[0][1361]=1360
-.[0][1362]=1361
-.[0][1363]=1362
-.[0][1364]=1363
-.[0][1365]=1364
-.[0][1366]=1365
-.[0][1367]=1366
-.[0][1368]=1367
-.[0][1369]=1368
-.[0][1370]=1369
-.[0][1371]=1370
-.[0][1372]=1371
-.[0][1373]=1372
-.[0][1374]=1373
-.[0][1375]=1374
-.[0][1376]=1375
-.[0][1377]=1376
-.[0][1378]=1377
-.[0][1379]=1378
-.[0][1380]=1379
-.[0][1381]=1380
-.[0][1382]=1381
-.[0][1383]=1382
-.[0][1384]=1383
-.[0][1385]=1384
-.[0][1386]=1385
-.[0][1387]=1386
-.[0][1388]=1387
-.[0][1389]=1388
-.[0][1390]=1389
-.[0][1391]=1390
-.[0][1392]=1391
-.[0][1393]=1392
-.[0][1394]=1393
-.[0][1395]=1394
-.[0][1396]=1395
-.[0][1397]=1396
-.[0][1398]=1397
-.[0][1399]=1398
-.[0][1400]=1399
-.[0][1401]=1400
-.[0][1402]=1401
-.[0][1403]=1402
-.[0][1404]=1403
-.[0][1405]=1404
-.[0][1406]=1405
-.[0][1407]=1406
-.[0][1408]=1407
-.[0][1409]=1408
-.[0][1410]=1409
-.[0][1411]=1410
-.[0][1412]=1411
-.[0][1413]=1412
-.[0][1414]=1413
-.[0][1415]=1414
-.[0][1416]=1415
-.[0][1417]=1416
-.[0][1418]=1417
-.[0][1419]=1418
-.[0][1420]=1419
-.[0][1421]=1420
-.[0][1422]=1421
-.[0][1423]=1422
-.[0][1424]=1423
-.[0][1425]=1424
-.[0][1426]=1425
-.[0][1427]=1426
-.[0][1428]=1427
-.[0][1429]=1428
-.[0][1430]=1429
-.[0][1431]=1430
-.[0][1432]=1431
-.[0][1433]=1432
-.[0][1434]=1433
-.[0][1435]=1434
-.[0][1436]=1435
-.[0][1437]=1436
-.[0][1438]=1437
-.[0][1439]=1438
-.[0][1440]=1439
-.[0][1441]=1440
-.[0][1442]=1441
-.[0][1443]=1442
-.[0][1444]=1443
-.[0][1445]=1444
-.[0][1446]=1445
-.[0][1447]=1446
-.[0][1448]=1447
-.[0][1449]=1448
-.[0][1450]=1449
-.[0][1451]=1450
-.[0][1452]=1451
-.[0][1453]=1452
-.[0][1454]=1453
-.[0][1455]=1454
-.[0][1456]=1455
-.[0][1457]=1456
-.[0][1458]=1457
-.[0][1459]=1458
-.[0][1460]=1459
-.[0][1461]=1460
-.[0][1462]=1461
-.[0][1463]=1462
-.[0][1464]=1463
-.[0][1465]=1464
-.[0][1466]=1465
-.[0][1467]=1466
-.[0][1468]=1467
-.[0][1469]=1468
-.[0][1470]=1469
-.[0][1471]=1470
-.[0][1472]=1471
-.[0][1473]=1472
-.[0][1474]=1473
-.[0][1475]=1474
-.[0][1476]=1475
-.[0][1477]=1476
-.[0][1478]=1477
-.[0][1479]=1478
-.[0][1480]=1479
-.[0][1481]=1480
-.[0][1482]=1481
-.[0][1483]=1482
-.[0][1484]=1483
-.[0][1485]=1484
-.[0][1486]=1485
-.[0][1487]=1486
-.[0][1488]=1487
-.[0][1489]=1488
-.[0][1490]=1489
-.[0][1491]=1490
-.[0][1492]=1491
-.[0][1493]=1492
-.[0][1494]=1493
-.[0][1495]=1494
-.[0][1496]=1495
-.[0][1497]=1496
-.[0][1498]=1497
-.[0][1499]=1498
-.[0][1500]=1499
-.[0][1501]=1500
-.[0][1502]=1501
-.[0][1503]=1502
-.[0][1504]=1503
-.[0][1505]=1504
-.[0][1506]=1505
-.[0][1507]=1506
-.[0][1508]=1507
-.[0][1509]=1508
-.[0][1510]=1509
-.[0][1511]=1510
-.[0][1512]=1511
-.[0][1513]=1512
-.[0][1514]=1513
-.[0][1515]=1514
-.[0][1516]=1515
-.[0][1517]=1516
-.[0][1518]=1517
-.[0][1519]=1518
-.[0][1520]=1519
-.[0][1521]=1520
-.[0][1522]=1521
-.[0][1523]=1522
-.[0][1524]=1523
-.[0][1525]=1524
-.[0][1526]=1525
-.[0][1527]=1526
-.[0][1528]=1527
-.[0][1529]=1528
-.[0][1530]=1529
-.[0][1531]=1530
-.[0][1532]=1531
-.[0][1533]=1532
-.[0][1534]=1533
-.[0][1535]=1534
-.[0][1536]=1535
-.[0][1537]=1536
-.[0][1538]=1537
-.[0][1539]=1538
-.[0][1540]=1539
-.[0][1541]=1540
-.[0][1542]=1541
-.[0][1543]=1542
-.[0][1544]=1543
-.[0][1545]=1544
-.[0][1546]=1545
-.[0][1547]=1546
-.[0][1548]=1547
-.[0][1549]=1548
-.[0][1550]=1549
-.[0][1551]=1550
-.[0][1552]=1551
-.[0][1553]=1552
-.[0][1554]=1553
-.[0][1555]=1554
-.[0][1556]=1555
-.[0][1557]=1556
-.[0][1558]=1557
-.[0][1559]=1558
-.[0][1560]=1559
-.[0][1561]=1560
-.[0][1562]=1561
-.[0][1563]=1562
-.[0][1564]=1563
-.[0][1565]=1564
-.[0][1566]=1565
-.[0][1567]=1566
-.[0][1568]=1567
-.[0][1569]=1568
-.[0][1570]=1569
-.[0][1571]=1570
-.[0][1572]=1571
-.[0][1573]=1572
-.[0][1574]=1573
-.[0][1575]=1574
-.[0][1576]=1575
-.[0][1577]=1576
-.[0][1578]=1577
-.[0][1579]=1578
-.[0][1580]=1579
-.[0][1581]=1580
-.[0][1582]=1581
-.[0][1583]=1582
-.[0][1584]=1583
-.[0][1585]=1584
-.[0][1586]=1585
-.[0][1587]=1586
-.[0][1588]=1587
-.[0][1589]=1588
-.[0][1590]=1589
-.[0][1591]=1590
-.[0][1592]=1591
-.[0][1593]=1592
-.[0][1594]=1593
-.[0][1595]=1594
-.[0][1596]=1595
-.[0][1597]=1596
-.[0][1598]=1597
-.[0][1599]=1598
-.[0][1600]=1599
-.[0][1601]=1600
-.[0][1602]=1601
-.[0][1603]=1602
-.[0][1604]=1603
-.[0][1605]=1604
-.[0][1606]=1605
-.[0][1607]=1606
-.[0][1608]=1607
-.[0][1609]=1608
-.[0][1610]=1609
-.[0][1611]=1610
-.[0][1612]=1611
-.[0][1613]=1612
-.[0][1614]=1613
-.[0][1615]=1614
-.[0][1616]=1615
-.[0][1617]=1616
-.[0][1618]=1617
-.[0][1619]=1618
-.[0][1620]=1619
-.[0][1621]=1620
-.[0][1622]=1621
-.[0][1623]=1622
-.[0][1624]=1623
-.[0][1625]=1624
-.[0][1626]=1625
-.[0][1627]=1626
-.[0][1628]=1627
-.[0][1629]=1628
-.[0][1630]=1629
-.[0][1631]=1630
-.[0][1632]=1631
-.[0][1633]=1632
-.[0][1634]=1633
-.[0][1635]=1634
-.[0][1636]=1635
-.[0][1637]=1636
-.[0][1638]=1637
-.[0][1639]=1638
-.[0][1640]=1639
-.[0][1641]=1640
-.[0][1642]=1641
-.[0][1643]=1642
-.[0][1644]=1643
-.[0][1645]=1644
-.[0][1646]=1645
-.[0][1647]=1646
-.[0][1648]=1647
-.[0][1649]=1648
-.[0][1650]=1649
-.[0][1651]=1650
-.[0][1652]=1651
-.[0][1653]=1652
-.[0][1654]=1653
-.[0][1655]=1654
-.[0][1656]=1655
-.[0][1657]=1656
-.[0][1658]=1657
-.[0][1659]=1658
-.[0][1660]=1659
-.[0][1661]=1660
-.[0][1662]=1661
-.[0][1663]=1662
-.[0][1664]=1663
-.[0][1665]=1664
-.[0][1666]=1665
-.[0][1667]=1666
-.[0][1668]=1667
-.[0][1669]=1668
-.[0][1670]=1669
-.[0][1671]=1670
-.[0][1672]=1671
-.[0][1673]=1672
-.[0][1674]=1673
-.[0][1675]=1674
-.[0][1676]=1675
-.[0][1677]=1676
-.[0][1678]=1677
-.[0][1679]=1678
-.[0][1680]=1679
-.[0][1681]=1680
-.[0][1682]=1681
-.[0][1683]=1682
-.[0][1684]=1683
-.[0][1685]=1684
-.[0][1686]=1685
-.[0][1687]=1686
-.[0][1688]=1687
-.[0][1689]=1688
-.[0][1690]=1689
-.[0][1691]=1690
-.[0][1692]=1691
-.[0][1693]=1692
-.[0][1694]=1693
-.[0][1695]=1694
-.[0][1696]=1695
-.[0][1697]=1696
-.[0][1698]=1697
-.[0][1699]=1698
-.[0][1700]=1699
-.[0][1701]=1700
-.[0][1702]=1701
-.[0][1703]=1702
-.[0][1704]=1703
-.[0][1705]=1704
-.[0][1706]=1705
-.[0][1707]=1706
-.[0][1708]=1707
-.[0][1709]=1708
-.[0][1710]=1709
-.[0][1711]=1710
-.[0][1712]=1711
-.[0][1713]=1712
-.[0][1714]=1713
-.[0][1715]=1714
-.[0][1716]=1715
-.[0][1717]=1716
-.[0][1718]=1717
-.[0][1719]=1718
-.[0][1720]=1719
-.[0][1721]=1720
-.[0][1722]=1721
-.[0][1723]=1722
-.[0][1724]=1723
-.[0][1725]=1724
-.[0][1726]=1725
-.[0][1727]=1726
-.[0][1728]=1727
-.[0][1729]=1728
-.[0][1730]=1729
-.[0][1731]=1730
-.[0][1732]=1731
-.[0][1733]=1732
-.[0][1734]=1733
-.[0][1735]=1734
-.[0][1736]=1735
-.[0][1737]=1736
-.[0][1738]=1737
-.[0][1739]=1738
-.[0][1740]=1739
-.[0][1741]=1740
-.[0][1742]=1741
-.[0][1743]=1742
-.[0][1744]=1743
-.[0][1745]=1744
-.[0][1746]=1745
-.[0][1747]=1746
-.[0][1748]=1747
-.[0][1749]=1748
-.[0][1750]=1749
-.[0][1751]=1750
-.[0][1752]=1751
-.[0][1753]=1752
-.[0][1754]=1753
-.[0][1755]=1754
-.[0][1756]=1755
-.[0][1757]=1756
-.[0][1758]=1757
-.[0][1759]=1758
-.[0][1760]=1759
-.[0][1761]=1760
-.[0][1762]=1761
-.[0][1763]=1762
-.[0][1764]=1763
-.[0][1765]=1764
-.[0][1766]=1765
-.[0][1767]=1766
-.[0][1768]=1767
-.[0][1769]=1768
-.[0][1770]=1769
-.[0][1771]=1770
-.[0][1772]=1771
-.[0][1773]=1772
-.[0][1774]=1773
-.[0][1775]=1774
-.[0][1776]=1775
-.[0][1777]=1776
-.[0][1778]=1777
-.[0][1779]=1778
-.[0][1780]=1779
-.[0][1781]=1780
-.[0][1782]=1781
-.[0][1783]=1782
-.[0][1784]=1783
-.[0][1785]=1784
-.[0][1786]=1785
-.[0][1787]=1786
-.[0][1788]=1787
-.[0][1789]=1788
-.[0][1790]=1789
-.[0][1791]=1790
-.[0][1792]=1791
-.[0][1793]=1792
-.[0][1794]=1793
-.[0][1795]=1794
-.[0][1796]=1795
-.[0][1797]=1796
-.[0][1798]=1797
-.[0][1799]=1798
-.[0][1800]=1799
-.[0][1801]=1800
-.[0][1802]=1801
-.[0][1803]=1802
-.[0][1804]=1803
-.[0][1805]=1804
-.[0][1806]=1805
-.[0][1807]=1806
-.[0][1808]=1807
-.[0][1809]=1808
-.[0][1810]=1809
-.[0][1811]=1810
-.[0][1812]=1811
-.[0][1813]=1812
-.[0][1814]=1813
-.[0][1815]=1814
-.[0][1816]=1815
-.[0][1817]=1816
-.[0][1818]=1817
-.[0][1819]=1818
-.[0][1820]=1819
-.[0][1821]=1820
-.[0][1822]=1821
-.[0][1823]=1822
-.[0][1824]=1823
-.[0][1825]=1824
-.[0][1826]=1825
-.[0][1827]=1826
-.[0][1828]=1827
-.[0][1829]=1828
-.[0][1830]=1829
-.[0][1831]=1830
-.[0][1832]=1831
-.[0][1833]=1832
-.[0][1834]=1833
-.[0][1835]=1834
-.[0][1836]=1835
-.[0][1837]=1836
-.[0][1838]=1837
-.[0][1839]=1838
-.[0][1840]=1839
-.[0][1841]=1840
-.[0][1842]=1841
-.[0][1843]=1842
-.[0][1844]=1843
-.[0][1845]=1844
-.[0][1846]=1845
-.[0][1847]=1846
-.[0][1848]=1847
-.[0][1849]=1848
-.[0][1850]=1849
-.[0][1851]=1850
-.[0][1852]=1851
-.[0][1853]=1852
-.[0][1854]=1853
-.[0][1855]=1854
-.[0][1856]=1855
-.[0][1857]=1856
-.[0][1858]=1857
-.[0][1859]=1858
-.[0][1860]=1859
-.[0][1861]=1860
-.[0][1862]=1861
-.[0][1863]=1862
-.[0][1864]=1863
-.[0][1865]=1864
-.[0][1866]=1865
-.[0][1867]=1866
-.[0][1868]=1867
-.[0][1869]=1868
-.[0][1870]=1869
-.[0][1871]=1870
-.[0][1872]=1871
-.[0][1873]=1872
-.[0][1874]=1873
-.[0][1875]=1874
-.[0][1876]=1875
-.[0][1877]=1876
-.[0][1878]=1877
-.[0][1879]=1878
-.[0][1880]=1879
-.[0][1881]=1880
-.[0][1882]=1881
-.[0][1883]=1882
-.[0][1884]=1883
-.[0][1885]=1884
-.[0][1886]=1885
-.[0][1887]=1886
-.[0][1888]=1887
-.[0][1889]=1888
-.[0][1890]=1889
-.[0][1891]=1890
-.[0][1892]=1891
-.[0][1893]=1892
-.[0][1894]=1893
-.[0][1895]=1894
-.[0][1896]=1895
-.[0][1897]=1896
-.[0][1898]=1897
-.[0][1899]=1898
-.[0][1900]=1899
-.[0][1901]=1900
-.[0][1902]=1901
-.[0][1903]=1902
-.[0][1904]=1903
-.[0][1905]=1904
-.[0][1906]=1905
-.[0][1907]=1906
-.[0][1908]=1907
-.[0][1909]=1908
-.[0][1910]=1909
-.[0][1911]=1910
-.[0][1912]=1911
-.[0][1913]=1912
-.[0][1914]=1913
-.[0][1915]=1914
-.[0][1916]=1915
-.[0][1917]=1916
-.[0][1918]=1917
-.[0][1919]=1918
-.[0][1920]=1919
-.[0][1921]=1920
-.[0][1922]=1921
-.[0][1923]=1922
-.[0][1924]=1923
-.[0][1925]=1924
-.[0][1926]=1925
-.[0][1927]=1926
-.[0][1928]=1927
-.[0][1929]=1928
-.[0][1930]=1929
-.[0][1931]=1930
-.[0][1932]=1931
-.[0][1933]=1932
-.[0][1934]=1933
-.[0][1935]=1934
-.[0][1936]=1935
-.[0][1937]=1936
-.[0][1938]=1937
-.[0][1939]=1938
-.[0][1940]=1939
-.[0][1941]=1940
-.[0][1942]=1941
-.[0][1943]=1942
-.[0][1944]=1943
-.[0][1945]=1944
-.[0][1946]=1945
-.[0][1947]=1946
-.[0][1948]=1947
-.[0][1949]=1948
-.[0][1950]=1949
-.[0][1951]=1950
-.[0][1952]=1951
-.[0][1953]=1952
-.[0][1954]=1953
-.[0][1955]=1954
-.[0][1956]=1955
-.[0][1957]=1956
-.[0][1958]=1957
-.[0][1959]=1958
-.[0][1960]=1959
-.[0][1961]=1960
-.[0][1962]=1961
-.[0][1963]=1962
-.[0][1964]=1963
-.[0][1965]=1964
-.[0][1966]=1965
-.[0][1967]=1966
-.[0][1968]=1967
-.[0][1969]=1968
-.[0][1970]=1969
-.[0][1971]=1970
-.[0][1972]=1971
-.[0][1973]=1972
-.[0][1974]=1973
-.[0][1975]=1974
-.[0][1976]=1975
-.[0][1977]=1976
-.[0][1978]=1977
-.[0][1979]=1978
-.[0][1980]=1979
-.[0][1981]=1980
-.[0][1982]=1981
-.[0][1983]=1982
-.[0][1984]=1983
-.[0][1985]=1984
-.[0][1986]=1985
-.[0][1987]=1986
-.[0][1988]=1987
-.[0][1989]=1988
-.[0][1990]=1989
-.[0][1991]=1990
-.[0][1992]=1991
-.[0][1993]=1992
-.[0][1994]=1993
-.[0][1995]=1994
-.[0][1996]=1995
-.[0][1997]=1996
-.[0][1998]=1997
-.[0][1999]=1998
-.[0][2000]=1999
-.[0][2001]=2000
-.[0][2002]=2001
-.[0][2003]=2002
-.[0][2004]=2003
-.[0][2005]=2004
-.[0][2006]=2005
-.[0][2007]=2006
-.[0][2008]=2007
-.[0][2009]=2008
-.[0][2010]=2009
-.[0][2011]=2010
-.[0][2012]=2011
-.[0][2013]=2012
-.[0][2014]=2013
-.[0][2015]=2014
-.[0][2016]=2015
-.[0][2017]=2016
-.[0][2018]=2017
-.[0][2019]=2018
-.[0][2020]=2019
-.[0][2021]=2020
-.[0][2022]=2021
-.[0][2023]=2022
-.[0][2024]=2023
-.[0][2025]=2024
-.[0][2026]=2025
-.[0][2027]=2026
-.[0][2028]=2027
-.[0][2029]=2028
-.[0][2030]=2029
-.[0][2031]=2030
-.[0][2032]=2031
-.[0][2033]=2032
-.[0][2034]=2033
-.[0][2035]=2034
-.[0][2036]=2035
-.[0][2037]=2036
-.[0][2038]=2037
-.[0][2039]=2038
-.[0][2040]=2039
-.[0][2041]=2040
-.[0][2042]=2041
-.[0][2043]=2042
-.[0][2044]=2043
-.[0][2045]=2044
-.[0][2046]=2045
-.[0][2047]=2046
-.[0][2048]=2047
-.[0][2049]=2048
-.[0][2050]=2049
-.[0][2051]=2050
-.[0][2052]=2051
-.[0][2053]=2052
-.[0][2054]=2053
-.[0][2055]=2054
-.[0][2056]=2055
-.[0][2057]=2056
-.[0][2058]=2057
-.[0][2059]=2058
-.[0][2060]=2059
-.[0][2061]=2060
-.[0][2062]=2061
-.[0][2063]=2062
-.[0][2064]=2063
-.[0][2065]=2064
-.[0][2066]=2065
-.[0][2067]=2066
-.[0][2068]=2067
-.[0][2069]=2068
-.[0][2070]=2069
-.[0][2071]=2070
-.[0][2072]=2071
-.[0][2073]=2072
-.[0][2074]=2073
-.[0][2075]=2074
-.[0][2076]=2075
-.[0][2077]=2076
-.[0][2078]=2077
-.[0][2079]=2078
-.[0][2080]=2079
-.[0][2081]=2080
-.[0][2082]=2081
-.[0][2083]=2082
-.[0][2084]=2083
-.[0][2085]=2084
-.[0][2086]=2085
-.[0][2087]=2086
-.[0][2088]=2087
-.[0][2089]=2088
-.[0][2090]=2089
-.[0][2091]=2090
-.[0][2092]=2091
-.[0][2093]=2092
-.[0][2094]=2093
-.[0][2095]=2094
-.[0][2096]=2095
-.[0][2097]=2096
-.[0][2098]=2097
-.[0][2099]=2098
-.[0][2100]=2099
-.[0][2101]=2100
-.[0][2102]=2101
-.[0][2103]=2102
-.[0][2104]=2103
-.[0][2105]=2104
-.[0][2106]=2105
-.[0][2107]=2106
-.[0][2108]=2107
-.[0][2109]=2108
-.[0][2110]=2109
-.[0][2111]=2110
-.[0][2112]=2111
-.[0][2113]=2112
-.[0][2114]=2113
-.[0][2115]=2114
-.[0][2116]=2115
-.[0][2117]=2116
-.[0][2118]=2117
-.[0][2119]=2118
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_large_01.json b/src/3rd_party-static/jsoncpp/test/data/test_large_01.json
deleted file mode 100644
index e4ab4cd433..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_large_01.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[["A",0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1154,1155,1156,1157,1158,1159,1160,1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1328,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1367,1368,1369,1370,1371,1372,1373,1374,1375,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1417,1418,1419,1420,1421,1422,1423,1424,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1470,1471,1472,1473,1474,1475,1476,1477,1478,1479,1480,1481,1482,1483,1484,1485,1486,1487,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,1515,1516,1517,1518,1519,1520,1521,1522,1523,1524,1525,1526,1527,1528,1529,1530,1531,1532,1533,1534,1535,1536,1537,1538,1539,1540,1541,1542,1543,1544,1545,1546,1547,1548,1549,1550,1551,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1563,1564,1565,1566,1567,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,1641,1642,1643,1644,1645,1646,1647,1648,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747,1748,1749,1750,1751,1752,1753,1754,1755,1756,1757,1758,1759,1760,1761,1762,1763,1764,1765,1766,1767,1768,1769,1770,1771,1772,1773,1774,1775,1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1786,1787,1788,1789,1790,1791,1792,1793,1794,1795,1796,1797,1798,1799,1800,1801,1802,1803,1804,1805,1806,1807,1808,1809,1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1839,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1867,1868,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,1915,1916,1917,1918,1919,1920,1921,1922,1923,1924,1925,1926,1927,1928,1929,1930,1931,1932,1933,1934,1935,1936,1937,1938,1939,1940,1941,1942,1943,1944,1945,1946,1947,1948,1949,1950,1951,1952,1953,1954,1955,1956,1957,1958,1959,1960,1961,1962,1963,1964,1965,1966,1967,1968,1969,1970,1971,1972,1973,1974,1975,1976,1977,1978,1979,1980,1981,1982,1983,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033,2034,2035,2036,2037,2038,2039,2040,2041,2042,2043,2044,2045,2046,2047,2048,2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,2065,2066,2067,2068,2069,2070,2071,2072,2073,2074,2075,2076,2077,2078,2079,2080,2081,2082,2083,2084,2085,2086,2087,2088,2089,2090,2091,2092,2093,2094,2095,2096,2097,2098,2099,2100,2101,2102,2103,2104,2105,2106,2107,2108,2109,2110,2111,2112,2113,2114,2115,2116,2117,2118]
-]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_object_01.expected
deleted file mode 100644
index 8e0634ef09..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_01.expected
+++ /dev/null
@@ -1 +0,0 @@
-.={}

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_01.json b/src/3rd_party-static/jsoncpp/test/data/test_object_01.json
deleted file mode 100644
index 69a88e3b65..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_01.json
+++ /dev/null
@@ -1 +0,0 @@
-{}

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_object_02.expected
deleted file mode 100644
index 2c9de063ee..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_02.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.={}

-.count=1234

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_02.json b/src/3rd_party-static/jsoncpp/test/data/test_object_02.json
deleted file mode 100644
index bd157ec4e2..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_02.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "count" : 1234 }

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_object_03.expected
deleted file mode 100644
index 235a28e3db..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_03.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-.={}

-.attribute="random"

-.count=1234

-.name="test"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_03.json b/src/3rd_party-static/jsoncpp/test/data/test_object_03.json
deleted file mode 100644
index 0947a44da6..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_03.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ 

-	"count" : 1234,

-	"name" : "test",

-	"attribute" : "random"

-}

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_04.expected b/src/3rd_party-static/jsoncpp/test/data/test_object_04.expected
deleted file mode 100644
index cf4d7c3e4b..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_04.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.={}

-.=1234

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_object_04.json b/src/3rd_party-static/jsoncpp/test/data/test_object_04.json
deleted file mode 100644
index f1e364ae8e..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_object_04.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{ 

-	"" : 1234

-}

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_preserve_comment_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_preserve_comment_01.expected
deleted file mode 100644
index b5616a970f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_preserve_comment_01.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-.={}

-.first=1

-.second=2

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_preserve_comment_01.json b/src/3rd_party-static/jsoncpp/test/data/test_preserve_comment_01.json
deleted file mode 100644
index 0291fff000..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_preserve_comment_01.json
+++ /dev/null
@@ -1,14 +0,0 @@
-/* A comment

-   at the beginning of the file.

- */

-{

-   "first" : 1, // comment after 'first' on the same line

-

-/* Comment before 'second'

- */

-   "second" : 2

-}

-

-/* A comment at 

-   the end of the file.

- */

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_01.expected
deleted file mode 100644
index 57dee39e1c..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_01.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=8589934592

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_01.json b/src/3rd_party-static/jsoncpp/test/data/test_real_01.json
deleted file mode 100644
index 5cb1bbf807..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_01.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// 2^33 => out of integer range, switch to double

-8589934592

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_02.expected
deleted file mode 100644
index 181592a3e3..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_02.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=-4294967295

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_02.json b/src/3rd_party-static/jsoncpp/test/data/test_real_02.json
deleted file mode 100644
index 45092efc9a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_02.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// -2^32 => out of signed integer range, switch to double

--4294967295

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_03.expected
deleted file mode 100644
index 181592a3e3..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_03.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=-4294967295

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_03.json b/src/3rd_party-static/jsoncpp/test/data/test_real_03.json
deleted file mode 100644
index 45092efc9a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_03.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// -2^32 => out of signed integer range, switch to double

--4294967295

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_04.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_04.expected
deleted file mode 100644
index 2f84bf1527..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_04.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.=1.2345678

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_04.json b/src/3rd_party-static/jsoncpp/test/data/test_real_04.json
deleted file mode 100644
index 7e71794a9f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_04.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// 1.2345678

-12345678e-7

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_05.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_05.expected
deleted file mode 100644
index 168f6e8277..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_05.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-.=1234567.8

-

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_05.json b/src/3rd_party-static/jsoncpp/test/data/test_real_05.json
deleted file mode 100644
index 950f6a78e6..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_05.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// 1234567.8

-0.12345678e7

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_06.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_06.expected
deleted file mode 100644
index 45906e3154..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_06.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-.=-1.2345678

-

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_06.json b/src/3rd_party-static/jsoncpp/test/data/test_real_06.json
deleted file mode 100644
index dde1916134..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_06.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// -1.2345678

--12345678e-7

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_07.expected b/src/3rd_party-static/jsoncpp/test/data/test_real_07.expected
deleted file mode 100644
index f2922f94bc..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_07.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-.=-1234567.8

-

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_real_07.json b/src/3rd_party-static/jsoncpp/test/data/test_real_07.json
deleted file mode 100644
index dd43ba7caf..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_real_07.json
+++ /dev/null
@@ -1,3 +0,0 @@
-// -1234567.8

--0.12345678e7

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_01.expected
deleted file mode 100644
index 8fd37b1e0e..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_01.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_01.json b/src/3rd_party-static/jsoncpp/test/data/test_string_01.json
deleted file mode 100644
index c8c059ba5e..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_01.json
+++ /dev/null
@@ -1 +0,0 @@
-"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_02.expected
deleted file mode 100644
index 0443bc3649..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_02.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_02.json b/src/3rd_party-static/jsoncpp/test/data/test_string_02.json
deleted file mode 100644
index f0fe56a650..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_02.json
+++ /dev/null
@@ -1 +0,0 @@
-"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_03.expected
deleted file mode 100644
index 6ed627a850..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_03.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="http://jsoncpp.sourceforge.net/"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_03.json b/src/3rd_party-static/jsoncpp/test/data/test_string_03.json
deleted file mode 100644
index f0a220fce3..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_03.json
+++ /dev/null
@@ -1 +0,0 @@
-"http:\/\/jsoncpp.sourceforge.net\/"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_01.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_01.expected
deleted file mode 100644
index 447f85a30f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_01.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="a"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_01.json b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_01.json
deleted file mode 100644
index 024114bc09..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_01.json
+++ /dev/null
@@ -1 +0,0 @@
-"\u0061"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_02.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_02.expected
deleted file mode 100644
index c0b3b43ba3..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_02.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="¢"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_02.json b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_02.json
deleted file mode 100644
index 4961024fab..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_02.json
+++ /dev/null
@@ -1 +0,0 @@
-"\u00A2"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_03.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_03.expected
deleted file mode 100644
index 7289743ecf..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_03.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="€"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_03.json b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_03.json
deleted file mode 100644
index e7e1a9e138..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_03.json
+++ /dev/null
@@ -1 +0,0 @@
-"\u20AC"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_04.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_04.expected
deleted file mode 100644
index 868fbc3309..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_04.expected
+++ /dev/null
@@ -1 +0,0 @@
-.="𝄞"

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_04.json b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_04.json
deleted file mode 100644
index dae65c5155..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_04.json
+++ /dev/null
@@ -1 +0,0 @@
-"\uD834\uDD1E"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_05.expected b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_05.expected
deleted file mode 100644
index 19b2c403b8..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_05.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-.="Zażółć gęślą jaźń"

-

diff --git a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_05.json b/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_05.json
deleted file mode 100644
index 8770410946..0000000000
--- a/src/3rd_party-static/jsoncpp/test/data/test_string_unicode_05.json
+++ /dev/null
@@ -1 +0,0 @@
-"Zażółć gęślą jaźń"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/generate_expected.py b/src/3rd_party-static/jsoncpp/test/generate_expected.py
deleted file mode 100644
index 5b215c4670..0000000000
--- a/src/3rd_party-static/jsoncpp/test/generate_expected.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import glob
-import os.path
-for path in glob.glob( '*.json' ):
-    text = file(path,'rt').read()
-    target = os.path.splitext(path)[0] + '.expected'
-    if os.path.exists( target ):
-        print 'skipping:', target
-    else:
-        print 'creating:', target
-        file(target,'wt').write(text)
-
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail1.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail1.json
deleted file mode 100644
index 6216b865f1..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail1.json
+++ /dev/null
@@ -1 +0,0 @@
-"A JSON payload should be an object or array, not a string."
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail10.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail10.json
deleted file mode 100644
index 5d8c0047bd..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra value after close": true} "misplaced quoted value"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail11.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail11.json
deleted file mode 100644
index 76eb95b458..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail11.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal expression": 1 + 2}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail12.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail12.json
deleted file mode 100644
index 77580a4522..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail12.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Illegal invocation": alert()}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail13.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail13.json
deleted file mode 100644
index 379406b59b..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail13.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot have leading zeroes": 013}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail14.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail14.json
deleted file mode 100644
index 0ed366b38a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail14.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Numbers cannot be hex": 0x14}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail15.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail15.json
deleted file mode 100644
index fc8376b605..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail15.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \x15"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail16.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail16.json
deleted file mode 100644
index 3fe21d4b53..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail16.json
+++ /dev/null
@@ -1 +0,0 @@
-[\naked]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail17.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail17.json
deleted file mode 100644
index 62b9214aed..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail17.json
+++ /dev/null
@@ -1 +0,0 @@
-["Illegal backslash escape: \017"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail18.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail18.json
deleted file mode 100644
index edac92716f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail18.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail19.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail19.json
deleted file mode 100644
index 3b9c46fa9a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail19.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Missing colon" null}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail2.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail2.json
deleted file mode 100644
index 6b7c11e5a5..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail2.json
+++ /dev/null
@@ -1 +0,0 @@
-["Unclosed array"
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail20.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail20.json
deleted file mode 100644
index 27c1af3e72..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail20.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Double colon":: null}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail21.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail21.json
deleted file mode 100644
index 62474573b2..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail21.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead of colon", null}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail22.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail22.json
deleted file mode 100644
index a7752581bc..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail22.json
+++ /dev/null
@@ -1 +0,0 @@
-["Colon instead of comma": false]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail23.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail23.json
deleted file mode 100644
index 494add1ca1..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail23.json
+++ /dev/null
@@ -1 +0,0 @@
-["Bad value", truth]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail24.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail24.json
deleted file mode 100644
index caff239bfc..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail24.json
+++ /dev/null
@@ -1 +0,0 @@
-['single quote']
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail25.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail25.json
deleted file mode 100644
index 8b7ad23e01..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail25.json
+++ /dev/null
@@ -1 +0,0 @@
-["	tab	character	in	string	"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail26.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail26.json
deleted file mode 100644
index 845d26a6a5..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail26.json
+++ /dev/null
@@ -1 +0,0 @@
-["tab\   character\   in\  string\  "]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail27.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail27.json
deleted file mode 100644
index 6b01a2ca4a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail27.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line
-break"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail28.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail28.json
deleted file mode 100644
index 621a0101c6..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail28.json
+++ /dev/null
@@ -1,2 +0,0 @@
-["line\
-break"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail29.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail29.json
deleted file mode 100644
index 47ec421bb6..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail29.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail3.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail3.json
deleted file mode 100644
index 168c81eb78..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail3.json
+++ /dev/null
@@ -1 +0,0 @@
-{unquoted_key: "keys must be quoted"}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail30.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail30.json
deleted file mode 100644
index 8ab0bc4b8b..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail30.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail31.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail31.json
deleted file mode 100644
index 1cce602b51..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail31.json
+++ /dev/null
@@ -1 +0,0 @@
-[0e+-1]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail32.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail32.json
deleted file mode 100644
index 45cba7396f..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail32.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Comma instead if closing brace": true,
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail33.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail33.json
deleted file mode 100644
index ca5eb19dc9..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail33.json
+++ /dev/null
@@ -1 +0,0 @@
-["mismatch"}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail4.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail4.json
deleted file mode 100644
index 9de168bf34..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail4.json
+++ /dev/null
@@ -1 +0,0 @@
-["extra comma",]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail5.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail5.json
deleted file mode 100644
index ddf3ce3d24..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail5.json
+++ /dev/null
@@ -1 +0,0 @@
-["double extra comma",,]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail6.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail6.json
deleted file mode 100644
index ed91580e1b..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail6.json
+++ /dev/null
@@ -1 +0,0 @@
-[   , "<-- missing value"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail7.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail7.json
deleted file mode 100644
index 8a96af3e4e..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail7.json
+++ /dev/null
@@ -1 +0,0 @@
-["Comma after the close"],
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail8.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail8.json
deleted file mode 100644
index b28479c6ec..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail8.json
+++ /dev/null
@@ -1 +0,0 @@
-["Extra close"]]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail9.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/fail9.json
deleted file mode 100644
index 5815574f36..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/fail9.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Extra comma": true,}
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/pass1.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/pass1.json
deleted file mode 100644
index 70e2685436..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/pass1.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "":  23456789012E66,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "0123456789": "digit",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.JSON.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],"compact":[1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066,
-1e1,
-0.1e1,
-1e-1,
-1e00,2e+00,2e-00
-,"rosebud"]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/pass2.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/pass2.json
deleted file mode 100644
index d3c63c7ad8..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/pass2.json
+++ /dev/null
@@ -1 +0,0 @@
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/pass3.json b/src/3rd_party-static/jsoncpp/test/jsonchecker/pass3.json
deleted file mode 100644
index 4528d51f1a..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/pass3.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}
diff --git a/src/3rd_party-static/jsoncpp/test/jsonchecker/readme.txt b/src/3rd_party-static/jsoncpp/test/jsonchecker/readme.txt
deleted file mode 100644
index 321d89d998..0000000000
--- a/src/3rd_party-static/jsoncpp/test/jsonchecker/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Test suite from http://json.org/JSON_checker/.
-
-If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.
diff --git a/src/3rd_party-static/jsoncpp/test/pyjsontestrunner.py b/src/3rd_party-static/jsoncpp/test/pyjsontestrunner.py
deleted file mode 100644
index 504f3db2e7..0000000000
--- a/src/3rd_party-static/jsoncpp/test/pyjsontestrunner.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Simple implementation of a json test runner to run the test against json-py.
-
-import sys
-import os.path
-import json
-import types
-
-if len(sys.argv) != 2:
-    print "Usage: %s input-json-file", sys.argv[0]
-    sys.exit(3)
-    
-input_path = sys.argv[1]
-base_path = os.path.splitext(input_path)[0]
-actual_path = base_path + '.actual'
-rewrite_path = base_path + '.rewrite'
-rewrite_actual_path = base_path + '.actual-rewrite'
-
-def valueTreeToString( fout, value, path = '.' ):
-    ty = type(value) 
-    if ty  is types.DictType:
-        fout.write( '%s={}\n' % path )
-        suffix = path[-1] != '.' and '.' or ''
-        names = value.keys()
-        names.sort()
-        for name in names:
-            valueTreeToString( fout, value[name], path + suffix + name )
-    elif ty is types.ListType:
-        fout.write( '%s=[]\n' % path )
-        for index, childValue in zip( xrange(0,len(value)), value ):
-            valueTreeToString( fout, childValue, path + '[%d]' % index )
-    elif ty is types.StringType:
-        fout.write( '%s="%s"\n' % (path,value) )
-    elif ty is types.IntType:
-        fout.write( '%s=%d\n' % (path,value) )
-    elif ty is types.FloatType:
-        fout.write( '%s=%.16g\n' % (path,value) )
-    elif value is True:
-        fout.write( '%s=true\n' % path )
-    elif value is False:
-        fout.write( '%s=false\n' % path )
-    elif value is None:
-        fout.write( '%s=null\n' % path )
-    else:
-        assert False and "Unexpected value type"
-        
-def parseAndSaveValueTree( input, actual_path ):
-    root = json.loads( input )
-    fout = file( actual_path, 'wt' )
-    valueTreeToString( fout, root )
-    fout.close()
-    return root
-
-def rewriteValueTree( value, rewrite_path ):
-    rewrite = json.dumps( value )
-    #rewrite = rewrite[1:-1]  # Somehow the string is quoted ! jsonpy bug ?
-    file( rewrite_path, 'wt').write( rewrite + '\n' )
-    return rewrite
-    
-input = file( input_path, 'rt' ).read()
-root = parseAndSaveValueTree( input, actual_path )
-rewrite = rewriteValueTree( json.write( root ), rewrite_path )
-rewrite_root = parseAndSaveValueTree( rewrite, rewrite_actual_path )
-
-sys.exit( 0 )
diff --git a/src/3rd_party-static/jsoncpp/test/runjsontests.py b/src/3rd_party-static/jsoncpp/test/runjsontests.py
deleted file mode 100644
index ffe8bd51ea..0000000000
--- a/src/3rd_party-static/jsoncpp/test/runjsontests.py
+++ /dev/null
@@ -1,134 +0,0 @@
-import sys
-import os
-import os.path
-from glob import glob
-import optparse
-
-VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes '
-
-def compareOutputs( expected, actual, message ):
-    expected = expected.strip().replace('\r','').split('\n')
-    actual = actual.strip().replace('\r','').split('\n')
-    diff_line = 0
-    max_line_to_compare = min( len(expected), len(actual) )
-    for index in xrange(0,max_line_to_compare):
-        if expected[index].strip() != actual[index].strip():
-            diff_line = index + 1
-            break
-    if diff_line == 0 and len(expected) != len(actual):
-        diff_line = max_line_to_compare+1
-    if diff_line == 0:
-        return None
-    def safeGetLine( lines, index ):
-        index += -1
-        if index >= len(lines):
-            return ''
-        return lines[index].strip()
-    return """  Difference in %s at line %d:
-  Expected: '%s'
-  Actual:   '%s'
-""" % (message, diff_line,
-       safeGetLine(expected,diff_line),
-       safeGetLine(actual,diff_line) )
-        
-def safeReadFile( path ):
-    try:
-        return file( path, 'rt' ).read()
-    except IOError, e:
-        return '<File "%s" is missing: %s>' % (path,e)
-
-def runAllTests( jsontest_executable_path, input_dir = None,
-                 use_valgrind=False, with_json_checker=False ):
-    if not input_dir:
-        input_dir = os.path.join( os.getcwd(), 'data' )
-    tests = glob( os.path.join( input_dir, '*.json' ) )
-    if with_json_checker:
-        test_jsonchecker = glob( os.path.join( input_dir, '../jsonchecker', '*.json' ) )
-    else:
-        test_jsonchecker = []
-    failed_tests = []
-    valgrind_path = use_valgrind and VALGRIND_CMD or ''
-    for input_path in tests + test_jsonchecker:
-        expect_failure = os.path.basename( input_path ).startswith( 'fail' )
-        is_json_checker_test = (input_path in test_jsonchecker) or expect_failure
-        print 'TESTING:', input_path,
-        options = is_json_checker_test and '--json-checker' or ''
-        pipe = os.popen( "%s%s %s %s" % (
-            valgrind_path, jsontest_executable_path, options,
-            input_path) )
-        process_output = pipe.read()
-        status = pipe.close()
-        if is_json_checker_test:
-            if expect_failure:
-                if status is None:
-                    print 'FAILED'
-                    failed_tests.append( (input_path, 'Parsing should have failed:\n%s' %
-                                          safeReadFile(input_path)) )
-                else:
-                    print 'OK'
-            else:
-                if status is not None:
-                    print 'FAILED'
-                    failed_tests.append( (input_path, 'Parsing failed:\n' + process_output) )
-                else:
-                    print 'OK'
-        else:
-            base_path = os.path.splitext(input_path)[0]
-            actual_output = safeReadFile( base_path + '.actual' )
-            actual_rewrite_output = safeReadFile( base_path + '.actual-rewrite' )
-            file(base_path + '.process-output','wt').write( process_output )
-            if status:
-                print 'parsing failed'
-                failed_tests.append( (input_path, 'Parsing failed:\n' + process_output) )
-            else:
-                expected_output_path = os.path.splitext(input_path)[0] + '.expected'
-                expected_output = file( expected_output_path, 'rt' ).read()
-                detail = ( compareOutputs( expected_output, actual_output, 'input' )
-                            or compareOutputs( expected_output, actual_rewrite_output, 'rewrite' ) )
-                if detail:
-                    print 'FAILED'
-                    failed_tests.append( (input_path, detail) )
-                else:
-                    print 'OK'
-
-    if failed_tests:
-        print
-        print 'Failure details:'
-        for failed_test in failed_tests:
-            print '* Test', failed_test[0]
-            print failed_test[1]
-            print
-        print 'Test results: %d passed, %d failed.' % (len(tests)-len(failed_tests),
-                                                       len(failed_tests) )
-        return 1
-    else:
-        print 'All %d tests passed.' % len(tests)
-        return 0
-
-def main():
-    from optparse import OptionParser
-    parser = OptionParser( usage="%prog [options] <path to jsontestrunner.exe> [test case directory]" )
-    parser.add_option("--valgrind",
-                  action="store_true", dest="valgrind", default=False,
-                  help="run all the tests using valgrind to detect memory leaks")
-    parser.add_option("-c", "--with-json-checker",
-                  action="store_true", dest="with_json_checker", default=False,
-                  help="run all the tests from the official JSONChecker test suite of json.org")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-
-    if len(args) < 1 or len(args) > 2:
-        parser.error( 'Must provides at least path to jsontestrunner executable.' )
-        sys.exit( 1 )
-
-    jsontest_executable_path = os.path.normpath( os.path.abspath( args[0] ) )
-    if len(args) > 1:
-        input_path = os.path.normpath( os.path.abspath( args[1] ) )
-    else:
-        input_path = None
-    status = runAllTests( jsontest_executable_path, input_path,
-                          use_valgrind=options.valgrind, with_json_checker=options.with_json_checker )
-    sys.exit( status )
-
-if __name__ == '__main__':
-    main()
diff --git a/src/3rd_party-static/jsoncpp/test/rununittests.py b/src/3rd_party-static/jsoncpp/test/rununittests.py
deleted file mode 100644
index 366184cfb5..0000000000
--- a/src/3rd_party-static/jsoncpp/test/rununittests.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import sys
-import os
-import os.path
-import subprocess
-from glob import glob
-import optparse
-
-VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes'
-
-class TestProxy(object):
-    def __init__( self, test_exe_path, use_valgrind=False ):
-        self.test_exe_path = os.path.normpath( os.path.abspath( test_exe_path ) )
-        self.use_valgrind = use_valgrind
-
-    def run( self, options ):
-        if self.use_valgrind:
-            cmd = VALGRIND_CMD.split()
-        else:
-            cmd = []
-        cmd.extend( [self.test_exe_path, '--test-auto'] + options )
-        process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
-        stdout = process.communicate()[0]
-        if process.returncode:
-            return False, stdout
-        return True, stdout
-
-def runAllTests( exe_path, use_valgrind=False ):
-    test_proxy = TestProxy( exe_path, use_valgrind=use_valgrind )
-    status, test_names = test_proxy.run( ['--list-tests'] )
-    if not status:
-        print >> sys.stderr, "Failed to obtain unit tests list:\n" + test_names
-        return 1
-    test_names = [name.strip() for name in test_names.strip().split('\n')]
-    failures = []
-    for name in test_names:
-        print 'TESTING %s:' % name,
-        succeed, result = test_proxy.run( ['--test', name] )
-        if succeed:
-            print 'OK'
-        else:
-            failures.append( (name, result) )
-            print 'FAILED'
-    failed_count = len(failures)
-    pass_count = len(test_names) - failed_count
-    if failed_count:
-        print
-        for name, result in failures:
-            print result
-        print '%d/%d tests passed (%d failure(s))' % (
-            pass_count, len(test_names), failed_count)
-        return 1
-    else:
-        print 'All %d tests passed' % len(test_names)
-        return 0
-
-def main():
-    from optparse import OptionParser
-    parser = OptionParser( usage="%prog [options] <path to test_lib_json.exe>" )
-    parser.add_option("--valgrind",
-                  action="store_true", dest="valgrind", default=False,
-                  help="run all the tests using valgrind to detect memory leaks")
-    parser.enable_interspersed_args()
-    options, args = parser.parse_args()
-
-    if len(args) != 1:
-        parser.error( 'Must provides at least path to test_lib_json executable.' )
-        sys.exit( 1 )
-
-    exit_code = runAllTests( args[0], use_valgrind=options.valgrind )
-    sys.exit( exit_code )
-
-if __name__ == '__main__':
-    main()
diff --git a/src/3rd_party-static/jsoncpp/version b/src/3rd_party-static/jsoncpp/version
deleted file mode 100644
index 673adfb9f2..0000000000
--- a/src/3rd_party-static/jsoncpp/version
+++ /dev/null
@@ -1 +0,0 @@
-0.6.0-rc2
\ No newline at end of file
diff --git a/src/3rd_party-static/test/json_reader_test.cc b/src/3rd_party-static/test/json_reader_test.cc
index 75001af6b7..ca82ff9220 100644
--- a/src/3rd_party-static/test/json_reader_test.cc
+++ b/src/3rd_party-static/test/json_reader_test.cc
@@ -32,7 +32,7 @@
 
 
 #include "gtest/gtest.h"
-#include "json/reader.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 
 namespace test {
 namespace third_party_libs {
@@ -62,9 +62,9 @@ class JSONReaderTest : public ::testing::Test {
   std::string comaString_;
   std::string colonString_;
 
-  Json::Reader reader;
   Json::Value json;
-
+public:
+  bool Parse(const std::string &str);
 };
 
 void JSONReaderTest::SetUp()
@@ -88,72 +88,78 @@ void JSONReaderTest::SetUp()
   colonString_ = "{\"field\" : \"va:lue\" }";
 }
 
-TEST_F(JSONReaderTest, ParseNormalString) {
-  ASSERT_TRUE(reader.parse(normalString_, json));
+bool JSONReaderTest::Parse(const std::string &str)
+{
+  utils::JsonReader reader;
+  return reader.parse(str, &json);
 }
 
-TEST_F(JSONReaderTest, ParseBackspaceString) {
-  ASSERT_TRUE(reader.parse(backspaceString_, json));
+TEST_F(JSONReaderTest, Parse_NormalString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(normalString_));
 }
 
-TEST_F(JSONReaderTest, ParseFormFeedString) {
-  ASSERT_TRUE(reader.parse(formfeedString_, json));
+TEST_F(JSONReaderTest, Parse_BackspaceString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(backspaceString_));
+}
 
+TEST_F(JSONReaderTest, Parse_FormFeedString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(formfeedString_));
 }
 
-TEST_F(JSONReaderTest, ParseLineFeedString) {
-  ASSERT_TRUE(reader.parse(linefeedString_, json));
+TEST_F(JSONReaderTest, Parse_LineFeedString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(linefeedString_));
 }
 
-TEST_F(JSONReaderTest, ParseReturnString) {
-  ASSERT_TRUE(reader.parse(returnString_, json));
+TEST_F(JSONReaderTest, ParseReturnString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(returnString_));
 }
 
-TEST_F(JSONReaderTest, ParseTabString) {
-  ASSERT_TRUE(reader.parse(tabString_, json));
+TEST_F(JSONReaderTest, Parse_TabString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(tabString_));
 }
 
-TEST_F(JSONReaderTest, ParseBellString) {
-  ASSERT_TRUE(reader.parse(bellString_, json));
+TEST_F(JSONReaderTest, Parse_BellString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(bellString_));
 }
 
-TEST_F(JSONReaderTest, ParseQuoteString) {
-  ASSERT_FALSE(reader.parse(quoteString_, json));
+TEST_F(JSONReaderTest, Parse_QuoteString_ExpectUnsuccessfulParsing) {
+  ASSERT_FALSE(Parse(quoteString_));
 }
 
-TEST_F(JSONReaderTest, ParseSlashString) {
-  ASSERT_TRUE(reader.parse(slashString_, json));
+TEST_F(JSONReaderTest, Parse_SlashString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(slashString_));
 }
 
-TEST_F(JSONReaderTest, ParseBackslashString) {
-  ASSERT_FALSE(reader.parse(backslashString_, json));
+TEST_F(JSONReaderTest, Parse_BackslashString_ExpectUnsuccessfulParsing) {
+  ASSERT_FALSE(Parse(backslashString_));
 }
 
-TEST_F(JSONReaderTest, ParseSinglequoteString) {
-  ASSERT_TRUE(reader.parse(singlequoteString_, json));
+TEST_F(JSONReaderTest, Parse_SinglequoteString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(singlequoteString_));
 }
 
-TEST_F(JSONReaderTest, ParseColonString) {
-  ASSERT_TRUE(reader.parse(colonString_, json));
+TEST_F(JSONReaderTest, Parse_ColonString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(colonString_));
 }
 
-TEST_F(JSONReaderTest, ParseComaString) {
-  ASSERT_TRUE(reader.parse(comaString_, json));
+TEST_F(JSONReaderTest, Parse_ComaString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(comaString_));
 }
 
-TEST_F(JSONReaderTest, ParseOpeningbraceString) {
-  ASSERT_TRUE(reader.parse(openingbraceString_, json));
+TEST_F(JSONReaderTest, Parse_OpeningbraceString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(openingbraceString_));
 }
 
-TEST_F(JSONReaderTest, ParseClosingbraceString) {
-  ASSERT_TRUE(reader.parse(closingbraceString_, json));
+TEST_F(JSONReaderTest, Parse_ClosingbraceString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(closingbraceString_));
 }
 
-TEST_F(JSONReaderTest, ParseOpeningbracketString) {
-  ASSERT_TRUE(reader.parse(openingbracketString_, json));
+TEST_F(JSONReaderTest, Parse_OpeningbracketString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(openingbracketString_));
 }
-TEST_F(JSONReaderTest, ParseClosingbracketString) {
-  ASSERT_TRUE(reader.parse(closingbracketString_, json));
+
+TEST_F(JSONReaderTest, Parse_ClosingbracketString_ExpectSuccessfulParsing) {
+  ASSERT_TRUE(Parse(closingbracketString_));
 }
 
 }  //  namespace json_reader_test
diff --git a/src/3rd_party/CMakeLists.txt b/src/3rd_party/CMakeLists.txt
index 951c437e59..4415a1bd7b 100644
--- a/src/3rd_party/CMakeLists.txt
+++ b/src/3rd_party/CMakeLists.txt
@@ -41,9 +41,9 @@ endif()
 
 if(FORCE_3RD_PARTY)
   if(NO_REBUILD_3RD_PARTY)
-  	message(FATAL_ERROR "Please don't turn on both FORCE_3RD_PARTY and NO_REBUILD_3RD_PARTY at the same time.")
+    message(FATAL_ERROR "Please don't turn on both FORCE_3RD_PARTY and NO_REBUILD_3RD_PARTY at the same time.")
   else()
-	set(FORCE_3RD_PARTY_LOGGER ON)
+    set(FORCE_3RD_PARTY_LOGGER ON)
   endif()
 endif()
 
@@ -55,13 +55,18 @@ if(ENABLE_LOG)
   if(NO_REBUILD_3RD_PARTY_LOGGER)
     message(STATUS "Not rebuilding logger.")
   else()
+    set(LOGGER_INSTALL_COMMAND make install)
+    if (${USE_DEFAULT_3RD_PARTY_PATH} STREQUAL "true")
+      set(LOGGER_INSTALL_COMMAND sudo make install)
+    endif()
     if(FORCE_3RD_PARTY_LOGGER)
       message(STATUS "Force to rebuild logger.")
 
       #build logger
       add_custom_target(3rd_party_logger
         make
-        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}
+        DEPENDS apr-util
+        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake
       )
 
       #install logger
@@ -71,12 +76,15 @@ if(ENABLE_LOG)
         COMMAND /bin/bash -c \"USE_DEFAULT_3RD_PARTY_PATH=${USE_DEFAULT_3RD_PARTY_PATH}\;
                                if [ \\$$USE_DEFAULT_3RD_PARTY_PATH == "true" ]\; then
                                  sudo -k \;
-                                 sudo make install\;
-                               else
-                                 make install\;
-                               fi\"
+                               fi\;
+                               cd ${3RD_PARTY_BINARY_DIRECTORY}/apr-cmake\;
+                               ${LOGGER_INSTALL_COMMAND}\;
+                               cd ${3RD_PARTY_BINARY_DIRECTORY}/apr-util-cmake\;
+                               ${LOGGER_INSTALL_COMMAND}\;
+                               cd ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake\;
+                               ${LOGGER_INSTALL_COMMAND}\"
         DEPENDS 3rd_party_logger
-        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}
+        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake
       )
     else()
       #build logger
@@ -94,17 +102,18 @@ if(ENABLE_LOG)
                                  fi\;
                                  if [ \\$$VAR1 != \\$$VAR2 ]\; then
                                    echo " Need to rebuild logger. " \;
-                                   cd ${3RD_PARTY_BINARY_DIRECTORY}\;
+                                   cd ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake\;
                                    make\;
                                  else
                                    echo " Logger is actual. " \;
                                  fi\;
                                else
                                  echo " Need to build logger. " \;
-                                 cd ${3RD_PARTY_BINARY_DIRECTORY}\;
+                                 cd ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake\;
                                  make\;
                                fi\"
-        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}
+        DEPENDS apr-util
+        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-build
       )
 
       #install logger
@@ -125,27 +134,29 @@ if(ENABLE_LOG)
                                  if [ \\$$VAR1 != \\$$VAR2 ]\; then
                                    USE_DEFAULT_3RD_PARTY_PATH=${USE_DEFAULT_3RD_PARTY_PATH}\;
                                    if [ \\$$USE_DEFAULT_3RD_PARTY_PATH == "true" ]\; then
-                                     cd ${3RD_PARTY_BINARY_DIRECTORY}\;
                                      sudo -k \;
-                                     sudo make install\;
-                                   else
-                                     cd ${3RD_PARTY_BINARY_DIRECTORY}\;
-                                     make install\;
                                    fi\;
+                                   cd ${3RD_PARTY_BINARY_DIRECTORY}/apr-cmake\;
+                                   ${LOGGER_INSTALL_COMMAND}\;
+                                   cd ${3RD_PARTY_BINARY_DIRECTORY}/apr-util-cmake\;
+                                   ${LOGGER_INSTALL_COMMAND}\;
+                                   cd ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake\;
+                                   ${LOGGER_INSTALL_COMMAND}\;
                                  fi\;
                                else
                                  USE_DEFAULT_3RD_PARTY_PATH=${USE_DEFAULT_3RD_PARTY_PATH}\;
                                  if [ \\$$USE_DEFAULT_3RD_PARTY_PATH == "true" ]\; then
-                                   cd ${3RD_PARTY_BINARY_DIRECTORY}\;
                                    sudo -k \;
-                                   sudo make install\;
-                                 else
-                                   cd ${3RD_PARTY_BINARY_DIRECTORY}\;
-                                   make install\;
                                  fi\;
+                                 cd ${3RD_PARTY_BINARY_DIRECTORY}/apr-cmake\;
+                                 ${LOGGER_INSTALL_COMMAND}\;
+                                 cd ${3RD_PARTY_BINARY_DIRECTORY}/apr-util-cmake\;
+                                 ${LOGGER_INSTALL_COMMAND}\;
+                                 cd ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-cmake\;
+                                 ${LOGGER_INSTALL_COMMAND}\;
                                fi\"
         DEPENDS 3rd_party_logger
-        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}
+        WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}/apache-log4cxx-build
       )
     endif()
 
@@ -238,8 +249,8 @@ add_custom_target(Boost) # empty target, Boost is already installed
 endif()
 
 add_custom_target(install-3rd_party
-  DEPENDS ${install-3rd_party_logger_var}
   DEPENDS libbson
   DEPENDS Boost
+  DEPENDS ${install-3rd_party_logger_var}
   WORKING_DIRECTORY ${3RD_PARTY_BINARY_DIRECTORY}
 )
diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt
index d543280d75..c2b7255ecc 100644
--- a/src/appMain/CMakeLists.txt
+++ b/src/appMain/CMakeLists.txt
@@ -167,8 +167,8 @@ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/smartDeviceLink.ini DESTINATION ${CMAKE_CU
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/hmi_capabilities.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sdl_preloaded_pt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/sample_policy_manager.py DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/start.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/start_external_proprietary.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/core.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/core_external_proprietary.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
   file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/init_policy.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 endif ()
@@ -217,7 +217,8 @@ endif ()
 # Install rules
 install(TARGETS ${PROJECT} DESTINATION bin)
 install(
-  FILES build_config.txt log4cxx.properties audio.8bit.wav test.txt smartDeviceLink.ini
+  FILES build_config.txt log4cxx.properties audio.8bit.wav test.txt
+    ${CMAKE_CURRENT_BINARY_DIR}/smartDeviceLink.ini
     hmi_capabilities.json sdl_preloaded_pt.json sample_policy_manager.py
     ${CMAKE_SOURCE_DIR}/mycert.pem ${CMAKE_SOURCE_DIR}/mykey.pem
   DESTINATION bin
@@ -245,15 +246,19 @@ if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
 endif ()
 
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
-  install(FILES start_external_proprietary.sh DESTINATION bin
+  install(FILES core_external_proprietary.sh DESTINATION bin
       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
-      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE RENAME start.sh)
+      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE RENAME core.sh)
 else()
-  install(FILES start.sh DESTINATION bin
+  install(FILES core.sh DESTINATION bin
       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
       GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif()
 
+install(FILES start.sh daemon.sh DESTINATION bin
+      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
 if(BUILD_TESTS)
   add_subdirectory(test)
 endif()
diff --git a/src/appMain/core.sh b/src/appMain/core.sh
new file mode 100644
index 0000000000..6604368993
--- /dev/null
+++ b/src/appMain/core.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+DIR=$(dirname $0)
+
+EXTERNAL_POLICIES=false
+if [ "$2" = "true" ]; then
+  EXTERNAL_POLICIES=true
+fi
+$DIR/daemon.sh $1 $EXTERNAL_POLICIES
diff --git a/src/appMain/core_external_proprietary.sh b/src/appMain/core_external_proprietary.sh
new file mode 100644
index 0000000000..dc43bfb42c
--- /dev/null
+++ b/src/appMain/core_external_proprietary.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+DIR=$(dirname $0)
+
+EXTERNAL_POLICIES=true
+# Allow for manual override to disable sample policy server
+if [ "$2" = "false" ]; then
+  EXTERNAL_POLICIES=false
+fi
+$DIR/daemon.sh $1 $EXTERNAL_POLICIES
diff --git a/src/appMain/daemon.sh b/src/appMain/daemon.sh
new file mode 100644
index 0000000000..fbde0d750a
--- /dev/null
+++ b/src/appMain/daemon.sh
@@ -0,0 +1,142 @@
+#!/bin/bash
+cd $(dirname $0)
+COMMAND=$1
+EXTERNAL_POLICIES=$2
+DIR=$(pwd)
+
+CORE_PID_FILE=${DIR}/core.pid
+CORE_APPLICATION_NAME=smartDeviceLinkCore
+PM_PID_FILE=${DIR}/policy_manager.pid
+PM_APPLICATION_NAME=sample_policy_manager.py
+
+function core_start() {
+  if [ -f "$CORE_PID_FILE" ] && [ -n "$(ps -p $(cat $CORE_PID_FILE) -o pid=)" ]; then
+    echo "Core is already running"
+    return 1
+  elif [ -n "$(pgrep -f $CORE_APPLICATION_NAME)" ]; then
+    echo "Core is already running outside of this script"
+    echo "All instances of Core can be stopped using the \"kill\" command"
+    return 2
+  else
+    echo "Starting SmartDeviceLink Core"
+    LD_LIBRARY_PATH=$DIR ${DIR}/${CORE_APPLICATION_NAME} &
+    CORE_PID=$!
+    echo $CORE_PID > $CORE_PID_FILE
+    return 0
+  fi
+}
+
+function core_stop() {
+  RESULT=1
+  if [ -f "$CORE_PID_FILE" ] && [ -n "$(ps -p $(cat $CORE_PID_FILE) -o pid=)" ]; then
+    echo "Stopping SmartDeviceLink Core"
+    CORE_PID=$(cat $CORE_PID_FILE)
+    kill $CORE_PID
+
+    # If Core doesn't close normally within 10 seconds, force-close it
+    timeout 10s tail --pid=$CORE_PID -f /dev/null
+    if [ -n "$(ps -p $CORE_PID -o pid=)" ]; then
+      echo "Core did not shut down properly, force-killing"
+      kill -9 $CORE_PID
+    fi
+    RESULT=0
+  fi
+
+  if [ -f "$CORE_PID_FILE" ]; then
+    rm $CORE_PID_FILE
+  fi 
+  return $RESULT
+}
+
+function pm_install_dependencies() {
+  pip3 list | grep -F tornado > /dev/null
+  if [ $? -eq 1 ]; then
+    echo "Installing tornado python package"
+    sudo -H pip3 install tornado
+  fi
+}
+
+function pm_start() {
+  if [ -f "$PM_PID_FILE" ] && [ -n "$(ps -p $(cat $PM_PID_FILE) -o pid=)" ]; then
+    echo "Policy Server is already running"
+    return 1
+  elif [ -n "$(pgrep -f $PM_APPLICATION_NAME)" ]; then
+    echo "Policy Server is already running outside of this script"
+    echo "All instances of Core can be stopped using the \"kill\" command"
+    return 2
+  else
+    pm_install_dependencies
+    echo "Starting Policy Manager"
+    python3 ${DIR}/${PM_APPLICATION_NAME} --pack_port 8088 --unpack_port 8089 --add_http_header --encryption &
+    PM_PID=$!
+    echo $PM_PID > $PM_PID_FILE
+    return 0
+  fi
+}
+
+function pm_stop() {
+  RESULT=1
+  if [ -f "$PM_PID_FILE" ] && [ -n "$(ps -p $(cat $PM_PID_FILE) -o pid=)" ]; then
+    echo "Stopping Policy Manager"
+    kill -INT $(cat $PM_PID_FILE)
+    kill -9 $(cat $PM_PID_FILE)
+    RESULT=0
+  fi
+  
+  # Clear PID regardless of whether the process was running or not
+  if [ -f "$PM_PID_FILE" ]; then
+    rm $PM_PID_FILE
+  fi
+  return $RESULT
+}
+
+if [ "$COMMAND" == "stop" ]; then
+  core_stop
+  if [ "$?" -ne 0 ]; then
+    echo "Core is not running (or was started outside of this script)"
+  fi
+
+  if [ "$EXTERNAL_POLICIES" == "true" ]; then
+    pm_stop
+    if [ "$?" -ne 0 ]; then
+      echo "Policy Server is not running (or was started outside of this script)"
+    fi
+  fi
+elif [ "$COMMAND" == "restart" ]; then
+  core_stop
+  if [ "$?" -eq 0 ]; then
+    core_start
+  else
+    echo "Core is not running (or was started outside of this script)"
+  fi
+
+  if [ "$EXTERNAL_POLICIES" == "true" ]; then
+    pm_stop
+    if [ "$?" -eq 0 ]; then
+      pm_start
+    else
+      echo "Policy Server is not running (or was started outside of this script)"
+    fi
+  fi
+elif [ "$COMMAND" == "start" ]; then
+  core_start
+  if [ "$EXTERNAL_POLICIES" == "true" ]; then
+    pm_start
+  fi
+elif [ "$COMMAND" == "kill" ]; then
+  core_stop
+  pkill -9 -f $CORE_APPLICATION_NAME
+  if [ "$?" -eq 0 ]; then
+    echo "Killed all lingering instances of SDL Core"
+  fi
+
+  if [ "$EXTERNAL_POLICIES" == "true" ]; then
+    pm_stop
+    pkill -9 -f $PM_APPLICATION_NAME
+    if [ "$?" -eq 0 ]; then
+      echo "Killed all lingering instances of the Policy Server"
+    fi
+  fi
+else
+  echo "usage: daemon.sh [start/restart/stop/kill] [use_sample_policy_manager?]"
+fi
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index cbfec341f9..099374bca8 100755
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -259,6 +259,7 @@
                 "CLOCK1", "CLOCK2", "CLOCK3", "CLOCKTEXT1", "CLOCKTEXT2", "CLOCKTEXT3", "CLOCKTEXT4"
             ],
             "graphicSupported": true,
+            "menuLayoutsAvailable": [ "LIST", "TILES" ],
             "templatesAvailable": [
                 "DEFAULT", "MEDIA", "NON-MEDIA", "ONSCREEN_PRESETS", "NAV_FULLSCREEN_MAP", "NAV_KEYBOARD",
                 "GRAPHIC_WITH_TEXT", "TEXT_WITH_GRAPHIC", "TILES_ONLY", "TEXTBUTTONS_ONLY",
@@ -284,11 +285,11 @@
                 "STATIC"
             ]
         },
-        "audioPassThruCapabilities": {
+        "audioPassThruCapabilities": [{
             "samplingRate": "44KHZ",
             "bitsPerSample": "RATE_8_BIT",
             "audioType": "PCM"
-        },
+        }],
         "pcmStreamCapabilities": {
             "samplingRate": "16KHZ",
             "bitsPerSample": "RATE_16_BIT",
@@ -319,7 +320,25 @@
                     "protocol": "RAW",
                     "codec": "H264"
                 }],
-                "hapticSpatialDataSupported": false
+                "hapticSpatialDataSupported": false,
+                "diagonalScreenSize": 8,
+                "pixelPerInch": 117,
+                "scale": 1
+            },
+            "seatLocationCapability": {
+                "rows": 2,
+                "columns": 3,
+                "levels": 1,
+                "seats": [
+                    {
+                        "row": 0,
+                        "col": 0,
+                        "level": 0,
+                        "rowspan": 1,
+                        "levelspan": 1,
+                        "colspan": 1
+                    }
+                ]
             },
             "driverDistractionCapability": {
                 "menuLength": 10,
@@ -330,114 +349,190 @@
                     {
                         "longPressAvailable": true,
                         "name": "AC_MAX",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "AC",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "RECIRCULATE",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "FAN_UP",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "FAN_DOWN",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "TEMP_UP",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "TEMP_DOWN",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "DEFROST_MAX",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "DEFROST",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "DEFROST_REAR",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "UPPER_VENT",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "LOWER_VENT",
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "VOLUME_UP",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "VOLUME_DOWN",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "EJECT",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "SOURCE",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "SHUFFLE",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     },
                     {
                         "longPressAvailable": true,
                         "name": "REPEAT",
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": false
+                        },
                         "shortPressAvailable": true,
                         "upDownAvailable": false
                     }
                 ],
                 "climateControlCapabilities": [
                     {
+                        "moduleInfo": {
+                            "moduleId": "34045662-a9dc-4823-8435-91056d4c26cb",
+                            "allowMultipleAccess": false
+                        },
                         "acEnableAvailable": true,
                         "acMaxEnableAvailable": true,
                         "autoModeEnableAvailable": true,
@@ -470,6 +565,10 @@
                 ],
                 "radioControlCapabilities": [
                     {
+                        "moduleInfo": {
+                            "moduleId": "eb7739ea-b263-4fe1-af9c-9311d1acac2d",
+                            "allowMultipleAccess": true
+                        },
                         "availableHdChannelsAvailable": true,
                         "hdChannelAvailable": true,
                         "moduleName": "radio",
@@ -488,6 +587,10 @@
                 "audioControlCapabilities": [
                     {
                         "moduleName": "audio",
+                        "moduleInfo": {
+                            "moduleId": "a279fe12-4587-4d12-8514-50f4ea9e9537",
+                            "allowMultipleAccess": true
+                        },
                         "sourceAvailable": true,
                         "volumeAvailable": true,
                         "equalizerAvailable": true,
@@ -498,6 +601,10 @@
                 "seatControlCapabilities": [
                     {
                         "moduleName": "driver_seat",
+                        "moduleInfo": {
+                            "moduleId": "06cdec22-920e-4865-bf2e-9518463edc68",
+                            "allowMultipleAccess": false
+                        },
                         "heatingEnabledAvailable" : true,
                         "coolingEnabledAvailable": true,
                         "heatingLevelAvailable": true,
@@ -517,6 +624,10 @@
                 ],
                 "lightControlCapabilities": {
                         "moduleName": "light",
+                        "moduleInfo": {
+                            "moduleId": "8d73e369-6a1f-4459-ab5a-6e432631881d",
+                            "allowMultipleAccess": false
+                        },
                         "supportedLights":[
                               {
                                  "statusAvailable":true,
@@ -810,6 +921,10 @@
                 },
                 "hmiSettingsControlCapabilities": {
                         "moduleName": "hmiSettings",
+                        "moduleInfo": {
+                            "moduleId": "c8cace3c-d482-4be1-8862-624a21e34563",
+                            "allowMultipleAccess": true
+                        },
                         "distanceUnitAvailable": true,
                         "temperatureUnitAvailable": true,
                         "displayModeUnitAvailable": true
diff --git a/src/appMain/life_cycle_impl.cc b/src/appMain/life_cycle_impl.cc
index 10f0fc0d52..4c2d1e88ac 100644
--- a/src/appMain/life_cycle_impl.cc
+++ b/src/appMain/life_cycle_impl.cc
@@ -34,8 +34,8 @@
 #include "application_manager/system_time/system_time_handler_impl.h"
 #include "config_profile/profile.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "utils/signals.h"
-
 #ifdef ENABLE_SECURITY
 #include "application_manager/policies/policy_handler.h"
 #include "security_manager/crypto_manager_impl.h"
@@ -67,7 +67,6 @@ LifeCycleImpl::LifeCycleImpl(const profile::Profile& profile)
     , hmi_handler_(NULL)
     , hmi_message_adapter_(NULL)
     , media_manager_(NULL)
-    , last_state_(NULL)
 #ifdef TELEMETRY_MONITOR
     , telemetry_monitor_(NULL)
 #endif  // TELEMETRY_MONITOR
@@ -80,12 +79,16 @@ LifeCycleImpl::LifeCycleImpl(const profile::Profile& profile)
 
 bool LifeCycleImpl::StartComponents() {
   LOG4CXX_AUTO_TRACE(logger_);
-  DCHECK(!last_state_);
-  last_state_ = new resumption::LastStateImpl(profile_.app_storage_folder(),
-                                              profile_.app_info_storage());
+  DCHECK(!last_state_wrapper_);
+
+  auto last_state = std::make_shared<resumption::LastStateImpl>(
+      profile_.app_storage_folder(), profile_.app_info_storage());
+  last_state_wrapper_ =
+      std::make_shared<resumption::LastStateWrapperImpl>(last_state);
 
   DCHECK(!transport_manager_);
-  transport_manager_ = new transport_manager::TransportManagerDefault(profile_);
+  transport_manager_ = new transport_manager::TransportManagerDefault(
+      profile_, transport_manager::TransportAdapterFactory());
 
   DCHECK(!connection_handler_);
   connection_handler_ = new connection_handler::ConnectionHandlerImpl(
@@ -103,6 +106,13 @@ bool LifeCycleImpl::StartComponents() {
   app_manager_ =
       new application_manager::ApplicationManagerImpl(profile_, profile_);
 
+  auto service_status_update_handler =
+      std::unique_ptr<protocol_handler::ServiceStatusUpdateHandler>(
+          new protocol_handler::ServiceStatusUpdateHandler(app_manager_));
+
+  protocol_handler_->set_service_status_update_handler(
+      std::move(service_status_update_handler));
+
   DCHECK(!hmi_handler_);
   hmi_handler_ = new hmi_message_handler::HMIMessageHandlerImpl(profile_);
 
@@ -112,7 +122,7 @@ bool LifeCycleImpl::StartComponents() {
   media_manager_ = new media_manager::MediaManagerImpl(*app_manager_, profile_);
   app_manager_->set_connection_handler(connection_handler_);
   app_manager_->AddPolicyObserver(protocol_handler_);
-  if (!app_manager_->Init(*last_state_, media_manager_)) {
+  if (!app_manager_->Init(last_state_wrapper_, media_manager_)) {
     LOG4CXX_ERROR(logger_, "Application manager init failed.");
     return false;
   }
@@ -163,12 +173,14 @@ bool LifeCycleImpl::StartComponents() {
   // It's important to initialise TM after setting up listener chain
   // [TM -> CH -> AM], otherwise some events from TM could arrive at nowhere
   app_manager_->set_protocol_handler(protocol_handler_);
-  if (transport_manager::E_SUCCESS != transport_manager_->Init(*last_state_)) {
+  if (transport_manager::E_SUCCESS !=
+      transport_manager_->Init(last_state_wrapper_)) {
     LOG4CXX_ERROR(logger_, "Transport manager init failed.");
     return false;
   }
   // start transport manager
-  transport_manager_->Visibility(true);
+  transport_manager_->PerformActionOnClients(
+      transport_manager::TransportAction::kVisibilityOn);
 
   LowVoltageSignalsOffset signals_offset{profile_.low_voltage_signal_offset(),
                                          profile_.wake_up_signal_offset(),
@@ -182,7 +194,10 @@ bool LifeCycleImpl::StartComponents() {
 
 void LifeCycleImpl::LowVoltage() {
   LOG4CXX_AUTO_TRACE(logger_);
-  transport_manager_->Visibility(false);
+  transport_manager_->PerformActionOnClients(
+      transport_manager::TransportAction::kListeningOff);
+  transport_manager_->StopEventsProcessing();
+  transport_manager_->Deinit();
   app_manager_->OnLowVoltage();
 }
 
@@ -193,9 +208,11 @@ void LifeCycleImpl::IgnitionOff() {
 
 void LifeCycleImpl::WakeUp() {
   LOG4CXX_AUTO_TRACE(logger_);
-  app_manager_->OnWakeUp();
   transport_manager_->Reinit();
-  transport_manager_->Visibility(true);
+  transport_manager_->PerformActionOnClients(
+      transport_manager::TransportAction::kListeningOn);
+  app_manager_->OnWakeUp();
+  transport_manager_->StartEventsProcessing();
 }
 
 #ifdef MESSAGEBROKER_HMIADAPTER
@@ -286,7 +303,8 @@ void LifeCycleImpl::StopComponents() {
 
   LOG4CXX_INFO(logger_, "Destroying Transport Manager.");
   DCHECK_OR_RETURN_VOID(transport_manager_);
-  transport_manager_->Visibility(false);
+  transport_manager_->PerformActionOnClients(
+      transport_manager::TransportAction::kVisibilityOff);
   transport_manager_->Stop();
   delete transport_manager_;
   transport_manager_ = NULL;
@@ -304,10 +322,8 @@ void LifeCycleImpl::StopComponents() {
   delete connection_handler_;
   connection_handler_ = NULL;
 
-  LOG4CXX_INFO(logger_, "Destroying Last State");
-  DCHECK(last_state_);
-  delete last_state_;
-  last_state_ = NULL;
+  LOG4CXX_INFO(logger_, "Destroying Last State.");
+  last_state_wrapper_.reset();
 
   LOG4CXX_INFO(logger_, "Destroying Application Manager.");
   DCHECK(app_manager_);
diff --git a/src/appMain/life_cycle_impl.h b/src/appMain/life_cycle_impl.h
index 5bddf6bff9..4a2e41b52f 100644
--- a/src/appMain/life_cycle_impl.h
+++ b/src/appMain/life_cycle_impl.h
@@ -95,7 +95,7 @@ class LifeCycleImpl : public LifeCycle {
   hmi_message_handler::HMIMessageHandlerImpl* hmi_handler_;
   hmi_message_handler::HMIMessageAdapter* hmi_message_adapter_;
   media_manager::MediaManagerImpl* media_manager_;
-  resumption::LastState* last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
 #ifdef TELEMETRY_MONITOR
   telemetry_monitor::TelemetryMonitor* telemetry_monitor_;
 #endif  // TELEMETRY_MONITOR
diff --git a/src/appMain/main.cc b/src/appMain/main.cc
index cb59f63b1d..ade6a0054c 100644
--- a/src/appMain/main.cc
+++ b/src/appMain/main.cc
@@ -135,7 +135,7 @@ int32_t main(int32_t argc, char** argv) {
   // Logger initialization
   INIT_LOGGER("log4cxx.properties", profile_instance.logs_enabled());
 
-  threads::Thread::SetNameForId(threads::Thread::CurrentId(), "MainThread");
+  threads::Thread::SetNameForId(threads::Thread::CurrentId(), "SDLCore");
 
   if (!utils::appenders_loader.Loaded()) {
     LOG4CXX_ERROR(logger_,
diff --git a/src/appMain/sample_policy_manager.py b/src/appMain/sample_policy_manager.py
index 681c7bbb91..542aa5339b 100644
--- a/src/appMain/sample_policy_manager.py
+++ b/src/appMain/sample_policy_manager.py
@@ -42,49 +42,95 @@ def http_header(data):
     return json.dumps(header)
 
 
-def crypt(data):
+def encrypt(data):
     return data
 
 
 def decrypt(data):
     return data
 
-def pack(file_path, encryption, add_http_header):
 
-    file = open(file_path, "r+")
-    data = file.read()
-    file.seek(0)
-    file.truncate()    
-    
-    if encryption:
-        data = crypt(data)
-    if add_http_header:
-        data = http_header(data)
+def pack(data, encryption, add_http_header):
+    file_path = data['fileName']
+    file_ptr = open(file_path, "r+")
 
-    file.write(data)
-    file.close()
-    return file_path
+    request_type = data['requestType']
+    pack_handler = get_handler(request_type, 'pack')
+
+    new_data = pack_handler(data, file_ptr)
+    if new_data is not None:
+        if encryption:
+            new_data = encrypt(new_data)
+        if add_http_header:
+            new_data = http_header(new_data)
+
+        file_ptr.write(new_data)
 
+    file_ptr.close()
+    return file_path
 
-def unpack(file_path, encryption):
 
-    file = open(file_path, 'r+')
-    read_data = file.read()
-    file.seek(0)
-    file.truncate()
+def unpack(data, encryption):
+    file_path = data['fileName']
+    file_ptr = open(file_path, 'r+')
 
-    json_data = json.loads(read_data)
-    policy_data = json.dumps(json_data['data'][0])
+    request_type = data['requestType']
+    unpack_handler = get_handler(request_type, 'unpack')
 
-    if encryption:
-        policy_data = decrypt(policy_data)
+    new_data = unpack_handler(data, file_ptr)
+    if new_data is not None:
+        if encryption:
+            new_data = decrypt(new_data)
 
-    file.write(policy_data)
-    file.close()
+        file_ptr.write(new_data)
+    file_ptr.close()
 
     return file_path
 
 
+def get_handler(request_type, handler_type):
+    handlers_map = {
+        "PROPRIETARY": get_proprietary_handler
+    }
+    if request_type not in handlers_map:
+        print('\033[33;1mUnhandled request type: %s. Using default request handler\033[0m' % request_type)
+        default_handler = lambda data, file_ptr: None
+        return default_handler
+
+    return handlers_map[request_type](handler_type)
+
+# Handler getter template
+# def get_<request_type>_handler(handler_type):
+#   def pack(data, file_ptr):
+#       ...
+#   def unpack(data, file_ptr):
+#       ...
+# return pack if handler_type == 'pack' else unpack
+
+def get_proprietary_handler(handler_type):    
+    def pack(data, file_ptr):
+        read_data = file_ptr.read()
+        file_ptr.seek(0)
+        file_ptr.truncate()        
+        return read_data
+
+    def unpack(data, file_ptr):
+        read_data = file_ptr.read()
+        file_ptr.seek(0)
+        file_ptr.truncate()
+
+        try:
+            json_data = json.loads(read_data)
+        except ValueError:
+            print('\033[31;1mInvalid JSON data: %s\033[0m' % read_data)
+            return None
+
+        policy_data = json.dumps(json_data['data'][0])
+        return policy_data
+    
+    return pack if handler_type == 'pack' else unpack
+
+
 class WebSocketHandler(tornado.websocket.WebSocketHandler):
 
     def initialize(self,encryption, add_http_header, handle_func):
@@ -96,7 +142,19 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
         print ("Socket Connected\n")
 
     def on_message(self, data):
-        self.write_message(self.handle_func(data, self.encryption, self.add_http_header))
+        try:
+            json_data = json.loads(data)
+        except ValueError:
+            print('\033[31;1mInvalid JSON message: %s\033[0m' % data)
+            return
+        if 'requestType' not in json_data:
+            print('\033[31;1mMissing requestType parameter: %s\033[0m' % str(json_data))
+            return
+        if 'fileName' not in json_data:
+            print('\033[31;1mMissing fileName parameter: %s\033[0m' % str(json_data))
+            return
+
+        self.write_message(self.handle_func(json_data, self.encryption, self.add_http_header))
 
     def on_close(self):
         print ("Connection Closed\n")
diff --git a/src/appMain/sdl_preloaded_pt.json b/src/appMain/sdl_preloaded_pt.json
index 9e6722c8cf..4f97d90b09 100644
--- a/src/appMain/sdl_preloaded_pt.json
+++ b/src/appMain/sdl_preloaded_pt.json
@@ -1,2558 +1,4089 @@
-{

-    "policy_table": {

-        "module_config": {

-            "preloaded_pt": true,

-            "exchange_after_x_ignition_cycles": 100,

-            "exchange_after_x_kilometers": 1800,

-            "exchange_after_x_days": 30,

-            "timeout_after_x_seconds": 60,

-            "seconds_between_retries": [1,

-            5,

-            25,

-            125,

-            625],

-            "endpoints": {

-                "0x07": {

-                    "default": ["http://x.x.x.x:3000/api/1/policies/proprietary"]

-                },

-                "0x04": {

-                    "default": ["http://x.x.x.x:3000/api/1/softwareUpdate"]

-                },

-                "queryAppsUrl": {

-                    "default": ["http://sdl.shaid.server"]

-                },

-                "lock_screen_icon_url": {

-                    "default": ["http://i.imgur.com/TgkvOIZ.png"]

-                }

-            },

-            "notifications_per_minute_by_priority": {

-                "EMERGENCY": 60,

-                "NAVIGATION": 15,

-                "PROJECTION": 15,

-                "VOICECOM": 20,

-                "COMMUNICATION": 6,

-                "NORMAL": 4,

-                "NONE": 0

-            },

-            "lock_screen_dismissal_enabled": true

-        },

-        "functional_groupings": {

-            "Base-4": {

-                "rpcs": {

-                    "AddCommand": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "AddSubMenu": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ShowAppMenu": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "Alert": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "ChangeRegistration": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "CreateInteractionChoiceSet": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "DeleteCommand": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "DeleteFile": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "DeleteInteractionChoiceSet": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "DeleteSubMenu": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "EncodedSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "EndAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GenericResponse": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GetSystemCapability": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "ListFiles": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnAppInterfaceUnregistered": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "OnButtonEvent": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED",

-                        "BACKGROUND"]

-                    },

-                    "OnButtonPress": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED",

-                        "BACKGROUND"]

-                    },

-                    "OnCommand": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "OnDriverDistraction": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnEncodedSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnHashChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnHMIStatus": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnLanguageChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnPermissionsChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnSystemRequest": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnSystemCapabilityUpdated": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "PerformAudioPassThru": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "PerformInteraction": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "PutFile": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },                    

-                    "RegisterAppInterface": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "ResetGlobalProperties": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "ScrollableMessage": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "SetAppIcon": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetDisplayLayout": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetGlobalProperties": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetMediaClockTimer": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED",

-                        "BACKGROUND"]

-                    },

-                    "Show": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "Slider": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "Speak": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "SubscribeButton": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "SystemRequest": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "UnregisterAppInterface": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "UnsubscribeButton": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "CloseApplication": {

-                        "hmi_levels": [

-                          "FULL",

-                          "LIMITED",

-                          "BACKGROUND"

-                        ]

-                    }

-                }

-            },

-            "Location-1": {

-                "user_consent_prompt": "Location",

-                "rpcs": {

-                    "GetVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["gps",

-                        "speed"]

-                    },

-                    "OnVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["gps",

-                        "speed"]

-                    },

-                    "SubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["gps",

-                        "speed"]

-                    },

-                    "UnsubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["gps",

-                        "speed"]

-                    }

-                }

-            },

-            "Notifications": {

-                "user_consent_prompt": "Notifications",

-                "rpcs": {

-                    "Alert": {

-                        "hmi_levels": ["BACKGROUND"]

-                    }

-                }

-            },

-            "Notifications-RC": {

-                "rpcs": {

-                    "OnHMIStatus": {

-                        "hmi_levels": [

-                            "BACKGROUND",

-                            "FULL",

-                            "LIMITED",

-                            "NONE"

-                        ]

-                    },

-                    "OnPermissionsChange": {

-                        "hmi_levels": [

-                            "BACKGROUND",

-                            "FULL",

-                            "LIMITED",

-                            "NONE"

-                        ]

-                    },

-                    "OnSystemRequest": {

-                        "hmi_levels": [

-                            "BACKGROUND",

-                            "FULL",

-                            "LIMITED",

-                            "NONE"

-                        ]

-                    }

-                }

-            },

-            "DrivingCharacteristics-3": {

-                "user_consent_prompt": "DrivingCharacteristics",

-                "rpcs": {

-                    "GetVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["accPedalPosition",

-                        "beltStatus",

-                        "electronicParkBrakeStatus",

-                        "driverBraking",

-                        "myKey",

-                        "prndl",

-                        "rpm",

-                        "steeringWheelAngle"]

-                    },

-                    "OnVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["accPedalPosition",

-                        "beltStatus",

-                        "electronicParkBrakeStatus",

-                        "driverBraking",

-                        "myKey",

-                        "prndl",

-                        "rpm",

-                        "steeringWheelAngle"]

-                    },

-                    "SubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["accPedalPosition",

-                        "beltStatus",

-                        "electronicParkBrakeStatus",

-                        "driverBraking",

-                        "myKey",

-                        "prndl",

-                        "rpm",

-                        "steeringWheelAngle"]

-                    },

-                    "UnsubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["accPedalPosition",

-                        "beltStatus",

-                        "electronicParkBrakeStatus",

-                        "driverBraking",

-                        "myKey",

-                        "prndl",

-                        "rpm",

-                        "steeringWheelAngle"]

-                    }

-                }

-            },

-            "VehicleInfo-3": {

-                "user_consent_prompt": "VehicleInfo",

-                "rpcs": {

-                    "GetVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["bodyInformation",

-                        "deviceStatus",

-                        "engineOilLife",

-                        "engineTorque",

-                        "externalTemperature",

-                        "turnSignal",

-                        "fuelLevel",

-                        "fuelLevel_State",

-                        "headLampStatus",

-                        "instantFuelConsumption",

-                        "fuelRange",

-                        "cloudAppVehicleID",

-                        "odometer",

-                        "tirePressure",

-                        "vin",

-                        "wiperStatus"]

-                    },

-                    "OnVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["bodyInformation",

-                        "deviceStatus",

-                        "engineOilLife",

-                        "engineTorque",

-                        "externalTemperature",

-                        "turnSignal",

-                        "fuelLevel",

-                        "fuelLevel_State",

-                        "headLampStatus",

-                        "instantFuelConsumption",

-                        "fuelRange",

-                        "cloudAppVehicleID",

-                        "odometer",

-                        "tirePressure",

-                        "vin",

-                        "wiperStatus"]

-                    },

-                    "SubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["bodyInformation",

-                        "deviceStatus",

-                        "engineOilLife",

-                        "engineTorque",

-                        "externalTemperature",

-                        "turnSignal",

-                        "fuelLevel",

-                        "fuelLevel_State",

-                        "headLampStatus",

-                        "instantFuelConsumption",

-                        "fuelRange",

-                        "cloudAppVehicleID",

-                        "odometer",

-                        "tirePressure",

-                        "wiperStatus"]

-                    },

-                    "UnsubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["bodyInformation",

-                        "deviceStatus",

-                        "engineOilLife",

-                        "engineTorque",

-                        "externalTemperature",

-                        "turnSignal",

-                        "fuelLevel",

-                        "fuelLevel_State",

-                        "headLampStatus",

-                        "instantFuelConsumption",

-                        "fuelRange",

-                        "cloudAppVehicleID",

-                        "odometer",

-                        "tirePressure",

-                        "wiperStatus"]

-                    }

-                }

-            },

-            "PropriataryData-1": {

-                "rpcs": {

-                    "DiagnosticMessage": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GetDTCs": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ReadDID": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "PropriataryData-2": {

-                "rpcs": {

-                    "DiagnosticMessage": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GetDTCs": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ReadDID": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "ProprietaryData-3": {

-                "rpcs": {

-                    "GetDTCs": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ReadDID": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "CloudAppStore": {

-                "rpcs": {

-                    "SetCloudAppProperties":{

-                        "hmi_levels":["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GetCloudAppProperties":{

-                        "hmi_levels":["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "CloudApp": {

-                "rpcs": {

-                    "GetVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": [

-                        "cloudAppVehicleID"

-                        ]

-                    },

-                    "OnVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": [

-                        "cloudAppVehicleID"

-                        ]

-                    },

-                    "SubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": [

-                        "cloudAppVehicleID"

-                        ]

-                    },

-                    "UnsubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": [

-                        "cloudAppVehicleID"

-                        ]

-                    }

-                }

-            },

-            "AppServiceProvider": {

-                "rpcs": {

-                    "PublishAppService": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    },

-                    "UnpublishAppService": {

-                      "hmi_levels": [

-                          "FULL",

-                          "LIMITED",

-                          "BACKGROUND",

-                          "NONE"

-                      ]

-                    },

-                    "GetAppServiceData": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    },

-                    "OnAppServiceData": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    },

-                    "PerformAppServiceInteraction": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    }

-                }

-            },

-            "AppServiceConsumer": {

-                "rpcs": {

-                    "GetFile": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    },

-                    "GetAppServiceData": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    },

-                    "OnAppServiceData": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    },

-                    "PerformAppServiceInteraction": {

-                        "hmi_levels": [

-                            "FULL",

-                            "LIMITED",

-                            "BACKGROUND",

-                            "NONE"

-                        ]

-                    }

-                }

-            },

-            "RemoteControl": {

-                "rpcs": {

-                    "ButtonPress": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GetInteriorVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "SetInteriorVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "OnInteriorVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "SystemRequest": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnRCStatus": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    }

-                }

-            },

-            "Emergency-1": {

-                "rpcs": {

-                    "GetVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["airbagStatus",

-                        "clusterModeStatus",

-                        "eCallInfo",

-                        "emergencyEvent"]

-                    },

-                    "OnVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["airbagStatus",

-                        "clusterModeStatus",

-                        "eCallInfo",

-                        "emergencyEvent"]

-                    },

-                    "SubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["airbagStatus",

-                        "clusterModeStatus",

-                        "eCallInfo",

-                        "emergencyEvent"]

-                    },

-                    "UnsubscribeVehicleData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"],

-                        "parameters": ["airbagStatus",

-                        "clusterModeStatus",

-                        "eCallInfo",

-                        "emergencyEvent"]

-                    }

-                }

-            },

-            "Navigation-1": {

-                "rpcs": {

-                    "AlertManeuver": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ShowConstantTBT": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "UpdateTurnList": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "Base-6": {

-                "rpcs": {

-                    "AddCommand": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "AddSubMenu": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ShowAppMenu": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "Alert": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "ChangeRegistration": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "CreateInteractionChoiceSet": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "DeleteCommand": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "DeleteFile": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "DeleteInteractionChoiceSet": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "DeleteSubMenu": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "EncodedSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "EndAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "GenericResponse": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ListFiles": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnAppInterfaceUnregistered": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "OnButtonEvent": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "OnButtonPress": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "OnCommand": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "OnDriverDistraction": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnEncodedSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnHMIStatus": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnLanguageChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnPermissionsChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnTBTClientState": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "PerformAudioPassThru": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "PerformInteraction": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "PutFile": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "RegisterAppInterface": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "ResetGlobalProperties": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "ScrollableMessage": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "SetAppIcon": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetDisplayLayout": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetGlobalProperties": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "SetMediaClockTimer": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "Show": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "Slider": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "Speak": {

-                        "hmi_levels": ["FULL",

-                        "LIMITED"]

-                    },

-                    "SubscribeButton": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "SyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "UnregisterAppInterface": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "UnsubscribeButton": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "OnKeyboardInputOnlyGroup": {

-                "rpcs": {

-                    "OnKeyboardInput": {

-                        "hmi_levels": ["FULL"]

-                    }

-                }

-            },

-            "OnTouchEventOnlyGroup": {

-                "rpcs": {

-                    "OnTouchEvent": {

-                        "hmi_levels": ["FULL"]

-                    }

-                }

-            },

-            "DiagnosticMessageOnly": {

-                "rpcs": {

-                    "DiagnosticMessage": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "DataConsent-2": {

-                "user_consent_prompt": "DataConsent",

-                "rpcs": null

-            },

-            "BaseBeforeDataConsent": {

-                "rpcs": {

-                    "ChangeRegistration": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "DeleteFile": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "EncodedSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "ListFiles": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnAppInterfaceUnregistered": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnEncodedSyncPData": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnHashChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnHMIStatus": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnLanguageChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnPermissionsChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "OnSystemRequest": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "PutFile": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "RegisterAppInterface": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "ResetGlobalProperties": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetGlobalProperties": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetAppIcon": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SetDisplayLayout": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "SystemRequest": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    },

-                    "UnregisterAppInterface": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED",

-                        "NONE"]

-                    }

-                }

-            },

-            "SendLocation": {

-                "rpcs": {

-                    "SendLocation": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "WayPoints": {

-                "rpcs": {

-                    "GetWayPoints": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "SubscribeWayPoints": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "UnsubscribeWayPoints": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    },

-                    "OnWayPointChange": {

-                        "hmi_levels": ["BACKGROUND",

-                        "FULL",

-                        "LIMITED"]

-                    }

-                }

-            },

-            "BackgroundAPT": {

-                "rpcs": {

-                    "EndAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND"]

-                    },

-                    "OnAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND"]

-                    },

-                    "PerformAudioPassThru": {

-                        "hmi_levels": ["BACKGROUND"]

-                    }

-                }

-            },

-            "HapticGroup": {

-                "rpcs": {

-                    "OnTouchEvent": {

-                        "hmi_levels": ["FULL"]

-                    },

-                    "SendHapticData": {

-                        "hmi_levels": ["FULL"]

-                    }

-                }

-            }

-        },

-        "consumer_friendly_messages": {

-            "version": "001.001.021",

-            "messages": {

-                "AppPermissions": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",

-                            "line1": "Zugriffsanfrage(n)",

-                            "line2": "erlauben?"

-                        },

-                        "en-au": {

-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",

-                            "line1": "Grant requested",

-                            "line2": "permission(s)?"

-                        },

-                        "en-gb": {

-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",

-                            "line1": "Grant requested",

-                            "line2": "permission(s)?",

-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."

-                        },

-                        "en-ie": {

-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",

-                            "line1": "Grant requested",

-                            "line2": "permission(s)?"

-                        },

-                        "en-us": {

-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",

-                            "line1": "Grant Requested",

-                            "line2": "Permission(s)?",

-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."

-                        },

-                        "es-en": {

-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",

-                            "line1": "¿Otorgar permiso(s)",

-                            "line2": "solicitado(s)?",

-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."

-                        },

-                        "es-es": {

-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",

-                            "line1": "¿Conceder permisos",

-                            "line2": "solicitados?"

-                        },

-                        "es-mx": {

-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",

-                            "line1": "¿Otorgar permiso(s)",

-                            "line2": "solicitado(s)?",

-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. \n\nSi presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."

-                        },

-                        "fr-ca": {

-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",

-                            "line1": "Accorder permission(s)",

-                            "line2": "demandée(s)",

-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."

-                        },

-                        "fr-fr": {

-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",

-                            "line1": "Accorder permission(s)",

-                            "line2": "demandée(s)"

-                        },

-                        "it-it": {

-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",

-                            "line1": "Concedi autorizzaz.",

-                            "line2": "richiesta(e)?"

-                        },

-                        "nl-nl": {

-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",

-                            "line1": "Aangevraagde",

-                            "line2": "permissie(s) verlenen?"

-                        },

-                        "pl-pl": {

-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",

-                            "line1": "Udzielić żądanych",

-                            "line2": "pozwoleń?"

-                        },

-                        "pt-br": {

-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",

-                            "line1": "Conceder permissão",

-                            "line2": "solicitada?"

-                        },

-                        "pt-pt": {

-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",

-                            "line1": "Conceder permiss.",

-                            "line2": "solicitada(s)?"

-                        },

-                        "ru-ru": {

-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",

-                            "line1": "Предост. заправш.",

-                            "line2": "разрешения?"

-                        },

-                        "sv-se": {

-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",

-                            "line1": "Vill du ge",

-                            "line2": "tillstånd?"

-                        },

-                        "tr-tr": {

-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",

-                            "line1": "İstenen izinler",

-                            "line2": "verilsin mi?"

-                        },

-                        "zh-cn": {

-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",

-                            "line1": "是否允许请求的",

-                            "line2": "权限？"

-                        },

-                        "zh-tw": {

-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",

-                            "line1": "允許",

-                            "line2": "授權請求?"

-                        }

-                    }

-                },

-                "AppPermissionsHelp": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."

-                        },

-                        "en-au": {

-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."

-                        },

-                        "en-gb": {

-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."

-                        },

-                        "en-ie": {

-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."

-                        },

-                        "en-us": {

-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."

-                        },

-                        "es-en": {

-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."

-                        },

-                        "es-es": {

-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."

-                        },

-                        "es-mx": {

-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."

-                        },

-                        "fr-ca": {

-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."

-                        },

-                        "fr-fr": {

-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."

-                        },

-                        "it-it": {

-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."

-                        },

-                        "nl-nl": {

-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."

-                        },

-                        "pl-pl": {

-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."

-                        },

-                        "pt-br": {

-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."

-                        },

-                        "pt-pt": {

-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."

-                        },

-                        "ru-ru": {

-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."

-                        },

-                        "sv-se": {

-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."

-                        },

-                        "tr-tr": {

-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."

-                        },

-                        "zh-cn": {

-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"

-                        },

-                        "zh-tw": {

-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"

-                        }

-                    }

-                },

-                "AppPermissionsRevoked": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."

-                        },

-                        "en-au": {

-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."

-                        },

-                        "en-gb": {

-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."

-                        },

-                        "en-ie": {

-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."

-                        },

-                        "en-us": {

-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."

-                        },

-                        "es-en": {

-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."

-                        },

-                        "es-es": {

-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."

-                        },

-                        "es-mx": {

-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."

-                        },

-                        "fr-ca": {

-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."

-                        },

-                        "fr-fr": {

-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."

-                        },

-                        "it-it": {

-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."

-                        },

-                        "nl-nl": {

-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."

-                        },

-                        "pl-pl": {

-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."

-                        },

-                        "pt-br": {

-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."

-                        },

-                        "pt-pt": {

-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."

-                        },

-                        "ru-ru": {

-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."

-                        },

-                        "sv-se": {

-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."

-                        },

-                        "tr-tr": {

-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."

-                        },

-                        "zh-cn": {

-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"

-                        },

-                        "zh-tw": {

-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"

-                        }

-                    }

-                },

-                "AppUnauthorized": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",

-                            "line1": "nicht autorisiert"

-                        },

-                        "en-au": {

-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",

-                            "line1": "not authorized"

-                        },

-                        "en-gb": {

-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",

-                            "line1": "not authorized",

-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."

-                        },

-                        "en-ie": {

-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",

-                            "line1": "not authorized"

-                        },

-                        "en-us": {

-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",

-                            "line1": "Not Authorized",

-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."

-                        },

-                        "es-en": {

-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",

-                            "line1": "no autorizada",

-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."

-                        },

-                        "es-es": {

-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",

-                            "line1": "No autorizada"

-                        },

-                        "es-mx": {

-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",

-                            "line1": "no autorizada",

-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."

-                        },

-                        "fr-ca": {

-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",

-                            "line1": "non autorisée",

-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."

-                        },

-                        "fr-fr": {

-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",

-                            "line1": "non autorisée"

-                        },

-                        "it-it": {

-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",

-                            "line1": "non autorizzata"

-                        },

-                        "nl-nl": {

-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",

-                            "line1": "niet geautoriseerd"

-                        },

-                        "pl-pl": {

-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",

-                            "line1": "brak autoryzacji"

-                        },

-                        "pt-br": {

-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",

-                            "line1": "não autorizado"

-                        },

-                        "pt-pt": {

-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",

-                            "line1": "não autorizada"

-                        },

-                        "ru-ru": {

-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",

-                            "line1": "не авторизировано"

-                        },

-                        "sv-se": {

-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",

-                            "line1": "är ej godkänd"

-                        },

-                        "tr-tr": {

-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",

-                            "line1": "için izin yok"

-                        },

-                        "zh-cn": {

-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",

-                            "line1": "未得到授权"

-                        },

-                        "zh-tw": {

-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",

-                            "line1": "無授權"

-                        }

-                    }

-                },

-                "AppUnsupported": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",

-                            "line1": "nicht unterstützt"

-                        },

-                        "en-au": {

-                            "tts": "This version of %appName% is not supported by SYNC.",

-                            "line1": "not supported"

-                        },

-                        "en-gb": {

-                            "tts": "This version of %appName% is not supported by SYNC.",

-                            "line1": "not supported",

-                            "textBody": "This version of %appName% is not supported by SYNC."

-                        },

-                        "en-ie": {

-                            "tts": "This version of %appName% is not supported by SYNC.",

-                            "line1": "not supported"

-                        },

-                        "en-us": {

-                            "tts": "This version of %appName% is not supported by SYNC.",

-                            "line1": "Not Supported",

-                            "textBody": "Your version of %appName% is not supported by SYNC."

-                        },

-                        "es-en": {

-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",

-                            "line1": "no compatible",

-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."

-                        },

-                        "es-es": {

-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",

-                            "line1": "No compatible"

-                        },

-                        "es-mx": {

-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",

-                            "line1": "no compatible",

-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."

-                        },

-                        "fr-ca": {

-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",

-                            "line1": "incompatible",

-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."

-                        },

-                        "fr-fr": {

-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",

-                            "line1": "incompatible"

-                        },

-                        "it-it": {

-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",

-                            "line1": "non supportata"

-                        },

-                        "nl-nl": {

-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",

-                            "line1": "niet ondersteund"

-                        },

-                        "pl-pl": {

-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",

-                            "line1": "aplikacja nie obsług."

-                        },

-                        "pt-br": {

-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",

-                            "line1": "não suportado"

-                        },

-                        "pt-pt": {

-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",

-                            "line1": "não suportada"

-                        },

-                        "ru-ru": {

-                            "tts": "Эта версия %appName% не поддерживается SYNC.",

-                            "line1": "не поддерживается"

-                        },

-                        "sv-se": {

-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",

-                            "line1": "stöds ej"

-                        },

-                        "tr-tr": {

-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",

-                            "line1": "desteklenmiyor"

-                        },

-                        "zh-cn": {

-                            "tts": "SYNC不支持此版本的%appName%。",

-                            "line1": "不受支持"

-                        },

-                        "zh-tw": {

-                            "tts": "SYNC 不支援此版本的%appName% 。",

-                            "line1": "不支援"

-                        }

-                    }

-                },

-                "DataConsent": {

-                    "languages": {

-                        "en-gb": {

-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."

-                        },

-                        "en-us": {

-                            "line1": "Enable Mobile Apps",

-                            "line2": "on SYNC? (Uses Data)",

-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."

-                        },

-                        "es-mx": {

-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. \n\nLas actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. \n\nPresione Sí para permitir y No para denegar."

-                        },

-                        "fr-ca": {

-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements.\r\n\r\nVeuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."

-                        }

-                    }

-                },

-                "DataConsentHelp": {

-                    "languages": {

-                        "en-us": {

-                            "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."

-                        },

-                        "es-mx": {

-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."

-                        },

-                        "fr-ca": {

-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."

-                        }

-                    }

-                },

-                "DisableApps": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",

-                            "line1": "Auto-Update",

-                            "line2": "und Mobile Apps deaktivieren"

-                        },

-                        "en-au": {

-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",

-                            "line1": "Disable auto-updates",

-                            "line2": "and Mobile Apps?"

-                        },

-                        "en-gb": {

-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",

-                            "line1": "Disable auto-updates",

-                            "line2": "and Mobile Apps?",

-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."

-                        },

-                        "en-ie": {

-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",

-                            "line1": "Disable auto-updates",

-                            "line2": "and Mobile Apps?"

-                        },

-                        "en-us": {

-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",

-                            "line1": "Disable Auto-Updates",

-                            "line2": "and Mobile Apps?",

-                            "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."

-                        },

-                        "es-en": {

-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",

-                            "line1": "¿Deshab. actualiz.",

-                            "line2": "autom. y aplic. móv.?",

-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."

-                        },

-                        "es-es": {

-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",

-                            "line1": "¿Desact. actual. auto",

-                            "line2": "y apl. móviles?"

-                        },

-                        "es-mx": {

-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",

-                            "line1": "¿Deshab. actualiz.",

-                            "line2": "autom. y aplic. móv.?",

-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."

-                        },

-                        "fr-ca": {

-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",

-                            "line1": "Désactiver màj autom.",

-                            "line2": "et app. mobiles?",

-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."

-                        },

-                        "fr-fr": {

-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",

-                            "line1": "Désactiver màj autom.",

-                            "line2": "et app. mobiles?"

-                        },

-                        "it-it": {

-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",

-                            "line1": "Disabilitare agg. aut.",

-                            "line2": "e app mobili?"

-                        },

-                        "nl-nl": {

-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",

-                            "line1": "Auto-updates en mob.",

-                            "line2": "apps uitschakelen?"

-                        },

-                        "pl-pl": {

-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",

-                            "line1": "Wył. automat. aktual.",

-                            "line2": "i aplikacje mobilne?"

-                        },

-                        "pt-br": {

-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",

-                            "line1": "Desativar atualizações",

-                            "line2": "autom. e aplicativos?"

-                        },

-                        "pt-pt": {

-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",

-                            "line1": "Desact. actual. autom.",

-                            "line2": "e aplicações móveis?"

-                        },

-                        "ru-ru": {

-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",

-                            "line1": "Откл. автообновления",

-                            "line2": "и мобил. прилож.?"

-                        },

-                        "sv-se": {

-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",

-                            "line1": "Avaktiverar autouppdat.",

-                            "line2": "och mobilappar?"

-                        },

-                        "tr-tr": {

-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",

-                            "line1": "Oto. güncelleme ve",

-                            "line2": "mobil uygul. kapat?"

-                        },

-                        "zh-cn": {

-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",

-                            "line1": "是否禁用自动更新和",

-                            "line2": "移动应用程序？"

-                        },

-                        "zh-tw": {

-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",

-                            "line1": "停用自動更新",

-                            "line2": "和行動應用程式？"

-                        }

-                    }

-                },

-                "DrivingCharacteristics": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",

-                            "label": "Fahreigenschaften"

-                        },

-                        "en-au": {

-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",

-                            "label": "Driving characteristics"

-                        },

-                        "en-gb": {

-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",

-                            "label": "Driving characteristics",

-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."

-                        },

-                        "en-ie": {

-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",

-                            "label": "Driving characteristics"

-                        },

-                        "en-us": {

-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",

-                            "label": "Driving Characteristics",

-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."

-                        },

-                        "es-en": {

-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",

-                            "label": "Características del manejo",

-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."

-                        },

-                        "es-es": {

-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",

-                            "label": "Características de conducción"

-                        },

-                        "es-mx": {

-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",

-                            "label": "Características del manejo",

-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."

-                        },

-                        "fr-ca": {

-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",

-                            "label": "Caractéristiques de conduite",

-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."

-                        },

-                        "fr-fr": {

-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",

-                            "label": "Caractéristiques de conduite"

-                        },

-                        "it-it": {

-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",

-                            "label": "Caratteristiche di guida"

-                        },

-                        "nl-nl": {

-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",

-                            "label": "Rijkenmerken"

-                        },

-                        "pl-pl": {

-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",

-                            "label": "Informacje dotyczące stylu jazdy"

-                        },

-                        "pt-br": {

-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",

-                            "label": "Características de condução"

-                        },

-                        "pt-pt": {

-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",

-                            "label": "Características de condução"

-                        },

-                        "ru-ru": {

-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",

-                            "label": "Характеристики движения"

-                        },

-                        "sv-se": {

-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",

-                            "label": "Köregenskaper"

-                        },

-                        "tr-tr": {

-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",

-                            "label": "Sürüş karakteristikleri"

-                        },

-                        "zh-cn": {

-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",

-                            "label": "行驶特性"

-                        },

-                        "zh-tw": {

-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",

-                            "label": "駕駛特性"

-                        }

-                    }

-                },

-                "Location": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",

-                            "label": "GPS und Geschwindigkeit"

-                        },

-                        "en-au": {

-                            "tts": "An app can access vehicle GPS and speed.",

-                            "label": "GPS and speed"

-                        },

-                        "en-gb": {

-                            "tts": "An app can access vehicle GPS and speed.",

-                            "label": "GPS and speed",

-                            "textBody": "An app can access vehicle GPS and speed."

-                        },

-                        "en-ie": {

-                            "tts": "An app can access vehicle GPS and speed.",

-                            "label": "GPS and speed"

-                        },

-                        "en-us": {

-                            "tts": "An app can access vehicle GPS and speed.",

-                            "label": "GPS and speed",

-                            "textBody": "An app can access vehicle GPS and speed."

-                        },

-                        "es-en": {

-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",

-                            "label": "GPS y velocidad",

-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."

-                        },

-                        "es-es": {

-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",

-                            "label": "GPS y velocidad"

-                        },

-                        "es-mx": {

-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",

-                            "label": "GPS y velocidad",

-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."

-                        },

-                        "fr-ca": {

-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",

-                            "label": "GPS et vitesse",

-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."

-                        },

-                        "fr-fr": {

-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",

-                            "label": "GPS et vitesse"

-                        },

-                        "it-it": {

-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",

-                            "label": "GPS e velocità"

-                        },

-                        "nl-nl": {

-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",

-                            "label": "Gps en snelheid"

-                        },

-                        "pl-pl": {

-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",

-                            "label": "GPS i prędkość"

-                        },

-                        "pt-br": {

-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",

-                            "label": "GPS e velocidade"

-                        },

-                        "pt-pt": {

-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",

-                            "label": "GPS e velocidade"

-                        },

-                        "ru-ru": {

-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",

-                            "label": "GPS и скорость"

-                        },

-                        "sv-se": {

-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",

-                            "label": "GPS och hastighet"

-                        },

-                        "tr-tr": {

-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",

-                            "label": "GPS ve hız"

-                        },

-                        "zh-cn": {

-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",

-                            "label": "GPS 和车速"

-                        },

-                        "zh-tw": {

-                            "tts": "應用程式可存取車輛的GPS和速度。",

-                            "label": "GPS和車速"

-                        }

-                    }

-                },

-                "LockScreenDismissalWarning":{

-                    "languages":{

-                        "en-us":{

-                            "textBody": "Swipe down to dismiss, acknowledging that you are not the driver"

-                        }

-                    }

-                },

-                "Notifications": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",

-                            "label": "Push-Benachrichtigungen"

-                        },

-                        "en-au": {

-                            "tts": "An app can send notifications when running in the background.",

-                            "label": "Push notifications"

-                        },

-                        "en-gb": {

-                            "tts": "An app can send notifications when running in the background.",

-                            "label": "Push notifications",

-                            "textBody": "An app can send notifications when running in the background."

-                        },

-                        "en-ie": {

-                            "tts": "An app can send notifications when running in the background.",

-                            "label": "Push notifications"

-                        },

-                        "en-us": {

-                            "tts": "An app can send notifications when running in the background.",

-                            "label": "Push notifications",

-                            "textBody": "An app can send notifications when running in the background."

-                        },

-                        "es-en": {

-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",

-                            "label": "Notificaciones tipo Push",

-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."

-                        },

-                        "es-es": {

-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",

-                            "label": "Notificaciones push"

-                        },

-                        "es-mx": {

-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",

-                            "label": "Notificaciones tipo Push",

-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."

-                        },

-                        "fr-ca": {

-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",

-                            "label": "Notifications instantanées",

-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."

-                        },

-                        "fr-fr": {

-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",

-                            "label": "Notifications push"

-                        },

-                        "it-it": {

-                            "tts": "Un'app può inviare notifiche se eseguita in background.",

-                            "label": "Notifiche push"

-                        },

-                        "nl-nl": {

-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",

-                            "label": "Push-meldingen"

-                        },

-                        "pl-pl": {

-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",

-                            "label": "Powiadomienia Push"

-                        },

-                        "pt-br": {

-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",

-                            "label": "Notificações Push"

-                        },

-                        "pt-pt": {

-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",

-                            "label": "Notificações push"

-                        },

-                        "ru-ru": {

-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",

-                            "label": "Оповещения о пересылке"

-                        },

-                        "sv-se": {

-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",

-                            "label": "Push-notiser"

-                        },

-                        "tr-tr": {

-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",

-                            "label": "Anlık bildirimleri"

-                        },

-                        "zh-cn": {

-                            "tts": "移动应用程序在后台运行时可推送通知。",

-                            "label": "推送通知"

-                        },

-                        "zh-tw": {

-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",

-                            "label": "傳送通知"

-                        }

-                    }

-                },

-                "SettingDisableUpdates": {

-                    "languages": {

-                        "de-de": {

-                            "line1": "Updates deakt."

-                        },

-                        "en-au": {

-                            "line1": "Disable updates"

-                        },

-                        "en-gb": {

-                            "line1": "Disable updates"

-                        },

-                        "en-ie": {

-                            "line1": "Disable updates"

-                        },

-                        "en-us": {

-                            "line1": "Disable Updates",

-                            "textBody": "Disable Updates"

-                        },

-                        "es-en": {

-                            "line1": "Deshab. actual.",

-                            "textBody": "Deshab. actual."

-                        },

-                        "es-es": {

-                            "line1": "Desact. actual."

-                        },

-                        "es-mx": {

-                            "line1": "Deshab. actual.",

-                            "textBody": "Deshab. actual."

-                        },

-                        "fr-ca": {

-                            "line1": "Désactiver MAJ",

-                            "textBody": "Désactiver MAJ"

-                        },

-                        "fr-fr": {

-                            "line1": "Désactiver màj"

-                        },

-                        "it-it": {

-                            "line1": "Disabilita agg."

-                        },

-                        "nl-nl": {

-                            "line1": "Upd. uitschak."

-                        },

-                        "pl-pl": {

-                            "line1": "Wyłącz aktual."

-                        },

-                        "pt-br": {

-                            "line1": "Desat. atualiz."

-                        },

-                        "pt-pt": {

-                            "line1": "Desact. actualiz."

-                        },

-                        "ru-ru": {

-                            "line1": "Откл. обновл."

-                        },

-                        "sv-se": {

-                            "line1": "Inaktivera uppd."

-                        },

-                        "tr-tr": {

-                            "line1": "Güncell. Kapat"

-                        },

-                        "zh-cn": {

-                            "line1": "禁用更新"

-                        },

-                        "zh-tw": {

-                            "line1": "停用更新"

-                        }

-                    }

-                },

-                "SettingEnableUpdates": {

-                    "languages": {

-                        "de-de": {

-                            "line1": "Apps aktivieren"

-                        },

-                        "en-au": {

-                            "line1": "Enable Apps"

-                        },

-                        "en-gb": {

-                            "line1": "Enable Apps"

-                        },

-                        "en-ie": {

-                            "line1": "Enable Apps"

-                        },

-                        "en-us": {

-                            "line1": "Enable Apps"

-                        },

-                        "es-en": {

-                            "line1": "Hab. aplic."

-                        },

-                        "es-es": {

-                            "line1": "Activar apl."

-                        },

-                        "es-mx": {

-                            "line1": "Hab. aplic."

-                        },

-                        "fr-ca": {

-                            "line1": "Activer app.",

-                            "textBody": "Activer app."

-                        },

-                        "fr-fr": {

-                            "line1": "Activer app."

-                        },

-                        "it-it": {

-                            "line1": "Abilita app"

-                        },

-                        "nl-nl": {

-                            "line1": "Apps inschak."

-                        },

-                        "pl-pl": {

-                            "line1": "Włącz aplikacje"

-                        },

-                        "pt-br": {

-                            "line1": "Ativar aplic."

-                        },

-                        "pt-pt": {

-                            "line1": "Activar actualiz."

-                        },

-                        "ru-ru": {

-                            "line1": "Вкл. прилож."

-                        },

-                        "sv-se": {

-                            "line1": "Aktivera appar"

-                        },

-                        "tr-tr": {

-                            "line1": "Uygulamaları aç"

-                        },

-                        "zh-cn": {

-                            "line1": "启用应用程序"

-                        },

-                        "zh-tw": {

-                            "line1": "啟用應用程式"

-                        }

-                    }

-                },

-                "SettingUpdateAuto": {

-                    "languages": {

-                        "de-de": {

-                            "line1": "Update anford."

-                        },

-                        "en-au": {

-                            "line1": "Request update"

-                        },

-                        "en-gb": {

-                            "line1": "Request update"

-                        },

-                        "en-ie": {

-                            "line1": "Request update"

-                        },

-                        "en-us": {

-                            "line1": "Request Update",

-                            "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."

-                        },

-                        "es-en": {

-                            "line1": "Solicit. actualiz.",

-                            "textBody": "Solicit. actualiz."

-                        },

-                        "es-es": {

-                            "line1": "Solicitar actual."

-                        },

-                        "es-mx": {

-                            "line1": "Solicit. actualiz.",

-                            "textBody": "Solicit. actualiz."

-                        },

-                        "fr-ca": {

-                            "line1": "Demander MAJ",

-                            "textBody": "Demander MAJ"

-                        },

-                        "fr-fr": {

-                            "line1": "Demander màj"

-                        },

-                        "it-it": {

-                            "line1": "Rich. aggiorn."

-                        },

-                        "nl-nl": {

-                            "line1": "Upd. aanvragen"

-                        },

-                        "pl-pl": {

-                            "line1": "Zażądaj aktual."

-                        },

-                        "pt-br": {

-                            "line1": "Solicitar atualiz."

-                        },

-                        "pt-pt": {

-                            "line1": "Solicit. actualiz."

-                        },

-                        "ru-ru": {

-                            "line1": "Запрос на обн."

-                        },

-                        "sv-se": {

-                            "line1": "Begär uppdat."

-                        },

-                        "tr-tr": {

-                            "line1": "Güncelleme iste"

-                        },

-                        "zh-cn": {

-                            "line1": "请求更新"

-                        },

-                        "zh-tw": {

-                            "line1": "請求更新"

-                        }

-                    }

-                },

-                "StatusNeeded": {

-                    "languages": {

-                        "de-de": {

-                            "line1": "Update benötigt"

-                        },

-                        "en-au": {

-                            "line1": "Update needed"

-                        },

-                        "en-gb": {

-                            "line1": "Update needed",

-                            "textBody": "Update needed"

-                        },

-                        "en-ie": {

-                            "line1": "Update needed"

-                        },

-                        "en-us": {

-                            "line1": "Update Needed",

-                            "textBody": "Update Needed"

-                        },

-                        "es-en": {

-                            "line1": "Actualiz. neces.",

-                            "textBody": "Actualiz. neces."

-                        },

-                        "es-es": {

-                            "line1": "Actu. necesaria"

-                        },

-                        "es-mx": {

-                            "line1": "Actualiz. neces.",

-                            "textBody": "Actualiz. neces."

-                        },

-                        "fr-ca": {

-                            "line1": "Màj requise",

-                            "textBody": "Màj requise"

-                        },

-                        "fr-fr": {

-                            "line1": "Mise à jour requise"

-                        },

-                        "it-it": {

-                            "line1": "Necess. aggiorn."

-                        },

-                        "nl-nl": {

-                            "line1": "Update nodig"

-                        },

-                        "pl-pl": {

-                            "line1": "Potrzeba aktual."

-                        },

-                        "pt-br": {

-                            "line1": "Atualiz. necess."

-                        },

-                        "pt-pt": {

-                            "line1": "Actual. necess."

-                        },

-                        "ru-ru": {

-                            "line1": "Необх. обновл."

-                        },

-                        "sv-se": {

-                            "line1": "Uppdat. krävs"

-                        },

-                        "tr-tr": {

-                            "line1": "Güncellenmeli"

-                        },

-                        "zh-cn": {

-                            "line1": "需要进行更新"

-                        },

-                        "zh-tw": {

-                            "line1": "需更新"

-                        }

-                    }

-                },

-                "StatusPending": {

-                    "languages": {

-                        "de-de": {

-                            "line1": "Aktualisieren..."

-                        },

-                        "en-au": {

-                            "line1": "Updating..."

-                        },

-                        "en-gb": {

-                            "line1": "Updating...",

-                            "textBody": "Updating..."

-                        },

-                        "en-ie": {

-                            "line1": "Updating..."

-                        },

-                        "en-us": {

-                            "line1": "Updating...",

-                            "textBody": "Updating..."

-                        },

-                        "es-en": {

-                            "line1": "Actualizando...",

-                            "textBody": "Actualizando..."

-                        },

-                        "es-es": {

-                            "line1": "Actualizando..."

-                        },

-                        "es-mx": {

-                            "line1": "Actualizando...",

-                            "textBody": "Actualizando..."

-                        },

-                        "fr-ca": {

-                            "line1": "MAJ en cours...",

-                            "textBody": "MAJ en cours..."

-                        },

-                        "fr-fr": {

-                            "line1": "Màj en cours..."

-                        },

-                        "it-it": {

-                            "line1": "Aggiornamento"

-                        },

-                        "nl-nl": {

-                            "line1": "Updaten..."

-                        },

-                        "pl-pl": {

-                            "line1": "Aktualizowanie"

-                        },

-                        "pt-br": {

-                            "line1": "Atualizando..."

-                        },

-                        "pt-pt": {

-                            "line1": "A actualizar..."

-                        },

-                        "ru-ru": {

-                            "line1": "Обновление..."

-                        },

-                        "sv-se": {

-                            "line1": "Uppdaterar..."

-                        },

-                        "tr-tr": {

-                            "line1": "Güncelleniyor..."

-                        },

-                        "zh-cn": {

-                            "line1": "正在更新......"

-                        },

-                        "zh-tw": {

-                            "line1": "更新中..."

-                        }

-                    }

-                },

-                "StatusUpToDate": {

-                    "languages": {

-                        "de-de": {

-                            "line1": "Aktuelle Version"

-                        },

-                        "en-au": {

-                            "line1": "Up-to-date"

-                        },

-                        "en-gb": {

-                            "line1": "Up-to-date",

-                            "textBody": "Up-to-date"

-                        },

-                        "en-ie": {

-                            "line1": "Up-to-date"

-                        },

-                        "en-us": {

-                            "line1": "Up-To-Date",

-                            "textBody": "Up-To-Date"

-                        },

-                        "es-en": {

-                            "line1": "Actualizado",

-                            "textBody": "Actualizado"

-                        },

-                        "es-es": {

-                            "line1": "Actualizada"

-                        },

-                        "es-mx": {

-                            "line1": "Actualizado",

-                            "textBody": "Actualizado"

-                        },

-                        "fr-ca": {

-                            "line1": "Déjà à jour",

-                            "textBody": "Déjà à jour"

-                        },

-                        "fr-fr": {

-                            "line1": "Déjà à jour"

-                        },

-                        "it-it": {

-                            "line1": "più recente"

-                        },

-                        "nl-nl": {

-                            "line1": "Up-to-date"

-                        },

-                        "pl-pl": {

-                            "line1": "Aktualne"

-                        },

-                        "pt-br": {

-                            "line1": "Atualizado"

-                        },

-                        "pt-pt": {

-                            "line1": "Actualizado"

-                        },

-                        "ru-ru": {

-                            "line1": "Обновлено"

-                        },

-                        "sv-se": {

-                            "line1": "Uppdat. krävs ej"

-                        },

-                        "tr-tr": {

-                            "line1": "Güncel"

-                        },

-                        "zh-cn": {

-                            "line1": "最新更新"

-                        },

-                        "zh-tw": {

-                            "line1": "更新最新"

-                        }

-                    }

-                },

-                "VehicleInfo": {

-                    "languages": {

-                        "de-de": {

-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",

-                            "label": "Fahrzeuginformationen"

-                        },

-                        "en-au": {

-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",

-                            "label": "Vehicle information"

-                        },

-                        "en-gb": {

-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",

-                            "label": "Vehicle information",

-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."

-                        },

-                        "en-ie": {

-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",

-                            "label": "Vehicle information"

-                        },

-                        "en-us": {

-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",

-                            "label": "Vehicle information",

-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."

-                        },

-                        "es-en": {

-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",

-                            "label": "Información del vehículo",

-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."

-                        },

-                        "es-es": {

-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",

-                            "label": "Información del vehículo"

-                        },

-                        "es-mx": {

-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",

-                            "label": "Información del vehículo",

-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."

-                        },

-                        "fr-ca": {

-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",

-                            "label": "Renseignements du véhicule",

-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."

-                        },

-                        "fr-fr": {

-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",

-                            "label": "Renseignements du véhicule"

-                        },

-                        "it-it": {

-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",

-                            "label": "Informazioni sul veicolo"

-                        },

-                        "nl-nl": {

-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",

-                            "label": "Voertuiginformatie"

-                        },

-                        "pl-pl": {

-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",

-                            "label": "Informacje o pojeździe"

-                        },

-                        "pt-br": {

-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",

-                            "label": "Informações sobre o veículo"

-                        },

-                        "pt-pt": {

-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",

-                            "label": "Informações do veículo"

-                        },

-                        "ru-ru": {

-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",

-                            "label": "Информация об автомобиле"

-                        },

-                        "sv-se": {

-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",

-                            "label": "Fordonsinformation"

-                        },

-                        "tr-tr": {

-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",

-                            "label": "Araç bilgisi"

-                        },

-                        "zh-cn": {

-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",

-                            "label": "车辆信息"

-                        },

-                        "zh-tw": {

-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",

-                            "label": "車輛資訊"

-                        }

-                    }

-                }

-            }

-        },

-        "app_policies": {

-            "default": {

-                "keep_context": false,

-                "steal_focus": false,

-                "priority": "NONE",

-                "default_hmi": "NONE",

-                "groups": ["Base-4"],

-                "RequestType": [],

-                "RequestSubType": []

-            },

-            "device": {

-                "keep_context": false,

-                "steal_focus": false,

-                "priority": "NONE",

-                "default_hmi": "NONE",

-                "groups": ["DataConsent-2"]

-            },

-            "pre_DataConsent": {

-                "keep_context": false,

-                "steal_focus": false,

-                "priority": "NONE",

-                "default_hmi": "NONE",

-                "groups": ["BaseBeforeDataConsent"]

-            }

-        }

-    }

-}

+{
+    "policy_table": {
+        "module_config": {
+            "preloaded_pt": true,
+            "exchange_after_x_ignition_cycles": 100,
+            "exchange_after_x_kilometers": 1800,
+            "exchange_after_x_days": 30,
+            "timeout_after_x_seconds": 60,
+            "seconds_between_retries": [
+                1,
+                5,
+                25,
+                125,
+                625
+            ],
+            "endpoints": {
+                "0x07": {
+                    "default": [
+                        "http://x.x.x.x:3000/api/1/policies/proprietary"
+                    ]
+                },
+                "0x04": {
+                    "default": [
+                        "http://x.x.x.x:3000/api/1/softwareUpdate"
+                    ]
+                },
+                "queryAppsUrl": {
+                    "default": [
+                        "http://sdl.shaid.server"
+                    ]
+                },
+                "lock_screen_icon_url": {
+                    "default": [
+                        "http://i.imgur.com/TgkvOIZ.png"
+                    ]
+                },
+                "custom_vehicle_data_mapping_url": {
+                    "default": [
+                        "http://x.x.x.x:3000/api/1/vehicleDataMap"
+                    ]
+                }
+            },
+            "endpoint_properties": {
+                "custom_vehicle_data_mapping_url": {
+                    "version": "0.0.0"
+                }
+            },
+            "notifications_per_minute_by_priority": {
+                "EMERGENCY": 60,
+                "NAVIGATION": 15,
+                "PROJECTION": 15,
+                "VOICECOM": 20,
+                "COMMUNICATION": 6,
+                "NORMAL": 4,
+                "NONE": 0
+            },
+            "lock_screen_dismissal_enabled": true
+        },
+        "functional_groupings": {
+            "Base-4": {
+                "rpcs": {
+                    "AddCommand": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "AddSubMenu": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ShowAppMenu": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "Alert": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ChangeRegistration": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "CreateInteractionChoiceSet": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "DeleteCommand": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "DeleteFile": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "DeleteInteractionChoiceSet": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "DeleteSubMenu": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "EncodedSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "EndAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GenericResponse": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GetSystemCapability": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ListFiles": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnAppInterfaceUnregistered": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnButtonEvent": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND"
+                        ]
+                    },
+                    "OnButtonPress": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND"
+                        ]
+                    },
+                    "OnCommand": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnDriverDistraction": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnEncodedSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnHashChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnHMIStatus": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnLanguageChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnPermissionsChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnSystemRequest": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnSystemCapabilityUpdated": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "PerformAudioPassThru": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "PerformInteraction": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "PutFile": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "RegisterAppInterface": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ResetGlobalProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ScrollableMessage": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "SetAppIcon": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetDisplayLayout": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetGlobalProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetMediaClockTimer": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND"
+                        ]
+                    },
+                    "Show": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "Slider": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "Speak": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SubscribeButton": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SystemRequest": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "UnregisterAppInterface": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "UnsubscribeButton": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "CancelInteraction": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "CloseApplication": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND"
+                        ]
+                    }
+                }
+            },
+            "Location-1": {
+                "user_consent_prompt": "Location",
+                "rpcs": {
+                    "GetVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "gps",
+                            "speed"
+                        ]
+                    },
+                    "OnVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "gps",
+                            "speed"
+                        ]
+                    },
+                    "SubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "gps",
+                            "speed"
+                        ]
+                    },
+                    "UnsubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "gps",
+                            "speed"
+                        ]
+                    }
+                }
+            },
+            "Notifications": {
+                "user_consent_prompt": "Notifications",
+                "rpcs": {
+                    "Alert": {
+                        "hmi_levels": [
+                            "BACKGROUND"
+                        ]
+                    }
+                }
+            },
+            "Notifications-RC": {
+                "rpcs": {
+                    "OnHMIStatus": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnPermissionsChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnSystemRequest": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    }
+                }
+            },
+            "DrivingCharacteristics-3": {
+                "user_consent_prompt": "DrivingCharacteristics",
+                "rpcs": {
+                    "GetVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "accPedalPosition",
+                            "beltStatus",
+                            "electronicParkBrakeStatus",
+                            "driverBraking",
+                            "myKey",
+                            "prndl",
+                            "rpm",
+                            "steeringWheelAngle"
+                        ]
+                    },
+                    "OnVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "accPedalPosition",
+                            "beltStatus",
+                            "electronicParkBrakeStatus",
+                            "driverBraking",
+                            "myKey",
+                            "prndl",
+                            "rpm",
+                            "steeringWheelAngle"
+                        ]
+                    },
+                    "SubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "accPedalPosition",
+                            "beltStatus",
+                            "electronicParkBrakeStatus",
+                            "driverBraking",
+                            "myKey",
+                            "prndl",
+                            "rpm",
+                            "steeringWheelAngle"
+                        ]
+                    },
+                    "UnsubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "accPedalPosition",
+                            "beltStatus",
+                            "electronicParkBrakeStatus",
+                            "driverBraking",
+                            "myKey",
+                            "prndl",
+                            "rpm",
+                            "steeringWheelAngle"
+                        ]
+                    }
+                }
+            },
+            "VehicleInfo-3": {
+                "user_consent_prompt": "VehicleInfo",
+                "rpcs": {
+                    "GetVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "bodyInformation",
+                            "deviceStatus",
+                            "engineOilLife",
+                            "engineTorque",
+                            "externalTemperature",
+                            "turnSignal",
+                            "fuelLevel",
+                            "fuelLevel_State",
+                            "headLampStatus",
+                            "instantFuelConsumption",
+                            "fuelRange",
+                            "cloudAppVehicleID",
+                            "odometer",
+                            "tirePressure",
+                            "vin",
+                            "wiperStatus"
+                        ]
+                    },
+                    "OnVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "bodyInformation",
+                            "deviceStatus",
+                            "engineOilLife",
+                            "engineTorque",
+                            "externalTemperature",
+                            "turnSignal",
+                            "fuelLevel",
+                            "fuelLevel_State",
+                            "headLampStatus",
+                            "instantFuelConsumption",
+                            "fuelRange",
+                            "cloudAppVehicleID",
+                            "odometer",
+                            "tirePressure",
+                            "vin",
+                            "wiperStatus"
+                        ]
+                    },
+                    "SubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "bodyInformation",
+                            "deviceStatus",
+                            "engineOilLife",
+                            "engineTorque",
+                            "externalTemperature",
+                            "turnSignal",
+                            "fuelLevel",
+                            "fuelLevel_State",
+                            "headLampStatus",
+                            "instantFuelConsumption",
+                            "fuelRange",
+                            "cloudAppVehicleID",
+                            "odometer",
+                            "tirePressure",
+                            "wiperStatus"
+                        ]
+                    },
+                    "UnsubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "bodyInformation",
+                            "deviceStatus",
+                            "engineOilLife",
+                            "engineTorque",
+                            "externalTemperature",
+                            "turnSignal",
+                            "fuelLevel",
+                            "fuelLevel_State",
+                            "headLampStatus",
+                            "instantFuelConsumption",
+                            "fuelRange",
+                            "cloudAppVehicleID",
+                            "odometer",
+                            "tirePressure",
+                            "wiperStatus"
+                        ]
+                    }
+                }
+            },
+            "PropriataryData-1": {
+                "rpcs": {
+                    "DiagnosticMessage": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GetDTCs": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ReadDID": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "PropriataryData-2": {
+                "rpcs": {
+                    "DiagnosticMessage": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GetDTCs": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ReadDID": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "ProprietaryData-3": {
+                "rpcs": {
+                    "GetDTCs": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ReadDID": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "CloudAppStore": {
+                "rpcs": {
+                    "SetCloudAppProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GetCloudAppProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "CloudApp": {
+                "rpcs": {
+                    "GetVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "cloudAppVehicleID"
+                        ]
+                    },
+                    "OnVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "cloudAppVehicleID"
+                        ]
+                    },
+                    "SubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "cloudAppVehicleID"
+                        ]
+                    },
+                    "UnsubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "cloudAppVehicleID"
+                        ]
+                    }
+                }
+            },
+            "AppServiceProvider": {
+                "rpcs": {
+                    "PublishAppService": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "UnpublishAppService": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "GetAppServiceData": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "OnAppServiceData": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "PerformAppServiceInteraction": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    }
+                }
+            },
+            "AppServiceConsumer": {
+                "rpcs": {
+                    "GetFile": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "GetAppServiceData": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "OnAppServiceData": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    },
+                    "PerformAppServiceInteraction": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED",
+                            "BACKGROUND",
+                            "NONE"
+                        ]
+                    }
+                }
+            },
+            "RemoteControl": {
+                "rpcs": {
+                    "ButtonPress": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GetInteriorVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SetInteriorVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnInteriorVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SystemRequest": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnRCStatus": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ReleaseInteriorVehicleDataModule": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "GetInteriorVehicleDataConsent": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    }
+                }
+            },
+            "Emergency-1": {
+                "rpcs": {
+                    "GetVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "airbagStatus",
+                            "clusterModeStatus",
+                            "eCallInfo",
+                            "emergencyEvent"
+                        ]
+                    },
+                    "OnVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "airbagStatus",
+                            "clusterModeStatus",
+                            "eCallInfo",
+                            "emergencyEvent"
+                        ]
+                    },
+                    "SubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "airbagStatus",
+                            "clusterModeStatus",
+                            "eCallInfo",
+                            "emergencyEvent"
+                        ]
+                    },
+                    "UnsubscribeVehicleData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ],
+                        "parameters": [
+                            "airbagStatus",
+                            "clusterModeStatus",
+                            "eCallInfo",
+                            "emergencyEvent"
+                        ]
+                    }
+                }
+            },
+            "Navigation-1": {
+                "rpcs": {
+                    "AlertManeuver": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ShowConstantTBT": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "UpdateTurnList": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "Base-6": {
+                "rpcs": {
+                    "AddCommand": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "AddSubMenu": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ShowAppMenu": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "Alert": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ChangeRegistration": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "CreateInteractionChoiceSet": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "DeleteCommand": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "DeleteFile": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "DeleteInteractionChoiceSet": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "DeleteSubMenu": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "EncodedSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "EndAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "GenericResponse": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ListFiles": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnAppInterfaceUnregistered": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnButtonEvent": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnButtonPress": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnCommand": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnDriverDistraction": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnEncodedSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnHMIStatus": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnLanguageChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnPermissionsChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnTBTClientState": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "PerformAudioPassThru": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "PerformInteraction": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "PutFile": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "RegisterAppInterface": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ResetGlobalProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "ScrollableMessage": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "SetAppIcon": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetDisplayLayout": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetGlobalProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SetMediaClockTimer": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "Show": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "Slider": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    },
+                    "Speak": {
+                        "hmi_levels": [
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SubscribeButton": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "UnregisterAppInterface": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "UnsubscribeButton": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "OnKeyboardInputOnlyGroup": {
+                "rpcs": {
+                    "OnKeyboardInput": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    }
+                }
+            },
+            "OnTouchEventOnlyGroup": {
+                "rpcs": {
+                    "OnTouchEvent": {
+                        "hmi_levels": [
+                            "FULL"
+                        ]
+                    }
+                }
+            },
+            "DiagnosticMessageOnly": {
+                "rpcs": {
+                    "DiagnosticMessage": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "DataConsent-2": {
+                "user_consent_prompt": "DataConsent",
+                "rpcs": null
+            },
+            "BaseBeforeDataConsent": {
+                "rpcs": {
+                    "ChangeRegistration": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "DeleteFile": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "EncodedSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ListFiles": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnAppInterfaceUnregistered": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnEncodedSyncPData": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnHashChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnHMIStatus": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnLanguageChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnPermissionsChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "OnSystemRequest": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "PutFile": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "RegisterAppInterface": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "ResetGlobalProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetGlobalProperties": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetAppIcon": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SetDisplayLayout": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "SystemRequest": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    },
+                    "UnregisterAppInterface": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED",
+                            "NONE"
+                        ]
+                    }
+                }
+            },
+            "SendLocation": {
+                "rpcs": {
+                    "SendLocation": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "WayPoints": {
+                "rpcs": {
+                    "GetWayPoints": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "SubscribeWayPoints": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "UnsubscribeWayPoints": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    },
+                    "OnWayPointChange": {
+                        "hmi_levels": [
+                            "BACKGROUND",
+                            "FULL",
+                            "LIMITED"
+                        ]
+                    }
+                }
+            },
+            "BackgroundAPT": {
+                "rpcs": {
+                    "EndAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND"
+                        ]
+                    },
+                    "OnAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND"
+                        ]
+                    },
+                    "PerformAudioPassThru": {
+                        "hmi_levels": [
+                            "BACKGROUND"
+                        ]
+                    }
+                }
+            },
+            "HapticGroup": {
+                "rpcs": {
+                    "OnTouchEvent": {
+                        "hmi_levels": ["FULL"]
+                    },
+                    "SendHapticData": {
+                        "hmi_levels": [
+                          "FULL"
+                        ]
+                    }
+                }
+            },
+            "WidgetSupport": {
+                "rpcs": {
+                    "CreateWindow": {
+                        "hmi_levels": [
+                          "BACKGROUND",
+                          "FULL",
+                          "LIMITED"
+                        ]
+                    },
+                    "DeleteWindow": {
+                        "hmi_levels": [
+                          "BACKGROUND",
+                          "FULL",
+                          "LIMITED"
+                        ]
+                    },
+                    "Show": {
+                        "hmi_levels": [
+                          "BACKGROUND",
+                          "FULL",
+                          "LIMITED"
+                        ]
+                    },
+                    "OnSystemCapabilityUpdated": {
+                        "hmi_levels": [
+                          "BACKGROUND",
+                          "FULL",
+                          "LIMITED",
+                          "NONE"
+                        ]
+                    }
+                }
+            }
+        },
+        "consumer_friendly_messages": {
+            "version": "001.001.021",
+            "messages": {
+                "AppPermissions": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
+                            "line1": "Zugriffsanfrage(n)",
+                            "line2": "erlauben?"
+                        },
+                        "en-au": {
+                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
+                            "line1": "Grant requested",
+                            "line2": "permission(s)?"
+                        },
+                        "en-gb": {
+                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
+                            "line1": "Grant requested",
+                            "line2": "permission(s)?",
+                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
+                        },
+                        "en-ie": {
+                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
+                            "line1": "Grant requested",
+                            "line2": "permission(s)?"
+                        },
+                        "en-us": {
+                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
+                            "line1": "Grant Requested",
+                            "line2": "Permission(s)?",
+                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
+                        },
+                        "es-en": {
+                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
+                            "line1": "¿Otorgar permiso(s)",
+                            "line2": "solicitado(s)?",
+                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
+                        },
+                        "es-es": {
+                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
+                            "line1": "¿Conceder permisos",
+                            "line2": "solicitados?"
+                        },
+                        "es-mx": {
+                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
+                            "line1": "¿Otorgar permiso(s)",
+                            "line2": "solicitado(s)?",
+                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. \n\nSi presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
+                        },
+                        "fr-ca": {
+                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
+                            "line1": "Accorder permission(s)",
+                            "line2": "demandée(s)",
+                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
+                        },
+                        "fr-fr": {
+                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
+                            "line1": "Accorder permission(s)",
+                            "line2": "demandée(s)"
+                        },
+                        "it-it": {
+                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
+                            "line1": "Concedi autorizzaz.",
+                            "line2": "richiesta(e)?"
+                        },
+                        "nl-nl": {
+                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
+                            "line1": "Aangevraagde",
+                            "line2": "permissie(s) verlenen?"
+                        },
+                        "pl-pl": {
+                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
+                            "line1": "Udzielić żądanych",
+                            "line2": "pozwoleń?"
+                        },
+                        "pt-br": {
+                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
+                            "line1": "Conceder permissão",
+                            "line2": "solicitada?"
+                        },
+                        "pt-pt": {
+                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
+                            "line1": "Conceder permiss.",
+                            "line2": "solicitada(s)?"
+                        },
+                        "ru-ru": {
+                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
+                            "line1": "Предост. заправш.",
+                            "line2": "разрешения?"
+                        },
+                        "sv-se": {
+                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
+                            "line1": "Vill du ge",
+                            "line2": "tillstånd?"
+                        },
+                        "tr-tr": {
+                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
+                            "line1": "İstenen izinler",
+                            "line2": "verilsin mi?"
+                        },
+                        "zh-cn": {
+                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
+                            "line1": "是否允许请求的",
+                            "line2": "权限？"
+                        },
+                        "zh-tw": {
+                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
+                            "line1": "允許",
+                            "line2": "授權請求?"
+                        }
+                    }
+                },
+                "AppPermissionsHelp": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+                        },
+                        "en-au": {
+                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+                        },
+                        "en-gb": {
+                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+                        },
+                        "en-ie": {
+                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+                        },
+                        "en-us": {
+                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
+                        },
+                        "es-en": {
+                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+                        },
+                        "es-es": {
+                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
+                        },
+                        "es-mx": {
+                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+                        },
+                        "fr-ca": {
+                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+                        },
+                        "fr-fr": {
+                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+                        },
+                        "it-it": {
+                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
+                        },
+                        "nl-nl": {
+                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
+                        },
+                        "pl-pl": {
+                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
+                        },
+                        "pt-br": {
+                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
+                        },
+                        "pt-pt": {
+                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
+                        },
+                        "ru-ru": {
+                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
+                        },
+                        "sv-se": {
+                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
+                        },
+                        "tr-tr": {
+                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
+                        },
+                        "zh-cn": {
+                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
+                        },
+                        "zh-tw": {
+                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
+                        }
+                    }
+                },
+                "AppPermissionsRevoked": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
+                        },
+                        "en-au": {
+                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+                        },
+                        "en-gb": {
+                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+                        },
+                        "en-ie": {
+                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+                        },
+                        "en-us": {
+                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+                        },
+                        "es-en": {
+                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+                        },
+                        "es-es": {
+                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
+                        },
+                        "es-mx": {
+                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+                        },
+                        "fr-ca": {
+                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+                        },
+                        "fr-fr": {
+                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+                        },
+                        "it-it": {
+                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
+                        },
+                        "nl-nl": {
+                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
+                        },
+                        "pl-pl": {
+                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
+                        },
+                        "pt-br": {
+                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
+                        },
+                        "pt-pt": {
+                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
+                        },
+                        "ru-ru": {
+                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
+                        },
+                        "sv-se": {
+                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
+                        },
+                        "tr-tr": {
+                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
+                        },
+                        "zh-cn": {
+                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
+                        },
+                        "zh-tw": {
+                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
+                        }
+                    }
+                },
+                "AppUnauthorized": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
+                            "line1": "nicht autorisiert"
+                        },
+                        "en-au": {
+                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
+                            "line1": "not authorized"
+                        },
+                        "en-gb": {
+                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
+                            "line1": "not authorized",
+                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
+                        },
+                        "en-ie": {
+                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
+                            "line1": "not authorized"
+                        },
+                        "en-us": {
+                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
+                            "line1": "Not Authorized",
+                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
+                        },
+                        "es-en": {
+                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+                            "line1": "no autorizada",
+                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+                        },
+                        "es-es": {
+                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
+                            "line1": "No autorizada"
+                        },
+                        "es-mx": {
+                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+                            "line1": "no autorizada",
+                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+                        },
+                        "fr-ca": {
+                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
+                            "line1": "non autorisée",
+                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+                        },
+                        "fr-fr": {
+                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
+                            "line1": "non autorisée"
+                        },
+                        "it-it": {
+                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
+                            "line1": "non autorizzata"
+                        },
+                        "nl-nl": {
+                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
+                            "line1": "niet geautoriseerd"
+                        },
+                        "pl-pl": {
+                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
+                            "line1": "brak autoryzacji"
+                        },
+                        "pt-br": {
+                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
+                            "line1": "não autorizado"
+                        },
+                        "pt-pt": {
+                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
+                            "line1": "não autorizada"
+                        },
+                        "ru-ru": {
+                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
+                            "line1": "не авторизировано"
+                        },
+                        "sv-se": {
+                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
+                            "line1": "är ej godkänd"
+                        },
+                        "tr-tr": {
+                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
+                            "line1": "için izin yok"
+                        },
+                        "zh-cn": {
+                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
+                            "line1": "未得到授权"
+                        },
+                        "zh-tw": {
+                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
+                            "line1": "無授權"
+                        }
+                    }
+                },
+                "AppUnsupported": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
+                            "line1": "nicht unterstützt"
+                        },
+                        "en-au": {
+                            "tts": "This version of %appName% is not supported by SYNC.",
+                            "line1": "not supported"
+                        },
+                        "en-gb": {
+                            "tts": "This version of %appName% is not supported by SYNC.",
+                            "line1": "not supported",
+                            "textBody": "This version of %appName% is not supported by SYNC."
+                        },
+                        "en-ie": {
+                            "tts": "This version of %appName% is not supported by SYNC.",
+                            "line1": "not supported"
+                        },
+                        "en-us": {
+                            "tts": "This version of %appName% is not supported by SYNC.",
+                            "line1": "Not Supported",
+                            "textBody": "Your version of %appName% is not supported by SYNC."
+                        },
+                        "es-en": {
+                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
+                            "line1": "no compatible",
+                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
+                        },
+                        "es-es": {
+                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
+                            "line1": "No compatible"
+                        },
+                        "es-mx": {
+                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
+                            "line1": "no compatible",
+                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
+                        },
+                        "fr-ca": {
+                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
+                            "line1": "incompatible",
+                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
+                        },
+                        "fr-fr": {
+                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
+                            "line1": "incompatible"
+                        },
+                        "it-it": {
+                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
+                            "line1": "non supportata"
+                        },
+                        "nl-nl": {
+                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
+                            "line1": "niet ondersteund"
+                        },
+                        "pl-pl": {
+                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
+                            "line1": "aplikacja nie obsług."
+                        },
+                        "pt-br": {
+                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
+                            "line1": "não suportado"
+                        },
+                        "pt-pt": {
+                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
+                            "line1": "não suportada"
+                        },
+                        "ru-ru": {
+                            "tts": "Эта версия %appName% не поддерживается SYNC.",
+                            "line1": "не поддерживается"
+                        },
+                        "sv-se": {
+                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
+                            "line1": "stöds ej"
+                        },
+                        "tr-tr": {
+                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
+                            "line1": "desteklenmiyor"
+                        },
+                        "zh-cn": {
+                            "tts": "SYNC不支持此版本的%appName%。",
+                            "line1": "不受支持"
+                        },
+                        "zh-tw": {
+                            "tts": "SYNC 不支援此版本的%appName% 。",
+                            "line1": "不支援"
+                        }
+                    }
+                },
+                "DataConsent": {
+                    "languages": {
+                        "en-gb": {
+                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
+                        },
+                        "en-us": {
+                            "line1": "Enable Mobile Apps",
+                            "line2": "on SYNC? (Uses Data)",
+                            "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
+                        },
+                        "es-mx": {
+                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. \n\nLas actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. \n\nPresione Sí para permitir y No para denegar."
+                        },
+                        "fr-ca": {
+                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements.\r\n\r\nVeuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+                        }
+                    }
+                },
+                "DataConsentHelp": {
+                    "languages": {
+                        "en-us": {
+                            "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
+                        },
+                        "es-mx": {
+                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
+                        },
+                        "fr-ca": {
+                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
+                        }
+                    }
+                },
+                "DisableApps": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
+                            "line1": "Auto-Update",
+                            "line2": "und Mobile Apps deaktivieren"
+                        },
+                        "en-au": {
+                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
+                            "line1": "Disable auto-updates",
+                            "line2": "and Mobile Apps?"
+                        },
+                        "en-gb": {
+                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
+                            "line1": "Disable auto-updates",
+                            "line2": "and Mobile Apps?",
+                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+                        },
+                        "en-ie": {
+                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
+                            "line1": "Disable auto-updates",
+                            "line2": "and Mobile Apps?"
+                        },
+                        "en-us": {
+                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
+                            "line1": "Disable Auto-Updates",
+                            "line2": "and Mobile Apps?",
+                            "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
+                        },
+                        "es-en": {
+                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+                            "line1": "¿Deshab. actualiz.",
+                            "line2": "autom. y aplic. móv.?",
+                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+                        },
+                        "es-es": {
+                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
+                            "line1": "¿Desact. actual. auto",
+                            "line2": "y apl. móviles?"
+                        },
+                        "es-mx": {
+                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+                            "line1": "¿Deshab. actualiz.",
+                            "line2": "autom. y aplic. móv.?",
+                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+                        },
+                        "fr-ca": {
+                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
+                            "line1": "Désactiver màj autom.",
+                            "line2": "et app. mobiles?",
+                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+                        },
+                        "fr-fr": {
+                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
+                            "line1": "Désactiver màj autom.",
+                            "line2": "et app. mobiles?"
+                        },
+                        "it-it": {
+                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
+                            "line1": "Disabilitare agg. aut.",
+                            "line2": "e app mobili?"
+                        },
+                        "nl-nl": {
+                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
+                            "line1": "Auto-updates en mob.",
+                            "line2": "apps uitschakelen?"
+                        },
+                        "pl-pl": {
+                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
+                            "line1": "Wył. automat. aktual.",
+                            "line2": "i aplikacje mobilne?"
+                        },
+                        "pt-br": {
+                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
+                            "line1": "Desativar atualizações",
+                            "line2": "autom. e aplicativos?"
+                        },
+                        "pt-pt": {
+                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
+                            "line1": "Desact. actual. autom.",
+                            "line2": "e aplicações móveis?"
+                        },
+                        "ru-ru": {
+                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
+                            "line1": "Откл. автообновления",
+                            "line2": "и мобил. прилож.?"
+                        },
+                        "sv-se": {
+                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
+                            "line1": "Avaktiverar autouppdat.",
+                            "line2": "och mobilappar?"
+                        },
+                        "tr-tr": {
+                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
+                            "line1": "Oto. güncelleme ve",
+                            "line2": "mobil uygul. kapat?"
+                        },
+                        "zh-cn": {
+                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
+                            "line1": "是否禁用自动更新和",
+                            "line2": "移动应用程序？"
+                        },
+                        "zh-tw": {
+                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
+                            "line1": "停用自動更新",
+                            "line2": "和行動應用程式？"
+                        }
+                    }
+                },
+                "DrivingCharacteristics": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
+                            "label": "Fahreigenschaften"
+                        },
+                        "en-au": {
+                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
+                            "label": "Driving characteristics"
+                        },
+                        "en-gb": {
+                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
+                            "label": "Driving characteristics",
+                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+                        },
+                        "en-ie": {
+                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
+                            "label": "Driving characteristics"
+                        },
+                        "en-us": {
+                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
+                            "label": "Driving Characteristics",
+                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
+                        },
+                        "es-en": {
+                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
+                            "label": "Características del manejo",
+                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
+                        },
+                        "es-es": {
+                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
+                            "label": "Características de conducción"
+                        },
+                        "es-mx": {
+                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
+                            "label": "Características del manejo",
+                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
+                        },
+                        "fr-ca": {
+                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
+                            "label": "Caractéristiques de conduite",
+                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
+                        },
+                        "fr-fr": {
+                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
+                            "label": "Caractéristiques de conduite"
+                        },
+                        "it-it": {
+                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
+                            "label": "Caratteristiche di guida"
+                        },
+                        "nl-nl": {
+                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
+                            "label": "Rijkenmerken"
+                        },
+                        "pl-pl": {
+                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
+                            "label": "Informacje dotyczące stylu jazdy"
+                        },
+                        "pt-br": {
+                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
+                            "label": "Características de condução"
+                        },
+                        "pt-pt": {
+                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
+                            "label": "Características de condução"
+                        },
+                        "ru-ru": {
+                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
+                            "label": "Характеристики движения"
+                        },
+                        "sv-se": {
+                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
+                            "label": "Köregenskaper"
+                        },
+                        "tr-tr": {
+                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
+                            "label": "Sürüş karakteristikleri"
+                        },
+                        "zh-cn": {
+                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
+                            "label": "行驶特性"
+                        },
+                        "zh-tw": {
+                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
+                            "label": "駕駛特性"
+                        }
+                    }
+                },
+                "Location": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
+                            "label": "GPS und Geschwindigkeit"
+                        },
+                        "en-au": {
+                            "tts": "An app can access vehicle GPS and speed.",
+                            "label": "GPS and speed"
+                        },
+                        "en-gb": {
+                            "tts": "An app can access vehicle GPS and speed.",
+                            "label": "GPS and speed",
+                            "textBody": "An app can access vehicle GPS and speed."
+                        },
+                        "en-ie": {
+                            "tts": "An app can access vehicle GPS and speed.",
+                            "label": "GPS and speed"
+                        },
+                        "en-us": {
+                            "tts": "An app can access vehicle GPS and speed.",
+                            "label": "GPS and speed",
+                            "textBody": "An app can access vehicle GPS and speed."
+                        },
+                        "es-en": {
+                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+                            "label": "GPS y velocidad",
+                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+                        },
+                        "es-es": {
+                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
+                            "label": "GPS y velocidad"
+                        },
+                        "es-mx": {
+                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+                            "label": "GPS y velocidad",
+                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+                        },
+                        "fr-ca": {
+                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
+                            "label": "GPS et vitesse",
+                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
+                        },
+                        "fr-fr": {
+                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
+                            "label": "GPS et vitesse"
+                        },
+                        "it-it": {
+                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
+                            "label": "GPS e velocità"
+                        },
+                        "nl-nl": {
+                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
+                            "label": "Gps en snelheid"
+                        },
+                        "pl-pl": {
+                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
+                            "label": "GPS i prędkość"
+                        },
+                        "pt-br": {
+                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
+                            "label": "GPS e velocidade"
+                        },
+                        "pt-pt": {
+                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
+                            "label": "GPS e velocidade"
+                        },
+                        "ru-ru": {
+                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
+                            "label": "GPS и скорость"
+                        },
+                        "sv-se": {
+                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
+                            "label": "GPS och hastighet"
+                        },
+                        "tr-tr": {
+                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
+                            "label": "GPS ve hız"
+                        },
+                        "zh-cn": {
+                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
+                            "label": "GPS 和车速"
+                        },
+                        "zh-tw": {
+                            "tts": "應用程式可存取車輛的GPS和速度。",
+                            "label": "GPS和車速"
+                        }
+                    }
+                },
+                "LockScreenDismissalWarning": {
+                    "languages": {
+                        "en-us": {
+                            "textBody": "Swipe down to dismiss, acknowledging that you are not the driver"
+                        }
+                    }
+                },
+                "Notifications": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
+                            "label": "Push-Benachrichtigungen"
+                        },
+                        "en-au": {
+                            "tts": "An app can send notifications when running in the background.",
+                            "label": "Push notifications"
+                        },
+                        "en-gb": {
+                            "tts": "An app can send notifications when running in the background.",
+                            "label": "Push notifications",
+                            "textBody": "An app can send notifications when running in the background."
+                        },
+                        "en-ie": {
+                            "tts": "An app can send notifications when running in the background.",
+                            "label": "Push notifications"
+                        },
+                        "en-us": {
+                            "tts": "An app can send notifications when running in the background.",
+                            "label": "Push notifications",
+                            "textBody": "An app can send notifications when running in the background."
+                        },
+                        "es-en": {
+                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+                            "label": "Notificaciones tipo Push",
+                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+                        },
+                        "es-es": {
+                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
+                            "label": "Notificaciones push"
+                        },
+                        "es-mx": {
+                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+                            "label": "Notificaciones tipo Push",
+                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+                        },
+                        "fr-ca": {
+                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
+                            "label": "Notifications instantanées",
+                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+                        },
+                        "fr-fr": {
+                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
+                            "label": "Notifications push"
+                        },
+                        "it-it": {
+                            "tts": "Un'app può inviare notifiche se eseguita in background.",
+                            "label": "Notifiche push"
+                        },
+                        "nl-nl": {
+                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
+                            "label": "Push-meldingen"
+                        },
+                        "pl-pl": {
+                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
+                            "label": "Powiadomienia Push"
+                        },
+                        "pt-br": {
+                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
+                            "label": "Notificações Push"
+                        },
+                        "pt-pt": {
+                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
+                            "label": "Notificações push"
+                        },
+                        "ru-ru": {
+                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
+                            "label": "Оповещения о пересылке"
+                        },
+                        "sv-se": {
+                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
+                            "label": "Push-notiser"
+                        },
+                        "tr-tr": {
+                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
+                            "label": "Anlık bildirimleri"
+                        },
+                        "zh-cn": {
+                            "tts": "移动应用程序在后台运行时可推送通知。",
+                            "label": "推送通知"
+                        },
+                        "zh-tw": {
+                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
+                            "label": "傳送通知"
+                        }
+                    }
+                },
+                "SettingDisableUpdates": {
+                    "languages": {
+                        "de-de": {
+                            "line1": "Updates deakt."
+                        },
+                        "en-au": {
+                            "line1": "Disable updates"
+                        },
+                        "en-gb": {
+                            "line1": "Disable updates"
+                        },
+                        "en-ie": {
+                            "line1": "Disable updates"
+                        },
+                        "en-us": {
+                            "line1": "Disable Updates",
+                            "textBody": "Disable Updates"
+                        },
+                        "es-en": {
+                            "line1": "Deshab. actual.",
+                            "textBody": "Deshab. actual."
+                        },
+                        "es-es": {
+                            "line1": "Desact. actual."
+                        },
+                        "es-mx": {
+                            "line1": "Deshab. actual.",
+                            "textBody": "Deshab. actual."
+                        },
+                        "fr-ca": {
+                            "line1": "Désactiver MAJ",
+                            "textBody": "Désactiver MAJ"
+                        },
+                        "fr-fr": {
+                            "line1": "Désactiver màj"
+                        },
+                        "it-it": {
+                            "line1": "Disabilita agg."
+                        },
+                        "nl-nl": {
+                            "line1": "Upd. uitschak."
+                        },
+                        "pl-pl": {
+                            "line1": "Wyłącz aktual."
+                        },
+                        "pt-br": {
+                            "line1": "Desat. atualiz."
+                        },
+                        "pt-pt": {
+                            "line1": "Desact. actualiz."
+                        },
+                        "ru-ru": {
+                            "line1": "Откл. обновл."
+                        },
+                        "sv-se": {
+                            "line1": "Inaktivera uppd."
+                        },
+                        "tr-tr": {
+                            "line1": "Güncell. Kapat"
+                        },
+                        "zh-cn": {
+                            "line1": "禁用更新"
+                        },
+                        "zh-tw": {
+                            "line1": "停用更新"
+                        }
+                    }
+                },
+                "SettingEnableUpdates": {
+                    "languages": {
+                        "de-de": {
+                            "line1": "Apps aktivieren"
+                        },
+                        "en-au": {
+                            "line1": "Enable Apps"
+                        },
+                        "en-gb": {
+                            "line1": "Enable Apps"
+                        },
+                        "en-ie": {
+                            "line1": "Enable Apps"
+                        },
+                        "en-us": {
+                            "line1": "Enable Apps"
+                        },
+                        "es-en": {
+                            "line1": "Hab. aplic."
+                        },
+                        "es-es": {
+                            "line1": "Activar apl."
+                        },
+                        "es-mx": {
+                            "line1": "Hab. aplic."
+                        },
+                        "fr-ca": {
+                            "line1": "Activer app.",
+                            "textBody": "Activer app."
+                        },
+                        "fr-fr": {
+                            "line1": "Activer app."
+                        },
+                        "it-it": {
+                            "line1": "Abilita app"
+                        },
+                        "nl-nl": {
+                            "line1": "Apps inschak."
+                        },
+                        "pl-pl": {
+                            "line1": "Włącz aplikacje"
+                        },
+                        "pt-br": {
+                            "line1": "Ativar aplic."
+                        },
+                        "pt-pt": {
+                            "line1": "Activar actualiz."
+                        },
+                        "ru-ru": {
+                            "line1": "Вкл. прилож."
+                        },
+                        "sv-se": {
+                            "line1": "Aktivera appar"
+                        },
+                        "tr-tr": {
+                            "line1": "Uygulamaları aç"
+                        },
+                        "zh-cn": {
+                            "line1": "启用应用程序"
+                        },
+                        "zh-tw": {
+                            "line1": "啟用應用程式"
+                        }
+                    }
+                },
+                "SettingUpdateAuto": {
+                    "languages": {
+                        "de-de": {
+                            "line1": "Update anford."
+                        },
+                        "en-au": {
+                            "line1": "Request update"
+                        },
+                        "en-gb": {
+                            "line1": "Request update"
+                        },
+                        "en-ie": {
+                            "line1": "Request update"
+                        },
+                        "en-us": {
+                            "line1": "Request Update",
+                            "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
+                        },
+                        "es-en": {
+                            "line1": "Solicit. actualiz.",
+                            "textBody": "Solicit. actualiz."
+                        },
+                        "es-es": {
+                            "line1": "Solicitar actual."
+                        },
+                        "es-mx": {
+                            "line1": "Solicit. actualiz.",
+                            "textBody": "Solicit. actualiz."
+                        },
+                        "fr-ca": {
+                            "line1": "Demander MAJ",
+                            "textBody": "Demander MAJ"
+                        },
+                        "fr-fr": {
+                            "line1": "Demander màj"
+                        },
+                        "it-it": {
+                            "line1": "Rich. aggiorn."
+                        },
+                        "nl-nl": {
+                            "line1": "Upd. aanvragen"
+                        },
+                        "pl-pl": {
+                            "line1": "Zażądaj aktual."
+                        },
+                        "pt-br": {
+                            "line1": "Solicitar atualiz."
+                        },
+                        "pt-pt": {
+                            "line1": "Solicit. actualiz."
+                        },
+                        "ru-ru": {
+                            "line1": "Запрос на обн."
+                        },
+                        "sv-se": {
+                            "line1": "Begär uppdat."
+                        },
+                        "tr-tr": {
+                            "line1": "Güncelleme iste"
+                        },
+                        "zh-cn": {
+                            "line1": "请求更新"
+                        },
+                        "zh-tw": {
+                            "line1": "請求更新"
+                        }
+                    }
+                },
+                "StatusNeeded": {
+                    "languages": {
+                        "de-de": {
+                            "line1": "Update benötigt"
+                        },
+                        "en-au": {
+                            "line1": "Update needed"
+                        },
+                        "en-gb": {
+                            "line1": "Update needed",
+                            "textBody": "Update needed"
+                        },
+                        "en-ie": {
+                            "line1": "Update needed"
+                        },
+                        "en-us": {
+                            "line1": "Update Needed",
+                            "textBody": "Update Needed"
+                        },
+                        "es-en": {
+                            "line1": "Actualiz. neces.",
+                            "textBody": "Actualiz. neces."
+                        },
+                        "es-es": {
+                            "line1": "Actu. necesaria"
+                        },
+                        "es-mx": {
+                            "line1": "Actualiz. neces.",
+                            "textBody": "Actualiz. neces."
+                        },
+                        "fr-ca": {
+                            "line1": "Màj requise",
+                            "textBody": "Màj requise"
+                        },
+                        "fr-fr": {
+                            "line1": "Mise à jour requise"
+                        },
+                        "it-it": {
+                            "line1": "Necess. aggiorn."
+                        },
+                        "nl-nl": {
+                            "line1": "Update nodig"
+                        },
+                        "pl-pl": {
+                            "line1": "Potrzeba aktual."
+                        },
+                        "pt-br": {
+                            "line1": "Atualiz. necess."
+                        },
+                        "pt-pt": {
+                            "line1": "Actual. necess."
+                        },
+                        "ru-ru": {
+                            "line1": "Необх. обновл."
+                        },
+                        "sv-se": {
+                            "line1": "Uppdat. krävs"
+                        },
+                        "tr-tr": {
+                            "line1": "Güncellenmeli"
+                        },
+                        "zh-cn": {
+                            "line1": "需要进行更新"
+                        },
+                        "zh-tw": {
+                            "line1": "需更新"
+                        }
+                    }
+                },
+                "StatusPending": {
+                    "languages": {
+                        "de-de": {
+                            "line1": "Aktualisieren..."
+                        },
+                        "en-au": {
+                            "line1": "Updating..."
+                        },
+                        "en-gb": {
+                            "line1": "Updating...",
+                            "textBody": "Updating..."
+                        },
+                        "en-ie": {
+                            "line1": "Updating..."
+                        },
+                        "en-us": {
+                            "line1": "Updating...",
+                            "textBody": "Updating..."
+                        },
+                        "es-en": {
+                            "line1": "Actualizando...",
+                            "textBody": "Actualizando..."
+                        },
+                        "es-es": {
+                            "line1": "Actualizando..."
+                        },
+                        "es-mx": {
+                            "line1": "Actualizando...",
+                            "textBody": "Actualizando..."
+                        },
+                        "fr-ca": {
+                            "line1": "MAJ en cours...",
+                            "textBody": "MAJ en cours..."
+                        },
+                        "fr-fr": {
+                            "line1": "Màj en cours..."
+                        },
+                        "it-it": {
+                            "line1": "Aggiornamento"
+                        },
+                        "nl-nl": {
+                            "line1": "Updaten..."
+                        },
+                        "pl-pl": {
+                            "line1": "Aktualizowanie"
+                        },
+                        "pt-br": {
+                            "line1": "Atualizando..."
+                        },
+                        "pt-pt": {
+                            "line1": "A actualizar..."
+                        },
+                        "ru-ru": {
+                            "line1": "Обновление..."
+                        },
+                        "sv-se": {
+                            "line1": "Uppdaterar..."
+                        },
+                        "tr-tr": {
+                            "line1": "Güncelleniyor..."
+                        },
+                        "zh-cn": {
+                            "line1": "正在更新......"
+                        },
+                        "zh-tw": {
+                            "line1": "更新中..."
+                        }
+                    }
+                },
+                "StatusUpToDate": {
+                    "languages": {
+                        "de-de": {
+                            "line1": "Aktuelle Version"
+                        },
+                        "en-au": {
+                            "line1": "Up-to-date"
+                        },
+                        "en-gb": {
+                            "line1": "Up-to-date",
+                            "textBody": "Up-to-date"
+                        },
+                        "en-ie": {
+                            "line1": "Up-to-date"
+                        },
+                        "en-us": {
+                            "line1": "Up-To-Date",
+                            "textBody": "Up-To-Date"
+                        },
+                        "es-en": {
+                            "line1": "Actualizado",
+                            "textBody": "Actualizado"
+                        },
+                        "es-es": {
+                            "line1": "Actualizada"
+                        },
+                        "es-mx": {
+                            "line1": "Actualizado",
+                            "textBody": "Actualizado"
+                        },
+                        "fr-ca": {
+                            "line1": "Déjà à jour",
+                            "textBody": "Déjà à jour"
+                        },
+                        "fr-fr": {
+                            "line1": "Déjà à jour"
+                        },
+                        "it-it": {
+                            "line1": "più recente"
+                        },
+                        "nl-nl": {
+                            "line1": "Up-to-date"
+                        },
+                        "pl-pl": {
+                            "line1": "Aktualne"
+                        },
+                        "pt-br": {
+                            "line1": "Atualizado"
+                        },
+                        "pt-pt": {
+                            "line1": "Actualizado"
+                        },
+                        "ru-ru": {
+                            "line1": "Обновлено"
+                        },
+                        "sv-se": {
+                            "line1": "Uppdat. krävs ej"
+                        },
+                        "tr-tr": {
+                            "line1": "Güncel"
+                        },
+                        "zh-cn": {
+                            "line1": "最新更新"
+                        },
+                        "zh-tw": {
+                            "line1": "更新最新"
+                        }
+                    }
+                },
+                "VehicleInfo": {
+                    "languages": {
+                        "de-de": {
+                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
+                            "label": "Fahrzeuginformationen"
+                        },
+                        "en-au": {
+                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
+                            "label": "Vehicle information"
+                        },
+                        "en-gb": {
+                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
+                            "label": "Vehicle information",
+                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
+                        },
+                        "en-ie": {
+                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
+                            "label": "Vehicle information"
+                        },
+                        "en-us": {
+                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
+                            "label": "Vehicle information",
+                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
+                        },
+                        "es-en": {
+                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
+                            "label": "Información del vehículo",
+                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
+                        },
+                        "es-es": {
+                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
+                            "label": "Información del vehículo"
+                        },
+                        "es-mx": {
+                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
+                            "label": "Información del vehículo",
+                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
+                        },
+                        "fr-ca": {
+                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
+                            "label": "Renseignements du véhicule",
+                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
+                        },
+                        "fr-fr": {
+                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
+                            "label": "Renseignements du véhicule"
+                        },
+                        "it-it": {
+                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
+                            "label": "Informazioni sul veicolo"
+                        },
+                        "nl-nl": {
+                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
+                            "label": "Voertuiginformatie"
+                        },
+                        "pl-pl": {
+                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
+                            "label": "Informacje o pojeździe"
+                        },
+                        "pt-br": {
+                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
+                            "label": "Informações sobre o veículo"
+                        },
+                        "pt-pt": {
+                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
+                            "label": "Informações do veículo"
+                        },
+                        "ru-ru": {
+                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
+                            "label": "Информация об автомобиле"
+                        },
+                        "sv-se": {
+                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
+                            "label": "Fordonsinformation"
+                        },
+                        "tr-tr": {
+                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
+                            "label": "Araç bilgisi"
+                        },
+                        "zh-cn": {
+                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
+                            "label": "车辆信息"
+                        },
+                        "zh-tw": {
+                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
+                            "label": "車輛資訊"
+                        }
+                    }
+                }
+            }
+        },
+        "app_policies": {
+            "default": {
+                "keep_context": false,
+                "steal_focus": false,
+                "priority": "NONE",
+                "default_hmi": "NONE",
+                "groups": [
+                    "Base-4"
+                ],
+                "RequestType": [],
+                "RequestSubType": []
+            },
+            "device": {
+                "keep_context": false,
+                "steal_focus": false,
+                "priority": "NONE",
+                "default_hmi": "NONE",
+                "groups": [
+                    "DataConsent-2"
+                ]
+            },
+            "pre_DataConsent": {
+                "keep_context": false,
+                "steal_focus": false,
+                "priority": "NONE",
+                "default_hmi": "NONE",
+                "groups": [
+                    "BaseBeforeDataConsent"
+                ]
+            }
+        },
+        "vehicle_data": {
+            "schema_version": "0.0.0",
+            "schema_items": [
+                {
+                    "name": "gps",
+                    "params": [
+                        {
+                            "name": "longitudeDegrees",
+                            "key": "OEM_REF_LONG_DEG",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": -180,
+                            "maxvalue": 180
+                        },
+                        {
+                            "name": "latitudeDegrees",
+                            "key": "OEM_REF_LAT_DEG",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": -90,
+                            "maxvalue": 90
+                        },
+                        {
+                            "name": "utcYear",
+                            "key": "OEM_REF_UTC_YEAR",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 2010,
+                            "maxvalue": 2100,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "utcYear",
+                            "key": "OEM_REF_UTC_YEAR",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 2010,
+                            "maxvalue": 2100,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "utcMonth",
+                            "key": "OEM_REF_UTC_MONTH",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 1,
+                            "maxvalue": 12,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "utcMonth",
+                            "key": "OEM_REF_UTC_MONTH",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 1,
+                            "maxvalue": 12,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "utcDay",
+                            "key": "OEM_REF_UTC_DAY",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 1,
+                            "maxvalue": 31,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "utcDay",
+                            "key": "OEM_REF_UTC_DAY",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 1,
+                            "maxvalue": 31,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "utcHours",
+                            "key": "OEM_REF_UTC_HOURS",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 23,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "utcHours",
+                            "key": "OEM_REF_UTC_HOURS",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 23,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "utcMinutes",
+                            "key": "OEM_REF_UTC_MIN",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 59,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "utcMinutes",
+                            "key": "OEM_REF_UTC_MIN",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 59,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "utcSeconds",
+                            "key": "OEM_REF_UTC_SEC",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 59,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "utcSeconds",
+                            "key": "OEM_REF_UTC_SEC",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 59,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "compassDirection",
+                            "key": "OEM_REF_COM_DIR",
+                            "type": "CompassDirection",
+                            "mandatory": false,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "compassDirection",
+                            "key": "OEM_REF_COM_DIR",
+                            "type": "CompassDirection",
+                            "mandatory": true,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "pdop",
+                            "key": "OEM_REF_PDOP",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 1000,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "pdop",
+                            "key": "OEM_REF_PDOP",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 10,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "hdop",
+                            "key": "OEM_REF_HDOP",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 1000,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "hdop",
+                            "key": "OEM_REF_HDOP",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 10,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "vdop",
+                            "key": "OEM_REF_VDOP",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 1000,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "vdop",
+                            "key": "OEM_REF_VDOP",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 10,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "actual",
+                            "key": "OEM_REF_ACT",
+                            "type": "Boolean",
+                            "mandatory": false,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "actual",
+                            "key": "OEM_REF_ACT",
+                            "type": "Boolean",
+                            "mandatory": true,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "satellites",
+                            "key": "OEM_REF_SAT",
+                            "type": "Integer",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 31,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "satellites",
+                            "key": "OEM_REF_SAT",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 31,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "dimension",
+                            "key": "OEM_REF_DIM",
+                            "type": "Dimension",
+                            "mandatory": false,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "dimension",
+                            "key": "OEM_REF_DIM",
+                            "type": "Dimension",
+                            "mandatory": true,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "altitude",
+                            "key": "OEM_REF_ALT",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": -10000,
+                            "maxvalue": 10000,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "altitude",
+                            "key": "OEM_REF_ALT",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": -10000,
+                            "maxvalue": 10000,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "heading",
+                            "key": "OEM_REF_HEAD",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 359.99,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "heading",
+                            "key": "OEM_REF_HEAD",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 359.99,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "speed",
+                            "key": "OEM_REF_GPS_SPEED",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 500,
+                            "since": "5.0"
+                        },
+                        {
+                            "name": "speed",
+                            "key": "OEM_REF_GPS_SPEED",
+                            "type": "Float",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 500,
+                            "since": "2.0",
+                            "until": "5.0"
+                        },
+                        {
+                            "name": "shifted",
+                            "key": "OEM_REF_SHIFT",
+                            "type": "Boolean",
+                            "mandatory": false,
+                            "since": "6.0"
+                        }
+                    ],
+                    "key": "OEM_REF_GPS",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "speed",
+                    "key": "OEM_REF_SPEED",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": 0,
+                    "maxvalue": 700
+                },
+                {
+                    "name": "rpm",
+                    "key": "OEM_REF_RPM",
+                    "type": "Integer",
+                    "mandatory": false,
+                    "minvalue": 0,
+                    "maxvalue": 20000
+                },
+                {
+                    "name": "fuelLevel",
+                    "key": "OEM_REF_FUEL_LEV",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": -6,
+                    "maxvalue": 106
+                },
+                {
+                    "name": "fuelLevel_State",
+                    "key": "OEM_REF_FUEL_LEV_ST",
+                    "type": "ComponentVolumeStatus",
+                    "mandatory": false
+                },
+                {
+                    "name": "instantFuelConsumption",
+                    "key": "OEM_REF_INS_FUEL_CON",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": 0,
+                    "maxvalue": 25575
+                },
+                {
+                    "name": "fuelRange",
+                    "params": [
+                        {
+                            "name": "type",
+                            "key": "OEM_REF_FUEL_RAN_TYPE",
+                            "type": "FuelType",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "range",
+                            "key": "OEM_REF_FUEL_RAN_RANG",
+                            "type": "Float",
+                            "mandatory": false,
+                            "minvalue": 0,
+                            "maxvalue": 10000
+                        }
+                    ],
+                    "key": "OEM_REF_FUEL_RAN",
+                    "array": true,
+                    "type": "Struct",
+                    "mandatory": false,
+                    "minsize": 0,
+                    "maxsize": 100,
+                    "since": "5.0"
+                },
+                {
+                    "name": "externalTemperature",
+                    "key": "OEM_REF_EXT_TEMP",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": -40,
+                    "maxvalue": 100
+                },
+                {
+                    "name": "turnSignal",
+                    "key": "OEM_REF_TURN_SIGN",
+                    "type": "TurnSignal",
+                    "mandatory": false,
+                    "since": "5.0"
+                },
+                {
+                    "name": "vin",
+                    "key": "OEM_REF_VIN",
+                    "type": "String",
+                    "mandatory": false,
+                    "maxlength": 17,
+                    "since": "5.0"
+                },
+                {
+                    "name": "prndl",
+                    "key": "OEM_REF_PRNDL",
+                    "type": "PRNDL",
+                    "mandatory": false
+                },
+                {
+                    "name": "tirePressure",
+                    "params": [
+                        {
+                            "name": "pressureTelltale",
+                            "key": "OEM_REF_PRES_TEL",
+                            "type": "WarningLightStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "leftFront",
+                            "params": [
+                                {
+                                    "name": "status",
+                                    "key": "OEM_REF_LEFT_FR_ST",
+                                    "type": "ComponentVolumeStatus",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "tpms",
+                                    "key": "OEM_REF_LEFT_FR_TMPS",
+                                    "type": "TPMS",
+                                    "mandatory": false,
+                                    "since": "5.0"
+                                },
+                                {
+                                    "name": "pressure",
+                                    "key": "OEM_REF_LEFT_FR_PRES",
+                                    "type": "Float",
+                                    "mandatory": false,
+                                    "minvalue": 0,
+                                    "maxvalue": 2000,
+                                    "since": "5.0"
+                                }
+                            ],
+                            "key": "OEM_REF_LEFT_FR",
+                            "type": "Struct",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "rightFront",
+                            "params": [
+                                {
+                                    "name": "status",
+                                    "key": "OEM_REF_RIGHT_FR_ST",
+                                    "type": "ComponentVolumeStatus",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "tpms",
+                                    "key": "OEM_REF_RIGHT_FR_TMPS",
+                                    "type": "TPMS",
+                                    "mandatory": false,
+                                    "since": "5.0"
+                                },
+                                {
+                                    "name": "pressure",
+                                    "key": "OEM_REF_RIGHT_FR_PRES",
+                                    "type": "Float",
+                                    "mandatory": false,
+                                    "minvalue": 0,
+                                    "maxvalue": 2000,
+                                    "since": "5.0"
+                                }
+                            ],
+                            "key": "OEM_REF_RIGHT_FR",
+                            "type": "Struct",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "leftRear",
+                            "params": [
+                                {
+                                    "name": "status",
+                                    "key": "OEM_REF_LEFT_REAR_ST",
+                                    "type": "ComponentVolumeStatus",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "tpms",
+                                    "key": "OEM_REF_LEFT_REAR_TMPS",
+                                    "type": "TPMS",
+                                    "mandatory": false,
+                                    "since": "5.0"
+                                },
+                                {
+                                    "name": "pressure",
+                                    "key": "OEM_REF_LEFT_REAR_PRES",
+                                    "type": "Float",
+                                    "mandatory": false,
+                                    "minvalue": 0,
+                                    "maxvalue": 2000,
+                                    "since": "5.0"
+                                }
+                            ],
+                            "key": "OEM_REF_LEFT_REAR",
+                            "type": "Struct",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "rightRear",
+                            "params": [
+                                {
+                                    "name": "status",
+                                    "key": "OEM_REF_RIGHT_REAR_ST",
+                                    "type": "ComponentVolumeStatus",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "tpms",
+                                    "key": "OEM_REF_RIGHT_REAR_TMPS",
+                                    "type": "TPMS",
+                                    "mandatory": false,
+                                    "since": "5.0"
+                                },
+                                {
+                                    "name": "pressure",
+                                    "key": "OEM_REF_RIGHT_REAR_PRES",
+                                    "type": "Float",
+                                    "mandatory": false,
+                                    "minvalue": 0,
+                                    "maxvalue": 2000,
+                                    "since": "5.0"
+                                }
+                            ],
+                            "key": "OEM_REF_RIGHT_REAR",
+                            "type": "Struct",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "innerLeftRear",
+                            "params": [
+                                {
+                                    "name": "status",
+                                    "key": "OEM_REF_IN_LEFT_REAR_ST",
+                                    "type": "ComponentVolumeStatus",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "tpms",
+                                    "key": "OEM_REF_IN_LEFT_REAR_TMPS",
+                                    "type": "TPMS",
+                                    "mandatory": false,
+                                    "since": "5.0"
+                                },
+                                {
+                                    "name": "pressure",
+                                    "key": "OEM_REF_IN_LEFT_REAR_PRES",
+                                    "type": "Float",
+                                    "mandatory": false,
+                                    "minvalue": 0,
+                                    "maxvalue": 2000,
+                                    "since": "5.0"
+                                }
+                            ],
+                            "key": "OEM_REF_IN_LEFT_REAR",
+                            "type": "Struct",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "innerRightRear",
+                            "params": [
+                                {
+                                    "name": "status",
+                                    "key": "OEM_REF_IN_RIGHT_REAR_ST",
+                                    "type": "ComponentVolumeStatus",
+                                    "mandatory": true
+                                },
+                                {
+                                    "name": "tpms",
+                                    "key": "OEM_REF_IN_RIGHT_REAR_TMPS",
+                                    "type": "TPMS",
+                                    "mandatory": false,
+                                    "since": "5.0"
+                                },
+                                {
+                                    "name": "pressure",
+                                    "key": "OEM_REF_IN_RIGHT_REAR_PRES",
+                                    "type": "Float",
+                                    "mandatory": false,
+                                    "minvalue": 0,
+                                    "maxvalue": 2000,
+                                    "since": "5.0"
+                                }
+                            ],
+                            "key": "OEM_REF_IN_RIGHT_REAR",
+                            "type": "Struct",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_TIRE_PRES",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "odometer",
+                    "key": "OEM_REF_ODOM",
+                    "type": "Integer",
+                    "mandatory": false,
+                    "minvalue": 0,
+                    "maxvalue": 17000000
+                },
+                {
+                    "name": "beltStatus",
+                    "params": [
+                        {
+                            "name": "driverBeltDeployed",
+                            "key": "OEM_REF_DR_BELT_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerBeltDeployed",
+                            "key": "OEM_REF_PAS_BELT_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerBuckleBelted",
+                            "key": "OEM_REF_PAS_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "driverBuckleBelted",
+                            "key": "OEM_REF_DR_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "leftRow2BuckleBelted",
+                            "key": "OEM_REF_LEFT_R2_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerChildDetected",
+                            "key": "OEM_REF_PASS_CH_DET",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "rightRow2BuckleBelted",
+                            "key": "OEM_REF_RIGHT_R2_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "middleRow2BuckleBelted",
+                            "key": "OEM_REF_MID_R2_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "middleRow3BuckleBelted",
+                            "key": "OEM_REF_MID_R3_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "leftRow3BuckleBelted",
+                            "key": "OEM_REF_LEFT_R3_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "rightRow3BuckleBelted",
+                            "key": "OEM_REF_RIGHT_R3_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "leftRearInflatableBelted",
+                            "key": "OEM_REF_LEFT_REAR_INF_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "rightRearInflatableBelted",
+                            "key": "OEM_REF_RIGHT_REAR_INF_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "middleRow1BeltDeployed",
+                            "key": "OEM_REF_MID_R1_BELT_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "middleRow1BuckleBelted",
+                            "key": "OEM_REF_MID_R1_BUCK_BELT",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_BELT_ST",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "bodyInformation",
+                    "params": [
+                        {
+                            "name": "parkBrakeActive",
+                            "key": "OEM_REF_PARK_BR_ACT",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "ignitionStableStatus",
+                            "key": "OEM_REF_IGN_STAB_ST",
+                            "type": "IgnitionStableStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "ignitionStatus",
+                            "key": "OEM_REF_IGN_ST",
+                            "type": "IgnitionStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "driverDoorAjar",
+                            "key": "OEM_REF_DR_DOOR_AJ",
+                            "type": "Boolean",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "passengerDoorAjar",
+                            "key": "OEM_REF_PAS_DOOR_AJ",
+                            "type": "Boolean",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "rearLeftDoorAjar",
+                            "key": "OEM_REF_REAR_LEFT_DOOR_AJ",
+                            "type": "Boolean",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "rearRightDoorAjar",
+                            "key": "OEM_REF_REAR_RIGHT_DOOR_AJ",
+                            "type": "Boolean",
+                            "mandatory": false
+                        }
+                    ],
+                    "key": "OEM_REF_BODY_INF",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "deviceStatus",
+                    "params": [
+                        {
+                            "name": "voiceRecOn",
+                            "key": "OEM_REF_VOICE_REC_ON",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "btIconOn",
+                            "key": "OEM_REF_BT_ICO_ON",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "callActive",
+                            "key": "OEM_REF_CAL_ACT",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "phoneRoaming",
+                            "key": "OEM_REF_PH_ROAM",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "textMsgAvailable",
+                            "key": "OEM_REF_TEXT_MSG_AV",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "battLevelStatus",
+                            "key": "OEM_REF_BAT_LEV_ST",
+                            "type": "DeviceLevelStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "stereoAudioOutputMuted",
+                            "key": "OEM_REF_STER_AUD_OUT_MUT",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "monoAudioOutputMuted",
+                            "key": "OEM_REF_MONO_AUD_OUT_MUT",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "signalLevelStatus",
+                            "key": "OEM_REF_SIG_LEV_ST",
+                            "type": "DeviceLevelStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "primaryAudioSource",
+                            "key": "OEM_REF_PR_AUD_SOUR",
+                            "type": "PrimaryAudioSource",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "eCallEventActive",
+                            "key": "OEM_REF_E_CALL_INF_ACT",
+                            "type": "Boolean",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_DEV_ST",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "driverBraking",
+                    "key": "OEM_REF_DR_BRAK",
+                    "type": "VehicleDataEventStatus",
+                    "mandatory": false
+                },
+                {
+                    "name": "wiperStatus",
+                    "key": "OEM_REF_WI_ST",
+                    "type": "WiperStatus",
+                    "mandatory": false
+                },
+                {
+                    "name": "headLampStatus",
+                    "params": [
+                        {
+                            "name": "ambientLightSensorStatus",
+                            "key": "OEM_REF_AMB_LIGHT",
+                            "type": "AmbientLightStatus",
+                            "mandatory": false
+                        },
+                        {
+                            "name": "highBeamsOn",
+                            "key": "OEM_REF_HIGH_BEAM",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "lowBeamsOn",
+                            "key": "OEM_REF_LOW_BEAM",
+                            "type": "Boolean",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_HLSTATUS",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "engineTorque",
+                    "key": "OEM_REF_ENG_TORQ",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": -1000,
+                    "maxvalue": 2000
+                },
+                {
+                    "name": "accPedalPosition",
+                    "key": "OEM_REF_ACC_PED_POS",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": 0,
+                    "maxvalue": 100
+                },
+                {
+                    "name": "steeringWheelAngle",
+                    "key": "OEM_REF_STE_WH_ANG",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": -2000,
+                    "maxvalue": 2000
+                },
+                {
+                    "name": "engineOilLife",
+                    "key": "OEM_REF_ENG_OIL_LIFE",
+                    "type": "Float",
+                    "mandatory": false,
+                    "minvalue": 0,
+                    "maxvalue": 100,
+                    "since": "5.0"
+                },
+                {
+                    "name": "electronicParkBrakeStatus",
+                    "key": "OEM_REF_EL_PARK_BR_ST",
+                    "type": "ElectronicParkBrakeStatus",
+                    "mandatory": false,
+                    "since": "5.0"
+                },
+                {
+                    "name": "cloudAppVehicleID",
+                    "key": "OEM_REF_CL_APP_VEH_ID",
+                    "type": "String",
+                    "mandatory": false,
+                    "since": "5.1"
+                },
+                {
+                    "name": "eCallInfo",
+                    "params": [
+                        {
+                            "name": "eCallNotificationStatus",
+                            "key": "OEM_REF_E_CALL_NOT_ST",
+                            "type": "VehicleDataNotificationStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "auxECallNotificationStatus",
+                            "key": "OEM_REF_AUX_E_CALL_NOT_ST",
+                            "type": "VehicleDataNotificationStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "eCallConfirmationStatus",
+                            "key": "OEM_REF_E_CALL_CONF_ST",
+                            "type": "ECallConfirmationStatus",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_E_CALL_INF",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "airbagStatus",
+                    "params": [
+                        {
+                            "name": "driverAirbagDeployed",
+                            "key": "OEM_REF_DR_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "driverSideAirbagDeployed",
+                            "key": "OEM_REF_DR_SIDE_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "driverCurtainAirbagDeployed",
+                            "key": "OEM_REF_DR_CUR_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerAirbagDeployed",
+                            "key": "OEM_REF_PASS_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerCurtainAirbagDeployed",
+                            "key": "OEM_REF_PASS_CUR_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "driverKneeAirbagDeployed",
+                            "key": "OEM_REF_DR_KNEE_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerSideAirbagDeployed",
+                            "key": "OEM_REF_PASS_SIDE_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "passengerKneeAirbagDeployed",
+                            "key": "OEM_REF_PASS_KNEE_AIR_DEP",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_AIR_ST",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "emergencyEvent",
+                    "params": [
+                        {
+                            "name": "emergencyEventType",
+                            "key": "OEM_REF_EM_EV_TYPE",
+                            "type": "EmergencyEventType",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "fuelCutoffStatus",
+                            "key": "OEM_REF_FUEL_CUT_ST",
+                            "type": "FuelCutoffStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "rolloverEvent",
+                            "key": "OEM_REF_ROL_EV",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "maximumChangeVelocity",
+                            "key": "OEM_REF_MAX_CH_VEL",
+                            "type": "Integer",
+                            "mandatory": true,
+                            "minvalue": 0,
+                            "maxvalue": 255
+                        },
+                        {
+                            "name": "multipleEvents",
+                            "key": "OEM_REF_MUL_EV",
+                            "type": "VehicleDataEventStatus",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_EM_EV",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "clusterModeStatus",
+                    "params": [
+                        {
+                            "name": "powerModeActive",
+                            "key": "OEM_REF_POW_MOD_ACT",
+                            "type": "Boolean",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "powerModeQualificationStatus",
+                            "key": "OEM_REF_POW_MOD_QU_ST",
+                            "type": "PowerModeQualificationStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "carModeStatus",
+                            "key": "OEM_REF_CAR_MOD_ST",
+                            "type": "CarModeStatus",
+                            "mandatory": true
+                        },
+                        {
+                            "name": "powerModeStatus",
+                            "key": "OEM_REF_POW_MOD_ST",
+                            "type": "PowerModeStatus",
+                            "mandatory": true
+                        }
+                    ],
+                    "key": "OEM_REF_CL_MOD_ST",
+                    "type": "Struct",
+                    "mandatory": false
+                },
+                {
+                    "name": "myKey",
+                    "params": [
+                        {
+                            "name": "e911Override",
+                            "key": "OEM_REF_E_9110_VE",
+                            "type": "VehicleDataStatus",
+                            "mandatory": true,
+                            "since": "2.0"
+                        }
+                    ],
+                    "key": "OEM_REF_MY_KEY",
+                    "type": "Struct",
+                    "mandatory": false
+                }
+            ]
+        }
+    }
+}
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini
index 40c1bf08a7..31302f24c6 100644
--- a/src/appMain/smartDeviceLink.ini
+++ b/src/appMain/smartDeviceLink.ini
@@ -202,9 +202,27 @@ TCPAdapterPort = 12345
 ; If the name is omitted, Core will listen on all network interfaces by binding to INADDR_ANY.
 TCPAdapterNetworkInterface =
 
+; WebSocket connection address used for incoming connections
+WebSocketServerAddress = 0.0.0.0
+; Listening port for incoming connection to websocket server
+WebSocketServerPort = 2020
+; WS Server Certificate
+; WSServerCertificatePath = server-cert.pem
+; WSServerKeyPath = server-key.pem
+; WSServerCACertificatePath = ca-cert.pem
+
 ; 128 bit uuid for bluetooth device discovery. Please format as 16 seperate bytes.
 ;BluetoothUUID = 0x93, 0x6D, 0xA0, 0x1F, 0x9A, 0xBD, 0x4D, 0x9D, 0x80, 0xC7, 0x02, 0xAF, 0x85, 0xC8, 0x22, 0xA8
 
+; AOA USB Transport Configuration
+; USBAccessory Filter Parameters
+AOAFilterManufacturer = SDL
+AOAFilterModelName = Core
+AOAFilterDescription = SmartDeviceLink Core Component USB
+AOAFilterVersion = 1.0
+AOAFilterURI = http://www.smartdevicelink.org
+AOAFilterSerialNumber = N000000
+
 [CloudAppConnections]
 ; Value in milliseconds for time between retry attempts on a failed websocket connection
 CloudAppRetryTimeout = 1000 
@@ -381,4 +399,8 @@ HMIOriginID = "HMI_ID"
 EmbeddedServices = MEDIA, WEATHER, NAVIGATION
 
 ; Additional time added to RPC timeout when passing through to App service
-RpcPassThroughTimeout = 10000
\ No newline at end of file
+RpcPassThroughTimeout = 10000
+
+[RCModuleConsent]
+; The period (in days) after which consent for module_id should be removed.
+PeriodForConsentExpiration = 30
diff --git a/src/appMain/start.sh b/src/appMain/start.sh
index ea6dea9d50..df867c75af 100644
--- a/src/appMain/start.sh
+++ b/src/appMain/start.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-LD_LIBRARY_PATH=. ./smartDeviceLinkCore
\ No newline at end of file
+trap close INT
+
+function close() {
+  $DIR/core.sh stop
+}
+
+DIR=$(dirname $0)
+CORE_PID_FILE=${DIR}/core.pid
+
+$DIR/core.sh start
+
+# Wait for the application to close
+CORE_PID=$(cat $CORE_PID_FILE)
+tail --pid=$CORE_PID -f /dev/null
+
+# Verify that the application closed sucessfully
+close > /dev/null
diff --git a/src/appMain/start_external_proprietary.sh b/src/appMain/start_external_proprietary.sh
deleted file mode 100644
index 15ee2ecae5..0000000000
--- a/src/appMain/start_external_proprietary.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-pip list | grep -F tornado > /dev/null
-if [ $? -eq 1 ]
-  then
-    echo "Installing tornado python package"
-    sudo pip install tornado
-fi
-echo "Starting Policy Manager"
-python sample_policy_manager.py --pack_port 8088 --unpack_port 8089 --add_http_header --encryption &
-POLICY_MANAGER=$!
-
-trap ctrl_c INT
-
-function ctrl_c() {
-        echo "Stopping SmartDeviceLinkCore"
-        kill -INT $POLICY_MANAGER
-        kill -9 $POLICY_MANAGER
-}
-
-echo "Starting SmartDeviceLinkCore"
-LD_LIBRARY_PATH=. ./smartDeviceLinkCore
diff --git a/src/components/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt
index 625e119270..c7f2aede9a 100644
--- a/src/components/application_manager/CMakeLists.txt
+++ b/src/components/application_manager/CMakeLists.txt
@@ -142,6 +142,7 @@ set(LIBRARIES
   formatters
   dbms
   Utils
+  policy_struct
   bson -L${BSON_LIBS_DIRECTORY}
   emhashmap -L${EMHASHMAP_LIBS_DIRECTORY}
 )
@@ -159,7 +160,7 @@ add_library("AMEventEngine" ${EVENT_ENGINE_SOURCES})
 target_link_libraries("AMEventEngine" ${LIBRARIES})
 
 add_library("AMPolicyLibrary" ${POLICIES_MANAGER_SOURCES} )
-target_link_libraries("AMPolicyLibrary" ${LIBRARIES} AMEventEngine)
+target_link_libraries("AMPolicyLibrary" ${LIBRARIES} AMEventEngine policy_struct)
 
 add_library("SystemTimeLibrary" ${SYSTEM_TIME_SOURCES})
 target_link_libraries("SystemTimeLibrary" ${LIBRARIES} AMEventEngine)
diff --git a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h
index 9463a349d9..9e60183960 100644
--- a/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h
+++ b/src/components/application_manager/include/application_manager/app_launch/app_launch_data_json.h
@@ -35,8 +35,7 @@
 
 #include <memory>
 #include "application_manager/app_launch/app_launch_data_impl.h"
-#include "resumption/last_state.h"
-#include "smart_objects/smart_object.h"
+#include "resumption/last_state_wrapper.h"
 #include "utils/lock.h"
 #include "utils/macro.h"
 
@@ -53,7 +52,12 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
    * @brief Constructor of AppLaunchDataJson object
    */
   AppLaunchDataJson(const AppLaunchSettings& settings,
+                    resumption::LastStateWrapperPtr last_state_wrapper);
+
+  DEPRECATED
+  AppLaunchDataJson(const AppLaunchSettings& settings,
                     resumption::LastState& last_state);
+
   /**
    * @brief allows to destroy AppLaunchDataJson object
    */
@@ -88,9 +92,15 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
    * @param app_data - searching filled in object
    * @param founded_index - referenceto index of founded record
    * in case it wasn't found it'll be -1
+   * @param dictionary - data dictionary where all necessary info stored
    * @return  pointer to json list object
    */
   Json::Value& GetApplicationListAndIndex(const ApplicationData& app_data,
+                                          int32_t& found_index,
+                                          Json::Value& dictionary) const;
+
+  DEPRECATED
+  Json::Value& GetApplicationListAndIndex(const ApplicationData& app_data,
                                           int32_t& founded_index) const;
 
  private:
@@ -117,27 +127,22 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
       const std::string& dev_mac) const OVERRIDE;
 
   /**
-   * @return pointer to LastState functionality
-   */
-  resumption::LastState& last_state() const {
-    return last_state_;
-  }
-
-  /**
    * @brief delete record with oldest timestamp
    * @return true in success cases and false othrewise
    */
   bool DeleteOldestAppData();
 
   /**
+   * @param dictionary - data dictionary where all necessary info stored
    * @return pointer to AppLaunch data block in Json file
    */
-  Json::Value& GetSavedApplicationDataList() const;
+  Json::Value& GetSavedApplicationDataList(Json::Value& dictionary) const;
 
   /**
+   * @param dictionary - data dictionary where all necessary info stored
    * @return pointer to AppLaunch records block in Json file
    */
-  Json::Value& GetApplicationData() const;
+  Json::Value& GetApplicationData(Json::Value& dictionary) const;
 
   /**
    * @brief lock to protected common data
@@ -147,7 +152,7 @@ class AppLaunchDataJson : public AppLaunchDataImpl {
   /**
    * @brief ponter to Last State object
    */
-  resumption::LastState& last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLaunchDataJson);
 };
diff --git a/src/components/application_manager/include/application_manager/app_service_manager.h b/src/components/application_manager/include/application_manager/app_service_manager.h
index 5080748f17..d26598c1e9 100644
--- a/src/components/application_manager/include/application_manager/app_service_manager.h
+++ b/src/components/application_manager/include/application_manager/app_service_manager.h
@@ -36,11 +36,9 @@
 #include "application_manager/application.h"
 #include "application_manager/rpc_passing_handler.h"
 #include "interfaces/MOBILE_API.h"
+#include "resumption/last_state_wrapper.h"
 #include "smart_objects/smart_object.h"
-
-namespace resumption {
-class LastState;
-}
+#include "utils/macro.h"
 
 namespace application_manager {
 
@@ -65,7 +63,10 @@ class AppServiceManager {
    * @param app_manager
    */
   AppServiceManager(ApplicationManager& app_manager,
-                    resumption::LastState& last_state);
+                    resumption::LastStateWrapperPtr last_state);
+
+  DEPRECATED AppServiceManager(ApplicationManager& app_manager,
+                               resumption::LastState& last_state);
 
   /**
    * @brief Class destructor
@@ -221,7 +222,7 @@ class AppServiceManager {
 
  private:
   ApplicationManager& app_manager_;
-  resumption::LastState& last_state_;
+  resumption::LastStateWrapperPtr last_state_;
 
   sync_primitives::RecursiveLock published_services_lock_;
   std::map<std::string, AppService> published_services_;
diff --git a/src/components/application_manager/include/application_manager/application.h b/src/components/application_manager/include/application_manager/application.h
index 3406f0e4cb..a97da79d15 100644
--- a/src/components/application_manager/include/application_manager/application.h
+++ b/src/components/application_manager/include/application_manager/application.h
@@ -62,13 +62,17 @@ typedef int32_t ErrorCode;
 
 class UsageStatistics;
 
+class DisplayCapabilitiesBuilder;
+
 enum APIVersion {
   kUnknownAPI = -1,
   kAPIV0 = 0,
   kAPIV1 = 1,
   kAPIV2 = 2,
   kAPIV3 = 3,
-  kAPIV4 = 4
+  kAPIV4 = 4,
+  kAPIV5 = 5,
+  kAPIV6 = 6
 };
 
 enum TLimitSource { POLICY_TABLE = 0, CONFIG_FILE };
@@ -146,6 +150,12 @@ typedef std::map<uint32_t, smart_objects::SmartObject*> SubMenuMap;
 typedef std::map<uint32_t, smart_objects::SmartObject*> ChoiceSetMap;
 
 /*
+ * @brief Typedef for map of window ids to data used as parameters
+ * to CreateWindow request.
+ */
+typedef std::map<WindowID, smart_objects::SmartObjectSPtr> WindowParamsMap;
+
+/*
  * @brief Typedef for perform interaction choice
  * @param choice id
  * @param SmartObject choice
@@ -162,7 +172,7 @@ typedef std::map<uint32_t, PerformChoice> PerformChoiceSetMap;
 /**
  * @brief Defines id of SoftButton
  */
-typedef std::set<uint32_t> SoftButtonID;
+typedef std::set<std::pair<uint32_t, WindowID> > SoftButtonID;
 
 /**
  * @brief Defines set of buttons subscription
@@ -188,9 +198,25 @@ class DynamicApplicationData {
   virtual const smart_objects::SmartObject* keyboard_props() const = 0;
   virtual const smart_objects::SmartObject* menu_title() const = 0;
   virtual const smart_objects::SmartObject* menu_icon() const = 0;
-  virtual const smart_objects::SmartObject* day_color_scheme() const = 0;
-  virtual const smart_objects::SmartObject* night_color_scheme() const = 0;
-  virtual const std::string& display_layout() const = 0;
+  virtual smart_objects::SmartObject day_color_scheme() const = 0;
+  virtual smart_objects::SmartObject night_color_scheme() const = 0;
+  virtual std::string display_layout() const = 0;
+
+  /**
+   * @brief Specific display capabilities of application
+   * @return display capabilities of application or NULL-initialized pointer if
+   * not specified
+   */
+  virtual smart_objects::SmartObjectSPtr display_capabilities() const = 0;
+
+  /**
+   * @brief Specific display capabilities of application
+   * @param window id - id of an affected widget
+   * @return display capabilities of application or NULL-initialized pointer if
+   * not specified
+   */
+  virtual smart_objects::SmartObjectSPtr display_capabilities(
+      const WindowID window_id) const = 0;
 
   virtual void load_global_properties(const smart_objects::SmartObject& so) = 0;
   virtual void set_help_prompt(
@@ -222,12 +248,84 @@ class DynamicApplicationData {
   virtual void set_video_stream_retry_number(
       const uint32_t& video_stream_retry_number) = 0;
 
+  virtual void set_display_layout(const std::string& layout) = 0;
   virtual void set_day_color_scheme(
       const smart_objects::SmartObject& color_scheme) = 0;
   virtual void set_night_color_scheme(
       const smart_objects::SmartObject& color_scheme) = 0;
 
-  virtual void set_display_layout(const std::string& layout) = 0;
+  /**
+   * @brief Set specific application display capabilities
+   * @param display_capabilities new display capabilities of application
+   */
+  virtual void set_display_capabilities(
+      const smart_objects::SmartObject& display_capabilities) = 0;
+
+  /**
+   * @brief deletes stored window capability for given window id
+   * @param window id of capability to remove
+   */
+  virtual void remove_window_capability(const WindowID window_id) = 0;
+
+  /**
+   * @brief checks whether a specific menu layout is supported
+   * @param menu layout to check
+   */
+  virtual bool menu_layout_supported(
+      const mobile_apis::MenuLayout::eType layout) const = 0;
+
+  /**
+   * @brief Sets layout for application's specific window
+   * @param window_id window id for which layout should be set
+   * @param layout - layout to be set
+   */
+  virtual void set_window_layout(const WindowID window_id,
+                                 const std::string& layout) = 0;
+
+  /**
+   * @brief Sets day color scheme for application's specific window
+   * @param window_id window id for which day color scheme should be set
+   * @param color_scheme - color scheme to be set
+   */
+  virtual void set_day_color_scheme(
+      const WindowID window_id,
+      const smart_objects::SmartObject& color_scheme) = 0;
+
+  /**
+   * @brief Sets night color scheme for application's specific window
+   * @param window_id window id for which night color scheme should be set
+   * @param color_scheme - color scheme to be set
+   */
+  virtual void set_night_color_scheme(
+      const WindowID window_id,
+      const smart_objects::SmartObject& color_scheme) = 0;
+
+  /**
+   * @brief Gets window layout for application's specific window_id
+   * @param window_id window id for which display layout should be returned
+   * @return string containing set display layout,
+   * if no display layout is set - empty string is returned
+   */
+  virtual std::string window_layout(const WindowID window_id) const = 0;
+
+  /**
+   * @brief Gets day color scheme for application's specific window_id
+   * @param window_id window id for which color scheme should be returned
+   * @return day color scheme which is set for specified app window,
+   * if no day color scheme is set - Smart object with NullType is returned
+   */
+  virtual smart_objects::SmartObject day_color_scheme(
+      const WindowID window_id) const = 0;
+
+  /**
+   * @brief Gets night color scheme for application's specific window_id
+   * @param window_id window id for which color scheme should be returned
+   * @return night color scheme which is set for specified app window
+   * if no night color scheme is set - Smart object with NullType is returned
+   */
+  virtual smart_objects::SmartObject night_color_scheme(
+      const WindowID window_id) const = 0;
+
   /**
    * @brief Checks if application is media, voice communication or navigation
    * @return true if application is media, voice communication or navigation,
@@ -291,6 +389,20 @@ class DynamicApplicationData {
   virtual void RemoveChoiceSet(uint32_t choice_set_id) = 0;
 
   /*
+   * @brief Adds window info
+   * @param window_id unique id of a window
+   * @param window_info SmartObject that represent window info
+   */
+  virtual void SetWindowInfo(const WindowID window_id,
+                             const smart_objects::SmartObject& window_info) = 0;
+
+  /*
+   * @brief Removes window info
+   * @param window_id unique id of a window
+   */
+  virtual void RemoveWindowInfo(const WindowID window_id) = 0;
+
+  /*
    * @brief Finds choice set with the specified choice_set_id id
    *
    * @param choice_set_id Unique ID of the interaction choice set
@@ -325,6 +437,16 @@ class DynamicApplicationData {
       const = 0;
 
   /*
+   * @brief Retrieves window info map
+   */
+  virtual DataAccessor<WindowParamsMap> window_optional_params_map() const = 0;
+
+  /*
+   * @brief Retrieves display capabilities builder
+   */
+  virtual DisplayCapabilitiesBuilder& display_capabilities_builder() = 0;
+
+  /*
    * @brief Retrieve application commands
    */
   virtual DataAccessor<CommandsMap> commands_map() const = 0;
@@ -450,6 +572,20 @@ class Application : public virtual InitialApplicationData,
    */
   virtual void set_is_application_data_changed(bool state_application_data) = 0;
 
+  /**
+   * @brief Checks if application data is allowed to be resumed
+   * @return TRUE if data of application is allowed to be resumed, otherwise
+   * return FALSE
+   */
+  virtual bool is_app_data_resumption_allowed() const = 0;
+
+  /**
+   * @brief Sets resumption allowance for application data
+   * @param allowed - true if app data allowed to be resumed,
+   * false value means that app data is disallowed for resumption
+   */
+  virtual void set_app_data_resumption_allowance(const bool allowed) = 0;
+
   virtual void CloseActiveMessage() = 0;
   virtual bool IsFullscreen() const = 0;
   virtual void ChangeSupportingAppHMIType() = 0;
@@ -521,8 +657,10 @@ class Application : public virtual InitialApplicationData,
   /**
    * @brief Wakes up streaming process for application
    * @param service_type Type of streaming service
+   * @param timer_len The amount of time in ms the timer will wait
    */
-  virtual void WakeUpStreaming(protocol_handler::ServiceType service_type) = 0;
+  virtual void WakeUpStreaming(protocol_handler::ServiceType service_type,
+                               uint32_t timer_len = 0) = 0;
 
   virtual bool is_voice_communication_supported() const = 0;
   virtual void set_voice_communication_supported(
@@ -546,11 +684,26 @@ class Application : public virtual InitialApplicationData,
   virtual bool is_media_application() const = 0;
   virtual bool is_foreground() const = 0;
   virtual void set_foreground(const bool is_foreground) = 0;
-  virtual const mobile_api::HMILevel::eType hmi_level() const = 0;
+
+  /**
+   * @brief hmi_level current HMI level of application's window
+   * @param window_id id of application's window to get
+   * @return HMI level of application's window
+   */
+  virtual const mobile_api::HMILevel::eType hmi_level(
+      const WindowID window_id) const = 0;
+
   virtual const uint32_t put_file_in_none_count() const = 0;
   virtual const uint32_t delete_file_in_none_count() const = 0;
   virtual const uint32_t list_files_in_none_count() const = 0;
-  virtual const mobile_api::SystemContext::eType system_context() const = 0;
+
+  /**
+   * @brief system_context current system context of application's window
+   * @param window_id id of application's window to get
+   * @return system context of application's window
+   */
+  virtual const mobile_api::SystemContext::eType system_context(
+      const WindowID window_id) const = 0;
   virtual const mobile_api::AudioStreamingState::eType audio_streaming_state()
       const = 0;
   virtual const mobile_api::VideoStreamingState::eType video_streaming_state()
@@ -695,58 +848,91 @@ class Application : public virtual InitialApplicationData,
   /**
    * @brief SetInitialState sets initial HMI state for application on
    * registration
+   * @param window_id window id for HMI state
+   * @param window_name name of inited window
    * @param state Hmi state value
    */
-  virtual void SetInitialState(HmiStatePtr state) = 0;
+  virtual void SetInitialState(const WindowID window_id,
+                               const std::string& window_name,
+                               HmiStatePtr state) = 0;
 
   /**
    * @brief SetRegularState set permanent state of application
-   *
+   * @param window_id window id for HMI state
    * @param state state to setup
    */
-  virtual void SetRegularState(HmiStatePtr state) = 0;
+  virtual void SetRegularState(const WindowID window_id, HmiStatePtr state) = 0;
 
   /**
    * @brief SetPostponedState sets postponed state to application.
    * This state could be set as regular later
-   *
+   * @param window_id window id for HMI state
    * @param state state to setup
    */
-  virtual void SetPostponedState(HmiStatePtr state) = 0;
+  virtual void SetPostponedState(const WindowID window_id,
+                                 HmiStatePtr state) = 0;
 
-  virtual void RemovePostponedState() = 0;
+  /**
+   * @brief RemovePostponedState removes postponed state for application
+   * After removal, this state will not be set as regular later
+   * @param window_id window id for HMI state
+   */
+  virtual void RemovePostponedState(const WindowID window_id) = 0;
 
   /**
    * @brief AddHMIState the function that will change application's
    * hmi state.
    *
-   * @param app_id id of the application whose hmi level should be changed.
+   * @param window_id window id for HMI state
    *
    * @param state new hmi state for certain application.
    */
-  virtual void AddHMIState(HmiStatePtr state) = 0;
+  virtual void AddHMIState(const WindowID window_id, HmiStatePtr state) = 0;
 
   /**
    * @brief RemoveHMIState the function that will turn back hmi_level after end
    * of some event
    *
-   * @param app_id id of the application whose hmi level should be changed.
+   * @param window_id window id for HMI state
    *
    * @param state_id that should be removed
    */
-  virtual void RemoveHMIState(HmiState::StateID state_id) = 0;
+  virtual void RemoveHMIState(const WindowID window_id,
+                              HmiState::StateID state_id) = 0;
 
   /**
    * @brief HmiState of application within active events PhoneCall, TTS< etc ...
+   * @param window_id window id for HMI state
    * @return Active HmiState of application
    */
-  virtual const HmiStatePtr CurrentHmiState() const = 0;
+  virtual const HmiStatePtr CurrentHmiState(const WindowID window_id) const = 0;
+
+  /**
+   * @brief Getter for a list of available application windows including the
+   * main
+   * @return list of available window IDs created by application
+   */
+  virtual WindowIds GetWindowIds() const = 0;
+
+  /**
+   * @brief Getter for a list of all existing window names
+   * @return list of available window names created by application
+   */
+  virtual WindowNames GetWindowNames() const = 0;
+
+  /**
+   * @brief Check if application has specified window
+   * @param window_id - id of window to check
+   * @return true if app has specified window , otherwise false
+   */
+  virtual bool WindowIdExists(const WindowID window_id) const = 0;
 
   /**
    * @brief RegularHmiState of application without active events VR, TTS etc ...
+   * @param window_id window id for HMI state
    * @return HmiState of application
    */
-  virtual const HmiStatePtr RegularHmiState() const = 0;
+  virtual const HmiStatePtr RegularHmiState(const WindowID window_id) const = 0;
 
   /**
    * @brief Checks if app is allowed to change audio source
@@ -757,10 +943,11 @@ class Application : public virtual InitialApplicationData,
   /**
    * @brief PostponedHmiState returns postponed hmi state of application
    * if it's present
-   *
+   * @param window_id window id for HMI state
    * @return Postponed hmi state of application
    */
-  virtual const HmiStatePtr PostponedHmiState() const = 0;
+  virtual const HmiStatePtr PostponedHmiState(
+      const WindowID window_id) const = 0;
 
   /**
    * @brief Keeps id of softbuttons which is created in commands:
@@ -773,6 +960,13 @@ class Application : public virtual InitialApplicationData,
                                       const SoftButtonID& softbuttons_id) = 0;
 
   /**
+   * @brief Retreives window id on which given button is created
+   * @param button_id identifier of a button
+   * @param window id of a widget containing button
+   */
+  virtual WindowID GetSoftButtonWindowID(const uint32_t button_id) = 0;
+
+  /**
    * @brief Determine the existence of softbutton
    * @param Softbutton_id contains id of softbutton
    * @return Returns true if application contains softbutton id otherwise
@@ -902,9 +1096,11 @@ class Application : public virtual InitialApplicationData,
 
   /**
    * @brief set_system_context Set system context for application
+   * @param window_id window id for HMI state
    * @param system_context Current context
    */
   virtual void set_system_context(
+      const WindowID window_id,
       const mobile_api::SystemContext::eType& system_context) = 0;
 
   /**
@@ -916,9 +1112,11 @@ class Application : public virtual InitialApplicationData,
 
   /**
    * @brief set_hmi_level Set HMI level for application
+   * @param window_id window id for HMI state
    * @param hmi_level Current HMI level
    */
-  virtual void set_hmi_level(const mobile_api::HMILevel::eType& hmi_level) = 0;
+  virtual void set_hmi_level(const WindowID window_id,
+                             const mobile_api::HMILevel::eType& hmi_level) = 0;
 
   /**
    * @brief Return pointer to extension by uid
@@ -1014,6 +1212,19 @@ class Application : public virtual InitialApplicationData,
    */
   virtual void set_cloud_app_certificate(const std::string& certificate) = 0;
 
+  /**
+   * @brief Set user location
+   * @param smart object of user location
+   */
+  virtual void set_user_location(
+      const smart_objects::SmartObject& user_location) = 0;
+
+  /**
+   * @brief Get user location
+   * @return smart object of user location
+   */
+  virtual const smart_objects::SmartObject& get_user_location() const = 0;
+
  protected:
   mutable sync_primitives::Lock hmi_states_lock_;
 
diff --git a/src/components/application_manager/include/application_manager/application_data_impl.h b/src/components/application_manager/include/application_manager/application_data_impl.h
index 69e35280fd..decd3b51a3 100644
--- a/src/components/application_manager/include/application_manager/application_data_impl.h
+++ b/src/components/application_manager/include/application_manager/application_data_impl.h
@@ -35,6 +35,7 @@
 
 #include <string>
 #include "application_manager/application.h"
+#include "application_manager/display_capabilities_builder.h"
 #include "interfaces/MOBILE_API.h"
 #include "smart_objects/smart_object.h"
 #include "utils/lock.h"
@@ -88,6 +89,7 @@ class InitialApplicationDataImpl : public virtual Application {
 
 class DynamicApplicationDataImpl : public virtual Application {
  public:
+  typedef std::map<WindowID, smart_objects::SmartObject> AppWindowsTemplates;
   DynamicApplicationDataImpl();
   ~DynamicApplicationDataImpl();
   const smart_objects::SmartObject* help_prompt() const;
@@ -100,9 +102,31 @@ class DynamicApplicationDataImpl : public virtual Application {
   const smart_objects::SmartObject* keyboard_props() const;
   const smart_objects::SmartObject* menu_title() const;
   const smart_objects::SmartObject* menu_icon() const;
-  const smart_objects::SmartObject* day_color_scheme() const;
-  const smart_objects::SmartObject* night_color_scheme() const;
-  const std::string& display_layout() const;
+
+  smart_objects::SmartObject day_color_scheme() const OVERRIDE;
+  smart_objects::SmartObject night_color_scheme() const OVERRIDE;
+  std::string display_layout() const OVERRIDE;
+  smart_objects::SmartObjectSPtr display_capabilities() const OVERRIDE;
+  smart_objects::SmartObjectSPtr display_capabilities(
+      const WindowID window_id) const OVERRIDE;
+
+  void set_window_layout(const WindowID window_id,
+                         const std::string& layout) OVERRIDE;
+
+  void set_day_color_scheme(
+      const WindowID window_id,
+      const smart_objects::SmartObject& color_scheme) OVERRIDE;
+  void set_night_color_scheme(
+      const WindowID window_id,
+      const smart_objects::SmartObject& color_scheme) OVERRIDE;
+
+  std::string window_layout(const WindowID window_id) const OVERRIDE;
+
+  smart_objects::SmartObject day_color_scheme(
+      const WindowID window_id) const OVERRIDE;
+
+  smart_objects::SmartObject night_color_scheme(
+      const WindowID window_id) const OVERRIDE;
 
   void load_global_properties(const smart_objects::SmartObject& properties_so);
   void set_help_prompt(const smart_objects::SmartObject& help_prompt);
@@ -120,21 +144,37 @@ class DynamicApplicationDataImpl : public virtual Application {
   void set_day_color_scheme(const smart_objects::SmartObject& color_scheme);
   void set_night_color_scheme(const smart_objects::SmartObject& color_scheme);
   void set_display_layout(const std::string& layout);
+  void set_display_capabilities(
+      const smart_objects::SmartObject& display_capabilities) OVERRIDE;
+  void remove_window_capability(const WindowID window_id) OVERRIDE;
+
+  /**
+   * @brief checks whether a specific menu layout is supported
+   * @param menu layout to check
+   */
+  bool menu_layout_supported(
+      const mobile_apis::MenuLayout::eType layout) const OVERRIDE;
+
   /*
-   * @brief Adds a command to the in application menu
+   * @brief Adds a command to the application menu
+   * @param[in] internal_id Internal consecutive command id
+   * @param[in] command Command to add
    */
-  void AddCommand(uint32_t cmd_id, const smart_objects::SmartObject& command);
+  void AddCommand(const uint32_t internal_id,
+                  const smart_objects::SmartObject& command);
 
   /*
    * @brief Deletes all commands from the application menu with the specified
    * command id
+   * @param[in] cmd_id Command id
    */
-  void RemoveCommand(uint32_t cmd_id);
+  void RemoveCommand(const uint32_t cmd_id);
 
   /*
    * @brief Finds command with the specified command id
+   * @param[in] cmd_id Command id
    */
-  smart_objects::SmartObject* FindCommand(uint32_t cmd_id);
+  smart_objects::SmartObject* FindCommand(const uint32_t cmd_id);
 
   /*
    * @brief Adds a menu to the application
@@ -157,6 +197,11 @@ class DynamicApplicationDataImpl : public virtual Application {
   bool IsSubMenuNameAlreadyExist(const std::string& name,
                                  const int32_t parent_id);
 
+  void SetWindowInfo(const WindowID window_id,
+                     const smart_objects::SmartObject& window_info) OVERRIDE;
+
+  void RemoveWindowInfo(const WindowID window_id) OVERRIDE;
+
   /*
    * @brief Adds a interaction choice set to the application
    *
@@ -222,6 +267,10 @@ class DynamicApplicationDataImpl : public virtual Application {
    */
   inline DataAccessor<ChoiceSetMap> choice_set_map() const;
 
+  DataAccessor<WindowParamsMap> window_optional_params_map() const;
+
+  DisplayCapabilitiesBuilder& display_capabilities_builder();
+
   /*
    * @brief Sets perform interaction state
    *
@@ -275,9 +324,8 @@ class DynamicApplicationDataImpl : public virtual Application {
   smart_objects::SmartObject* menu_title_;
   smart_objects::SmartObject* menu_icon_;
   smart_objects::SmartObject* tbt_show_command_;
-  smart_objects::SmartObject* day_color_scheme_;
-  smart_objects::SmartObject* night_color_scheme_;
-  std::string display_layout_;
+  smart_objects::SmartObjectSPtr display_capabilities_;
+  AppWindowsTemplates window_templates_;
 
   CommandsMap commands_;
   mutable std::shared_ptr<sync_primitives::RecursiveLock> commands_lock_ptr_;
@@ -288,9 +336,12 @@ class DynamicApplicationDataImpl : public virtual Application {
   PerformChoiceSetMap performinteraction_choice_set_map_;
   mutable std::shared_ptr<sync_primitives::RecursiveLock>
       performinteraction_choice_set_lock_ptr_;
+  WindowParamsMap window_params_map_;
+  mutable std::shared_ptr<sync_primitives::Lock> window_params_map_lock_ptr_;
   uint32_t is_perform_interaction_active_;
   bool is_reset_global_properties_active_;
   int32_t perform_interaction_mode_;
+  DisplayCapabilitiesBuilder display_capabilities_builder_;
 
  private:
   void SetGlobalProperties(
diff --git a/src/components/application_manager/include/application_manager/application_impl.h b/src/components/application_manager/include/application_manager/application_impl.h
index fd9b77eb0f..185d700d58 100644
--- a/src/components/application_manager/include/application_manager/application_impl.h
+++ b/src/components/application_manager/include/application_manager/application_impl.h
@@ -139,7 +139,8 @@ class ApplicationImpl : public virtual Application,
   void StopStreamingForce(protocol_handler::ServiceType service_type);
   void StopStreaming(protocol_handler::ServiceType service_type);
   void SuspendStreaming(protocol_handler::ServiceType service_type);
-  void WakeUpStreaming(protocol_handler::ServiceType service_type);
+  void WakeUpStreaming(protocol_handler::ServiceType service_type,
+                       uint32_t timer_len = 0);
 
   virtual bool is_voice_communication_supported() const;
   virtual void set_voice_communication_supported(
@@ -158,11 +159,13 @@ class ApplicationImpl : public virtual Application,
   bool is_media_application() const;
   bool is_foreground() const OVERRIDE;
   void set_foreground(const bool is_foreground) OVERRIDE;
-  const mobile_apis::HMILevel::eType hmi_level() const;
+  const mobile_apis::HMILevel::eType hmi_level(
+      const WindowID window_id) const OVERRIDE;
   const uint32_t put_file_in_none_count() const;
   const uint32_t delete_file_in_none_count() const;
   const uint32_t list_files_in_none_count() const;
-  const mobile_api::SystemContext::eType system_context() const;
+  const mobile_api::SystemContext::eType system_context(
+      const WindowID window_id) const OVERRIDE;
   inline const mobile_apis::AudioStreamingState::eType audio_streaming_state()
       const;
   inline const mobile_apis::VideoStreamingState::eType video_streaming_state()
@@ -229,6 +232,8 @@ class ApplicationImpl : public virtual Application,
   bool IsSubscribedToButton(mobile_apis::ButtonName::eType btn_name);
   bool UnsubscribeFromButton(mobile_apis::ButtonName::eType btn_name);
 
+  WindowID GetSoftButtonWindowID(const uint32_t button_id) OVERRIDE;
+
   inline bool IsRegistered() const OVERRIDE;
 
   /**
@@ -279,6 +284,9 @@ class ApplicationImpl : public virtual Application,
 
   virtual bool is_application_data_changed() const;
 
+  bool is_app_data_resumption_allowed() const OVERRIDE;
+  void set_app_data_resumption_allowance(const bool allowed) OVERRIDE;
+
   virtual void set_is_application_data_changed(bool state_application_data);
 
   /**
@@ -299,26 +307,35 @@ class ApplicationImpl : public virtual Application,
   /**
    * @brief SetInitialState sets initial HMI state for application on
    * registration
+   * @param window_id window id for HMI state
+   * @param window_name name of inited window
    * @param state Hmi state value
    */
-  void SetInitialState(HmiStatePtr state) FINAL;
+  void SetInitialState(const WindowID window_id,
+                       const std::string& window_name,
+                       HmiStatePtr state) FINAL;
 
   /**
    * @brief SetRegularState set permanent state of application
-   *
+   * @param window_id window id for HMI state
    * @param state state to setup
    */
-  virtual void SetRegularState(HmiStatePtr state);
+  void SetRegularState(const WindowID window_id, HmiStatePtr state) FINAL;
 
   /**
    * @brief SetPostponedState sets postponed state to application.
    * This state could be set as regular later
-   *
+   * @param window_id window id for HMI state
    * @param state state to setup
    */
-  virtual void SetPostponedState(HmiStatePtr state);
+  void SetPostponedState(const WindowID window_id, HmiStatePtr state) FINAL;
 
-  virtual void RemovePostponedState();
+  /**
+   * @brief RemovePostponedState removes postponed state for application
+   * After removal, this state will not be set as regular later
+   * @param window_id window id for HMI state
+   */
+  void RemovePostponedState(const WindowID window_id) FINAL;
 
   /**
    * @brief AddHMIState the function that will change application's
@@ -328,7 +345,7 @@ class ApplicationImpl : public virtual Application,
    *
    * @param state new hmi state for certain application.
    */
-  virtual void AddHMIState(HmiStatePtr state);
+  void AddHMIState(const WindowID window_id, HmiStatePtr state) FINAL;
 
   /**
    * @brief RemoveHMIState the function that will turn back hmi_level after end
@@ -338,13 +355,20 @@ class ApplicationImpl : public virtual Application,
    *
    * @param state_id that should be removed
    */
-  virtual void RemoveHMIState(HmiState::StateID state_id);
+  void RemoveHMIState(const WindowID window_id,
+                      HmiState::StateID state_id) FINAL;
 
   /**
    * @brief HmiState of application within active events PhoneCall, TTS< etc ...
    * @return Active HmiState of application
    */
-  virtual const HmiStatePtr CurrentHmiState() const;
+  const HmiStatePtr CurrentHmiState(const WindowID window_i) const FINAL;
+
+  WindowNames GetWindowNames() const FINAL;
+
+  WindowIds GetWindowIds() const FINAL;
+
+  bool WindowIdExists(const WindowID window_id) const FINAL;
 
   /**
    * @brief Checks if app is allowed to change audio source
@@ -356,7 +380,7 @@ class ApplicationImpl : public virtual Application,
    * @brief RegularHmiState of application without active events VR, TTS etc ...
    * @return HmiState of application
    */
-  virtual const HmiStatePtr RegularHmiState() const;
+  const HmiStatePtr RegularHmiState(const WindowID window_id) const FINAL;
 
   /**
    * @brief PostponedHmiState returns postponed hmi state of application
@@ -364,7 +388,7 @@ class ApplicationImpl : public virtual Application,
    *
    * @return Postponed hmi state of application
    */
-  virtual const HmiStatePtr PostponedHmiState() const;
+  const HmiStatePtr PostponedHmiState(const WindowID window_id) const FINAL;
 
   uint32_t audio_stream_retry_number() const;
 
@@ -391,6 +415,7 @@ class ApplicationImpl : public virtual Application,
    * @param system_context new system context
    */
   void set_system_context(
+      const WindowID window_id,
       const mobile_api::SystemContext::eType& system_context) OVERRIDE;
   /**
    * @brief Sets current audio streaming state
@@ -402,7 +427,8 @@ class ApplicationImpl : public virtual Application,
    * @brief Sets current HMI level
    * @param hmi_level new HMI level
    */
-  void set_hmi_level(const mobile_api::HMILevel::eType& hmi_level) OVERRIDE;
+  void set_hmi_level(const WindowID window_id,
+                     const mobile_api::HMILevel::eType& hmi_level) OVERRIDE;
 
   void PushMobileMessage(
       smart_objects::SmartObjectSPtr mobile_message) OVERRIDE;
@@ -475,6 +501,11 @@ class ApplicationImpl : public virtual Application,
    */
   void set_cloud_app_certificate(const std::string& certificate) OVERRIDE;
 
+  void set_user_location(
+      const smart_objects::SmartObject& user_location) OVERRIDE;
+
+  const smart_objects::SmartObject& get_user_location() const OVERRIDE;
+
  protected:
   /**
    * @brief Clean up application folder. Persistent files will stay
@@ -546,6 +577,7 @@ class ApplicationImpl : public virtual Application,
   sync_primitives::Lock streaming_stop_lock_;
 
   bool is_app_allowed_;
+  bool is_app_data_resumption_allowed_;
   bool has_been_activated_;
   bool tts_properties_in_none_;
   bool tts_properties_in_full_;
@@ -569,6 +601,7 @@ class ApplicationImpl : public virtual Application,
   std::atomic_bool is_resuming_;
   mobile_api::HMILevel::eType deferred_resumption_hmi_level_;
   bool is_hash_changed_during_suspend_;
+  smart_objects::SmartObject user_location_;
 
   uint32_t video_stream_retry_number_;
   uint32_t audio_stream_retry_number_;
@@ -632,7 +665,8 @@ uint32_t ApplicationImpl::app_id() const {
 const mobile_api::AudioStreamingState::eType
 ApplicationImpl::audio_streaming_state() const {
   using namespace mobile_apis;
-  const HmiStatePtr hmi_state = CurrentHmiState();
+  const HmiStatePtr hmi_state =
+      CurrentHmiState(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
   return hmi_state ? hmi_state->audio_streaming_state()
                    : AudioStreamingState::INVALID_ENUM;
 }
@@ -640,7 +674,8 @@ ApplicationImpl::audio_streaming_state() const {
 const mobile_api::VideoStreamingState::eType
 ApplicationImpl::video_streaming_state() const {
   using namespace mobile_apis;
-  const HmiStatePtr hmi_state = CurrentHmiState();
+  const HmiStatePtr hmi_state =
+      CurrentHmiState(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
   return hmi_state ? hmi_state->video_streaming_state()
                    : VideoStreamingState::INVALID_ENUM;
 }
diff --git a/src/components/application_manager/include/application_manager/application_manager_impl.h b/src/components/application_manager/include/application_manager/application_manager_impl.h
index c34affbf13..633bea87be 100644
--- a/src/components/application_manager/include/application_manager/application_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/application_manager_impl.h
@@ -58,6 +58,8 @@
 #include "application_manager/rpc_service.h"
 #include "application_manager/state_controller_impl.h"
 
+#include "application_manager/rpc_handler.h"
+
 #include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/policies/policy_handler_observer.h"
 #include "connection_handler/connection_handler.h"
@@ -69,6 +71,7 @@
 #include "policies/policy_handler.h"
 #include "protocol_handler/protocol_handler.h"
 #include "protocol_handler/protocol_observer.h"
+#include "protocol_handler/service_status_update_handler_listener.h"
 
 #include "interfaces/HMI_API.h"
 #include "interfaces/HMI_API_schema.h"
@@ -114,6 +117,9 @@ class ApplicationManagerImpl;
 
 enum VRTTSSessionChanging { kVRSessionChanging = 0, kTTSSessionChanging };
 
+typedef std::map<protocol_handler::ServiceType, std::set<uint32_t> >
+    ServiceStreamingStatusMap;
+
 struct CommandParametersPermissions;
 typedef std::map<std::string, hmi_apis::Common_TransportType::eType>
     DeviceTypes;
@@ -132,7 +138,8 @@ typedef std::shared_ptr<timer::Timer> TimerSPtr;
 class ApplicationManagerImpl
     : public ApplicationManager,
       public connection_handler::ConnectionHandlerObserver,
-      public policy::PolicyHandlerObserver
+      public policy::PolicyHandlerObserver,
+      public protocol_handler::ServiceStatusUpdateHandlerListener
 #ifdef ENABLE_SECURITY
     ,
       public security_manager::SecurityManagerListener
@@ -151,10 +158,14 @@ class ApplicationManagerImpl
                          const policy::PolicySettings& policy_settings);
   ~ApplicationManagerImpl();
 
+  DEPRECATED
+  bool Init(resumption::LastState&,
+            media_manager::MediaManager* media_manager) OVERRIDE;
+
   /**
    * Inits application manager
    */
-  bool Init(resumption::LastState& last_state,
+  bool Init(resumption::LastStateWrapperPtr last_state_wrapper,
             media_manager::MediaManager* media_manager) OVERRIDE;
 
   /**
@@ -166,19 +177,26 @@ class ApplicationManagerImpl
 
   DataAccessor<ApplicationSet> applications() const OVERRIDE;
   DataAccessor<AppsWaitRegistrationSet> pending_applications() const OVERRIDE;
+  DataAccessor<ReregisterWaitList> reregister_applications() const OVERRIDE;
   ApplicationSharedPtr application(uint32_t app_id) const OVERRIDE;
 
   ApplicationSharedPtr active_application() const OVERRIDE;
 
+  ApplicationSharedPtr get_full_or_limited_application() const OVERRIDE;
+
   ApplicationSharedPtr application_by_hmi_app(
       uint32_t hmi_app_id) const OVERRIDE;
   ApplicationSharedPtr application_by_policy_id(
       const std::string& policy_app_id) const OVERRIDE;
-  ApplicationSharedPtr application_by_name(
-      const std::string& app_name) const OVERRIDE;
+  DEPRECATED ApplicationSharedPtr
+  application_by_name(const std::string& app_name) const OVERRIDE;
   ApplicationSharedPtr pending_application_by_policy_id(
       const std::string& policy_app_id) const OVERRIDE;
+  ApplicationSharedPtr reregister_application_by_policy_id(
+      const std::string& policy_app_id) const OVERRIDE;
 
+  std::vector<ApplicationSharedPtr> applications_by_name(
+      const std::string& app_name) const OVERRIDE;
   std::vector<ApplicationSharedPtr> applications_by_button(
       uint32_t button) OVERRIDE;
   std::vector<ApplicationSharedPtr> applications_with_navi() OVERRIDE;
@@ -199,12 +217,14 @@ class ApplicationManagerImpl
 
   void set_current_audio_source(const uint32_t source) OVERRIDE;
 
-  void OnHMILevelChanged(uint32_t app_id,
-                         mobile_apis::HMILevel::eType from,
-                         mobile_apis::HMILevel::eType to) OVERRIDE;
+  void OnHMIStateChanged(const uint32_t app_id,
+                         const HmiStatePtr from,
+                         const HmiStatePtr to) OVERRIDE;
 
-  void SendHMIStatusNotification(
-      const std::shared_ptr<Application> app) OVERRIDE;
+  void ProcessOnDataStreamingNotification(
+      const protocol_handler::ServiceType service_type,
+      const uint32_t app_id,
+      const bool streaming_data_available) FINAL;
 
   void SendDriverDistractionState(ApplicationSharedPtr application);
 
@@ -251,12 +271,29 @@ class ApplicationManagerImpl
 
   /**
    * @brief Checks if Application is subscribed for way points
+   * @param Application id
+   * @return true if Application is subscribed for way points
+   * otherwise false
+   */
+  bool IsAppSubscribedForWayPoints(uint32_t app_id) const OVERRIDE;
+
+  /**
+   * @brief Checks if Application is subscribed for way points
    * @param Application pointer
    * @return true if Application is subscribed for way points
    * otherwise false
    */
   bool IsAppSubscribedForWayPoints(ApplicationSharedPtr app) const OVERRIDE;
 
+  void SaveWayPointsMessage(
+      smart_objects::SmartObjectSPtr way_points_message) OVERRIDE;
+
+  /**
+   * @brief Subscribe Application for way points
+   * @param Application id
+   */
+  void SubscribeAppForWayPoints(uint32_t app_id) OVERRIDE;
+
   /**
    * @brief Subscribe Application for way points
    * @param Application pointer
@@ -265,6 +302,12 @@ class ApplicationManagerImpl
 
   /**
    * @brief Unsubscribe Application for way points
+   * @param Application id
+   */
+  void UnsubscribeAppFromWayPoints(uint32_t app_id) OVERRIDE;
+
+  /**
+   * @brief Unsubscribe Application for way points
    * @param Application pointer
    */
   void UnsubscribeAppFromWayPoints(ApplicationSharedPtr app) OVERRIDE;
@@ -288,8 +331,7 @@ class ApplicationManagerImpl
    * @param vehicle_info Enum value of type of vehicle data
    * @param new value (for integer values currently) of vehicle data
    */
-  void IviInfoUpdated(mobile_apis::VehicleDataType::eType vehicle_info,
-                      int value) OVERRIDE;
+  void IviInfoUpdated(const std::string& vehicle_info, int value) OVERRIDE;
 
   void OnApplicationRegistered(ApplicationSharedPtr app) OVERRIDE;
 
@@ -390,7 +432,13 @@ class ApplicationManagerImpl
   void CreatePendingApplication(
       const transport_manager::ConnectionUID connection_id,
       const transport_manager::DeviceInfo& device_info,
-      connection_handler::DeviceHandle device_id);
+      connection_handler::DeviceHandle device_id) OVERRIDE;
+
+  void OnWebEngineDeviceCreated() OVERRIDE;
+
+  void CreatePendingLocalApplication(const std::string& policy_app_id) OVERRIDE;
+
+  void RemovePendingApplication(const std::string& policy_app_id) OVERRIDE;
 
   void SetPendingApplicationState(
       const transport_manager::ConnectionUID connection_id,
@@ -476,6 +524,7 @@ class ApplicationManagerImpl
   /**
    * @brief CreateRegularState create regular HMI state for application
    * @param app Application
+   * @param window_type type of window
    * @param hmi_level of returned state
    * @param audio_state of returned state
    * @param system_context of returned state
@@ -483,16 +532,17 @@ class ApplicationManagerImpl
    */
   HmiStatePtr CreateRegularState(
       std::shared_ptr<Application> app,
-      mobile_apis::HMILevel::eType hmi_level,
-      mobile_apis::AudioStreamingState::eType audio_state,
-      mobile_apis::VideoStreamingState::eType video_state,
-      mobile_apis::SystemContext::eType system_context) const OVERRIDE;
+      const mobile_apis::WindowType::eType window_type,
+      const mobile_apis::HMILevel::eType hmi_level,
+      const mobile_apis::AudioStreamingState::eType audio_state,
+      const mobile_apis::VideoStreamingState::eType video_state,
+      const mobile_apis::SystemContext::eType system_context) const OVERRIDE;
 
   /**
    * @brief Checks, if given RPC is allowed at current HMI level for specific
    * application in policy table
    * @param app Application
-   * @param hmi_level Current HMI level of application
+   * @param window_id id of application's window
    * @param function_id FunctionID of RPC
    * @param params_permissions Permissions for RPC parameters (e.g.
    * SubscribeVehicleData) defined in policy table
@@ -500,6 +550,7 @@ class ApplicationManagerImpl
    */
   mobile_apis::Result::eType CheckPolicyPermissions(
       const ApplicationSharedPtr app,
+      const WindowID window_id,
       const std::string& function_id,
       const RPCParams& rpc_params,
       CommandParametersPermissions* params_permissions = NULL) OVERRIDE;
@@ -517,32 +568,6 @@ class ApplicationManagerImpl
   bool IsApplicationForbidden(uint32_t connection_key,
                               const std::string& mobile_app_id);
 
-  struct ApplicationsAppIdSorter {
-    bool operator()(const ApplicationSharedPtr lhs,
-                    const ApplicationSharedPtr rhs) {
-      return lhs->app_id() < rhs->app_id();
-    }
-  };
-
-  struct ApplicationsMobileAppIdSorter {
-    bool operator()(const ApplicationSharedPtr lhs,
-                    const ApplicationSharedPtr rhs) {
-      if (lhs->policy_app_id() == rhs->policy_app_id()) {
-        return lhs->device() < rhs->device();
-      }
-      return lhs->policy_app_id() < rhs->policy_app_id();
-    }
-  };
-
-  // typedef for Applications list
-  typedef std::set<ApplicationSharedPtr, ApplicationsAppIdSorter> ApplictionSet;
-
-  // typedef for Applications list iterator
-  typedef ApplictionSet::iterator ApplictionSetIt;
-
-  // typedef for Applications list const iterator
-  typedef ApplictionSet::const_iterator ApplictionSetConstIt;
-
   /**
    * @brief Notification from PolicyHandler about PTU.
    * Compares AppHMIType between saved in app and received from PTU. If they are
@@ -564,6 +589,52 @@ class ApplicationManagerImpl
    */
   void OnPTUFinished(const bool ptu_result) FINAL;
 
+#if defined(EXTERNAL_PROPRIETARY_MODE) && defined(ENABLE_SECURITY)
+  /**
+   * @brief OnCertDecryptFailed is called when certificate decryption fails in
+   * external flow
+   * @return since this callback is a part of SecurityManagerListener, bool
+   * return value is used to indicate whether listener instance can be deleted
+   * by calling entity. if true - listener can be deleted and removed from
+   * listeners by SecurityManager, false - listener retains its place within
+   * SecurityManager.
+   */
+  bool OnCertDecryptFailed() FINAL;
+
+  /**
+   * @brief OnCertDecryptFinished is called when certificate decryption is
+   * finished in the external flow
+   * @param decrypt_result bool value indicating whether decryption was
+   * successful
+   */
+  void OnCertDecryptFinished(const bool decrypt_result) FINAL;
+#endif
+
+  /**
+   * @brief OnPTUTimeoutExceeded is called on policy table update timed out
+   */
+  void OnPTUTimeoutExceeded() FINAL;
+
+  /**
+   *@brief ProcessServiceStatusUpdate callback that is invoked in case of
+   *service status update
+   *@param connection_key - connection key
+   *@param service_type enum value containing type of service.
+   *@param service_event enum value containing event that occured during service
+   *start.
+   *@param service_update_reason enum value containing reason why service_event
+   *occured.
+   **/
+  void ProcessServiceStatusUpdate(
+      const uint32_t connection_key,
+      hmi_apis::Common_ServiceType::eType service_type,
+      hmi_apis::Common_ServiceEvent::eType service_event,
+      utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
+          service_update_reason) FINAL;
+
+#ifdef ENABLE_SECURITY
+  bool OnPTUFailed() FINAL;
+#endif  // ENABLE_SECURITY
   /*
    * @brief Starts audio pass thru thread
    *
@@ -621,6 +692,9 @@ class ApplicationManagerImpl
                         const uint32_t corr_id,
                         const int32_t function_id) OVERRIDE;
 
+  void OnQueryAppsRequest(
+      const connection_handler::DeviceHandle device) OVERRIDE;
+
   // Overriden ConnectionHandlerObserver method
   void OnDeviceListUpdated(
       const connection_handler::DeviceMap& device_list) OVERRIDE;
@@ -683,7 +757,7 @@ class ApplicationManagerImpl
    * @brief Notification about handshake failure
    * @return true on success notification handling or false otherwise
    */
-  bool OnHandshakeFailed() OVERRIDE;
+  bool OnGetSystemTimeFailed() OVERRIDE;
 
   /**
    * @brief Notification that certificate update is required.
@@ -757,12 +831,13 @@ class ApplicationManagerImpl
   void RemovePolicyObserver(PolicyHandlerObserver* listener);
 
   /**
-   * @brief Checks HMI level and returns true if streaming is allowed
+   * @brief Checks application HMI state and returns true if streaming is
+   * allowed
    * @param app_id Application id
    * @param service_type Service type to check
    * @return True if streaming is allowed, false in other case
    */
-  bool HMILevelAllowsStreaming(
+  bool HMIStateAllowsStreaming(
       uint32_t app_id,
       protocol_handler::ServiceType service_type) const OVERRIDE;
 
@@ -782,12 +857,12 @@ class ApplicationManagerImpl
    */
   void EndNaviServices(uint32_t app_id) OVERRIDE;
 
-  /**
-   * @brief ForbidStreaming forbid the stream over the certain application.
-   * @param app_id the application's id which should stop streaming.
-   */
+  DEPRECATED
   void ForbidStreaming(uint32_t app_id) OVERRIDE;
 
+  void ForbidStreaming(uint32_t app_id,
+                       protocol_handler::ServiceType service_type) OVERRIDE;
+
   /**
    * @brief Called when application completes streaming configuration
    * @param app_id Streaming application id
@@ -1065,10 +1140,12 @@ class ApplicationManagerImpl
    * @brief IsAppInReconnectMode check if application belongs to session
    * affected by transport switching at the moment by checking internal
    * waiting list prepared on switching start
+   * @param device_id device identifier
    * @param policy_app_id Application id
    * @return True if application is in the waiting list, otherwise - false
    */
-  bool IsAppInReconnectMode(const std::string& policy_app_id) const FINAL;
+  bool IsAppInReconnectMode(const connection_handler::DeviceHandle& device_id,
+                            const std::string& policy_app_id) const FINAL;
 
   bool IsStopping() const OVERRIDE {
     return is_stopping_;
@@ -1108,8 +1185,27 @@ class ApplicationManagerImpl
    */
   protocol_handler::MajorProtocolVersion SupportedSDLVersion() const OVERRIDE;
 
+  void ApplyFunctorForEachPlugin(
+      std::function<void(plugin_manager::RPCPlugin&)> functor) OVERRIDE;
+
  private:
   /**
+   * @brief Adds application to registered applications list and marks it as
+   * registered
+   * @param application Application that should be added to registered
+   * applications list.
+   */
+  void AddAppToRegisteredAppList(const ApplicationSharedPtr application);
+
+  /**
+   * @brief Removes service status record for service that failed to start
+   * @param app Application whose service status record should be removed
+   * @param Service type which status record should be removed
+   */
+  bool HandleRejectedServiceStatus(
+      ApplicationSharedPtr app,
+      const hmi_apis::Common_ServiceType::eType service_type);
+  /**
    * @brief PullLanguagesInfo allows to pull information about languages.
    *
    * @param app_data entry to parse
@@ -1227,8 +1323,14 @@ class ApplicationManagerImpl
    * @param to the new HMILevel for the certain app.
    */
   void ProcessApp(const uint32_t app_id,
-                  const mobile_apis::HMILevel::eType from,
-                  const mobile_apis::HMILevel::eType to);
+                  const HmiStatePtr from,
+                  const HmiStatePtr to);
+
+  /**
+   * @brief Starts EndStream timer for a specified application
+   * @param app_id Application to process
+   */
+  void StartEndStreamTimer(const uint32_t app_id);
 
   /**
    * @brief Allows to send appropriate message to mobile device.
@@ -1411,12 +1513,14 @@ class ApplicationManagerImpl
   ApplicationSet applications_;
   AppsWaitRegistrationSet apps_to_register_;
   ForbiddenApps forbidden_applications;
+  ReregisterWaitList reregister_wait_list_;
 
   // Lock for applications list
   mutable std::shared_ptr<sync_primitives::RecursiveLock>
       applications_list_lock_ptr_;
   mutable std::shared_ptr<sync_primitives::Lock>
       apps_to_register_list_lock_ptr_;
+  mutable std::shared_ptr<sync_primitives::Lock> reregister_wait_list_lock_ptr_;
   mutable sync_primitives::Lock subscribed_way_points_apps_lock_;
 
   /**
@@ -1429,16 +1533,19 @@ class ApplicationManagerImpl
    */
   std::set<uint32_t> subscribed_way_points_apps_list_;
 
+  smart_objects::SmartObjectSPtr way_points_data_;
+
   /**
    * @brief Map contains applications which
    * will send TTS global properties to HMI after timeout
    */
   std::map<uint32_t, date_time::TimeDuration> tts_global_properties_app_list_;
-
+  std::set<connection_handler::DeviceHandle> query_apps_devices_;
   bool audio_pass_thru_active_;
   uint32_t audio_pass_thru_app_id_;
   sync_primitives::Lock audio_pass_thru_lock_;
   sync_primitives::Lock tts_global_properties_app_list_lock_;
+  mutable sync_primitives::Lock query_apps_devices_lock_;
   hmi_apis::Common_DriverDistractionState::eType driver_distraction_state_;
   bool is_vr_session_strated_;
   bool hmi_cooperating_;
@@ -1452,8 +1559,8 @@ class ApplicationManagerImpl
   connection_handler::ConnectionHandler* connection_handler_;
   std::unique_ptr<policy::PolicyHandlerInterface> policy_handler_;
   protocol_handler::ProtocolHandler* protocol_handler_;
-  request_controller::RequestController request_ctrl_;
   std::unique_ptr<plugin_manager::RPCPluginManager> plugin_manager_;
+  request_controller::RequestController request_ctrl_;
   std::unique_ptr<application_manager::AppServiceManager> app_service_manager_;
 
   /**
@@ -1497,26 +1604,21 @@ class ApplicationManagerImpl
   NaviServiceStatusMap navi_service_status_;
   sync_primitives::Lock navi_service_status_lock_;
   std::deque<uint32_t> navi_app_to_stop_;
+  sync_primitives::Lock navi_app_to_stop_lock_;
   std::deque<uint32_t> navi_app_to_end_stream_;
   uint32_t navi_close_app_timeout_;
   uint32_t navi_end_stream_timeout_;
 
-  std::vector<TimerSPtr> timer_pool_;
-  sync_primitives::Lock timer_pool_lock_;
+  std::vector<TimerSPtr> close_app_timer_pool_;
+  std::vector<TimerSPtr> end_stream_timer_pool_;
+  sync_primitives::Lock close_app_timer_pool_lock_;
+  sync_primitives::Lock end_stream_timer_pool_lock_;
+
   mutable sync_primitives::RecursiveLock stopping_application_mng_lock_;
   StateControllerImpl state_ctrl_;
   std::unique_ptr<app_launch::AppLaunchData> app_launch_dto_;
   std::unique_ptr<app_launch::AppLaunchCtrl> app_launch_ctrl_;
 
-  /**
-   * @brief ReregisterWaitList is list of applications expected to be
-   * re-registered after transport switching is complete
-   */
-  typedef std::vector<ApplicationSharedPtr> ReregisterWaitList;
-  ReregisterWaitList reregister_wait_list_;
-
-  mutable sync_primitives::Lock reregister_wait_list_lock_;
-
   // This is a cache to remember DeviceHandle of secondary transports. Only used
   // during RegisterApplication().
   typedef std::map<int32_t, connection_handler::DeviceHandle> DeviceMap;
@@ -1538,10 +1640,14 @@ class ApplicationManagerImpl
 
   Timer tts_global_properties_timer_;
 
+  Timer clear_pool_timer_;
+
   bool is_low_voltage_;
 
   uint32_t apps_size_;
 
+  std::atomic<bool> registered_during_timer_execution_;
+
   volatile bool is_stopping_;
 
   std::unique_ptr<CommandHolder> commands_holder_;
@@ -1549,6 +1655,9 @@ class ApplicationManagerImpl
   std::unique_ptr<rpc_service::RPCService> rpc_service_;
   std::unique_ptr<rpc_handler::RPCHandler> rpc_handler_;
 
+  ServiceStreamingStatusMap streaming_application_services_;
+  sync_primitives::Lock streaming_services_lock_;
+
 #ifdef BUILD_TESTS
  public:
   /**
diff --git a/src/components/application_manager/include/application_manager/application_state.h b/src/components/application_manager/include/application_manager/application_state.h
index d708a6188d..8c4d2d49d6 100644
--- a/src/components/application_manager/include/application_manager/application_state.h
+++ b/src/components/application_manager/include/application_manager/application_state.h
@@ -32,14 +32,21 @@
 
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_STATE_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_APPLICATION_STATE_H_
+
+#include <map>
 #include <vector>
+
 #include "application_manager/hmi_state.h"
 #include "utils/lock.h"
 #include "utils/macro.h"
 
 namespace application_manager {
 
+typedef std::vector<WindowID> WindowIds;
 typedef std::vector<HmiStatePtr> HmiStates;
+typedef std::map<WindowID, HmiStates> HmiStatesMap;
+typedef std::vector<std::string> WindowNames;
+typedef std::map<WindowID, std::string> WindowNamesMap;
 
 /*
  * Class represents application state, i.e. current HMI level, audio streaming
@@ -63,94 +70,137 @@ class ApplicationState {
 
   /**
    * @brief Init state
+   * @param window_id window id for HMI state
+   * @param window_name name of inited window
    * @param state Initial state
    */
-  void InitState(HmiStatePtr state);
+  void InitState(const WindowID window_id,
+                 const std::string& window_name,
+                 HmiStatePtr state);
 
   /**
    * @brief Adds state to states storage
+   * @param window_id window id for HMI state
    * @param state State of application
    */
-  void AddState(HmiStatePtr state);
+  void AddState(const WindowID window_id, HmiStatePtr state);
 
   /**
    * @brief Removes state from states storage
+   * @param window_id window id for HMI state
    * @param state State of application
    */
-  void RemoveState(HmiState::StateID state);
+  void RemoveState(const WindowID window_id, HmiState::StateID state);
 
   /**
    * @brief Gets state by state id
+   * @param window_id window id for HMI state
    * @param state_id State id
    * @return Pointer to application state
    */
-  HmiStatePtr GetState(HmiState::StateID state_id) const;
+  HmiStatePtr GetState(const WindowID window_id,
+                       HmiState::StateID state_id) const;
+
+  /**
+   * @brief Gets the list of all states matches provided state id
+   * @param state_id state id to get
+   * @return list of all states matches provided state id
+   */
+  HmiStates GetStates(const HmiState::StateID state_id) const;
+
+  /**
+   * @brief Getter for a list of available application windows including the
+   * main
+   * @return list of available window ids
+   */
+  WindowIds GetWindowIds() const;
+
+  /**
+   * @brief Getter f0r a list of all existing window names
+   * @return list of available window names
+   */
+  WindowNames GetWindowNames() const;
 
  private:
   /**
    * @brief AddHMIState the function that will change application's
    * hmi state.
    *
-   * @param app_id id of the application whose hmi level should be changed.
+   * @param window_id window id for HMI state
    *
    * @param state new hmi state for certain application.
    */
-  void AddHMIState(HmiStatePtr state);
+  void AddHMIState(const WindowID window_id, HmiStatePtr state);
 
   /**
    * @brief RemoveHMIState the function that will turn back hmi_level after end
    * of some event
    *
-   * @param app_id id of the application whose hmi level should be changed.
+   * @param window_id window id for HMI state.
    *
    * @param state_id that should be removed
    */
-  void RemoveHMIState(HmiState::StateID state_id);
+  void RemoveHMIState(const WindowID window_id, HmiState::StateID state_id);
+
+  /**
+   * @brief RemoveWindowHMIStates removes all HMI states related to specified
+   * window
+   * @param window_id window ID to remove
+   */
+  void RemoveWindowHMIStates(const WindowID window_id);
 
   /**
    * @brief Removes postponed state
+   * @param window_id window id for HMI state
    */
-  void RemovePostponedState();
+  void RemovePostponedState(const WindowID window_id);
 
   /**
    * @brief Sets regular state of application
+   * @param window_id window id for HMI state
    * @param state State of application
    */
-  void SetRegularState(HmiStatePtr state);
+  void SetRegularState(const WindowID window_id, HmiStatePtr state);
 
   /**
    * @brief Sets postponed state of application.
    * This state could be set as regular later on
-   *
+   * @param window_id window id for HMI state
    * @param state state to setup
    */
-  void SetPostponedState(HmiStatePtr state);
+  void SetPostponedState(const WindowID window_id, HmiStatePtr state);
 
   /**
    * @brief HmiState of application within active events PhoneCall, TTS< etc ...
+   * @param window_id window id for HMI state
    * @return Active HmiState of application
    */
-  HmiStatePtr CurrentHmiState() const;
+  HmiStatePtr CurrentHmiState(const WindowID window_id) const;
 
   /**
    * @brief RegularHmiState of application without active events VR, TTS etc ...
+   * @param window_id window id for HMI state
    * @return HmiState of application
    */
-  HmiStatePtr RegularHmiState() const;
+  HmiStatePtr RegularHmiState(const WindowID window_id) const;
 
   /**
    * @brief PostponedHmiState returns postponed hmi state of application
    * if it's present
-   *
+   * @param window_id window id for HMI state
    * @return Postponed hmi state of application
    */
-  HmiStatePtr PostponedHmiState() const;
+  HmiStatePtr PostponedHmiState(const WindowID window_id) const;
 
   /**
    * @brief Active states of application
    */
-  HmiStates hmi_states_;
-  mutable sync_primitives::Lock hmi_states_lock_;
+  HmiStatesMap hmi_states_map_;
+
+  /**
+   * @brief hmi_states_map_lock_
+   */
+  mutable sync_primitives::Lock hmi_states_map_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationState);
 };
diff --git a/src/components/application_manager/include/application_manager/command_holder.h b/src/components/application_manager/include/application_manager/command_holder.h
index 8cfe5f0889..3f5f657a0e 100644
--- a/src/components/application_manager/include/application_manager/command_holder.h
+++ b/src/components/application_manager/include/application_manager/command_holder.h
@@ -35,6 +35,7 @@
 
 #include <string>
 #include "application_manager/application.h"
+#include "application_manager/commands/command.h"
 #include "smart_objects/smart_object.h"
 
 namespace application_manager {
@@ -59,10 +60,12 @@ class CommandHolder {
    * internally
    * @param application Application pointer
    * @param type Command type
+   * @param source The source of suspended command
    * @param command Command
    */
   virtual void Suspend(ApplicationSharedPtr application,
                        CommandType type,
+                       commands::Command::CommandSource source,
                        smart_objects::SmartObjectSPtr command) = 0;
 
   /**
diff --git a/src/components/application_manager/include/application_manager/command_holder_impl.h b/src/components/application_manager/include/application_manager/command_holder_impl.h
index 8867336b3e..530aae47d2 100644
--- a/src/components/application_manager/include/application_manager/command_holder_impl.h
+++ b/src/components/application_manager/include/application_manager/command_holder_impl.h
@@ -64,10 +64,12 @@ class CommandHolderImpl : public CommandHolder {
    * @brief Suspend collects command for specific application id internally
    * @param application Application pointer
    * @param type Command type
+   * @param source The source of suspended command
    * @param command Command
    */
   void Suspend(ApplicationSharedPtr application,
                CommandType type,
+               commands::Command::CommandSource source,
                smart_objects::SmartObjectSPtr command) FINAL;
 
   /**
@@ -97,9 +99,17 @@ class CommandHolderImpl : public CommandHolder {
    */
   void ResumeMobileCommand(ApplicationSharedPtr application);
 
+  /**
+   * @brief Descriptor of each suspended command containing all necessary
+   * command info
+   */
+  struct AppCommandInfo {
+    std::shared_ptr<smart_objects::SmartObject> command_ptr_;
+    commands::Command::CommandSource command_source_;
+  };
+
   using AppCommands =
-      std::map<ApplicationSharedPtr,
-               std::vector<std::shared_ptr<smart_objects::SmartObject> > >;
+      std::map<ApplicationSharedPtr, std::vector<AppCommandInfo> >;
 
   ApplicationManager& app_manager_;
   sync_primitives::Lock commands_lock_;
diff --git a/src/components/application_manager/include/application_manager/commands/command.h b/src/components/application_manager/include/application_manager/commands/command.h
index 0693f9868d..a7241ce16d 100644
--- a/src/components/application_manager/include/application_manager/commands/command.h
+++ b/src/components/application_manager/include/application_manager/commands/command.h
@@ -33,6 +33,7 @@
 #ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_H_
 #define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMAND_H_
 #include <stdint.h>
+#include "application_manager/hmi_state.h"
 #include "smart_objects/smart_object.h"
 
 namespace application_manager {
@@ -93,6 +94,23 @@ class Command {
   virtual int32_t function_id() const = 0;
 
   /*
+   * @brief Retrieves Window ID
+   */
+  virtual WindowID window_id() const = 0;
+
+  /**
+   * @brief Set warning info string, to be sent on a successful response
+   * @param info Warning info string
+   */
+  virtual void set_warning_info(const std::string info) = 0;
+
+  /**
+   * @brief Returns warning info string
+   * @return Warning info string
+   */
+  virtual std::string warning_info() const = 0;
+
+  /*
    * @brief Function is called by RequestController when request execution time
    * has exceed it's limit
    *
diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h
index 4e52ac23ce..151c4d7874 100644
--- a/src/components/application_manager/include/application_manager/commands/command_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_impl.h
@@ -118,6 +118,15 @@ class CommandImpl : public Command {
   int32_t function_id() const OVERRIDE;
 
   /*
+   * @brief Retrieves Window ID
+   */
+  WindowID window_id() const OVERRIDE;
+
+  void set_warning_info(const std::string info) OVERRIDE;
+
+  std::string warning_info() const OVERRIDE;
+
+  /*
    * @brief Function is called by RequestController when request execution time
    * has exceed it's limit
    *
@@ -140,6 +149,24 @@ class CommandImpl : public Command {
    */
   void SetAllowedToTerminate(const bool allowed) OVERRIDE;
 
+  /**
+   * @brief Calculates command`s internal consecutive number
+   * for specified application used during resumption.
+   * This method is called when a new command is added.
+   * @param[in] app Application for wich a consecutive number is calculated
+   * @return internal consecutive number
+   */
+  static uint32_t CalcCommandInternalConsecutiveNumber(
+      application_manager::ApplicationConstSharedPtr app);
+
+  /**
+   * @brief Check syntax of string from mobile
+   * @param str - string that need to be checked
+   * @param allow_empty_string if true methods allow empty sting
+   * @return true if success otherwise return false
+   */
+  bool CheckSyntax(const std::string& str, bool allow_empty_line = false) const;
+
   // members
   static const int32_t hmi_protocol_type_;
   static const int32_t mobile_protocol_type_;
@@ -147,6 +174,20 @@ class CommandImpl : public Command {
 
  protected:
   /**
+   * @brief Checks message permissions and parameters according to policy table
+   * permissions
+   * @param source The source of the command (used to determine if a response
+   * should be sent on failure)
+   * @return true if the RPC is allowed, false otherwise
+   */
+  bool CheckAllowedParameters(const Command::CommandSource source);
+
+  /**
+   * @brief Remove from current message parameters disallowed by policy table
+   */
+  void RemoveDisallowedParameters();
+
+  /**
    * @brief Parses mobile message and replaces mobile app id with HMI app id
    * @param message Message to replace its ids
    * @return True if replacement succeeded, otherwise - false
@@ -168,6 +209,15 @@ class CommandImpl : public Command {
   HMICapabilities& hmi_capabilities_;
   policy::PolicyHandlerInterface& policy_handler_;
 
+  /**
+   * @brief warning_info_ Defines a warning message to send in the case of a
+   * successful response
+   */
+  std::string warning_info_;
+
+  CommandParametersPermissions parameters_permissions_;
+  CommandParametersPermissions removed_parameters_permissions_;
+
 #ifdef ENABLE_LOG
   static log4cxx::LoggerPtr logger_;
 #endif  // ENABLE_LOG
diff --git a/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h b/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h
index e8485a3abc..4a1d6efbc5 100644
--- a/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_notification_from_mobile_impl.h
@@ -50,6 +50,7 @@ class CommandNotificationFromMobileImpl : public CommandImpl {
       policy::PolicyHandlerInterface& policy_handler);
   virtual ~CommandNotificationFromMobileImpl();
   virtual bool Init();
+  bool CheckPermissions() OVERRIDE;
   virtual bool CleanUp();
   virtual void Run();
   void SendNotification();
diff --git a/src/components/application_manager/include/application_manager/commands/command_request_impl.h b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
index b5a330d907..87c19ca1d1 100644
--- a/src/components/application_manager/include/application_manager/commands/command_request_impl.h
+++ b/src/components/application_manager/include/application_manager/commands/command_request_impl.h
@@ -166,14 +166,6 @@ class CommandRequestImpl : public CommandImpl,
       const smart_objects::SmartObject* response_params = NULL,
       const std::vector<uint8_t> binary_data = std::vector<uint8_t>());
 
-  /**
-   * @brief Check syntax of string from mobile
-   * @param str - string that need to be checked
-   * @param allow_empty_string if true methods allow empty sting
-   * @return true if success otherwise return false
-   */
-  bool CheckSyntax(const std::string& str, bool allow_empty_line = false);
-
   void SendProviderRequest(
       const mobile_apis::FunctionID::eType& mobile_function_id,
       const hmi_apis::FunctionID::eType& hmi_function_id,
@@ -214,12 +206,33 @@ class CommandRequestImpl : public CommandImpl,
   mobile_apis::Result::eType GetMobileResultCode(
       const hmi_apis::Common_Result::eType& hmi_code) const;
 
+  /**
+   * @brief Checks Mobile result code for single RPC
+   * @param result_code contains result code from response to Mobile
+   * @return true if result code complies to successful result codes,
+   * false otherwise.
+   */
+  static bool IsMobileResultSuccess(
+      const mobile_apis::Result::eType result_code);
+
+  /**
+   * @brief Checks HMI result code for single RPC
+   * @param result_code contains result code from HMI response
+   * @return true if result code complies to successful result codes,
+   * false otherwise.
+   */
+  static bool IsHMIResultSuccess(
+      const hmi_apis::Common_Result::eType result_code);
+
  protected:
   /**
    * @brief Checks message permissions and parameters according to policy table
    * permissions
+   * @param source The source of the command (used to determine if a response
+   * should be sent on failure)
+   * @return true if the RPC is allowed, false otherwise
    */
-  bool CheckAllowedParameters();
+  bool CheckAllowedParameters(const Command::CommandSource source);
 
   /**
    * @brief Checks HMI capabilities for specified button support
@@ -230,11 +243,6 @@ class CommandRequestImpl : public CommandImpl,
   bool CheckHMICapabilities(const mobile_apis::ButtonName::eType button) const;
 
   /**
-   * @brief Remove from current message parameters disallowed by policy table
-   */
-  void RemoveDisallowedParameters();
-
-  /**
    * @brief Adds disallowed parameters back to response with appropriate
    * reasons
    * @param response Response message, which should be extended with blocked
@@ -249,14 +257,6 @@ class CommandRequestImpl : public CommandImpl,
   bool HasDisallowedParams() const;
 
   /**
-   * @brief Checks result code from Mobile for single RPC
-   * @param result_code contains result code from Mobile response
-   * @return true if result code complies successful result codes,
-   * false otherwise.
-   */
-  bool IsMobileResultSuccess(mobile_apis::Result::eType result_code) const;
-
-  /**
    * @brief Checks result code from HMI for single RPC
    * and returns parameter for sending to mobile app.
    * @param result_code contains result code from HMI response
@@ -317,6 +317,16 @@ class CommandRequestImpl : public CommandImpl,
   bool IsResultCodeUnsupported(const ResponseInfo& first,
                                const ResponseInfo& second) const;
 
+  /**
+   * @brief CheckResult checks whether the overall result
+   * of the responses is successful
+   * @param first response
+   * @param second response
+   * @return true if the overall result is successful
+   * otherwise - false
+   */
+  bool CheckResult(const ResponseInfo& first, const ResponseInfo& second) const;
+
  protected:
   /**
    * @brief Returns policy parameters permissions
@@ -355,8 +365,6 @@ class CommandRequestImpl : public CommandImpl,
 
   RequestState current_state_;
   sync_primitives::Lock state_lock_;
-  CommandParametersPermissions parameters_permissions_;
-  CommandParametersPermissions removed_parameters_permissions_;
 
   /**
    * @brief hash_update_mode_ Defines whether request must update hash value of
@@ -372,7 +380,7 @@ class CommandRequestImpl : public CommandImpl,
    * @param info string with disallowed params enumeration
    * @param param disallowed param
    */
-  void AddDissalowedParameterToInfoString(std::string& info,
+  void AddDisallowedParameterToInfoString(std::string& info,
                                           const std::string& param) const;
 
   /**
diff --git a/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h b/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h
index 430e549523..6b6dbde141 100644
--- a/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h
+++ b/src/components/application_manager/include/application_manager/commands/command_request_to_mobile.h
@@ -51,6 +51,7 @@ class CommandRequestToMobile : public CommandImpl {
                          policy::PolicyHandlerInterface& policy_handler);
   ~CommandRequestToMobile();
   bool Init() OVERRIDE;
+  bool CheckPermissions() OVERRIDE;
   bool CleanUp() OVERRIDE;
   void Run() OVERRIDE;
   void SendRequest();
diff --git a/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h b/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h
index 1401888890..f428d8561b 100644
--- a/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h
+++ b/src/components/application_manager/include/application_manager/commands/command_response_from_mobile.h
@@ -51,6 +51,7 @@ class CommandResponseFromMobile : public CommandImpl {
                             policy::PolicyHandlerInterface& policy_handler);
   ~CommandResponseFromMobile();
   bool Init() OVERRIDE;
+  bool CheckPermissions() OVERRIDE;
   bool CleanUp() OVERRIDE;
   void Run() OVERRIDE;
   void SendResponse();
diff --git a/src/components/application_manager/include/application_manager/display_capabilities_builder.h b/src/components/application_manager/include/application_manager/display_capabilities_builder.h
new file mode 100644
index 0000000000..529c9a32c1
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/display_capabilities_builder.h
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DISPLAY_CAPABILITIES_BUILDER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_DISPLAY_CAPABILITIES_BUILDER_H_
+#include "application_manager/application.h"
+
+namespace application_manager {
+/**
+ * @brief DisplayCapabilitiesBuilder utility class used for building cached
+ * notification, which is sent to mobile on resumption finish
+ */
+class DisplayCapabilitiesBuilder {
+  typedef std::function<void(Application&, const smart_objects::SmartObject)>
+      ResumeCallback;
+
+ public:
+  /**
+   * @brief DisplayCapabilitiesBuilder class constructor
+   * @param Application reference to application owner
+   */
+  DisplayCapabilitiesBuilder(Application& application);
+
+  /**
+   * @brief InitBuilder initialize builder with callback and windows to be
+   * restored
+   * @param resume_callback callback to be called when notifications for all
+   * windows have been received
+   * @param windows_info SO containing data of windows to be restored
+   */
+  void InitBuilder(ResumeCallback resume_callback,
+                   const smart_objects::SmartObject& windows_info);
+
+  /**
+   * @brief UpdateDisplayCapabilities update cached notification
+   * @param display_capabilities to update cached notification with
+   */
+  void UpdateDisplayCapabilities(
+      const smart_objects::SmartObject& display_capabilities);
+
+  /**
+   * @brief ResetDisplayCapabilities resets stored notification
+   */
+  void ResetDisplayCapabilities();
+
+  /**
+   * @brief StopWaitingForWindow stop waiting for window resumption by removing
+   * window_id from windows pending resumption
+   * @param window_id window id to be removed
+   */
+  void StopWaitingForWindow(const WindowID window_id);
+
+  /**
+   * @brief retreives stored notification data
+   */
+  const smart_objects::SmartObjectSPtr display_capabilities() const;
+
+ private:
+  smart_objects::SmartObjectSPtr display_capabilities_;
+  typedef std::set<WindowID> WindowIDsToResume;
+  WindowIDsToResume window_ids_to_resume_;
+  Application& owner_;
+  ResumeCallback resume_callback_;
+  sync_primitives::Lock display_capabilities_lock_;
+};
+}  // namespace application_manager
+#endif
diff --git a/src/components/application_manager/include/application_manager/event_engine/event_observer.h b/src/components/application_manager/include/application_manager/event_engine/event_observer.h
index 7a7fe7c2ec..1f4eccaf46 100644
--- a/src/components/application_manager/include/application_manager/event_engine/event_observer.h
+++ b/src/components/application_manager/include/application_manager/event_engine/event_observer.h
@@ -96,12 +96,6 @@ class EventObserver {
    * @brief Unsubscribes the observer from all events
    *
    */
-  DEPRECATED void unsubscribe_from_all_events();
-
-  /*
-   * @brief Unsubscribes the observer from all events
-   *
-   */
   void unsubscribe_from_all_hmi_events();
 
   // Mobile Events
diff --git a/src/components/application_manager/include/application_manager/helpers/application_helper.h b/src/components/application_manager/include/application_manager/helpers/application_helper.h
index 18267c9e7f..a7933c2451 100644
--- a/src/components/application_manager/include/application_manager/helpers/application_helper.h
+++ b/src/components/application_manager/include/application_manager/helpers/application_helper.h
@@ -69,6 +69,19 @@ ApplicationSharedPtr FindPendingApp(
   return app;
 }
 
+template <class UnaryPredicate>
+ApplicationSharedPtr FindReregisterApp(
+    DataAccessor<ReregisterWaitList> accessor, UnaryPredicate finder) {
+  ReregisterWaitList::const_iterator begin = accessor.GetData().begin();
+  ReregisterWaitList::const_iterator end = accessor.GetData().end();
+  ReregisterWaitList::const_iterator it = std::find_if(begin, end, finder);
+  if (accessor.GetData().end() == it) {
+    return ApplicationSharedPtr();
+  }
+  ApplicationSharedPtr app = *it;
+  return app;
+}
+
 /**
  * Helper function for lookup through applications list and returning all
  * applications satisfying predicate logic
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
index 6376f89096..ee6c31490f 100644
--- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
+++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h
@@ -41,10 +41,6 @@
 #include "smart_objects/smart_object.h"
 #include "utils/macro.h"
 
-namespace resumption {
-class LastState;
-}  // namespace resumption
-
 namespace application_manager {
 class ApplicationManager;
 
@@ -219,7 +215,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported display capabilities
    */
-  const smart_objects::SmartObject* display_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr display_capabilities() const OVERRIDE;
 
   /*
    * @brief Sets supported display capabilities
@@ -230,11 +226,25 @@ class HMICapabilitiesImpl : public HMICapabilities {
       const smart_objects::SmartObject& display_capabilities) OVERRIDE;
 
   /*
+   * @brief Retrieves information about the display capability
+   * @return Currently supported display capability
+   */
+  const smart_objects::SmartObjectSPtr system_display_capabilities()
+      const OVERRIDE;
+
+  /*
+   * @brief Sets supported display capability
+   * @param display_capabilities supported display capability
+   */
+  void set_system_display_capabilities(
+      const smart_objects::SmartObject& display_capabilities);
+
+  /*
    * @brief Retrieves information about the HMI zone capabilities
    *
    * @return Currently supported HMI zone capabilities
    */
-  const smart_objects::SmartObject* hmi_zone_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr hmi_zone_capabilities() const OVERRIDE;
 
   /*
    * @brief Sets supported HMI zone capabilities
@@ -249,7 +259,8 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported SoftButton's capabilities
    */
-  const smart_objects::SmartObject* soft_button_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr soft_button_capabilities()
+      const OVERRIDE;
 
   /*
    * @brief Sets supported SoftButton's capabilities
@@ -264,7 +275,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported Button's capabilities
    */
-  const smart_objects::SmartObject* button_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr button_capabilities() const OVERRIDE;
 
   /*
    * @brief Sets supported Button's capabilities
@@ -287,7 +298,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported speech capabilities
    */
-  const smart_objects::SmartObject* speech_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr speech_capabilities() const OVERRIDE;
 
   /*
    * @brief Sets supported VR capabilities
@@ -302,7 +313,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported VR capabilities
    */
-  const smart_objects::SmartObject* vr_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr vr_capabilities() const OVERRIDE;
 
   /*
    * @brief Sets supported audio_pass_thru capabilities
@@ -317,7 +328,7 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported audio_pass_thru capabilities
    */
-  const smart_objects::SmartObject* audio_pass_thru_capabilities()
+  const smart_objects::SmartObjectSPtr audio_pass_thru_capabilities()
       const OVERRIDE;
 
   /*
@@ -333,14 +344,15 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @return Currently supported pcm_streaming capabilities
    */
-  const smart_objects::SmartObject* pcm_stream_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr pcm_stream_capabilities() const OVERRIDE;
 
   /*
    * @brief Retrieves information about the preset bank capabilities
    *
    * @return Currently supported preset bank capabilities
    */
-  const smart_objects::SmartObject* preset_bank_capabilities() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr preset_bank_capabilities()
+      const OVERRIDE;
 
   /*
    * @brief Sets supported preset bank capabilities
@@ -363,14 +375,14 @@ class HMICapabilitiesImpl : public HMICapabilities {
    *
    * @param vehicle_type Cuurent vehicle information
    */
-  const smart_objects::SmartObject* vehicle_type() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr vehicle_type() const OVERRIDE;
 
   /*
    * @brief Retrieves information about the prerecorded speech
    *
    * @return Currently supported prerecorded speech
    */
-  const smart_objects::SmartObject* prerecorded_speech() const OVERRIDE;
+  const smart_objects::SmartObjectSPtr prerecorded_speech() const OVERRIDE;
 
   /*
    * @brief Sets supported prerecorded speech
@@ -509,12 +521,23 @@ class HMICapabilitiesImpl : public HMICapabilities {
 
   const smart_objects::SmartObject* rc_capability() const OVERRIDE;
 
+<<<<<<< HEAD
   void set_driver_distraction_capability(
       const smart_objects::SmartObject& driver_distraction_capability) OVERRIDE;
 
   const smart_objects::SmartObject* driver_distraction_capability()
       const OVERRIDE;
 
+=======
+  void set_seat_location_capability(
+      const smart_objects::SmartObject& seat_location_capability) OVERRIDE;
+
+  const smart_objects::SmartObject* seat_location_capability() const OVERRIDE;
+
+  void Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE;
+
+  DEPRECATED
+>>>>>>> origin/develop
   void Init(resumption::LastState* last_state) OVERRIDE;
 
   /*
@@ -564,6 +587,18 @@ class HMICapabilitiesImpl : public HMICapabilities {
       const Json::Value& json_languages,
       smart_objects::SmartObject& languages) const OVERRIDE;
 
+  /*
+   * @brief function that converts a single entry of audio pass thru capability
+   *        to smart object
+   *
+   * @param capability json object that represents a single entry of audio pass
+   *        thru capability
+   * @param output_so the converted object
+   */
+  void convert_audio_capability_to_obj(
+      const Json::Value& capability,
+      smart_objects::SmartObject& output_so) const OVERRIDE;
+
  private:
   bool is_vr_cooperating_;
   bool is_tts_cooperating_;
@@ -576,20 +611,26 @@ class HMICapabilitiesImpl : public HMICapabilities {
   hmi_apis::Common_Language::eType ui_language_;
   hmi_apis::Common_Language::eType vr_language_;
   hmi_apis::Common_Language::eType tts_language_;
-  smart_objects::SmartObject* vehicle_type_;
+  smart_objects::SmartObjectSPtr vehicle_type_;
   smart_objects::SmartObject* ui_supported_languages_;
   smart_objects::SmartObject* tts_supported_languages_;
   smart_objects::SmartObject* vr_supported_languages_;
-  smart_objects::SmartObject* display_capabilities_;
-  smart_objects::SmartObject* hmi_zone_capabilities_;
-  smart_objects::SmartObject* soft_buttons_capabilities_;
-  smart_objects::SmartObject* button_capabilities_;
-  smart_objects::SmartObject* preset_bank_capabilities_;
-  smart_objects::SmartObject* vr_capabilities_;
-  smart_objects::SmartObject* speech_capabilities_;
-  smart_objects::SmartObject* audio_pass_thru_capabilities_;
-  smart_objects::SmartObject* pcm_stream_capabilities_;
-  smart_objects::SmartObject* prerecorded_speech_;
+  /*
+   * display_capabilities_ is deprecated and replaced by
+   * system_display_capabilities_. For backward compatibility
+   * display_capabilities_ is not removed.
+   */
+  smart_objects::SmartObjectSPtr display_capabilities_;
+  smart_objects::SmartObjectSPtr system_display_capabilities_;
+  smart_objects::SmartObjectSPtr hmi_zone_capabilities_;
+  smart_objects::SmartObjectSPtr soft_buttons_capabilities_;
+  smart_objects::SmartObjectSPtr button_capabilities_;
+  smart_objects::SmartObjectSPtr preset_bank_capabilities_;
+  smart_objects::SmartObjectSPtr vr_capabilities_;
+  smart_objects::SmartObjectSPtr speech_capabilities_;
+  smart_objects::SmartObjectSPtr audio_pass_thru_capabilities_;
+  smart_objects::SmartObjectSPtr pcm_stream_capabilities_;
+  smart_objects::SmartObjectSPtr prerecorded_speech_;
   bool is_navigation_supported_;
   bool is_phone_call_supported_;
   bool is_video_streaming_supported_;
@@ -600,7 +641,11 @@ class HMICapabilitiesImpl : public HMICapabilities {
   smart_objects::SmartObject* phone_capability_;
   smart_objects::SmartObject* video_streaming_capability_;
   smart_objects::SmartObject* rc_capability_;
+<<<<<<< HEAD
   smart_objects::SmartObject* driver_distraction_capability_;
+=======
+  smart_objects::SmartObject* seat_location_capability_;
+>>>>>>> origin/develop
 
   ApplicationManager& app_mngr_;
   HMILanguageHandler hmi_language_handler_;
diff --git a/src/components/application_manager/include/application_manager/hmi_language_handler.h b/src/components/application_manager/include/application_manager/hmi_language_handler.h
index edf0759114..2ef034450d 100644
--- a/src/components/application_manager/include/application_manager/hmi_language_handler.h
+++ b/src/components/application_manager/include/application_manager/hmi_language_handler.h
@@ -35,12 +35,10 @@
 
 #include "application_manager/event_engine/event_observer.h"
 #include "interfaces/HMI_API.h"
+#include "resumption/last_state_wrapper.h"
 #include "smart_objects/smart_object.h"
 #include "utils/lock.h"
 
-namespace resumption {
-class LastState;
-}
 namespace application_manager {
 
 class ApplicationManager;
@@ -97,7 +95,11 @@ class HMILanguageHandler : public event_engine::EventObserver {
   void set_default_capabilities_languages(hmi_apis::Common_Language::eType ui,
                                           hmi_apis::Common_Language::eType vr,
                                           hmi_apis::Common_Language::eType tts);
-  void Init(resumption::LastState* value);
+
+  DEPRECATED
+  void Init(resumption::LastState*);
+
+  void Init(resumption::LastStateWrapperPtr value);
 
   /**
    * @brief Removes application from container after
@@ -179,7 +181,7 @@ class HMILanguageHandler : public event_engine::EventObserver {
    * @brief Indicates if current TTS language has been received from HMI
    */
   bool is_tts_language_received_;
-  resumption::LastState* last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   ApplicationManager& application_manager_;
 };
 
diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h
index b6a4c180e6..5b9e201391 100644
--- a/src/components/application_manager/include/application_manager/hmi_state.h
+++ b/src/components/application_manager/include/application_manager/hmi_state.h
@@ -46,6 +46,7 @@ class ApplicationManager;
 class Application;
 
 typedef std::shared_ptr<HmiState> HmiStatePtr;
+typedef int32_t WindowID;
 
 /**
  * @brief The HmiState class
@@ -62,18 +63,18 @@ class HmiState {
    * If no events occurred STATE_ID_DEFAULT should be presented
    */
   enum StateID {
-    STATE_ID_CURRENT,
-    STATE_ID_REGULAR,
-    STATE_ID_POSTPONED,
-    STATE_ID_PHONE_CALL,
-    STATE_ID_SAFETY_MODE,
-    STATE_ID_VR_SESSION,
-    STATE_ID_TTS_SESSION,
-    STATE_ID_VIDEO_STREAMING,
-    STATE_ID_NAVI_STREAMING,
-    STATE_ID_DEACTIVATE_HMI,
-    STATE_ID_AUDIO_SOURCE,
-    STATE_ID_EMBEDDED_NAVI
+    STATE_ID_CURRENT = 1,
+    STATE_ID_REGULAR = 2,
+    STATE_ID_POSTPONED = 3,
+    STATE_ID_PHONE_CALL = 4,
+    STATE_ID_SAFETY_MODE = 5,
+    STATE_ID_VR_SESSION = 6,
+    STATE_ID_TTS_SESSION = 7,
+    STATE_ID_VIDEO_STREAMING = 8,
+    STATE_ID_NAVI_STREAMING = 9,
+    STATE_ID_DEACTIVATE_HMI = 10,
+    STATE_ID_AUDIO_SOURCE = 11,
+    STATE_ID_EMBEDDED_NAVI = 12
   };
 
   /**
@@ -206,11 +207,24 @@ class HmiState {
     state_id_ = state_id;
   }
 
+  /**
+   * @brief window_type getter for a window type for this type
+   * @return current state window type
+   */
+  mobile_apis::WindowType::eType window_type() const;
+
+  /**
+   * @brief set_window_type sets current state window type
+   * @param window_type new window type
+   */
+  void set_window_type(const mobile_apis::WindowType::eType window_type);
+
  protected:
   uint32_t hmi_app_id_;
   StateID state_id_;
   const ApplicationManager& app_mngr_;
   HmiStatePtr parent_;
+  mobile_apis::WindowType::eType window_type_;
   mobile_apis::HMILevel::eType hmi_level_;
   mobile_apis::AudioStreamingState::eType audio_streaming_state_;
   mobile_apis::VideoStreamingState::eType video_streaming_state_;
diff --git a/src/components/application_manager/include/application_manager/message.h b/src/components/application_manager/include/application_manager/message.h
index 7525ff1aa3..1ce7596bf2 100644
--- a/src/components/application_manager/include/application_manager/message.h
+++ b/src/components/application_manager/include/application_manager/message.h
@@ -71,6 +71,12 @@ class Message {
   int32_t correlation_id() const;
   int32_t connection_key() const;
 
+  /**
+   * @brief retreives message's protection flag
+   * @return true if message is encrypted, otherwise returns false
+   */
+  bool is_message_encrypted() const;
+
   MessageType type() const;
   protocol_handler::MajorProtocolVersion protocol_version() const;
 
@@ -95,6 +101,13 @@ class Message {
   void set_data_size(size_t data_size);
   void set_payload_size(size_t payload_size);
 
+  /**
+   * @brief sets message's protection flag
+   * @param  protection - bool value, if message is encrypted - true, otherwise
+   * - false
+   */
+  void set_message_encryption(const bool protection);
+
   static bool is_sufficient_version(
       protocol_handler::MajorProtocolVersion minVersion,
       protocol_handler::MajorProtocolVersion version);
@@ -122,6 +135,8 @@ class Message {
   size_t data_size_;
   size_t payload_size_;
   protocol_handler::MajorProtocolVersion version_;
+
+  bool is_message_encrypted_;
 };
 
 typedef std::shared_ptr<application_manager::Message> MobileMessage;
diff --git a/src/components/application_manager/include/application_manager/message_helper.h b/src/components/application_manager/include/application_manager/message_helper.h
index 98992a20d5..09d225a120 100644
--- a/src/components/application_manager/include/application_manager/message_helper.h
+++ b/src/components/application_manager/include/application_manager/message_helper.h
@@ -42,6 +42,7 @@
 
 #include <application_manager/smart_object_keys.h>
 #include "application_manager/application.h"
+#include "application_manager/hmi_capabilities.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "connection_handler/device.h"
 #include "interfaces/HMI_API.h"
@@ -88,10 +89,18 @@ class MessageHelper {
   static smart_objects::SmartObjectSPtr CreateHMINotification(
       hmi_apis::FunctionID::eType function_id);
 
+  static smart_objects::SmartObjectSPtr CreateOnServiceUpdateNotification(
+      const hmi_apis::Common_ServiceType::eType type,
+      const hmi_apis::Common_ServiceEvent::eType event,
+      const hmi_apis::Common_ServiceStatusUpdateReason::eType reason =
+          hmi_apis::Common_ServiceStatusUpdateReason::INVALID_ENUM,
+      const uint32_t app_id = 0);
+
   /**
    * @brief Creates request for different interfaces(JSON)
    * @param correlation_id unique ID
-   * @param params Vector of arguments that we need in GetVehicleData request
+   * @param params Vector of arguments that we need in GetVehicleData
+   * request
    * (e.g. gps, odometer, fuel_level)
    */
   static void CreateGetVehicleDataRequest(
@@ -302,6 +311,30 @@ class MessageHelper {
       const uint32_t app_id,
       ApplicationManager& app_mngr);
 
+  /**
+   * @brief Creates UI.CreateWindow request
+   * @param application application instance
+   * @param app_mngr reference to application manager
+   * @param windows_info smart object containing saved windows info
+   * @return smart object with UI.CreateWindow request
+   */
+  static smart_objects::SmartObjectSPtr CreateUICreateWindowRequestToHMI(
+      ApplicationSharedPtr application,
+      ApplicationManager& app_mngr,
+      const smart_objects::SmartObject& window_info);
+
+  /**
+   * @brief Creates UI.CreateWindow requests
+   * @param application application instance
+   * @param app_mngr reference to application manager
+   * @param windows_info smart object containing saved windows info
+   * @return list of smart objects with UI.CreateWindow requests
+   */
+  static smart_objects::SmartObjectList CreateUICreateWindowRequestsToHMI(
+      application_manager::ApplicationSharedPtr application,
+      ApplicationManager& app_mngr,
+      const smart_objects::SmartObject& windows_info);
+
   /*
    * @brief Create Common.DeviceInfo struct from device handle
    * @param device_handle device handle of the app
@@ -347,6 +380,15 @@ class MessageHelper {
   static void SendOnAppUnregNotificationToHMI(ApplicationConstSharedPtr app,
                                               bool is_unexpected_disconnect,
                                               ApplicationManager& app_mngr);
+  /**
+   * @brief Creates BasicCommunication.OnAppPropertiesChange
+   * notification to the HMI
+   * @param policy_app_id unique policy app id
+   * @param app_mngr application manager
+   * @return smart object with BC.OnAppPropertiesChange notification
+   */
+  static smart_objects::SmartObjectSPtr CreateOnAppPropertiesChangeNotification(
+      const std::string& policy_app_id, ApplicationManager& app_mngr);
 
   static smart_objects::SmartObjectSPtr GetBCActivateAppRequestToHMI(
       ApplicationConstSharedPtr app,
@@ -449,9 +491,23 @@ class MessageHelper {
    * @brief Send notification for Update of Policy Table
    * with PT Snapshot.
    * @param connection_key Id of application to send message to
+   * @param snapshot_file_path path to PT Snapshot
+   * @param url If empty string, no URL is provided
+   * @param timeout If -1 no timeout is provided
+   */
+  static void SendPolicySnapshotNotification(
+      uint32_t connection_key,
+      const std::string& snapshot_file_path,
+      const std::string& url,
+      ApplicationManager& app_mngr);
+
+  /*
+   * @brief Send notification for Update of Policy Table
+   * with PT Snapshot.
+   * @param connection_key Id of application to send message to
    * @param policy_data PT Snapshot
    * @param url If empty string, no URL is provided
-   * @param timeout If -1 no timeout is provdied
+   * @param timeout If -1 no timeout is provided
    */
   static void SendPolicySnapshotNotification(
       uint32_t connection_key,
@@ -489,11 +545,14 @@ class MessageHelper {
    * @brief Send notification to mobile on application permissions update
    * @param connection_key Id of application to send message to
    * @param permissions updated permissions for application
+   * @param app_mngr reference to application manager
+   * @param require_encryption require encryption flag
    */
   static void SendOnPermissionsChangeNotification(
       uint32_t connection_key,
       const policy::Permissions& permissions,
-      ApplicationManager& app_mngr);
+      ApplicationManager& app_mngr,
+      const policy::EncryptionRequired encryprion_required);
 
   /*
    * @brief Send notification to HMI on application permissions update
@@ -695,6 +754,23 @@ class MessageHelper {
    * @param app current application
    *
    * @param function_id Unique command id from mobile API
+   *
+   * @param window_id window id containing soft buttons
+   */
+  static void SubscribeApplicationToSoftButton(
+      smart_objects::SmartObject& message_params,
+      ApplicationSharedPtr app,
+      int32_t function_id,
+      const WindowID window_id);
+
+  /*
+   * @brief subscribe application to softbutton
+   *
+   * @param message_params contains data of request
+   *
+   * @param app current application
+   *
+   * @param function_id Unique command id from mobile API
    */
   static void SubscribeApplicationToSoftButton(
       smart_objects::SmartObject& message_params,
@@ -711,6 +787,15 @@ class MessageHelper {
    */
   static bool PrintSmartObject(const smart_objects::SmartObject& object);
 
+  /**
+   * @brief Extract window unique ID from message, this id is used for identify
+   * the window
+   * @param s_map contains application's window id
+   * @return window id from current message
+   */
+  static WindowID ExtractWindowIdFromSmartObject(
+      const smart_objects::SmartObject& s_map);
+
   template <typename From, typename To>
   static To ConvertEnumAPINoCheck(const From& input) {
     return static_cast<To>(input);
@@ -864,10 +949,13 @@ class MessageHelper {
 
   /**
    * @brief Sends HMI status notification to mobile
-   * @param application_impl application with changed HMI status
+   * @param application application with changed HMI status
+   * @param window_id id of affected window
+   * @param application_manager reference to application manager
    **/
   static void SendHMIStatusNotification(
-      const Application& application_impl,
+      ApplicationSharedPtr application,
+      const WindowID window_id,
       ApplicationManager& application_manager);
 
   /**
@@ -901,6 +989,16 @@ class MessageHelper {
   static void BroadcastCapabilityUpdate(smart_objects::SmartObject& msg_params,
                                         ApplicationManager& app_mngr);
 
+  /**
+   * @brief CreateDisplayCapabilityUpdateToMobile creates notification with
+   * updated display capabilities acccoring to message type
+   * @param system_capabilities SO containing notification data
+   * @param app reference to application
+   * @return shared ptr to notification SO
+   */
+  static smart_objects::SmartObjectSPtr CreateDisplayCapabilityUpdateToMobile(
+      const smart_objects::SmartObject& system_capabilities, Application& app);
+
  private:
   /**
    * @brief Allows to fill SO according to the  current permissions.
diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
index aea0361f19..88f91d14fc 100644
--- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
+++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin.h
@@ -36,10 +36,13 @@
 #include "application_manager/application.h"
 #include "application_manager/commands/command.h"
 #include "application_manager/hmi_capabilities.h"
-#include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/rpc_service.h"
 #include "utils/macro.h"
 
+namespace policy {
+class PolicyHandlerInterface;
+}
+
 namespace application_manager {
 class CommandFactory;
 
@@ -57,7 +60,9 @@ enum ApplicationEvent {
   kApplicationExit = 0,
   kApplicationRegistered,
   kApplicationUnregistered,
-  kDeleteApplicationData
+  kDeleteApplicationData,
+  kGlobalPropertiesUpdated,
+  kRCStatusChanged
 };
 
 class RPCPlugin {
@@ -78,7 +83,16 @@ class RPCPlugin {
   virtual bool Init(ApplicationManager& app_manager,
                     rpc_service::RPCService& rpc_service,
                     HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handler) = 0;
+                    policy::PolicyHandlerInterface& policy_handler,
+                    resumption::LastStateWrapperPtr last_state) = 0;
+
+  DEPRECATED
+  virtual bool Init(ApplicationManager& app_manager,
+                    rpc_service::RPCService& rpc_service,
+                    HMICapabilities& hmi_capabilities,
+                    policy::PolicyHandlerInterface& policy_handler,
+                    resumption::LastState& last_state) = 0;
+
   /**
    * @brief IsAbleToProcess check if plugin is able to process function
    * @param function_id RPC identifier
@@ -117,7 +131,6 @@ class RPCPlugin {
       ApplicationEvent event,
       application_manager::ApplicationSharedPtr application) = 0;
 };
-typedef std::unique_ptr<RPCPlugin> RPCPluginPtr;
 
 }  // namespace plugin_manager
 }  // namespace application_manager
diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h
index b658e40b1c..eb14f26ae6 100644
--- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h
+++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager.h
@@ -44,6 +44,10 @@ namespace application_manager {
 namespace plugin_manager {
 
 class RPCPluginManager {
+ protected:
+  typedef std::unique_ptr<RPCPlugin, std::function<void(RPCPlugin*)> >
+      RPCPluginPtr;
+
  public:
   virtual ~RPCPluginManager() {}
   /**
@@ -56,12 +60,6 @@ class RPCPluginManager {
   virtual uint32_t LoadPlugins(const std::string& plugins_path) = 0;
 
   /**
-   * @brief GetPlugins get list of plugins
-   * @return list of loaded plugins
-   */
-  virtual std::vector<RPCPluginPtr>& GetPlugins() = 0;
-
-  /**
    * @brief FindPluginToProcess find plugin to process message
    * @param function_id RPC identifier to process
    * @param message_source message_source source of message to process
diff --git a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h
index 885181e9c4..004d6418f5 100644
--- a/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h
+++ b/src/components/application_manager/include/application_manager/plugin_manager/rpc_plugin_manager_impl.h
@@ -37,6 +37,7 @@
 #include "application_manager/plugin_manager/rpc_plugin_manager.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/rpc_service.h"
+#include "resumption/last_state_wrapper.h"
 #include "utils/optional.h"
 
 namespace application_manager {
@@ -55,20 +56,31 @@ class RPCPluginManagerImpl : public RPCPluginManager {
   RPCPluginManagerImpl(ApplicationManager& app_manager,
                        rpc_service::RPCService& rpc_service,
                        HMICapabilities& hmi_capabilities,
-                       policy::PolicyHandlerInterface& policy_handler);
+                       policy::PolicyHandlerInterface& policy_handler,
+                       resumption::LastStateWrapperPtr last_state);
+
+  DEPRECATED
+  RPCPluginManagerImpl(ApplicationManager& app_manager,
+                       rpc_service::RPCService& rpc_service,
+                       HMICapabilities& hmi_capabilities,
+                       policy::PolicyHandlerInterface& policy_handler,
+                       resumption::LastState& last_state);
 
   uint32_t LoadPlugins(const std::string& plugins_path) OVERRIDE;
-  std::vector<RPCPluginPtr>& GetPlugins() OVERRIDE;
+
   utils::Optional<RPCPlugin> FindPluginToProcess(
       const int32_t function_id,
       const commands::Command::CommandSource message_source) OVERRIDE;
 
  private:
+  RPCPluginPtr LoadPlugin(const std::string& full_plugin_path) const;
+
   std::vector<RPCPluginPtr> loaded_plugins_;
   ApplicationManager& app_manager_;
   rpc_service::RPCService& rpc_service_;
   HMICapabilities& hmi_capabilities_;
   policy::PolicyHandlerInterface& policy_handler_;
+  resumption::LastStateWrapperPtr last_state_;
 
   // RPCPluginManager interface
  public:
diff --git a/src/components/application_manager/include/application_manager/policies/custom_vehicle_data_provider.h b/src/components/application_manager/include/application_manager/policies/custom_vehicle_data_provider.h
new file mode 100644
index 0000000000..307f0b93df
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/policies/custom_vehicle_data_provider.h
@@ -0,0 +1,32 @@
+#ifndef CUSTOM_VEHICLE_DATA_PROVIDER_H
+#define CUSTOM_VEHICLE_DATA_PROVIDER_H
+
+#include <vector>
+
+namespace rpc {
+namespace policy_table_interface_base {
+struct VehicleDataItem;
+}
+}  // namespace rpc
+
+namespace policy {
+
+class VehicleDataItemProvider {
+ public:
+  /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<rpc::policy_table_interface_base::VehicleDataItem>
+  GetVehicleDataItems() const = 0;
+
+  /**
+   * @brief Gets vehicle data items removed by policies
+   * @return Structure with vehicle data items
+   */
+  virtual std::vector<rpc::policy_table_interface_base::VehicleDataItem>
+  GetRemovedVehicleDataItems() const = 0;
+};
+}  // namespace policy
+
+#endif  // CUSTOM_VEHICLE_DATA_PROVIDER_H
diff --git a/src/components/application_manager/include/application_manager/policies/policy_handler.h b/src/components/application_manager/include/application_manager/policies/policy_handler.h
index 917f8be559..8559e77061 100644
--- a/src/components/application_manager/include/application_manager/policies/policy_handler.h
+++ b/src/components/application_manager/include/application_manager/policies/policy_handler.h
@@ -45,6 +45,8 @@
 #include "application_manager/policies/policy_event_observer.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/policies/policy_handler_observer.h"
+
+#include "application_manager/policies/custom_vehicle_data_provider.h"
 #include "policy/policy_manager.h"
 #include "policy/policy_settings.h"
 #include "policy/usage_statistics/statistics_manager.h"
@@ -77,34 +79,45 @@ class PolicyHandler : public PolicyHandlerInterface,
   PolicyHandler(const policy::PolicySettings& get_settings,
                 application_manager::ApplicationManager& application_manager);
   virtual ~PolicyHandler();
+  PolicyEncryptionFlagGetterInterfaceSPtr PolicyEncryptionFlagGetter()
+      const OVERRIDE;
   bool LoadPolicyLibrary() OVERRIDE;
   bool PolicyEnabled() const OVERRIDE;
   bool InitPolicyTable() OVERRIDE;
   bool ResetPolicyTable() OVERRIDE;
   bool ClearUserConsent() OVERRIDE;
-  bool SendMessageToSDK(const BinaryMessage& pt_string,
-                        const std::string& url) OVERRIDE;
+  DEPRECATED bool SendMessageToSDK(const BinaryMessage& pt_string,
+                                   const std::string& url) OVERRIDE;
   bool ReceiveMessageFromSDK(const std::string& file,
                              const BinaryMessage& pt_string) OVERRIDE;
   bool UnloadPolicyLibrary() OVERRIDE;
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions,
                                     const HMILevel& default_hmi) OVERRIDE;
 
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions) OVERRIDE;
 
 #ifdef EXTERNAL_PROPRIETARY_MODE
   void OnSnapshotCreated(const BinaryMessage& pt_string,
                          const std::vector<int>& retry_delay_seconds,
                          uint32_t timeout_exchange) OVERRIDE;
+
+  PTURetryHandler& ptu_retry_handler() const OVERRIDE;
 #else   // EXTERNAL_PROPRIETARY_MODE
-  void OnSnapshotCreated(const BinaryMessage& pt_string) OVERRIDE;
+  void OnSnapshotCreated(const BinaryMessage& pt_string,
+                         const PTUIterationType iteration_type) OVERRIDE;
+  std::string GetNextUpdateUrl(const PTUIterationType iteration_type,
+                               uint32_t& app_id) OVERRIDE;
 #endif  // EXTERNAL_PROPRIETARY_MODE
   virtual bool GetPriority(const std::string& policy_app_id,
                            std::string* priority) const OVERRIDE;
   virtual void CheckPermissions(
       const application_manager::ApplicationSharedPtr app,
+      const application_manager::WindowID window_id,
       const PTString& rpc,
       const RPCParams& rpc_params,
       CheckPermissionResult& result) OVERRIDE;
@@ -113,12 +126,16 @@ class PolicyHandler : public PolicyHandlerInterface,
   virtual DeviceConsent GetUserConsentForDevice(
       const std::string& device_id) const OVERRIDE;
 
+  Json::Value GetPolicyTableData() const OVERRIDE;
+
   /**
    * @brief Sets HMI default type for specified application
+   * @param device_handle device identifier
    * @param application_id ID application
    * @param app_types list of HMI types
    */
-  void SetDefaultHmiTypes(const std::string& application_id,
+  void SetDefaultHmiTypes(const transport_manager::DeviceHandle& device_handle,
+                          const std::string& application_id,
                           const smart_objects::SmartObject* app_types) OVERRIDE;
 
   /**
@@ -168,6 +185,8 @@ class PolicyHandler : public PolicyHandlerInterface,
                          const std::string& policy_app_id,
                          const std::string& hmi_level) OVERRIDE;
 
+  void OnPTUTimeOut() OVERRIDE;
+
   /**
    * Gets all allowed module types
    * @param app_id unique identifier of application
@@ -177,16 +196,18 @@ class PolicyHandler : public PolicyHandlerInterface,
   bool GetModuleTypes(const std::string& policy_app_id,
                       std::vector<std::string>* modules) const OVERRIDE;
 
-  bool GetDefaultHmi(const std::string& policy_app_id,
+  bool GetDefaultHmi(const std::string& device_id,
+                     const std::string& policy_app_id,
                      std::string* default_hmi) const OVERRIDE;
   bool GetInitialAppData(const std::string& application_id,
                          StringArray* nicknames = NULL,
                          StringArray* app_hmi_types = NULL) OVERRIDE;
   void GetUpdateUrls(const std::string& service_type,
-                     EndpointUrls& out_end_points) OVERRIDE;
+                     EndpointUrls& out_end_points) const OVERRIDE;
   void GetUpdateUrls(const uint32_t service_type,
-                     EndpointUrls& out_end_points) OVERRIDE;
-  virtual std::string GetLockScreenIconUrl() const OVERRIDE;
+                     EndpointUrls& out_end_points) const OVERRIDE;
+  virtual std::string GetLockScreenIconUrl(
+      const std::string& policy_app_id = kDefaultId) const OVERRIDE;
   virtual std::string GetIconUrl(
       const std::string& policy_app_id) const OVERRIDE;
   uint32_t NextRetryTimeout() OVERRIDE;
@@ -203,7 +224,6 @@ class PolicyHandler : public PolicyHandlerInterface,
    */
   uint32_t TimeoutExchangeMSec() const OVERRIDE;
   void OnExceededTimeout() OVERRIDE;
-  void OnSystemReady() OVERRIDE;
   const boost::optional<bool> LockScreenDismissalEnabledState() const OVERRIDE;
   const boost::optional<std::string> LockScreenDismissalWarningMessage(
       const std::string& language) const OVERRIDE;
@@ -250,7 +270,8 @@ class PolicyHandler : public PolicyHandlerInterface,
    */
   void OnIgnitionCycleOver() OVERRIDE;
 
-  void OnPendingPermissionChange(const std::string& policy_app_id) OVERRIDE;
+  void OnPendingPermissionChange(const std::string& device_id,
+                                 const std::string& policy_app_id) OVERRIDE;
 
   /**
    * Initializes PT exchange at user request
@@ -301,6 +322,10 @@ class PolicyHandler : public PolicyHandlerInterface,
                               const PermissionConsent& permissions) OVERRIDE;
 #endif
 
+  void OnSystemRequestReceived() const OVERRIDE;
+
+  void TriggerPTUOnStartupIfRequired() OVERRIDE;
+
   /**
    * @brief Get appropriate message parameters and send them with response
    * to HMI
@@ -337,9 +362,11 @@ class PolicyHandler : public PolicyHandlerInterface,
   /**
    * @brief Update currently used device id in policies manager for given
    * application
+   * @param device_handle device identifier
    * @param policy_app_id Application id
    */
   std::string OnCurrentDeviceIdUpdateRequired(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) OVERRIDE;
 
   /**
@@ -359,11 +386,6 @@ class PolicyHandler : public PolicyHandlerInterface,
                        const std::string& language) OVERRIDE;
 
   /**
-   * @brief Send request to HMI to get update on system parameters
-   */
-  virtual void OnSystemInfoUpdateRequired() OVERRIDE;
-
-  /**
    * @brief Sends GetVehicleData request in case when Vechicle info is ready.
    */
   virtual void OnVIIsReady() OVERRIDE;
@@ -393,16 +415,34 @@ class PolicyHandler : public PolicyHandlerInterface,
    */
   void OnSystemError(int code) OVERRIDE;
 
+#ifndef EXTERNAL_PROPRIETARY_MODE
+  uint32_t ChoosePTUApplication(
+      const PTUIterationType iteration_type =
+          PTUIterationType::DefaultIteration) OVERRIDE;
+  void CacheRetryInfo(const uint32_t app_id = 0,
+                      const std::string url = std::string(),
+                      const std::string snapshot_path = std::string()) OVERRIDE;
+#endif  // EXTERNAL_PROPRIETARY_MODE
+
+  uint32_t GetAppIdForSending() const OVERRIDE;
+
   /**
-   * @brief Chooses random application id to be used for snapshot sending
-   * considering HMI level
-   * @return Application id or 0, if there are no suitable applications
+   * @brief Add application to PTU queue if no application with
+   * the same app id exists
+   * @param new_app_id app id new application
    */
-  uint32_t GetAppIdForSending() const OVERRIDE;
+  void PushAppIdToPTUQueue(const uint32_t new_app_id);
+
+  /**
+   * @brief Remove the first application from applications queue
+   */
+  void PopAppIdFromPTUQueue();
 
   custom_str::CustomString GetAppName(
       const std::string& policy_app_id) OVERRIDE;
 
+  std::vector<std::string> GetApplicationPolicyIDs() const OVERRIDE;
+
   /**
    * @brief Get a list of enabled cloud applications
    * @param enabled_apps List filled with the policy app id of each enabled
@@ -412,6 +452,13 @@ class PolicyHandler : public PolicyHandlerInterface,
       std::vector<std::string>& enabled_apps) const OVERRIDE;
 
   /**
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  std::vector<std::string> GetEnabledLocalApps() const OVERRIDE;
+
+  /**
    * @brief Checks if a given application is an enabled cloud application
    * @param policy_app_id Unique application id
    * @return true, if the application is an enabled cloud application,
@@ -420,33 +467,27 @@ class PolicyHandler : public PolicyHandlerInterface,
   const bool CheckCloudAppEnabled(
       const std::string& policy_app_id) const OVERRIDE;
 
+  bool GetAppProperties(
+      const std::string& policy_app_id,
+      policy::AppProperties& out_app_properties) const OVERRIDE;
+
+  void OnAuthTokenUpdated(const std::string& policy_app_id,
+                          const std::string& auth_token) OVERRIDE;
+
+  void OnSetAppProperties(
+      const smart_objects::SmartObject& properties) OVERRIDE;
+
+  AppPropertiesState GetAppPropertiesStatus(
+      const smart_objects::SmartObject& properties,
+      const std::string& app_id) const OVERRIDE;
+
+  bool IsNewApplication(const std::string& policy_app_id) const OVERRIDE;
+
+  void OnLocalAppAdded() OVERRIDE;
+
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
-   * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  bool GetCloudAppParameters(const std::string& policy_app_id,
-                             bool& enabled,
-                             std::string& endpoint,
-                             std::string& certificate,
-                             std::string& auth_token,
-                             std::string& cloud_transport_type,
-                             std::string& hybrid_app_preference) const OVERRIDE;
-
-  /**
-   * @brief Callback for when a SetCloudAppProperties message is received from a
-   * mobile app
+   * @brief Callback for when a SetCloudAppProperties message is received
+   * from a mobile app
    * @param message The SetCloudAppProperties message
    */
   void OnSetCloudAppProperties(
@@ -490,11 +531,11 @@ class PolicyHandler : public PolicyHandlerInterface,
 
   virtual void OnCertificateUpdated(
       const std::string& certificate_data) OVERRIDE;
+
 #ifdef EXTERNAL_PROPRIETARY_MODE
   void OnCertificateDecrypted(bool is_succeeded) OVERRIDE;
+  void ProcessCertDecryptFailed();
 #endif  // EXTERNAL_PROPRIETARY_MODE
-  void OnAuthTokenUpdated(const std::string& policy_app_id,
-                          const std::string& auth_token);
 
   virtual bool CanUpdate() OVERRIDE;
 
@@ -503,6 +544,10 @@ class PolicyHandler : public PolicyHandlerInterface,
 
   virtual void SendOnAppPermissionsChanged(
       const AppPermissions& permissions,
+      const std::string& device_id,
+      const std::string& policy_app_id) const OVERRIDE;
+
+  void SendOnAppPropertiesChangeNotification(
       const std::string& policy_app_id) const OVERRIDE;
 
   virtual void OnPTExchangeNeeded() OVERRIDE;
@@ -512,11 +557,13 @@ class PolicyHandler : public PolicyHandlerInterface,
   /**
    * @brief Allows to add new or update existed application during
    * registration process
+   * @param device_id device identifier
    * @param application_id The policy aplication id.
    * @param hmi_types list of hmi types
    * @return function that will notify update manager about new application
    */
   StatusNotifier AddApplication(
+      const std::string& device_id,
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE;
 
@@ -555,22 +602,34 @@ class PolicyHandler : public PolicyHandlerInterface,
    */
   void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
 
+  void OnAddedNewApplicationToAppList(const uint32_t new_app_id,
+                                      const std::string& policy_id) OVERRIDE;
+
+  /**
+   * @brief Queue applications for which PTU has not yet been completed
+   */
+  std::set<uint32_t> applications_ptu_queue_;
+
   /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
    * succesfully registered on mobile device.
    * It will send OnAppPermissionSend notification and will try to start PTU.
    *
+   * @param device_id device identifier
    * @param application_id registered application.
    */
-  void OnAppRegisteredOnMobile(const std::string& application_id) OVERRIDE;
+  void OnAppRegisteredOnMobile(const std::string& device_id,
+                               const std::string& application_id) OVERRIDE;
 
   /**
    * @brief Checks if certain request type is allowed for application
+   * @param device_handle device identifier
    * @param policy_app_id Unique applicaion id
    * @param type Request type
    * @return true, if allowed, otherwise - false
    */
   bool IsRequestTypeAllowed(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id,
       mobile_apis::RequestType::eType type) const OVERRIDE;
 
@@ -602,10 +661,12 @@ class PolicyHandler : public PolicyHandlerInterface,
 
   /**
    * @brief Gets application request types
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @return request types
    */
   const std::vector<std::string> GetAppRequestTypes(
+      const transport_manager::DeviceHandle& device_id,
       const std::string& policy_app_id) const OVERRIDE;
 
   /**
@@ -616,12 +677,6 @@ class PolicyHandler : public PolicyHandlerInterface,
   const std::vector<std::string> GetAppRequestSubTypes(
       const std::string& policy_app_id) const OVERRIDE;
 
-  /**
-   * @brief Gets vehicle information
-   * @return Structure with vehicle information
-   */
-  const VehicleInfo GetVehicleInfo() const OVERRIDE;
-
 #ifdef EXTERNAL_PROPRIETARY_MODE
   /**
    * @brief Gets meta information
@@ -655,6 +710,10 @@ class PolicyHandler : public PolicyHandlerInterface,
 
   virtual void OnPTUFinished(const bool ptu_result) OVERRIDE;
 
+  virtual void OnPTInited() OVERRIDE;
+
+  void StopRetrySequence() OVERRIDE;
+
   /**
    * @brief OnDeviceSwitching Notifies policy manager on device switch event so
    * policy permissions should be processed accordingly
@@ -664,6 +723,17 @@ class PolicyHandler : public PolicyHandlerInterface,
   void OnDeviceSwitching(const std::string& device_id_from,
                          const std::string& device_id_to) FINAL;
 
+  // VehicleDataItemProvider interface :
+  /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  const std::vector<rpc::policy_table_interface_base::VehicleDataItem>
+  GetVehicleDataItems() const OVERRIDE;
+
+  std::vector<rpc::policy_table_interface_base::VehicleDataItem>
+  GetRemovedVehicleDataItems() const OVERRIDE;
+
   void OnLockScreenDismissalStateChanged() FINAL;
 
  protected:
@@ -725,7 +795,7 @@ class PolicyHandler : public PolicyHandlerInterface,
   void UpdateHMILevel(application_manager::ApplicationSharedPtr app,
                       mobile_apis::HMILevel::eType level);
   std::vector<std::string> GetDevicesIds(
-      const std::string& policy_app_id) OVERRIDE;
+      const std::string& policy_app_id) const OVERRIDE;
 
   /**
    * @brief Sets days after epoch on successful policy update
@@ -812,8 +882,13 @@ class PolicyHandler : public PolicyHandlerInterface,
   std::vector<FunctionalGroupPermission> CollectAppPermissions(
       const uint32_t connection_key);
 
+ private:
   static const std::string kLibrary;
 
+  bool SendMessageToSDK(const BinaryMessage& pt_string,
+                        const std::string& url,
+                        const uint32_t app_id);
+
   /**
    * @brief Collects currently registered applications ids linked to their
    * device id
@@ -823,10 +898,16 @@ class PolicyHandler : public PolicyHandlerInterface,
 
   mutable sync_primitives::RWLock policy_manager_lock_;
   std::shared_ptr<PolicyManager> policy_manager_;
-  void* dl_handle_;
   std::shared_ptr<PolicyEventObserver> event_observer_;
   uint32_t last_activated_app_id_;
 
+#ifndef EXTERNAL_PROPRIETARY_MODE
+  // PTU retry information
+  uint32_t last_ptu_app_id_;
+  std::string retry_update_url_;
+  std::string policy_snapshot_path_;
+#endif  // EXTERNAL_PROPRIETARY_MODE
+
   /**
    * @brief Contains device handles, which were sent for user consent to HMI
    */
@@ -837,6 +918,7 @@ class PolicyHandler : public PolicyHandlerInterface,
   typedef std::list<PolicyHandlerObserver*> HandlersCollection;
   HandlersCollection listeners_;
   mutable sync_primitives::Lock listeners_lock_;
+  mutable sync_primitives::Lock app_id_queue_lock_;
 
   /**
    * @brief Application-to-device links are used for collecting their current
@@ -851,18 +933,21 @@ class PolicyHandler : public PolicyHandlerInterface,
   std::shared_ptr<StatisticManagerImpl> statistic_manager_impl_;
   const PolicySettings& settings_;
   application_manager::ApplicationManager& application_manager_;
+  std::string last_registered_policy_app_id_;
+
   friend class AppPermissionDelegate;
 
   /**
-   * @brief Checks if the application with the given policy
-   * application id is registered or it is default id
-   * @param app_idx Application idx from EndpointUrls vector
-   * @param urls EndpointUrls vector
+   * @brief Checks if an application is able to perform a PTU using the
+   * specified URL list
+   * @param app_id ID of application used for PTU
+   * @param app_data EndpointData struct with list of URLs
    * @return TRUE if the vector with URLs with given idx is not empty
-   * and is related to a registered application or these are default URLs,
+   * and is related to the provided application or if these are default URLs,
    * otherwise FALSE
    */
-  bool IsUrlAppIdValid(const uint32_t app_idx, const EndpointUrls& urls) const;
+  bool IsUrlAppIdValid(const std::string app_id,
+                       const EndpointData& app_data) const;
   DISALLOW_COPY_AND_ASSIGN(PolicyHandler);
 };
 
diff --git a/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h b/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h
index 3c4dce2fbc..fdfed698c4 100644
--- a/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h
+++ b/src/components/application_manager/include/application_manager/policies/regular/policy_handler_observer.h
@@ -53,6 +53,8 @@ class PolicyHandlerObserver {
 
   virtual void OnPTUFinished(const bool ptu_result) {}
 
+  virtual void OnPTUTimeoutExceeded() {}
+
   virtual ~PolicyHandlerObserver() {}
 };
 }  //  namespace policy
diff --git a/src/components/application_manager/include/application_manager/request_info.h b/src/components/application_manager/include/application_manager/request_info.h
index 1b140e2108..6900a50926 100644
--- a/src/components/application_manager/include/application_manager/request_info.h
+++ b/src/components/application_manager/include/application_manager/request_info.h
@@ -127,7 +127,7 @@ struct RequestInfo {
   }
   uint64_t hash();
   static uint64_t GenerateHash(uint32_t var1, uint32_t var2);
-  static uint32_t HmiConnectoinKey;
+  static uint32_t HmiConnectionKey;
 
  protected:
   RequestPtr request_;
diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h
index 0b744eec7f..e572eaec39 100644
--- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h
+++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl.h
@@ -47,8 +47,6 @@ namespace app_mngr = application_manager;
 
 namespace resumption {
 
-class LastState;
-
 /**
  * @brief Contains logic for storage/restore data of applications.
  */
@@ -81,6 +79,13 @@ class ResumeCtrl {
       application_manager::ApplicationSharedPtr application) = 0;
 
   /**
+   * @brief Restore widgets HMI level on the resumption response from HMI
+   * @param response_message smart_object with HMI message
+   */
+  virtual void RestoreWidgetsHMIState(
+      const smart_objects::SmartObject& response_message) = 0;
+
+  /**
    * @brief Set application HMI Level as stored in policy
    * @param application is application witch HMI Level is need to setup
    * @return true if success, otherwise return false
@@ -103,6 +108,16 @@ class ResumeCtrl {
       bool check_policy = true) = 0;
 
   /**
+   * @brief RestoreAppWidgets add widgets for the application
+   * @param application application which will be resumed
+   * @param saved_app application specific section from backup file
+   * @return the number of widget windows to be resumed
+   */
+  virtual size_t RestoreAppWidgets(
+      application_manager::ApplicationSharedPtr application,
+      const smart_objects::SmartObject& saved_app) = 0;
+
+  /**
    * @brief Remove application from list of saved applications
    * @param application is application which need to be removed
    * @return return true, if success, otherwise return false
@@ -233,7 +248,7 @@ class ResumeCtrl {
    * @param application - application to restore hmi level
    * and audio streaming state
    */
-  virtual void StartAppHmiStateResumption(
+  virtual bool StartAppHmiStateResumption(
       application_manager::ApplicationSharedPtr application) = 0;
 
   /**
@@ -255,12 +270,15 @@ class ResumeCtrl {
    */
   virtual void RemoveFromResumption(uint32_t app_id) = 0;
 
+  DEPRECATED
+  virtual bool Init(resumption::LastState& last_state) = 0;
+
   /**
    * @brief Initialization data for Resume controller
    * @return true if initialization is success otherwise
    * returns false
    */
-  virtual bool Init(LastState& last_state) = 0;
+  virtual bool Init(resumption::LastStateWrapperPtr last_state_wrapper) = 0;
 
   /**
    * @brief Notify resume controller about new application
@@ -282,6 +300,9 @@ class ResumeCtrl {
   virtual int32_t GetSavedAppHmiLevel(const std::string& app_id,
                                       const std::string& device_id) const = 0;
 
+  virtual void StartWaitingForDisplayCapabilitiesUpdate(
+      app_mngr::ApplicationSharedPtr application) = 0;
+
   virtual time_t LaunchTime() const = 0;
 
 #ifdef BUILD_TESTS
diff --git a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h
index a70e2453de..3ac59b9f88 100644
--- a/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h
+++ b/src/components/application_manager/include/application_manager/resumption/resume_ctrl_impl.h
@@ -52,8 +52,6 @@
 
 namespace resumption {
 
-class LastState;
-
 /**
  * @brief Contains logic for storage/restore data of applications.
  */
@@ -95,6 +93,9 @@ class ResumeCtrlImpl : public ResumeCtrl,
    */
   bool RestoreAppHMIState(app_mngr::ApplicationSharedPtr application) OVERRIDE;
 
+  void RestoreWidgetsHMIState(
+      const smart_objects::SmartObject& response_message) OVERRIDE;
+
   /**
    * @brief Set application HMI Level as stored in policy
    * @param application is application witch HMI Level is need to setup
@@ -117,6 +118,15 @@ class ResumeCtrlImpl : public ResumeCtrl,
                       bool check_policy = true) OVERRIDE;
 
   /**
+   * @brief RestoreAppWidgets add widgets for the application
+   * @param application application which will be resumed
+   * @param saved_app application specific section from backup file
+   */
+  size_t RestoreAppWidgets(
+      application_manager::ApplicationSharedPtr application,
+      const smart_objects::SmartObject& saved_app) OVERRIDE;
+
+  /**
    * @brief Remove application from list of saved applications
    * @param application is application which need to be removed
    * @return return true, if success, otherwise return false
@@ -250,8 +260,9 @@ class ResumeCtrlImpl : public ResumeCtrl,
    * @brief Resume HMI Level and audio streaming state if needed
    * @param application - application to restore hmi level
    * and audio streaming state
+   * @return true if success otherwise false
    */
-  void StartAppHmiStateResumption(
+  bool StartAppHmiStateResumption(
       app_mngr::ApplicationSharedPtr application) OVERRIDE;
 
   /**
@@ -273,12 +284,14 @@ class ResumeCtrlImpl : public ResumeCtrl,
    */
   void RemoveFromResumption(uint32_t app_id) OVERRIDE;
 
+  DEPRECATED bool Init(resumption::LastState& last_state) FINAL;
+
   /**
    * @brief Initialization data for Resume controller
    * @return true if initialization is success otherwise
    * returns false
    */
-  bool Init(LastState& last_state) OVERRIDE;
+  bool Init(resumption::LastStateWrapperPtr last_state_wrapper) FINAL;
 
   /**
    * @brief Notify resume controller about new application
@@ -296,6 +309,9 @@ class ResumeCtrlImpl : public ResumeCtrl,
   int32_t GetSavedAppHmiLevel(const std::string& app_id,
                               const std::string& device_id) const OVERRIDE;
 
+  void StartWaitingForDisplayCapabilitiesUpdate(
+      app_mngr::ApplicationSharedPtr application) OVERRIDE;
+
   /**
    * @brief geter for launch_time_
    * @return value of launch_time_
@@ -592,6 +608,16 @@ class ResumeCtrlImpl : public ResumeCtrl,
       app_mngr::ApplicationConstSharedPtr application) const;
 
   /**
+   * @brief Constructs and sends system capability mobile notification
+   *
+   * @param app to send display capabilities updated
+   * @param display_capabilities SO containing notification data
+   */
+  void ProcessSystemCapabilityUpdated(
+      app_mngr::Application& app,
+      const smart_objects::SmartObject& display_capabilities);
+
+  /**
    *@brief Mapping applications to time_stamps
    *       wait for timer to resume HMI Level
    *
@@ -609,6 +635,13 @@ class ResumeCtrlImpl : public ResumeCtrl,
   time_t wake_up_time_;
   std::shared_ptr<ResumptionData> resumption_storage_;
   application_manager::ApplicationManager& application_manager_;
+  /**
+   *@brief Mapping correlation id to request
+   *wait for on event response from HMI to resume HMI Level
+   */
+  typedef std::map<int32_t, smart_objects::SmartObjectSPtr>
+      WaitingResponseToRequest;
+  WaitingResponseToRequest requests_msg_;
 };
 
 }  // namespace resumption
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data.h b/src/components/application_manager/include/application_manager/resumption/resumption_data.h
index 7db7a09cb4..69fc5437de 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data.h
@@ -1,5 +1,5 @@
-/*
- * Copyright (c) 2015, Ford Motor Company
+/*
+ * Copyright (c) 2019, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -256,6 +256,14 @@ class ResumptionData {
       app_mngr::ApplicationConstSharedPtr application) const;
 
   /**
+   * @brief Retrieves of windows info from list of available window
+   * @param application contains list of available windows
+   * @return windows info from list of available window
+   */
+  smart_objects::SmartObject GetApplicationWidgetsInfo(
+      app_mngr::ApplicationConstSharedPtr application) const;
+
+  /**
    * @brief checks pointer that it is not equal NULL
    * @param ptr - contains pointer which need to check
    * @return smartObject from pointer
@@ -264,6 +272,21 @@ class ResumptionData {
       const smart_objects::SmartObject* ptr) const;
 
   /**
+   * @brief creates smart object containing window info
+   * @param window_id window id
+   * @param window_type window type
+   * @param window_name window name
+   * @param window_optional_params_map collection containing optional params for
+   * creating window
+   * @return smart object with window data
+   */
+  smart_objects::SmartObject CreateWindowInfoSO(
+      const application_manager::WindowID window_id,
+      const mobile_apis::WindowType::eType window_type,
+      const application_manager::WindowParamsMap& window_optional_params_map)
+      const;
+
+  /**
    * @brief Creates smart array from received data
    * @param first - iterator points to beginning of the data
    * @param last - iterator points to ending of the data
@@ -282,7 +305,6 @@ class ResumptionData {
       ++first;
     }
   }
-  mutable sync_primitives::RecursiveLock resumption_lock_;
   const application_manager::ApplicationManager& application_manager_;
 };
 }  // namespace resumption
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
index 2b5a1fdcc9..a667dbf8e2 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_db.h
@@ -838,6 +838,7 @@ class ResumptionDataDB : public ResumptionData {
   DISALLOW_COPY_AND_ASSIGN(ResumptionDataDB);
 
   utils::dbms::SQLDatabase* db_;
+  mutable sync_primitives::RecursiveLock resumption_lock_;
 };
 }  // namespace resumption
 
diff --git a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
index e2418fd033..2394fe00dc 100644
--- a/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
+++ b/src/components/application_manager/include/application_manager/resumption/resumption_data_json.h
@@ -35,7 +35,7 @@
 
 #include "application_manager/resumption/resumption_data.h"
 #include "json/json.h"
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 
 namespace resumption {
 
@@ -49,7 +49,12 @@ class ResumptionDataJson : public ResumptionData {
    * @brief Constructor of ResumptionDataJson
    */
   ResumptionDataJson(
-      LastState& last_state,
+      resumption::LastStateWrapperPtr last_state_wrapper,
+      const application_manager::ApplicationManager& application_manager);
+
+  DEPRECATED
+  ResumptionDataJson(
+      LastState&,
       const application_manager::ApplicationManager& application_manager);
 
   /**
@@ -175,9 +180,8 @@ class ResumptionDataJson : public ResumptionData {
    */
   void Persist() OVERRIDE;
 
-  resumption::LastState& last_state() const {
-    return last_state_;
-  }
+  DEPRECATED
+  resumption::LastState& last_state() const;
 
  private:
   /**
@@ -185,22 +189,26 @@ class ResumptionDataJson : public ResumptionData {
    * or adds the new one.
    * @param policy_app_id application id.
    * @param device_id unique id of device.
+   * @param dictionary - data dictionary where all necessary info stored
    * @return the reference to the record in applications array.
    */
   Json::Value& GetFromSavedOrAppend(const std::string& policy_app_id,
-                                    const std::string& device_id) const;
+                                    const std::string& device_id,
+                                    Json::Value& dictionary) const;
 
   /**
    * @brief Get applications for resumption of LastState
+   * @param dictionary - data dictionary where all necessary info stored
    * @return applications for resumption of LastState
    */
-  Json::Value& GetSavedApplications() const;
+  Json::Value& GetSavedApplications(Json::Value& dictionary) const;
 
   /**
    * @brief Get Resumption section of LastState
+   * @param dictionary - data dictionary where all necessary info stored
    * @return Resumption section of LastState in Json
    */
-  Json::Value& GetResumptionData() const;
+  Json::Value& GetResumptionData(Json::Value& dictionary) const;
 
   /**
    * @brief GetObjectIndex allows to obtain specified object index from
@@ -214,15 +222,17 @@ class ResumptionDataJson : public ResumptionData {
 
   /**
    * @brief Set applications for resumption to LastState
+   * @param dictionary - data dictionary where all necessary info stored
    * @parems apps_json applications to write in LastState
    */
-  void SetSavedApplication(Json::Value& apps_json);
+  void SetSavedApplication(Json::Value& apps_json, Json::Value& dictionary);
 
   /**
    * @brief Setup IgnOff time to LastState
+   * @param dictionary - data dictionary where all necessary info stored
    * @param ign_off_time - igition off time
    */
-  void SetLastIgnOffTime(time_t ign_off_time);
+  void SetLastIgnOffTime(time_t ign_off_time, Json::Value& dictionary);
 
   /*
    * @brief Return true if application resumption data is valid,
@@ -231,7 +241,7 @@ class ResumptionDataJson : public ResumptionData {
    */
   bool IsResumptionDataValid(uint32_t index) const;
 
-  LastState& last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   DISALLOW_COPY_AND_ASSIGN(ResumptionDataJson);
 };
 }  // namespace resumption
diff --git a/src/components/application_manager/include/application_manager/rpc_handler_impl.h b/src/components/application_manager/include/application_manager/rpc_handler_impl.h
index 2909a38cf7..ab140dbd8a 100644
--- a/src/components/application_manager/include/application_manager/rpc_handler_impl.h
+++ b/src/components/application_manager/include/application_manager/rpc_handler_impl.h
@@ -93,7 +93,9 @@ class RPCHandlerImpl : public RPCHandler,
                        public impl::FromMobileQueue::Handler,
                        public impl::FromHmiQueue::Handler {
  public:
-  RPCHandlerImpl(ApplicationManager& app_manager);
+  RPCHandlerImpl(ApplicationManager& app_manager,
+                 hmi_apis::HMI_API& hmi_so_factory,
+                 mobile_apis::MOBILE_API& mobile_so_factory);
   ~RPCHandlerImpl();
 
   // CALLED ON messages_from_mobile_ thread!
@@ -160,10 +162,21 @@ class RPCHandlerImpl : public RPCHandler,
                      bool allow_unknown_parameters) OVERRIDE;
 
  private:
+  /**
+   * @brief Checks if message has to be sent to mobile or not
+   * update output message according to checks
+   * @param output - message to check
+   * @returns true if message type is response otherwise false
+   */
+  bool HandleWrongMessageType(smart_objects::SmartObject& output,
+                              rpc::ValidationReport report) const;
+
   void ProcessMessageFromMobile(const std::shared_ptr<Message> message);
   void ProcessMessageFromHMI(const std::shared_ptr<Message> message);
+
   bool ConvertMessageToSO(const Message& message,
                           smart_objects::SmartObject& output,
+                          std::string& out_warning_info,
                           const bool allow_unknown_parameters = false,
                           const bool validate_params = true);
   std::shared_ptr<Message> ConvertRawMsgToMessage(
@@ -177,8 +190,8 @@ class RPCHandlerImpl : public RPCHandler,
   // Thread that pumps messages coming from HMI.
   impl::FromHmiQueue messages_from_hmi_;
 
-  hmi_apis::HMI_API hmi_so_factory_;
-  mobile_apis::MOBILE_API mobile_so_factory_;
+  hmi_apis::HMI_API& hmi_so_factory_;
+  mobile_apis::MOBILE_API& mobile_so_factory_;
 #ifdef TELEMETRY_MONITOR
   AMTelemetryObserver* metric_observer_;
 #endif  // TELEMETRY_MONITOR
diff --git a/src/components/application_manager/include/application_manager/rpc_protection_manager.h b/src/components/application_manager/include/application_manager/rpc_protection_manager.h
new file mode 100644
index 0000000000..34188da4e9
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/rpc_protection_manager.h
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_PROTOCOL_HANDLER_RPC_PROTECTION_MANAGER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_PROTOCOL_HANDLER_RPC_PROTECTION_MANAGER_H_
+
+#include <cstdint>
+#include <memory>
+
+#include "application_manager/application.h"
+#include "application_manager/policies/policy_handler_observer.h"
+#include "smart_objects/smart_object.h"
+
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
+class SmartObject;
+}  // namespace ns_smart_objects
+}  // namespace ns_smart_device_link
+namespace smart_objects = ns_smart_device_link::ns_smart_objects;
+
+namespace application_manager {
+class Application;
+}  // namespace application_manager
+
+namespace application_manager {
+/**
+ * @brief RPCProtectionManager interface
+ * This entity exists to get info from policy table regarding encryption on
+ * application and function group level, as well as make decisions whether
+ * certain RPC should be encrypted or not.
+ * It mediates communication between PRCService and
+ * PolicyEncryptionFlagGetterInterface which is implemented by PolicyManager,
+ * providing adequate level of abstraction.
+ */
+class RPCProtectionManager : public policy::PolicyHandlerObserver {
+ public:
+  /*
+   * @brief virtual destructor RPCProtectionManager
+   */
+  virtual ~RPCProtectionManager() {}
+
+  /*
+   * @brief checks whether given rpc requires encryption by policy
+   * @param function_id function id
+   * @param app ref to Application
+   * @param is_rpc_service_secure the flag the secure service started
+   * @return true if function need encryption for current app,  else false
+   */
+  virtual bool CheckPolicyEncryptionFlag(
+      const uint32_t function_id,
+      const ApplicationSharedPtr app,
+      const bool is_rpc_service_secure) const = 0;
+  /*
+   * @brief check whether given rpc is saved to internal cache and needs to be
+   * encrypted before sending to mobile
+   * @param app_id application id
+   * @param correlation_id correlation id
+   * @return true if the message with correlation id correlation_id needed e
+   * ncryption else false
+   */
+  virtual bool IsInEncryptionNeededCache(
+      const uint32_t app_id, const uint32_t conrrelation_id) const = 0;
+
+  /*
+   * @brief Adds app id and correlation id of a message to internal cache
+   * @param app_id application if
+   * @param correlation_id correlation id
+   */
+  virtual void AddToEncryptionNeededCache(const uint32_t app_id,
+                                          const uint32_t correlation_id) = 0;
+
+  /*
+   * @brief Removes app id and correlation id of a message from internal cache
+   * @param app_id application if
+   * @param correlation_id correlation id
+   */
+  virtual void RemoveFromEncryptionNeededCache(
+      const uint32_t app_id, const uint32_t correlation_id) = 0;
+};
+}  // namespace application_manager
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_PROTOCOL_HANDLER_RPC_PROTECTION_MANAGER_H_
diff --git a/src/components/application_manager/include/application_manager/rpc_protection_manager_impl.h b/src/components/application_manager/include/application_manager/rpc_protection_manager_impl.h
new file mode 100644
index 0000000000..b971ace480
--- /dev/null
+++ b/src/components/application_manager/include/application_manager/rpc_protection_manager_impl.h
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_PROTOCOL_HANDLER_RPC_PROTECTION_MANAGER_IMPL_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_PROTOCOL_HANDLER_RPC_PROTECTION_MANAGER_IMPL_H_
+
+#include <map>
+#include <set>
+#include "application_manager/policies/policy_handler.h"
+#include "application_manager/rpc_protection_manager.h"
+
+namespace application_manager {
+/*
+ * @brief RPCProtectionManager implementation
+ */
+class RPCProtectionManagerImpl : public RPCProtectionManager {
+ public:
+  typedef std::pair<uint32_t, uint32_t> AppIdCorrIdPair;
+  typedef std::set<std::string> FunctionNames;
+  typedef std::map<std::string, FunctionNames> AppEncryptedRpcMap;
+
+  RPCProtectionManagerImpl(policy::PolicyHandlerInterface& policy_handler);
+
+  ~RPCProtectionManagerImpl() OVERRIDE {}
+
+  bool CheckPolicyEncryptionFlag(
+      const uint32_t function_id,
+      const ApplicationSharedPtr app,
+      const bool is_rpc_service_secure) const OVERRIDE;
+
+  bool IsInEncryptionNeededCache(const uint32_t app_id,
+                                 const uint32_t conrrelation_id) const OVERRIDE;
+
+  void AddToEncryptionNeededCache(const uint32_t app_id,
+                                  const uint32_t correlation_id) OVERRIDE;
+
+  void RemoveFromEncryptionNeededCache(const uint32_t app_id,
+                                       const uint32_t correlation_id) OVERRIDE;
+
+  // PolicyHandlerObserver interface
+  void OnPTUFinished(const bool ptu_result) OVERRIDE;
+
+  void OnPTInited() OVERRIDE;
+
+ private:
+  /*
+   * @brief check whether given rpc is an exception
+   * @param function_id function id
+   * @return true if function_id is an exception (rpc that can be sent before
+   * app is registered, hence before secure rpc service is established)
+   */
+  bool IsExceptionRPC(const uint32_t function_id) const;
+
+  /*
+   * @brief retreives list of rpcs that require encryption by policy
+   * @param policy_app_id policy application name
+   * @return container with function names that require encryption by policy
+   */
+  FunctionNames GetEncryptedRPCsForApp(const std::string& policy_app_id);
+
+  /*
+   * @brief checks whether given function name is in saved encrypted rpc list
+   * @param policy_app_id policy application name
+   * @param function_name policy function name
+   * @return true if function_name for this policy_app_id is saved, otherwise -
+   * false
+   */
+  bool IsEncryptionRequiredByPolicy(const std::string& policy_app_id,
+                                    const std::string& function_name) const;
+
+  /*
+   * @brief saves rpcs that have encryption_required flag in policy table to
+   * internal container
+   */
+  void SaveEncryptedRPC();
+
+  policy::PolicyHandlerInterface& policy_handler_;
+
+  AppEncryptedRpcMap encrypted_rpcs_;
+  sync_primitives::Lock encrypted_rpcs_lock_;
+
+  std::set<AppIdCorrIdPair> encryption_needed_cache_;
+  sync_primitives::Lock message_needed_encryption_lock_;
+};
+}  // namespace application_manager
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_PROTOCOL_HANDLER_RPC_PROTECTION_MANAGER_IMPL_H_
diff --git a/src/components/application_manager/include/application_manager/rpc_service_impl.h b/src/components/application_manager/include/application_manager/rpc_service_impl.h
index ab71729b3f..a535198ca1 100644
--- a/src/components/application_manager/include/application_manager/rpc_service_impl.h
+++ b/src/components/application_manager/include/application_manager/rpc_service_impl.h
@@ -38,6 +38,7 @@
 #include "application_manager/message_helper.h"
 #include "application_manager/mobile_message_handler.h"
 #include "application_manager/request_controller.h"
+#include "application_manager/rpc_protection_manager.h"
 #include "application_manager/rpc_service.h"
 #include "application_manager/usage_statistics.h"
 
@@ -87,6 +88,14 @@ typedef threads::MessageLoopThread<utils::PrioritizedQueue<MessageToHmi> >
     ToHmiQueue;
 }  // namespace impl
 
+typedef std::shared_ptr<RPCProtectionManager> RPCProtectionManagerSPtr;
+
+enum class EncryptionFlagCheckResult {
+  kSuccess_Protected,
+  kSuccess_NotProtected,
+  kError_EncryptionNeeded
+};
+
 class RPCServiceImpl : public RPCService,
                        public impl::ToMobileQueue::Handler,
                        public impl::ToHmiQueue::Handler {
@@ -103,14 +112,25 @@ class RPCServiceImpl : public RPCService,
                  request_controller::RequestController& request_ctrl,
                  protocol_handler::ProtocolHandler* protocol_handler,
                  hmi_message_handler::HMIMessageHandler* hmi_handler,
-                 CommandHolder& commands_holder);
+                 CommandHolder& commands_holder,
+                 RPCProtectionManagerSPtr rpc_protection_manager,
+                 hmi_apis::HMI_API& hmi_so_factory_,
+                 mobile_apis::MOBILE_API& mobile_so_factory_);
   ~RPCServiceImpl();
 
+  void Stop() OVERRIDE;
+
   bool ManageMobileCommand(const commands::MessageSharedPtr message,
                            commands::Command::CommandSource source) OVERRIDE;
+  bool ManageMobileCommand(const commands::MessageSharedPtr message,
+                           commands::Command::CommandSource source,
+                           const std::string warning_info) OVERRIDE;
   bool ManageHMICommand(const commands::MessageSharedPtr message,
                         commands::Command::CommandSource source =
                             commands::Command::SOURCE_HMI) OVERRIDE;
+  bool ManageHMICommand(const commands::MessageSharedPtr message,
+                        commands::Command::CommandSource source,
+                        const std::string warning_info) OVERRIDE;
 
   // CALLED ON messages_to_hmi_ thread!
   void Handle(const impl::MessageToHmi message) OVERRIDE;
@@ -122,17 +142,31 @@ class RPCServiceImpl : public RPCService,
   void SendMessageToHMI(const commands::MessageSharedPtr message) OVERRIDE;
 
   bool IsAppServiceRPC(int32_t function_id,
-                       commands::Command::CommandSource source);
+                       commands::Command::CommandSource source) OVERRIDE;
 
   void set_protocol_handler(
       protocol_handler::ProtocolHandler* handler) OVERRIDE;
   void set_hmi_message_handler(
       hmi_message_handler::HMIMessageHandler* handler) OVERRIDE;
 
+  void UpdateMobileRPCParams(
+      const mobile_apis::FunctionID::eType& function_id,
+      const mobile_apis::messageType::eType& message_type,
+      const std::map<std::string, SMember>& members) OVERRIDE;
+  void UpdateHMIRPCParams(
+      const hmi_apis::FunctionID::eType& function_id,
+      const hmi_apis::messageType::eType& message_type,
+      const std::map<std::string, SMember>& members) OVERRIDE;
+
  private:
   bool ConvertSOtoMessage(const smart_objects::SmartObject& message,
                           Message& output,
                           const bool allow_unknown_parameters = false);
+
+  EncryptionFlagCheckResult IsEncryptionRequired(
+      const smart_objects::SmartObject& message,
+      ApplicationSharedPtr app,
+      const bool is_rpc_service_secure) const;
   hmi_apis::HMI_API& hmi_so_factory();
   mobile_apis::MOBILE_API& mobile_so_factory();
   void CheckSourceForUnsupportedRequest(
@@ -143,14 +177,15 @@ class RPCServiceImpl : public RPCService,
   request_controller::RequestController& request_ctrl_;
   protocol_handler::ProtocolHandler* protocol_handler_;
   hmi_message_handler::HMIMessageHandler* hmi_handler_;
+  RPCProtectionManagerSPtr rpc_protection_manager_;
   CommandHolder& commands_holder_;
   // Thread that pumps messages being passed to mobile side.
   impl::ToMobileQueue messages_to_mobile_;
   // Thread that pumps messages being passed to HMI.
   impl::ToHmiQueue messages_to_hmi_;
 
-  hmi_apis::HMI_API hmi_so_factory_;
-  mobile_apis::MOBILE_API mobile_so_factory_;
+  hmi_apis::HMI_API& hmi_so_factory_;
+  mobile_apis::MOBILE_API& mobile_so_factory_;
 };
 }  // namespace rpc_service
 }  // namespace application_manager
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index f8a457e7e8..f2702d2ccf 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -38,6 +38,8 @@ namespace application_manager {
 namespace strings {
 
 extern const char* params;
+extern const char* require_encryption;
+extern const char* protection;
 extern const char* message_type;
 extern const char* correlation_id;
 extern const char* function_id;
@@ -53,6 +55,7 @@ extern const char* info;
 extern const char* app_id;
 extern const char* full_app_id;
 extern const char* bundle_id;
+extern const char* window_id;
 extern const char* app_info;
 extern const char* app_launch;
 extern const char* app_launch_list;
@@ -111,11 +114,17 @@ extern const char* menu_icon;
 extern const char* keyboard_properties;
 extern const char* vr_commands;
 extern const char* position;
+extern const char* user_location;
 extern const char* num_ticks;
 extern const char* slider_footer;
 extern const char* menu_id;
 extern const char* menu_name;
+<<<<<<< HEAD
 extern const char* parent_id;
+=======
+extern const char* menu_layout;
+extern const char* menu_layouts_available;
+>>>>>>> origin/develop
 extern const char* interaction_choice_set_id;
 extern const char* interaction_choice_set_id_list;
 extern const char* choice_set;
@@ -131,6 +140,8 @@ extern const char* initial_prompt;
 extern const char* initial_text;
 extern const char* duration;
 extern const char* progress_indicator;
+extern const char* func_id;
+extern const char* cancel_id;
 extern const char* alert_type;
 extern const char* alert_icon;
 extern const char* play_tone;
@@ -169,9 +180,17 @@ extern const char* activate_app_hmi_level;
 extern const char* audio_streaming_state;
 extern const char* video_streaming_state;
 extern const char* system_context;
+extern const char* window_name;
+extern const char* window_type;
+extern const char* window_type_supported;
+extern const char* maximum_number_of_windows;
+extern const char* window_capabilities;
+extern const char* associated_service_type;
+extern const char* duplicate_updates_from_window_id;
 extern const char* speech_capabilities;
 extern const char* vr_capabilities;
 extern const char* audio_pass_thru_capabilities;
+extern const char* audio_pass_thru_capabilities_list;
 extern const char* pcm_stream_capabilities;
 extern const char* audio_pass_thru_icon;
 extern const char* way_points;
@@ -182,7 +201,11 @@ extern const char* navigation_capability;
 extern const char* phone_capability;
 extern const char* video_streaming_capability;
 extern const char* rc_capability;
+<<<<<<< HEAD
 extern const char* driver_distraction_capability;
+=======
+extern const char* seat_location_capability;
+>>>>>>> origin/develop
 extern const char* app_services_capabilities;
 extern const char* day_color_scheme;
 extern const char* night_color_scheme;
@@ -193,6 +216,8 @@ extern const char* red;
 extern const char* green;
 extern const char* blue;
 extern const char* display_layout;
+extern const char* template_configuration;
+extern const char* template_layout;
 extern const char* icon_resumed;
 extern const char* nicknames;
 extern const char* enabled;
@@ -202,6 +227,11 @@ extern const char* hybrid_app_preference;
 extern const char* is_cloud_application;
 extern const char* cloud_connection_status;
 extern const char* endpoint;
+extern const char* display_capabilities;
+extern const char* policy_type;
+extern const char* property;
+extern const char* displays;
+extern const char* seat_location;
 
 // PutFile
 extern const char* sync_file_name;
@@ -291,6 +321,7 @@ extern const char* e_call_info;
 extern const char* airbag_status;
 extern const char* emergency_event;
 extern const char* cluster_mode_status;
+extern const char* cluster_modes;
 extern const char* my_key;
 extern const char* help_prompt;
 extern const char* scroll_message_body;
@@ -310,6 +341,7 @@ extern const char* sdl_version;
 extern const char* system_software_version;
 extern const char* priority;
 extern const char* engine_oil_life;
+extern const char* oem_custom_data_type;
 
 // app services
 extern const char* app_service_manifest;
@@ -374,6 +406,8 @@ extern const char* ign_off_count;
 
 extern const char* global_ign_on_counter;
 
+extern const char* suspend_count;
+
 extern const char* connection_info;
 extern const char* is_download_complete;
 
@@ -410,6 +444,8 @@ extern const char* delivery_mode;
 
 extern const char* audio_streaming_indicator;
 
+extern const char* windows_info;
+
 // keys for default parameters loaded from hmi_capabilities.json:
 extern const char* const keyboard_properties_default;
 extern const char* const language_default;
@@ -442,6 +478,9 @@ extern const char* const resolution_height;
 extern const char* const max_bitrate;
 extern const char* const supported_formats;
 extern const char* const haptic_spatial_data_supported;
+extern const char* const diagonal_screen_size;
+extern const char* const pixel_per_inch;
+extern const char* const scale;
 extern const char* const haptic_rect_data;
 extern const char* const rect;
 extern const char* const x;
@@ -593,6 +632,9 @@ extern const char* policyfile;
 extern const char* is_active;
 extern const char* is_deactivated;
 extern const char* event_name;
+extern const char* service_type;
+extern const char* service_event;
+extern const char* reason;
 
 }  // namespace hmi_notification
 
diff --git a/src/components/application_manager/include/application_manager/state_controller_impl.h b/src/components/application_manager/include/application_manager/state_controller_impl.h
index 77da28cc91..c6121f5d1d 100644
--- a/src/components/application_manager/include/application_manager/state_controller_impl.h
+++ b/src/components/application_manager/include/application_manager/state_controller_impl.h
@@ -52,138 +52,79 @@ class StateControllerImpl : public event_engine::EventObserver,
  public:
   explicit StateControllerImpl(ApplicationManager& app_mngr);
 
-  /**
-   * @brief SetRegularState setup regular hmi state, that  will appear if
-   * no specific events are active
-   * @param app appication to setup regular State
-   * @param state state of new regular state
-   */
-
-  virtual void SetRegularState(ApplicationSharedPtr app,
-                               HmiStatePtr state,
-                               const bool SendActivateApp);
-
-  /**
-   * @brief SetRegularState Change regular hmi level and audio state
-   * @param app appication to setup regular State
-   * @param hmi_level of new regular state
-   * @param audio_state of new regular state
-   * @paran video_state of new regular state
-   * @param SendActivateApp: if true, ActivateAppRequest will be sent on HMI */
+  void SetRegularState(ApplicationSharedPtr app,
+                       const WindowID window_id,
+                       HmiStatePtr state,
+                       const bool SendActivateApp) OVERRIDE;
 
-  virtual void SetRegularState(
+  void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::HMILevel::eType hmi_level,
       const mobile_apis::AudioStreamingState::eType audio_state,
       const mobile_apis::VideoStreamingState::eType video_state,
-      const bool SendActivateApp);
+      const bool SendActivateApp) OVERRIDE;
 
-  /**
-   * @brief SetRegularState Change regular hmi level
-   * @param app appication to setup regular State
-   * @param hmi_level of new regular state
-   * @param SendActivateApp: if true, ActivateAppRequest will be sent on HMI
-   */
-  virtual void SetRegularState(ApplicationSharedPtr app,
-                               const mobile_apis::HMILevel::eType hmi_level,
-                               const bool SendActivateApp);
+  void SetRegularState(ApplicationSharedPtr app,
+                       const WindowID window_id,
+                       const mobile_apis::HMILevel::eType hmi_level,
+                       const bool SendActivateApp) OVERRIDE;
 
-  /**
-   * @brief SetRegularState Change regular hmi level, audio state and system
-   * context
-   * @param app appication to setup regular State
-   * @param hmi_level of new regular state
-   * @param audio_state of new regular state
-   * @param video_state of new regular state
-   * @param system_context of new regular state
-   * @param SendActivateApp: if true, ActivateAppRequest will be sent on HMI */
-
-  virtual void SetRegularState(
+  void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::HMILevel::eType hmi_level,
       const mobile_apis::AudioStreamingState::eType audio_state,
       const mobile_apis::VideoStreamingState::eType video_state,
       const mobile_apis::SystemContext::eType system_context,
-      const bool SendActivateApp);
+      const bool SendActivateApp) OVERRIDE;
 
-  /**
-   * @brief SetRegularState Sets regular state with new hmi level
-   * to application
-   * @param app appication to setup regular state
-   * @param hmi_level new hmi level for application
-   */
-  virtual void SetRegularState(ApplicationSharedPtr app,
-                               const mobile_apis::HMILevel::eType hmi_level);
+  void SetRegularState(ApplicationSharedPtr app,
+                       const WindowID window_id,
+                       const mobile_apis::HMILevel::eType hmi_level) OVERRIDE;
 
-  /**
-   * @brief SetRegularState Change regular audio state
-   * @param app appication to setup regular State
-   * @param audio_state of new regular state
-   * @param video_state of new regular state
-   */
-  virtual void SetRegularState(
+  void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::AudioStreamingState::eType audio_state,
-      const mobile_apis::VideoStreamingState::eType video_state);
+      const mobile_apis::VideoStreamingState::eType video_state) OVERRIDE;
 
-  /**
-   * @brief SetRegularState Change regular  system context
-   * @param app appication to setup regular State
-   * @param system_context of new regular state
-   */
-  virtual void SetRegularState(
+  void SetRegularState(
       ApplicationSharedPtr app,
-      const mobile_apis::SystemContext::eType system_context);
+      const WindowID window_id,
+      const mobile_apis::SystemContext::eType system_context) OVERRIDE;
 
-  /**
-   * @brief SetRegularState Sets new regular state to application
-   * @param app appication to setup regular state
-   * @param state new hmi state for application
-   */
-  virtual void SetRegularState(ApplicationSharedPtr app, HmiStatePtr state);
+  void SetRegularState(ApplicationSharedPtr app,
+                       const WindowID window_id,
+                       HmiStatePtr state) OVERRIDE;
 
-  // EventObserver interface
-  void on_event(const event_engine::Event& event);
-  void on_event(const event_engine::MobileEvent& event);
+  void OnApplicationRegistered(
+      ApplicationSharedPtr app,
+      const mobile_apis::HMILevel::eType default_level) OVERRIDE;
 
-  /**
-   * @brief Sets default application state and apply currently active HMI states
-   * on application registration
-   * @param app application to apply states
-   * @param default_level default HMI level
-   */
-  virtual void OnApplicationRegistered(
+  void OnAppWindowAdded(
       ApplicationSharedPtr app,
-      const mobile_apis::HMILevel::eType default_level);
+      const WindowID window_id,
+      const mobile_apis::WindowType::eType window_type,
+      const mobile_apis::HMILevel::eType default_level) OVERRIDE;
 
-  /**
-   * @brief OnVideoStreamingStarted process video streaming started
-   * @param app projection or navigation application starting streaming
-   */
-  virtual void OnVideoStreamingStarted(ApplicationConstSharedPtr app);
+  void OnVideoStreamingStarted(ApplicationConstSharedPtr app) OVERRIDE;
 
-  /**
-   * @brief OnVideoStreamingStopped process video streaming stopped
-   * @param app projection or navigation application stopping streaming
-   */
-  virtual void OnVideoStreamingStopped(ApplicationConstSharedPtr app);
+  void OnVideoStreamingStopped(ApplicationConstSharedPtr app) OVERRIDE;
 
-  /**
-   * @brief OnStateChanged send HMIStatusNotification if needed
-   * @param app application
-   * @param old_state state before change
-   * @param new_state state after change
-   */
-  virtual void OnStateChanged(ApplicationSharedPtr app,
-                              HmiStatePtr old_state,
-                              HmiStatePtr new_state);
+  void OnStateChanged(ApplicationSharedPtr app,
+                      const WindowID window_id,
+                      HmiStatePtr old_state,
+                      HmiStatePtr new_state) OVERRIDE;
 
-  /**
-   * @brief Checks activity of Deactivate HMI state.
-   * @return Returns TRUE if deactivate HMI state is active, otherwise returns
-   * FALSE.
-   */
-  virtual bool IsStateActive(HmiState::StateID state_id) const;
+  bool IsStateActive(HmiState::StateID state_id) const OVERRIDE;
+
+  // EventObserver interface
+  void on_event(const event_engine::Event& event) OVERRIDE;
+  void on_event(const event_engine::MobileEvent& event) OVERRIDE;
+
+  void ActivateDefaultWindow(ApplicationSharedPtr app) OVERRIDE;
+  void ExitDefaultWindow(ApplicationSharedPtr app) OVERRIDE;
 
  private:
   int64_t RequestHMIStateChange(ApplicationConstSharedPtr app,
@@ -195,24 +136,30 @@ class StateControllerImpl : public event_engine::EventObserver,
    */
   struct HmiLevelConflictResolver {
     const ApplicationSharedPtr applied_;
+    const WindowID window_id_;
     const HmiStatePtr state_;
     StateControllerImpl* state_ctrl_;
     HmiLevelConflictResolver(const ApplicationSharedPtr app,
+                             const WindowID window_id,
                              const HmiStatePtr state,
                              StateControllerImpl* state_ctrl)
-        : applied_(app), state_(state), state_ctrl_(state_ctrl) {}
+        : applied_(app)
+        , window_id_(window_id)
+        , state_(state)
+        , state_ctrl_(state_ctrl) {}
     void operator()(ApplicationSharedPtr to_resolve);
   };
 
   template <typename UnaryFunction>
   void ForEachApplication(UnaryFunction func) const {
-    DataAccessor<ApplicationSet> accessor = app_mngr_.applications();
-    ApplicationSet::iterator it = accessor.GetData().begin();
-    for (; it != accessor.GetData().end(); ++it) {
-      ApplicationConstSharedPtr const_app = *it;
-      if (const_app) {
-        func(app_mngr_.application(const_app->app_id()));
-      }
+    ApplicationSet applications;
+    {
+      DataAccessor<ApplicationSet> accessor = app_mngr_.applications();
+      applications = accessor.GetData();
+    }
+
+    for (const auto& app : applications) {
+      func(app);
     }
   }
 
@@ -298,14 +245,19 @@ class StateControllerImpl : public event_engine::EventObserver,
   template <HmiState::StateID ID>
   void HMIStateStarted(ApplicationSharedPtr app) {
     DCHECK_OR_RETURN_VOID(app);
-    HmiStatePtr old_hmi_state = app->CurrentHmiState();
-    HmiStatePtr new_hmi_state = CreateHmiState(app, ID);
-    DCHECK_OR_RETURN_VOID(new_hmi_state);
-    DCHECK_OR_RETURN_VOID(new_hmi_state->state_id() !=
-                          HmiState::STATE_ID_REGULAR);
-    new_hmi_state->set_parent(old_hmi_state);
-    app->AddHMIState(new_hmi_state);
-    OnStateChanged(app, old_hmi_state, new_hmi_state);
+    const WindowIds window_ids = app->GetWindowIds();
+
+    for (auto window_id : window_ids) {
+      HmiStatePtr old_hmi_state = app->CurrentHmiState(window_id);
+      HmiStatePtr new_hmi_state = CreateHmiState(app, ID);
+      DCHECK_OR_RETURN_VOID(new_hmi_state);
+      DCHECK_OR_RETURN_VOID(new_hmi_state->state_id() !=
+                            HmiState::STATE_ID_REGULAR);
+      new_hmi_state->set_parent(old_hmi_state);
+      new_hmi_state->set_window_type(old_hmi_state->window_type());
+      app->AddHMIState(window_id, new_hmi_state);
+      OnStateChanged(app, window_id, old_hmi_state, new_hmi_state);
+    }
   }
 
   /**
@@ -326,7 +278,7 @@ class StateControllerImpl : public event_engine::EventObserver,
    * depends on application type
    * @param app Application to deactivate
    */
-  void DeactivateApp(ApplicationSharedPtr app);
+  void DeactivateApp(ApplicationSharedPtr app, const WindowID window_id);
 
   /**
    * Function to remove temporary HmiState for application
@@ -334,45 +286,68 @@ class StateControllerImpl : public event_engine::EventObserver,
   template <HmiState::StateID ID>
   void HMIStateStopped(ApplicationSharedPtr app) {
     DCHECK_OR_RETURN_VOID(app);
-    HmiStatePtr cur = app->CurrentHmiState();
-    HmiStatePtr old_hmi_state =
-        CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
-    DCHECK_OR_RETURN_VOID(old_hmi_state);
-    old_hmi_state->set_hmi_level(cur->hmi_level());
-    old_hmi_state->set_audio_streaming_state(cur->audio_streaming_state());
-    old_hmi_state->set_video_streaming_state(cur->video_streaming_state());
-    old_hmi_state->set_system_context(cur->system_context());
-    app->RemoveHMIState(ID);
-    HmiStatePtr new_hmi_state = app->CurrentHmiState();
-    OnStateChanged(app, old_hmi_state, new_hmi_state);
+    const WindowIds window_ids = app->GetWindowIds();
+
+    for (auto window_id : window_ids) {
+      HmiStatePtr cur = app->CurrentHmiState(window_id);
+      HmiStatePtr old_hmi_state =
+          CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
+      DCHECK_OR_RETURN_VOID(old_hmi_state);
+      old_hmi_state->set_hmi_level(cur->hmi_level());
+      old_hmi_state->set_window_type(cur->window_type());
+      old_hmi_state->set_audio_streaming_state(cur->audio_streaming_state());
+      old_hmi_state->set_video_streaming_state(cur->video_streaming_state());
+      old_hmi_state->set_system_context(cur->system_context());
+      app->RemoveHMIState(window_id, ID);
+      HmiStatePtr new_hmi_state = app->CurrentHmiState(window_id);
+      OnStateChanged(app, window_id, old_hmi_state, new_hmi_state);
+    }
   }
 
   /**
    * @brief ApplyRegularState setup regular hmi state, that will appear if no
    * specific events are active, without sending ActivateApp
    * @param app appication to setup default State
+   * @param window_id id of applicaion's window to apply HMI state
    * @param state state of new defailt state
    */
-  void ApplyRegularState(ApplicationSharedPtr app, HmiStatePtr state);
+  void ApplyRegularState(ApplicationSharedPtr app,
+                         const WindowID window_id,
+                         HmiStatePtr state);
+
+  /**
+   * @brief UpdateAppWindowsStreamingState updates all application windows
+   * audio/video streaming state according to a new HMI state of the main window
+   * @param app pointer to affected application
+   * @param state pointer to state with the new streaming state of the main
+   * window
+   */
+  void UpdateAppWindowsStreamingState(ApplicationSharedPtr app,
+                                      HmiStatePtr state);
 
   /**
    * @brief SetupRegularHmiState set regular HMI State without
    * resolving conflicts and ActivateApp request
    * @param app application
+   * @param window_id id of applicaion's window to apply HMI state
    * @param state hmi_state to setup
    */
-  void SetupRegularHmiState(ApplicationSharedPtr app, HmiStatePtr state);
+  void SetupRegularHmiState(ApplicationSharedPtr app,
+                            const WindowID window_id,
+                            HmiStatePtr state);
 
   /**
    * @brief SetupRegularHmiState set regular HMI State without
    * resolving conflicts and ActivateApp request
    * @param app application
+   * @param window_id id of applicaion's window to apply HMI state
    * @param hmi_level of new regular state
    * @param audio_state of new regular state
    * @param video_state of new regular state
    */
   void SetupRegularHmiState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::HMILevel::eType hmi_level,
       const mobile_apis::AudioStreamingState::eType audio_state,
       const mobile_apis::VideoStreamingState::eType video_state);
diff --git a/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h b/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h
index 46aa98e6c1..a8ba796a1b 100644
--- a/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h
+++ b/src/components/application_manager/include/application_manager/system_time/system_time_handler_impl.h
@@ -130,6 +130,12 @@ class SystemTimeHandlerImpl : public utils::SystemTimeHandler,
   void ProcessSystemTimeReadyNotification();
 
   /**
+   * @brief ResetPendingSystemTimeRequests resets waiting for system time
+   * requests flag
+   */
+  void ResetPendingSystemTimeRequests() OVERRIDE;
+
+  /**
    * @brief Checks if UTC time is ready to provided by HMI
    * and can be requested by GetSystemTime request
    * @return True if HMI is ready to provide UTC time
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/CMakeLists.txt
index 1e23aac8ee..ef215cdd5a 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/CMakeLists.txt
@@ -53,22 +53,25 @@ collect_sources(COMMANDS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/commands")
 set(LIBRARIES
   HMI_API
   MOBILE_API
+  MessageHelper
   ApplicationManager
+  Resumption
   v4_protocol_v1_2_no_extra
   SmartObjects
   Utils
-  sdl_rpc_plugin
+  sdl_rpc_plugin_static
 )
 
 if(ENABLE_LOG)
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 
-add_library("app_service_rpc_plugin" SHARED ${PLUGIN_SOURCES} ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${COMMANDS_SOURCES})
-target_link_libraries("app_service_rpc_plugin" ${LIBRARIES})
+add_library("app_service_rpc_plugin_static" ${PLUGIN_SOURCES} ${MOBILE_COMMANDS} ${HMI_COMMANDS})
+target_link_libraries("app_service_rpc_plugin_static" ${LIBRARIES})
+
+add_library("app_service_rpc_plugin" SHARED "src/app_service_rpc_plugin.cc")
+target_link_libraries("app_service_rpc_plugin" app_service_rpc_plugin_static)
 
-add_library("AppServiceRpcPluginStaticLib" ${PLUGIN_SOURCES} ${MOBILE_COMMANDS} ${HMI_COMMANDS})
-target_link_libraries("AppServiceRpcPluginStaticLib" ${LIBRARIES})
 
 set(INSTALL_DESTINATION bin)
 
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_hmi_command_factory.h b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_hmi_command_factory.h
index c42b64f559..fd96bf0fb6 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_hmi_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_hmi_command_factory.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_APP_SERVICE_RPC_PLUGIN_INCLUDE_APP_SERVICE_RPC_PLUGIN_APP_SERVICE_RPC_HMI_COMMAND_FACTORY_H
 
 #include "application_manager/application_manager.h"
+#include "application_manager/command_factory.h"
 
 namespace app_service_rpc_plugin {
 namespace app_mngr = application_manager;
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_mobile_command_factory.h b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_mobile_command_factory.h
index bd1e10f267..a6300dbb3d 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_mobile_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_mobile_command_factory.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_APP_SERVICE_RPC_PLUGIN_INCLUDE_APP_SERVICE_RPC_PLUGIN_APP_SERVICE_RPC_MOBILE_COMMAND_FACTORY_H
 
 #include "application_manager/application_manager.h"
+#include "application_manager/command_factory.h"
 
 namespace app_service_rpc_plugin {
 namespace app_mngr = application_manager;
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h
index c9cb98cdfb..5d85237899 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/app_service_rpc_plugin.h
@@ -36,7 +36,6 @@
 #include "application_manager/command_factory.h"
 
 namespace app_service_rpc_plugin {
-// class AppServiceAppExtension;
 namespace app_mngr = application_manager;
 namespace plugins = application_manager::plugin_manager;
 
@@ -47,7 +46,15 @@ class AppServiceRpcPlugin : public plugins::RPCPlugin {
   bool Init(app_mngr::ApplicationManager& application_manager,
             app_mngr::rpc_service::RPCService& rpc_service,
             app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler) OVERRIDE;
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastStateWrapperPtr last_state) OVERRIDE;
+
+  DEPRECATED
+  bool Init(app_mngr::ApplicationManager& application_manager,
+            app_mngr::rpc_service::RPCService& rpc_service,
+            app_mngr::HMICapabilities& hmi_capabilities,
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastState& last_state);
 
   bool IsAbleToProcess(
       const int32_t function_id,
@@ -69,5 +76,6 @@ class AppServiceRpcPlugin : public plugins::RPCPlugin {
 }  // namespace app_service_rpc_plugin
 
 extern "C" application_manager::plugin_manager::RPCPlugin* Create();
+extern "C" void Delete(application_manager::plugin_manager::RPCPlugin* data);
 
 #endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_APP_SERVICE_PLUGIN_INCLUDE_APP_SERVICE_PLUGIN_APP_SERVICE_PLUGIN_H
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/commands/mobile/get_app_service_data_request.h b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/commands/mobile/get_app_service_data_request.h
index 7c80ec5e03..6971354806 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/commands/mobile/get_app_service_data_request.h
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/include/app_service_rpc_plugin/commands/mobile/get_app_service_data_request.h
@@ -68,6 +68,11 @@ class GetAppServiceDataRequest : public app_mngr::commands::CommandRequestImpl {
   virtual void Run();
 
   /**
+   * @brief Init sets hash update mode for request
+   **/
+  bool Init() FINAL;
+
+  /**
    * @brief Interface method that is called whenever new event received
    *
    * @param event The received event
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc
index 91d57cb952..87f947d250 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_app_extension.cc
@@ -103,7 +103,7 @@ void AppServiceAppExtension::ProcessResumption(
     const smart_objects::SmartObject& subscriptions_app_services =
         resumption_data[app_service_info];
     for (size_t i = 0; i < subscriptions_app_services.length(); ++i) {
-      std::string service_type = resumption_data[i].asString();
+      std::string service_type = subscriptions_app_services[i].asString();
       SubscribeToAppService(service_type);
     }
   }
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc
index 3b1b0715d4..1c3a9c77c5 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/app_service_rpc_plugin.cc
@@ -49,7 +49,21 @@ bool AppServiceRpcPlugin::Init(
     application_manager::ApplicationManager& app_manager,
     application_manager::rpc_service::RPCService& rpc_service,
     application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler) {
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastStateWrapperPtr last_state) {
+  UNUSED(last_state);
+  application_manager_ = &app_manager;
+  command_factory_.reset(new app_service_rpc_plugin::AppServiceCommandFactory(
+      app_manager, rpc_service, hmi_capabilities, policy_handler));
+  return true;
+}
+
+bool AppServiceRpcPlugin::Init(app_mngr::ApplicationManager& app_manager,
+                               app_mngr::rpc_service::RPCService& rpc_service,
+                               app_mngr::HMICapabilities& hmi_capabilities,
+                               policy::PolicyHandlerInterface& policy_handler,
+                               resumption::LastState& last_state) {
+  UNUSED(last_state);
   application_manager_ = &app_manager;
   command_factory_.reset(new app_service_rpc_plugin::AppServiceCommandFactory(
       app_manager, rpc_service, hmi_capabilities, policy_handler));
@@ -93,6 +107,14 @@ void AppServiceRpcPlugin::DeleteSubscriptions(
 
 }  // namespace app_service_rpc_plugin
 
-extern "C" application_manager::plugin_manager::RPCPlugin* Create() {
+extern "C" __attribute__((visibility("default")))
+application_manager::plugin_manager::RPCPlugin*
+Create() {
   return new app_service_rpc_plugin::AppServiceRpcPlugin();
 }
+
+extern "C" __attribute__((visibility("default"))) void Delete(
+    application_manager::plugin_manager::RPCPlugin* data) {
+  delete data;
+  DELETE_THREAD_LOGGER(app_service_rpc_plugin::logger_);
+}
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/get_app_service_data_request.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/get_app_service_data_request.cc
index 7c2e62abe2..e3bf40308d 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/get_app_service_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/src/commands/mobile/get_app_service_data_request.cc
@@ -65,6 +65,11 @@ void GetAppServiceDataRequest::Run() {
                       true);
 }
 
+bool GetAppServiceDataRequest::Init() {
+  hash_update_mode_ = HashUpdateMode::kDoHashUpdate;
+  return true;
+}
+
 void GetAppServiceDataRequest::HandleSubscribe() {
   std::string service_type =
       (*message_)[strings::msg_params][strings::service_type].asString();
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/CMakeLists.txt b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/CMakeLists.txt
index 0b56ddb7e9..1670ba5c22 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/CMakeLists.txt
@@ -25,16 +25,10 @@ file(GLOB SOURCES
 
 set(LIBRARIES
   gmock
-  Utils
-  SmartObjects
-  HMI_API
-  MOBILE_API
-  connectionHandler
-  app_service_rpc_plugin
-  sdl_rpc_plugin
-  jsoncpp
-  Policy
-  Resumption
+  sdl_rpc_plugin_static
+  app_service_rpc_plugin_static
 )
 
 create_cotired_test("app_services_commands_test" "${SOURCES}" "${LIBRARIES}" )
+
+add_subdirectory("app_service_plugin")
diff --git a/src/3rd_party-static/jsoncpp/CMakeLists.txt b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/app_service_plugin/CMakeLists.txt
index ac273cfe7b..9abe251204 100644
--- a/src/3rd_party-static/jsoncpp/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/app_service_plugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2016, Ford Motor Company
+# Copyright (c) 2019, Ford Motor Company, Livio
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -12,7 +12,7 @@
 # disclaimer in the documentation and/or other materials provided with the
 # distribution.
 #
-# Neither the name of the Ford Motor Company nor the names of its contributors
+# Neither the name of the copyright holders nor the names of their contributors
 # may be used to endorse or promote products derived from this software
 # without specific prior written permission.
 #
@@ -30,13 +30,25 @@
 
 include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
 
-set(JSONCPP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(JSONCPP_INCLUDE_DIRECTORY ${JSONCPP_INCLUDE_DIRECTORY} PARENT_SCOPE)
+
+set(APP_SERVICE_DIR "${COMPONENTS_DIR}/application_manager/rpc_plugins/app_service_rpc_plugin")
+set(APP_SERVICE_SRC_DIR "${APP_SERVICE_DIR}/src")
+set(APP_SERVICE_INCLUDE_DIR "${APP_SERVICE_DIR}/include/app_service_rpc_plugin")
+set(APP_SERVICE_TEST_DIR "${APP_SERVICE_DIR}/test")
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${GMOCK_INCLUDE_DIRECTORY}
+  ${APP_SERVICE_INCLUDE_DIR}
+) 
+
+set(SOURCES ${APP_SERVICE_TEST_DIR}/app_service_plugin/app_service_app_extension_test.cc
+            ${COMPONENTS_DIR}/application_manager/test/mock_message_helper.cc
 )
 
-collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/lib_json")
+set(LIBRARIES
+  gmock
+  sdl_rpc_plugin_static
+  app_service_rpc_plugin_static
+)
 
-add_library(jsoncpp ${SOURCES})
+create_test("app_service_plugin_test" "${SOURCES}" "${LIBRARIES}" )
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/app_service_plugin/app_service_app_extension_test.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/app_service_plugin/app_service_app_extension_test.cc
new file mode 100644
index 0000000000..785cdd5200
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/app_service_plugin/app_service_app_extension_test.cc
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "app_service_rpc_plugin/app_service_app_extension.h"
+#include <memory>
+#include "app_service_rpc_plugin/app_service_rpc_plugin.h"
+#include "application_manager/mock_application.h"
+#include "gtest/gtest.h"
+
+namespace {
+const std::string kAppServiceType1 = "AppServiceType1";
+const std::string kAppServiceType2 = "AppServiceType2";
+const std::string kResumptionDataKey = "kResumptionDataKey";
+const std::string kAppServiceInfoKey = "appService";
+}  // namespace
+
+namespace test {
+namespace components {
+namespace app_service_plugin_test {
+
+using test::components::application_manager_test::MockApplication;
+using ::testing::_;
+using ::testing::Mock;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnNull;
+using ::testing::ReturnRef;
+using ::testing::SaveArg;
+
+using namespace app_service_rpc_plugin;
+namespace strings = application_manager::strings;
+namespace plugins = application_manager::plugin_manager;
+
+class AppServiceAppExtensionTest : public ::testing::Test {
+ public:
+  AppServiceAppExtensionTest() : mock_app_(new NiceMock<MockApplication>()) {}
+
+ protected:
+  void SetUp() OVERRIDE {
+    app_service_app_extension_.reset(
+        new AppServiceAppExtension(app_service_plugin_, *mock_app_));
+  }
+
+  void TearDown() OVERRIDE {
+    app_service_app_extension_.reset();
+  }
+
+  app_service_rpc_plugin::AppServiceRpcPlugin app_service_plugin_;
+  std::unique_ptr<MockApplication> mock_app_;
+  std::unique_ptr<AppServiceAppExtension> app_service_app_extension_;
+};
+
+TEST_F(AppServiceAppExtensionTest, SubscribeToAppService_SUCCESS) {
+  EXPECT_TRUE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType1));
+  const auto& subs = app_service_app_extension_->Subscriptions();
+  EXPECT_EQ(1u, subs.size());
+  EXPECT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+}
+
+TEST_F(AppServiceAppExtensionTest,
+       SubscribeToAppService_SubscribeOneAppServiceType_Twice_FAIL) {
+  ASSERT_TRUE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType1));
+  ASSERT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+
+  EXPECT_FALSE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType1));
+  EXPECT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+  const auto& subs = app_service_app_extension_->Subscriptions();
+  EXPECT_EQ(1u, subs.size());
+}
+
+TEST_F(
+    AppServiceAppExtensionTest,
+    UnsubscribeFromAppService_AppServiceType1Unsubscribed_AppServiceType2Remains_SUCCESS) {
+  // Subscribe
+  ASSERT_TRUE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType1));
+  ASSERT_TRUE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType2));
+  auto subs = app_service_app_extension_->Subscriptions();
+  ASSERT_EQ(2u, subs.size());
+  ASSERT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+  ASSERT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType2));
+
+  // Unsubscribe
+  EXPECT_TRUE(
+      app_service_app_extension_->UnsubscribeFromAppService(kAppServiceType1));
+  EXPECT_FALSE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+  EXPECT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType2));
+  subs = app_service_app_extension_->Subscriptions();
+  EXPECT_EQ(1u, subs.size());
+}
+
+TEST_F(AppServiceAppExtensionTest,
+       UnsubscribeFromAppService_UnsubscribeNotSubscribedAppServiceType_FAIL) {
+  ASSERT_TRUE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType1));
+  ASSERT_EQ(1u, app_service_app_extension_->Subscriptions().size());
+  ASSERT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+
+  EXPECT_FALSE(
+      app_service_app_extension_->UnsubscribeFromAppService(kAppServiceType2));
+  EXPECT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+  EXPECT_EQ(1u, app_service_app_extension_->Subscriptions().size());
+}
+
+TEST_F(AppServiceAppExtensionTest,
+       UnsubscribeFromAppService_UnsubscribeAll_SUCCESS) {
+  auto app_service_types = {kAppServiceType1, kAppServiceType2};
+
+  for (const auto& app_service_type : app_service_types) {
+    ASSERT_TRUE(
+        app_service_app_extension_->SubscribeToAppService(app_service_type));
+    ASSERT_TRUE(
+        app_service_app_extension_->IsSubscribedToAppService(app_service_type));
+  }
+  ASSERT_EQ(2u, app_service_app_extension_->Subscriptions().size());
+
+  app_service_app_extension_->UnsubscribeFromAppService();
+
+  for (const auto& app_service_type : app_service_types) {
+    EXPECT_FALSE(
+        app_service_app_extension_->IsSubscribedToAppService(app_service_type));
+  }
+  EXPECT_EQ(0u, app_service_app_extension_->Subscriptions().size());
+}
+
+TEST_F(AppServiceAppExtensionTest, SaveResumptionData_SUCCESS) {
+  ASSERT_TRUE(
+      app_service_app_extension_->SubscribeToAppService(kAppServiceType1));
+  ASSERT_EQ(1u, app_service_app_extension_->Subscriptions().size());
+  ASSERT_TRUE(
+      app_service_app_extension_->IsSubscribedToAppService(kAppServiceType1));
+
+  smart_objects::SmartObject resumption_data;
+  resumption_data[kResumptionDataKey] = "some resumption data";
+
+  app_service_app_extension_->SaveResumptionData(resumption_data);
+
+  EXPECT_TRUE(resumption_data.keyExists(kResumptionDataKey));
+  EXPECT_TRUE(resumption_data.keyExists(kAppServiceInfoKey));
+  EXPECT_EQ(kAppServiceType1,
+            resumption_data[kAppServiceInfoKey][0].asString());
+}
+
+TEST_F(AppServiceAppExtensionTest, ProcessResumption_SUCCESS) {
+  app_service_app_extension_->UnsubscribeFromAppService();
+  ASSERT_EQ(0u, app_service_app_extension_->Subscriptions().size());
+
+  smart_objects::SmartObject app_service_data =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  app_service_data.asArray()->push_back(
+      smart_objects::SmartObject(kAppServiceType1));
+  app_service_data.asArray()->push_back(
+      smart_objects::SmartObject(kAppServiceType2));
+
+  smart_objects::SmartObject resumption_data;
+  resumption_data[kAppServiceInfoKey] = app_service_data;
+
+  app_service_app_extension_->ProcessResumption(resumption_data);
+
+  for (const auto& app_service_type : {kAppServiceType1, kAppServiceType2}) {
+    EXPECT_TRUE(
+        app_service_app_extension_->IsSubscribedToAppService(app_service_type));
+  }
+  EXPECT_EQ(2u, app_service_app_extension_->Subscriptions().size());
+}
+
+}  // namespace app_service_plugin_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc
index 3e88d4eaf3..6949a3aff0 100644
--- a/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/app_service_rpc_plugin/test/commands/mobile/on_app_service_data_notification_test.cc
@@ -41,6 +41,7 @@
 #include "gtest/gtest.h"
 #include "interfaces/MOBILE_API.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 
 namespace am = application_manager;
 using am::ApplicationSet;
@@ -80,7 +81,9 @@ class OnAppServiceDataNotificationTest
                 app_service_plugin_, *mock_app_))
       , apps_lock_(std::make_shared<sync_primitives::Lock>())
       , apps_da_(apps_, apps_lock_)
-      , last_state_("app_storage_folder", "app_info_storage")
+      , last_state_(std::make_shared<resumption::LastStateWrapperImpl>(
+            std::make_shared<resumption::LastStateImpl>("app_storage_folder",
+                                                        "app_info_storage")))
       , app_service_manager_(app_mngr_, last_state_) {
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
     ON_CALL(*mock_app_, is_remote_control_supported())
@@ -109,7 +112,7 @@ class OnAppServiceDataNotificationTest
   application_manager::ApplicationSet apps_;
   const std::shared_ptr<sync_primitives::Lock> apps_lock_;
   DataAccessor<application_manager::ApplicationSet> apps_da_;
-  resumption::LastStateImpl last_state_;
+  resumption::LastStateWrapperPtr last_state_;
   MockAppServiceManager app_service_manager_;
 };
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/CMakeLists.txt
index 00de927b6e..8129e1240d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/CMakeLists.txt
@@ -50,7 +50,10 @@ collect_sources(COMMANDS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/commands")
 set(LIBRARIES
   HMI_API
   MOBILE_API
+  MessageHelper
   ApplicationManager
+  ProtocolHandler
+  connectionHandler
   v4_protocol_v1_2_no_extra
   SmartObjects
   Utils
@@ -60,11 +63,12 @@ if(ENABLE_LOG)
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 
-add_library("rc_rpc_plugin" SHARED ${PLUGIN_SOURCES} ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${COMMANDS_SOURCES})
-target_link_libraries("rc_rpc_plugin" ${LIBRARIES})
+add_library("rc_rpc_plugin_static" ${PLUGIN_SOURCES} ${MOBILE_COMMANDS} ${HMI_COMMANDS})
+target_link_libraries("rc_rpc_plugin_static" ${LIBRARIES})
+
+add_library("rc_rpc_plugin" SHARED "src/rc_rpc_plugin.cc")
+target_link_libraries("rc_rpc_plugin" rc_rpc_plugin_static)
 
-add_library("RCRpcPluginStaticLib" ${PLUGIN_SOURCES} ${MOBILE_COMMANDS} ${HMI_COMMANDS})
-target_link_libraries("RCRpcPluginStaticLib" ${LIBRARIES})
 
 set(INSTALL_DESTINATION bin)
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h
index 7aa1aa3dba..82e0a8c13b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h
@@ -69,6 +69,7 @@ class RCOnRemoteControlSettingsNotification
  private:
   ResourceAllocationManager& resource_allocation_manager_;
   InteriorDataManager& interior_data_manager_;
+  RCConsentManager& rc_consent_manager_;
   /**
    * @brief Disalows RC functionality for all RC apps
    * All registered apps will be unsubsribed from OnInteriorVehicleData
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_global_properties_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_global_properties_request.h
new file mode 100644
index 0000000000..64b11c3d7b
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_global_properties_request.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_SET_GLOBAL_PROPERTIES_REQUEST_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_SET_GLOBAL_PROPERTIES_REQUEST_H
+
+#include "application_manager/commands/request_to_hmi.h"
+#include "rc_rpc_plugin/commands/rc_command_request.h"
+
+namespace rc_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+class RCSetGlobalPropertiesRequest : public app_mngr::commands::RequestToHMI {
+ public:
+  /**
+   * @brief RCSetGlobalPropertiesRequest class constructor
+   *
+   * @param message Command message as smart pointer to SmartObject
+   * @param params structure that contains references to
+   * parameters used in remote сontrol commands
+   */
+  RCSetGlobalPropertiesRequest(
+      const app_mngr::commands::MessageSharedPtr& message,
+      const RCCommandParams& params);
+  /**
+   * @brief Execute command
+   */
+  void Run() OVERRIDE;
+
+  ~RCSetGlobalPropertiesRequest();
+};
+}  // namespace commands
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_SET_GLOBAL_PROPERTIES_REQUEST_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_global_properties_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_global_properties_response.h
new file mode 100644
index 0000000000..2e1494364c
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/hmi/rc_set_global_properties_response.h
@@ -0,0 +1,68 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_SET_GLOBAL_PROPERTIES_RESPONSE_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_SET_GLOBAL_PROPERTIES_RESPONSE_H
+
+#include "application_manager/commands/response_from_hmi.h"
+#include "rc_rpc_plugin/commands/rc_command_request.h"
+
+namespace rc_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+class RCSetGlobalPropertiesResponse
+    : public application_manager::commands::ResponseFromHMI {
+ public:
+  /**
+   * @brief RCSetGlobalPropertiesResponse class constructor
+   *
+   * @param message Command message as smart pointer to SmartObject
+   * @param params Structure that contains references to
+   * parameters used in remote сontrol commands
+   */
+  RCSetGlobalPropertiesResponse(
+      const application_manager::commands::MessageSharedPtr& message,
+      const RCCommandParams& params);
+
+  /**
+   * @brief Execute command
+   */
+  void Run() OVERRIDE;
+
+  ~RCSetGlobalPropertiesResponse();
+};
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_RC_SET_GLOBAL_PROPERTIES_RESPONSE_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_request.h
index d6ecfd0128..3946d80508 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_request.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/button_press_request.h
@@ -64,9 +64,11 @@ class ButtonPressRequest : public RCCommandRequest {
   /**
    * @brief IsResourceFree check resource state
    * @param module_type Resource name
+   * @param module_id Resource id
    * @return True if free, otherwise - false
    */
-  bool IsResourceFree(const std::string& module_type) const FINAL;
+  bool IsResourceFree(const std::string& module_type,
+                      const std::string& module_id) const FINAL;
 
   /**
    * @brief SetResourceState changes state of resource
@@ -82,12 +84,18 @@ class ButtonPressRequest : public RCCommandRequest {
    */
   void on_event(const app_mngr::event_engine::Event& event) FINAL;
 
-  std::string ModuleType() FINAL;
+  std::string ModuleType() const FINAL;
+
+  std::string ModuleId() const FINAL;
 
   /**
    * @brief ButtonPressRequest class destructor
    */
   ~ButtonPressRequest();
+
+ private:
+  const mobile_apis::ButtonName::eType GetButtonId() const;
+  std::string GetButtonName() const;
 };
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_request.h
new file mode 100644
index 0000000000..c41169d027
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_request.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_REQUEST_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_REQUEST_H
+
+#include <string>
+
+#include "rc_rpc_plugin/commands/rc_command_params.h"
+#include "rc_rpc_plugin/commands/rc_command_request.h"
+#include "utils/macro.h"
+
+namespace rc_rpc_plugin {
+namespace commands {
+
+class GetInteriorVehicleDataConsentRequest
+    : public rc_rpc_plugin::commands::RCCommandRequest {
+ public:
+  /**
+   * @brief GetInteriorVehicleDataConsentRequest constructor
+   * @param message smart pointer with SmartObject
+   * @param params structure that contains references to
+   * parameters used in remote сontrol commands
+   */
+  GetInteriorVehicleDataConsentRequest(
+      const application_manager::commands::MessageSharedPtr& message,
+      const RCCommandParams& params);
+
+  /**
+   * @brief Execute command
+   */
+  void Execute() FINAL;
+
+  void on_event(const app_mngr::event_engine::Event& event) FINAL;
+
+  std::string ModuleType() const FINAL;
+
+  /**
+   * @brief For this RPC this method isn't correct, because SDL receives array
+   * of module_ids instead of only one module_id. This method returns empty
+   * string.
+   */
+  std::string ModuleId() const FINAL;
+
+  ~GetInteriorVehicleDataConsentRequest();
+
+ private:
+  /**
+   * @brief Saves ModuleId consents (saved before moduleids + received moduleId
+   * consents + date_of_consent) to file.
+   *
+   * @param msg_params Message params from response message as SmartObject.
+   */
+  bool SaveModuleIdConsents(std::string& info_out,
+                            const smart_objects::SmartObject& msg_params);
+
+  /**
+   * @brief Gets calculated vehicle data consent and puts it into provided smart
+   * object
+   * @param out_response output smart object
+   * @return true in case all required consent information was provided in
+   * output smart object, otherwise returns false
+   */
+  bool GetCalculatedVehicleDataConsent(
+      smart_objects::SmartObject& out_response) const;
+
+  /**
+   * @brief Checks whether the user_location is covered by the module's
+   * serviceArea
+   * @param module_uid module key(module_type + module_id)
+   * @return true if the user_location is covered by the module's serviceArea or
+   * the user is the driver (or if seatLocationCapabilities don't exists)
+   * otherwise false
+   */
+  bool IsUserLocationValid(const ModuleUid& module_uid) const;
+
+  /**
+   * @brief Checks whether user should have access to module using the specific
+   * accessMode's rules
+   * @param module_uid module key(moudle_type + module_id)
+   * @param access_mode current HMI accessMode
+   * @return consent enum value
+   */
+  rc_rpc_types::ModuleConsent GetModuleConsentByAccessMode(
+      const ModuleUid& module_uid,
+      const hmi_apis::Common_RCAccessMode::eType access_mode) const;
+
+  smart_objects::SmartObject hmi_request_consents_;
+};
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_REQUEST_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_response.h
new file mode 100644
index 0000000000..c163b02a80
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_response.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_RESPONSE_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_RESPONSE_H
+
+#include "application_manager/commands/command_response_impl.h"
+#include "rc_rpc_plugin/commands/rc_command_params.h"
+#include "utils/macro.h"
+
+namespace rc_rpc_plugin {
+
+namespace commands {
+
+class GetInteriorVehicleDataConsentResponse
+    : public application_manager::commands::CommandResponseImpl {
+ public:
+  /**
+   * @brief GetInteriorVehicleDataConsentResponse constructor
+   *
+   * @param message smart pointer with SmartObject
+   * @param params structure which contains references for next
+   * entities: ApplicationManager, RPCService, HMICapabilities,
+   * PolicyHandlerInterface, ResourceAllocationManager, InteriorDataCache,
+   * InteriorDataManager.
+   */
+  GetInteriorVehicleDataConsentResponse(
+      const application_manager::commands::MessageSharedPtr& message,
+      const RCCommandParams& params);
+
+  void Run() OVERRIDE;
+
+  ~GetInteriorVehicleDataConsentResponse();
+};
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RC_GET_INTERIOR_VEHICLE_DATA_CONSENT_RESPONSE_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h
index cfb5e72c95..7be37f0756 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h
@@ -63,8 +63,8 @@ class GetInteriorVehicleDataRequest : public RCCommandRequest {
   ~GetInteriorVehicleDataRequest();
 
  private:
-  std::vector<application_manager::ApplicationSharedPtr>
-  AppsSubscribedToModuleType(const std::string& module_type);
+  std::vector<application_manager::ApplicationSharedPtr> AppsSubscribedToModule(
+      const ModuleUid& module);
 
   /**
    * @brief Check if app wants to proceed with already setup subscription
@@ -87,7 +87,8 @@ class GetInteriorVehicleDataRequest : public RCCommandRequest {
    */
   void RemoveExcessiveSubscription();
 
-  std::string ModuleType() FINAL;
+  std::string ModuleType() const FINAL;
+  std::string ModuleId() const FINAL;
   bool excessive_subscription_occured_;
   bool ProcessCapabilities();
   void ProcessResponseToMobileFromCache(app_mngr::ApplicationSharedPtr app);
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h
index 2a7362510d..4663b4b371 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h
@@ -53,13 +53,16 @@ class OnInteriorVehicleDataNotification
 
   void Run() OVERRIDE;
 
-  std::string ModuleType();
+  std::string ModuleType() const;
+
+  std::string ModuleId() const;
 
   ~OnInteriorVehicleDataNotification();
 
  private:
   InteriorDataCache& interior_data_cache_;
-  void AddDataToCache(const std::string& module_type);
+  RCCapabilitiesManager& rc_capabilities_manager_;
+  void AddDataToCache(const ModuleUid& module);
 };
 }  // namespace commands
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_request.h
new file mode 100644
index 0000000000..316dc29a1d
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_request.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RELEASE_INTERIOR_VEHICLE_DATA_MODULE_REQUEST_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RELEASE_INTERIOR_VEHICLE_DATA_MODULE_REQUEST_H
+
+#include "rc_rpc_plugin/commands/rc_command_params.h"
+#include "rc_rpc_plugin/commands/rc_command_request.h"
+#include "utils/macro.h"
+
+namespace rc_rpc_plugin {
+namespace commands {
+
+class ReleaseInteriorVehicleDataModuleRequest
+    : public rc_rpc_plugin::commands::RCCommandRequest {
+ public:
+  /**
+   * @brief ReleaseInteriorVehicleDataModule constructor
+   * @param message smart pointer with SmartObject
+   * @param params structure that contains references to
+   * parameters used in remote сontrol commands
+   */
+  ReleaseInteriorVehicleDataModuleRequest(
+      const application_manager::commands::MessageSharedPtr& message,
+      const RCCommandParams& params);
+
+  void Execute() FINAL;
+
+  std::string ModuleType() const FINAL;
+
+  std::string ModuleId() const FINAL;
+
+  ~ReleaseInteriorVehicleDataModuleRequest();
+
+ private:
+  bool ProcessCapabilities();
+};
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RELEASE_INTERIOR_VEHICLE_DATA_MODULE_REQUEST_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_response.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_response.h
new file mode 100644
index 0000000000..42e0775a83
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_response.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RELEASE_INTERIOR_VEHICLE_DATA_MODULE_RESPONSE_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RELEASE_INTERIOR_VEHICLE_DATA_MODULE_RESPONSE_H
+
+#include "application_manager/commands/command_response_impl.h"
+#include "rc_rpc_plugin/commands/rc_command_params.h"
+#include "utils/macro.h"
+
+namespace rc_rpc_plugin {
+namespace commands {
+
+class ReleaseInteriorVehicleDataModuleResponse
+    : public application_manager::commands::CommandResponseImpl {
+ public:
+  /**
+   * @brief ReleaseInteriorVehicleDataModuleResponse constructor
+   *
+   * @param message smart pointer with SmartObject
+   * @param params structure which contains references for next
+   * entities: ApplicationManager, RPCService, HMICapabilities,
+   * PolicyHandlerInterface, ResourceAllocationManager, InteriorDataCache,
+   * InteriorDataManager.
+   */
+  ReleaseInteriorVehicleDataModuleResponse(
+      const application_manager::commands::MessageSharedPtr& message,
+      const RCCommandParams& params);
+
+  void Run() OVERRIDE;
+
+  ~ReleaseInteriorVehicleDataModuleResponse();
+};
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_MOBILE_RELEASE_INTERIOR_VEHICLE_DATA_MODULE_RESPONSE_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h
index 128c668ee9..bb152a52f8 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h
@@ -40,10 +40,6 @@ namespace app_mngr = application_manager;
 
 namespace commands {
 
-enum capabilitiesStatus { success, missedLightName, missedParam, readOnly };
-
-typedef std::pair<std::string, capabilitiesStatus> ModuleCapability;
-
 class SetInteriorVehicleDataRequest : public RCCommandRequest {
  public:
   SetInteriorVehicleDataRequest(
@@ -66,9 +62,11 @@ class SetInteriorVehicleDataRequest : public RCCommandRequest {
   /**
    * @brief IsResourceFree check resource state
    * @param module_type Resource name
+   * @param module_id Resource id
    * @return True if free, otherwise - false
    */
-  bool IsResourceFree(const std::string& module_type) const FINAL;
+  bool IsResourceFree(const std::string& module_type,
+                      const std::string& module_id) const FINAL;
 
   /**
    * @brief SetResourceState changes state of resource
@@ -85,28 +83,14 @@ class SetInteriorVehicleDataRequest : public RCCommandRequest {
   void on_event(const app_mngr::event_engine::Event& event) FINAL;
 
   /**
-   * @brief Method that check if READ_ONLY parameters present
-   * @param request_params params from received message,
-   * @param module_data_capabilities info for notification to mobile
-   * @return true if present , false - otherwise
-   */
-  bool AreReadOnlyParamsPresent(const smart_objects::SmartObject& module_data,
-                                ModuleCapability& module_data_capabilities);
-
-  /**
-   * @brief Method that check if all request parameters are READ_ONLY
-   * @param request_params params from received message
-   * @return true if all are read only , false - otherwise
-   */
-  bool AreAllParamsReadOnly(const smart_objects::SmartObject& module_data);
-
-  /**
    * @brief Method that cuts-off READ_ONLY parameters
    * @param module_data params to handle
    */
   void CutOffReadOnlyParams(smart_objects::SmartObject& module_data);
 
-  std::string ModuleType() FINAL;
+  std::string ModuleType() const FINAL;
+
+  std::string ModuleId() const FINAL;
 
   /**
    * @brief SetInteriorVehicleDataRequest class destructor
@@ -115,14 +99,6 @@ class SetInteriorVehicleDataRequest : public RCCommandRequest {
 
  private:
   /**
-   * @brief ControlData
-   * @param module_data received params
-   * @return value of module data depending on module type
-   */
-  const smart_objects::SmartObject& ControlData(
-      const smart_objects::SmartObject& module_data);
-
-  /**
    * @brief CheckAudioSource check that if app wants to change
    * the audio source from MOBILE_APP to other types of audio
    * source without keepContext parameter or with keepContext=false
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h
index 0ca7789791..3b46b7ea30 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_params.h
@@ -50,6 +50,8 @@ namespace rc_rpc_plugin {
 class ResourceAllocationManager;
 class InteriorDataCache;
 class InteriorDataManager;
+class RCCapabilitiesManager;
+class RCConsentManager;
 
 struct RCCommandParams {
   application_manager::ApplicationManager& application_manager_;
@@ -59,6 +61,8 @@ struct RCCommandParams {
   rc_rpc_plugin::ResourceAllocationManager& resource_allocation_manager_;
   rc_rpc_plugin::InteriorDataCache& interior_data_cache_;
   rc_rpc_plugin::InteriorDataManager& interior_data_manager_;
+  rc_rpc_plugin::RCCapabilitiesManager& rc_capabilities_manager_;
+  rc_rpc_plugin::RCConsentManager& rc_consent_manager_;
 };
 }  // namespace rc_rpc_plugin
 #endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_COMMANDS_RC_COMMAND_PARAMS_H_
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h
index b4e34c083e..6bca1017e0 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/commands/rc_command_request.h
@@ -37,6 +37,8 @@
 #include "rc_rpc_plugin/commands/rc_command_params.h"
 #include "rc_rpc_plugin/interior_data_cache.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
+#include "rc_rpc_plugin/rc_capabilities_manager.h"
+#include "rc_rpc_plugin/rc_consent_manager.h"
 #include "rc_rpc_plugin/resource_allocation_manager.h"
 
 namespace rc_rpc_plugin {
@@ -76,6 +78,8 @@ class RCCommandRequest : public app_mngr::commands::CommandRequestImpl {
   ResourceAllocationManager& resource_allocation_manager_;
   InteriorDataCache& interior_data_cache_;
   InteriorDataManager& interior_data_manager_;
+  RCCapabilitiesManager& rc_capabilities_manager_;
+  RCConsentManager& rc_consent_manager_;
   /**
    * @brief AcquireResource try to allocate resource for application
    * In case if allocation of resource is not required, return ALLOWED by
@@ -94,10 +98,13 @@ class RCCommandRequest : public app_mngr::commands::CommandRequestImpl {
    * This is default implementation which has to be redefined for RPCs which
    * need to manage the resources
    * @param module_type Resource name
+   * @param module_id Resource id
    * @return True if free, otherwise - false
    */
-  virtual bool IsResourceFree(const std::string& module_type) const {
+  virtual bool IsResourceFree(const std::string& module_type,
+                              const std::string& module_id) const {
     UNUSED(module_type);
+    UNUSED(module_id);
     return true;
   }
   /**
@@ -136,7 +143,24 @@ class RCCommandRequest : public app_mngr::commands::CommandRequestImpl {
     disallowed_info_ = info;
   }
 
-  virtual std::string ModuleType() = 0;
+  virtual std::string ModuleType() const = 0;
+
+  /**
+   * @brief Extracts ModuleId from command message. Each inherited class should
+   * implement its own functionality
+   *
+   * @return ModuleId as string.
+   */
+  virtual std::string ModuleId() const = 0;
+
+  /**
+   * @brief IsModuleIdProvided checks if moduleId parameter
+   * is provided in the hmi response
+   * @param hmi_response response from hmi
+   * @return true if provided, otherwise - false
+   */
+
+  bool IsModuleIdProvided(const smart_objects::SmartObject& hmi_response) const;
 
  private:
   /**
@@ -158,9 +182,38 @@ class RCCommandRequest : public app_mngr::commands::CommandRequestImpl {
   /**
    * @brief SendGetUserConsent sends consent request to HMI
    * @param module_type Resource name
+   * @param module_ids Array of module IDs of the module type that needed user
+   * consent for acquiring their resources
    */
-  void SendGetUserConsent(const std::string& module_type);
+  void SendGetUserConsent(const std::string& module_type,
+                          const smart_objects::SmartObject& module_ids);
+
   void ProcessAccessResponse(const app_mngr::event_engine::Event& event);
+
+  /**
+   * @brief Precesses consents result which has been received from HMI
+   * If module resource consented, resource state will be switched to state BUSY
+   * and called method Execute. Otherwise will be sent response to Mobile with
+   * result code REJECTED.
+   * @param is_allowed consent result
+   * @param module_type Module type
+   * @param module_id Module ID
+   * @param app_id Application, which has asked for module resource consent.
+   */
+  void ProcessConsentResult(const bool is_allowed,
+                            const std::string& module_type,
+                            const std::string& module_id,
+                            const uint32_t app_id);
+  /**
+   * @brief Processes ASK_DRIVE Mode. Tries to retrieve module consents from
+   * LastState. If consent is absent in LastState, will send
+   * GetInteriorVehicleDataConsent to HMI. Otherwise will start to process
+   * consent result.
+   * @param module_type Module type
+   * @param module_id Module ID
+   */
+  void ProcessAskDriverMode(const std::string& module_type,
+                            const std::string& module_id);
   bool IsInterfaceAvailable(
       const app_mngr::HmiInterfaces::InterfaceID interface) const;
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h
index c7dda761bf..dad37edd1b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache.h
@@ -37,8 +37,15 @@
 namespace rc_rpc_plugin {
 
 /**
+ * @brief ModuleUid uniquely identify a module
+ * moduleType + moduleID
+ */
+typedef std::pair<std::string, std::string> ModuleUid;
+
+/**
  * @brief The InteriorDataCache interface for caching data class
- * Provide ability to cache module data by module type name and clear cache
+ * Provide ability to cache module data by module type name and module id
+ * and clear cache
  */
 class InteriorDataCache {
  public:
@@ -49,32 +56,35 @@ class InteriorDataCache {
 
   /**
    * @brief Add module data to cache
-   * @param module_type module type name
+   * @param module module type + module id
    * @param module_data data to be cached
    */
-  virtual void Add(const std::string& module_type,
+  virtual void Add(const ModuleUid& module,
                    const smart_objects::SmartObject& module_data) = 0;
 
   /**
    * @brief Retrieve Get cached data
-   * @param module_type data type to get from cache
+   * @param module data type to get from cache
    * @return smart object with cached data, or nulll smart object
    */
   virtual smart_objects::SmartObject Retrieve(
+      const ModuleUid& module) const = 0;
+
+  virtual std::vector<ModuleUid> GetCachedModulesByType(
       const std::string& module_type) const = 0;
 
   /**
    * @brief Contains check if data exists in cache
-   * @param module_type module type name to check in cache
+   * @param module module name + module id to check in cache
    * @return true if cached, false otherwize
    */
-  virtual bool Contains(const std::string& module_type) const = 0;
+  virtual bool Contains(const ModuleUid& module) const = 0;
 
   /**
    * @brief Remove cached data
-   * @param module_type data type to remove from cache
+   * @param module data type to remove from cache
    */
-  virtual void Remove(const std::string& module_type) = 0;
+  virtual void Remove(const ModuleUid& module) = 0;
 
   /**
    * @brief Clear clear all cached data
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h
index b40ce4eb4b..d21b0e4162 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_cache_impl.h
@@ -46,16 +46,19 @@ class InteriorDataCacheImpl : public InteriorDataCache {
 
   ~InteriorDataCacheImpl();
 
-  void Add(const std::string& module_type,
+  void Add(const ModuleUid& module,
            const smart_objects::SmartObject& module_data) OVERRIDE;
-  smart_objects::SmartObject Retrieve(
+  smart_objects::SmartObject Retrieve(const ModuleUid& module) const OVERRIDE;
+
+  std::vector<ModuleUid> GetCachedModulesByType(
       const std::string& module_type) const OVERRIDE;
-  bool Contains(const std::string& module_type) const OVERRIDE;
-  void Remove(const std::string& module_type) OVERRIDE;
+
+  bool Contains(const ModuleUid& module) const OVERRIDE;
+  void Remove(const ModuleUid& module) OVERRIDE;
   void Clear() OVERRIDE;
 
  private:
-  std::map<std::string, smart_objects::SmartObject> cached_data_;
+  std::map<ModuleUid, smart_objects::SmartObject> cached_data_;
   mutable sync_primitives::Lock cached_data_lock_;
 };
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h
index 157e031869..c1fe30fa4d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager.h
@@ -41,8 +41,15 @@ namespace rc_rpc_plugin {
 namespace app_mngr = application_manager;
 namespace plugins = application_manager::plugin_manager;
 
+/**
+ * @brief ModuleUid uniquely identify a module
+ * moduleType + moduleID
+ */
+typedef std::pair<std::string, std::string> ModuleUid;
+
 class InteriorDataManager {
  public:
+  virtual ~InteriorDataManager() {}
   /**
    * @brief OnPolicyEvent Processes policy related events
    * @param event Policy event
@@ -67,18 +74,19 @@ class InteriorDataManager {
   /**
    * @brief StoreRequestToHMITime save information and time stamp of
    * current interior data subscriptions
+   * @param module Module resource (module_type + module_id)
    */
-  virtual void StoreRequestToHMITime(const std::string& module_type) = 0;
+  virtual void StoreRequestToHMITime(const ModuleUid& module) = 0;
 
   /**
    * @brief CheckRequestsToHMIFrequency check that rate limits are not allowed
    * of bounce during current time frame. calculate amount of requests per
-   * module type in time frame and checks if it bigger then allowed by ini file
-   * @param module_type moduletype to calculate frequency on
+   * module in time frame and checks if it bigger then allowed by ini file
+   * @param module module to calculate frequency on
    * @return true if amount of requests was not exceeded, otherwise return
    * false.
    */
-  virtual bool CheckRequestsToHMIFrequency(const std::string& module_type) = 0;
+  virtual bool CheckRequestsToHMIFrequency(const ModuleUid& module) = 0;
 };
 
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h
index b98ba596fb..791016cdcd 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/interior_data_manager_impl.h
@@ -61,9 +61,9 @@ class InteriorDataManagerImpl : public InteriorDataManager {
 
   void OnDisablingRC() OVERRIDE;
 
-  void StoreRequestToHMITime(const std::string& module_type) OVERRIDE;
+  void StoreRequestToHMITime(const ModuleUid& module) OVERRIDE;
 
-  bool CheckRequestsToHMIFrequency(const std::string& module_type) OVERRIDE;
+  bool CheckRequestsToHMIFrequency(const ModuleUid& module) OVERRIDE;
 
  private:
   /**
@@ -83,18 +83,20 @@ class InteriorDataManagerImpl : public InteriorDataManager {
       application_manager::Application& app);
 
   /**
-   * @brief UnsubscribeFromInteriorVehicleData remove module_type from cache and
+   * @brief UnsubscribeFromInteriorVehicleData remove module from cache and
    * send RC.GetInteriorVehicleData(subscribe=false) to HMI
-   * @param module_type module type that need to be unsubscribed
+   * @param module module that needs to be unsubscribed
    */
-  void UnsubscribeFromInteriorVehicleData(const std::string& module_type);
+  void UnsubscribeFromInteriorVehicleData(const ModuleUid& module);
+
+  void UnsubscribeFromInteriorVehicleDataOfType(const std::string& module_type);
 
   void ClearOldRequestsToHMIHistory();
   /**
    * @brief AppsModules mapping from applications to list of modules
    */
   typedef std::map<application_manager::ApplicationSharedPtr,
-                   std::vector<std::string> >
+                   std::vector<ModuleUid> >
       AppsModules;
 
   /**
@@ -104,11 +106,16 @@ class InteriorDataManagerImpl : public InteriorDataManager {
    */
   AppsModules AppsSubscribedModules();
 
+  typedef std::map<application_manager::ApplicationSharedPtr,
+                   std::vector<std::string> >
+      AppsModuleTypes;
+  AppsModuleTypes AppsSubscribedModuleTypes();
+
   /**
    * @brief RequestsToHMIHistory mapping from module type to vector of time
    * stamps
    */
-  typedef std::map<std::string, std::deque<date_time::TimeDuration> >
+  typedef std::map<ModuleUid, std::deque<date_time::TimeDuration> >
       RequestsToHMIHistory;
   RequestsToHMIHistory requests_to_hmi_history_;
   mutable sync_primitives::Lock requests_to_hmi_history_lock_;
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h
index 36fe9f5bdb..33271e64fd 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_app_extension.h
@@ -40,6 +40,103 @@
 #include "utils/macro.h"
 
 namespace rc_rpc_plugin {
+
+typedef std::pair<std::string, std::string> ModuleUid;
+
+struct Grid {
+  int32_t col_;
+  int32_t row_;
+  int32_t level_;
+  int32_t colspan_;
+  int32_t rowspan_;
+  int32_t levelspan_;
+
+  Grid()
+      : col_(0), row_(0), level_(0), colspan_(0), rowspan_(0), levelspan_(0) {}
+
+  Grid(int32_t col,
+       int32_t row,
+       int32_t level,
+       int32_t colspan,
+       int32_t rowspan,
+       int32_t levelspan)
+      : col_(col)
+      , row_(row)
+      , level_(level)
+      , colspan_(colspan)
+      , rowspan_(rowspan)
+      , levelspan_(levelspan) {}
+
+  Grid& operator=(const Grid& grid) {
+    col_ = grid.col_;
+    row_ = grid.row_;
+    level_ = grid.level_;
+    colspan_ = grid.colspan_;
+    rowspan_ = grid.rowspan_;
+    levelspan_ = grid.levelspan_;
+
+    return *this;
+  }
+
+  bool operator==(const Grid& grid) const {
+    return col_ == grid.col_ && row_ == grid.row_ && level_ == grid.level_ &&
+           colspan_ == grid.colspan_ && rowspan_ == grid.rowspan_ &&
+           levelspan_ == grid.levelspan_;
+  }
+
+  /**
+   * @brief LevelIntersectionExists checks if the grids have an
+   * intersection by levels.
+   * @param grid with which to check intersection
+   * @return true if intersection exists, otherwise - false
+   */
+  bool LevelIntersectionExists(const Grid& grid) const {
+    const int32_t top_level = (level_ + levelspan_) - 1;
+    const int32_t grid_top_level = (grid.level_ + grid.levelspan_) - 1;
+
+    const int32_t min_level = std::max(level_, grid.level_);
+    const int32_t max_level = std::min(top_level, grid_top_level);
+    if ((max_level - min_level) < 0) {
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * @brief IntersectionExists checks if the grids have an
+   * intersection. Grid can be represented by its bottom-left
+   * and top-right coordinates like a rectangle. First, the
+   * coordinates of the intersection are calculated, then checked
+   * that the rectangle which is formed by the intersections of two
+   * grids has non-zero width and height.
+   * @param grid with which to check intersection
+   * @return true if intersection exists, otherwise - false
+   */
+  bool IntersectionExists(const Grid& grid) const {
+    if (!LevelIntersectionExists(grid)) {
+      return false;
+    }
+
+    const int32_t right_top_col = (col_ + colspan_) - 1;
+    const int32_t right_top_row = (row_ + rowspan_) - 1;
+    const int32_t grid_right_top_col = (grid.col_ + grid.colspan_) - 1;
+    const int32_t grid_right_top_row = (grid.row_ + grid.rowspan_) - 1;
+
+    const int32_t left = std::max(col_, grid.col_);
+    const int32_t bottom = std::max(row_, grid.row_);
+    const int32_t right = std::min(right_top_col, grid_right_top_col);
+    const int32_t top = std::min(right_top_row, grid_right_top_row);
+
+    const int32_t width = right - left;
+    const int32_t height = top - bottom;
+
+    if ((width < 0) || (height < 0)) {
+      return false;
+    }
+    return true;
+  }
+};
+
 class RCAppExtension : public application_manager::AppExtension {
  public:
   explicit RCAppExtension(application_manager::AppExtensionUID uid);
@@ -49,13 +146,15 @@ class RCAppExtension : public application_manager::AppExtension {
    * @brief Subscribe to OnInteriorVehicleDataNotification
    * @param module interior data specification(zone, data type)
    */
-  void SubscribeToInteriorVehicleData(const std::string& module_type);
+  void SubscribeToInteriorVehicleData(const ModuleUid& module);
 
   /**
    * @brief Unsubscribe from OnInteriorVehicleDataNotification
    * @param module interior data specification(zone, data type)
    */
-  void UnsubscribeFromInteriorVehicleData(const std::string& module_type);
+  void UnsubscribeFromInteriorVehicleData(const ModuleUid& module);
+
+  void UnsubscribeFromInteriorVehicleDataOfType(const std::string& module_type);
 
   /**
    * @brief UnsubscribeFromInteriorVehicleData removes all subscriptions for
@@ -67,16 +166,40 @@ class RCAppExtension : public application_manager::AppExtension {
    * @brief Check if application subscribed to OnInteriorVehicleDataNotification
    * @param module interior data specification(zone, data type)
    */
-  bool IsSubscibedToInteriorVehicleData(const std::string& module_type);
+  bool IsSubscribedToInteriorVehicleData(const ModuleUid& module);
+
+  bool IsSubscribedToInteriorVehicleDataOfType(const std::string& module_type);
 
   /**
    * @brief get list of subscriptions of application
    * @return list of subscriptions of application
    */
-  std::set<std::string> InteriorVehicleDataSubscriptions() const;
+  std::set<ModuleUid> InteriorVehicleDataSubscriptions() const;
+
+  /**
+   * @brief GetUserLocation
+   * @return grid of user location
+   */
+  Grid GetUserLocation() const;
+
+  /**
+   * @brief SetUserLocation sets user location
+   * from object to the grid
+   * @param user_location smart object for user_location
+   */
+  void SetUserLocation(
+      const ns_smart_device_link::ns_smart_objects::SmartObject& user_location);
+
+  /**
+   * @brief SetUserLocation sets user location from grid
+   * @param grid grid of user_location
+   */
+  void SetUserLocation(const Grid& grid);
 
  private:
-  std::set<std::string> subscribed_interior_vehicle_data_;
+  std::set<ModuleUid> subscribed_interior_vehicle_data_;
+
+  Grid user_location_;
 
   // AppExtension interface
  public:
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager.h
new file mode 100644
index 0000000000..36fd8bbbf9
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager.h
@@ -0,0 +1,184 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_CAPABILITIES_MANAGER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_CAPABILITIES_MANAGER_H_
+#include "application_manager/application_manager.h"
+#include "rc_rpc_plugin/resource_allocation_manager.h"
+
+namespace rc_rpc_plugin {
+
+enum capabilitiesStatus { success, missedLightName, missedParam, readOnly };
+typedef std::pair<std::string, capabilitiesStatus> ModuleTypeCapability;
+
+class RCCapabilitiesManager {
+ public:
+  /**
+   * @brief CheckIfButtonExistInRCCaps checks if the
+   * specified button exists in rc_capabilities
+   * @param button button name
+   * @return true if present, otherwise - false
+   */
+  virtual bool CheckIfButtonExistInRCCaps(
+      const mobile_apis::ButtonName::eType button) const = 0;
+
+  /**
+   * @brief CheckButtonName checks if the button
+   * corresponds to the module_type
+   * @param module_type resource name
+   * @param button_name button name
+   * @return true if they match, otherwise - false
+   */
+  virtual bool CheckButtonName(const std::string& module_type,
+                               const std::string& button_name) const = 0;
+
+  /**
+   * @brief CheckIfModuleExistsInCapabilities checks
+   * if the specified module exists in rc_capabilities
+   * @param module moduleType + moduleId
+   * @return true if exists, otherwise - false
+   */
+  virtual bool CheckIfModuleExistsInCapabilities(
+      const ModuleUid& module) const = 0;
+
+  /**
+   * @brief GetModuleDataCapabilities checks whether rc module data
+   * capabilities are presented
+   * @param module_data smart object of module_data
+   * @param module_id module id
+   * @return pair of state and capability status - ModuleCapability
+   */
+  virtual ModuleTypeCapability GetModuleDataCapabilities(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_id) const = 0;
+
+  /**
+   * @brief ControlData retrieves control data
+   * for specified module type
+   * @param module_data smart object of module_data
+   * @param module_type resource name
+   * @return smart object of control data
+   */
+  virtual const smart_objects::SmartObject& ControlDataForType(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_type) const = 0;
+
+  /**
+   * @brief AreReadOnlyParamsPresent checks if there are
+   * any read only params in the module data
+   * @param module_data smart object of module_data
+   * @param module_type resource name
+   * @param module_data_capabilities smart object of capabilities
+   * @return true if read only params exist, otherwise - false
+   */
+  virtual bool AreReadOnlyParamsPresent(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_type,
+      ModuleTypeCapability& module_data_capabilities) const = 0;
+
+  /**
+   * @brief AreAllParamsReadOnly checks that all params from module
+   * data are read only
+   * @param module_data smart object of module_data
+   * @param module_type resource name
+   * @return true if all params are read only, otherwise - false
+   */
+  virtual bool AreAllParamsReadOnly(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_type) const = 0;
+
+  /**
+   * @brief GetDefaultModuleIdFromCapabilities returns the moduleId
+   * from the first item published by xyz-ControlCapabilities
+   * @param module_type resource name
+   * @return default module id from HMI capabilities
+   */
+  virtual const std::string GetDefaultModuleIdFromCapabilities(
+      const std::string& module_type) const = 0;
+
+  /**
+   * @brief GetResources get list of ModuleUids(moduleType + moduleId)
+   * of all known resources
+   * @return vector contains all known moduleUids
+   */
+  virtual const std::vector<ModuleUid> GetResources() const = 0;
+
+  /**
+   * @brief GetModuleServiceArea retrieves service area of module,
+   * if module serviceArea is missed in capabilities, serviceArea is
+   * assumed to be the same as location, if location
+   * is missed in capabilities, it is assumed that serviceArea covers
+   * the whole area of vehicle
+   * @param module module type + module id
+   * @return Grid of module service area
+   */
+  virtual Grid GetModuleServiceArea(const ModuleUid& module) const = 0;
+
+  /**
+   * @brief IsMultipleAccessAllowed checks if multiple access allowed
+   * for requested module
+   * @param module module type + module id
+   * @return true if allowed, otherwise - false
+   */
+  virtual bool IsMultipleAccessAllowed(const ModuleUid& module) const = 0;
+
+  /**
+   * @brief GetDriverLocationFromSeatLocationCapability retrieves the driver's
+   * location from seat location capabilities
+   * @return Grid of driver's location
+   */
+  virtual const Grid GetDriverLocationFromSeatLocationCapability() const = 0;
+
+  /**
+   * @brief IsSeatLocationCapabilityProvided checks whether all necessary
+   * parameters are provided in seat location capabilities
+   * @return true if provided, otherwise - false
+   */
+  virtual bool IsSeatLocationCapabilityProvided() const = 0;
+
+  /**
+   * @brief GetModuleIdForSeatLocation returns the moduleId if request from
+   * mobile contains the id parameter and doesn't contain the moduleId
+   * parameter. If the vehicle support at least one seat control, seat control
+   * capability includes at least two items. SupportedSeat id shall be converted
+   * to the moduleId according to capabilities: 1st item from capabilities for
+   * driver’s seat. 2nd item for front passenger’s seat.
+   * @param id supported seat id
+   */
+  virtual const std::string GetModuleIdForSeatLocation(
+      mobile_apis::SupportedSeat::eType id) const = 0;
+
+  virtual ~RCCapabilitiesManager() {}
+};
+
+}  // namespace rc_rpc_plugin
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_CAPABILITIES_MANAGER_H_
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h
new file mode 100644
index 0000000000..844647940f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h
@@ -0,0 +1,200 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_CAPABILITIES_MANAGER_IMPL_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_CAPABILITIES_MANAGER_IMPL_H_
+#include "application_manager/application_manager.h"
+#include "rc_rpc_plugin/rc_capabilities_manager.h"
+
+namespace rc_rpc_plugin {
+class RCCapabilitiesManagerImpl : public RCCapabilitiesManager {
+ public:
+  RCCapabilitiesManagerImpl(
+      application_manager::HMICapabilities& hmi_capabilities);
+
+  bool CheckIfButtonExistInRCCaps(
+      const mobile_apis::ButtonName::eType button) const FINAL;
+
+  bool CheckButtonName(const std::string& module_type,
+                       const std::string& button_name) const FINAL;
+
+  bool CheckIfModuleExistsInCapabilities(const ModuleUid& module) const FINAL;
+
+  ModuleTypeCapability GetModuleDataCapabilities(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_id) const FINAL;
+
+  const smart_objects::SmartObject& ControlDataForType(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_type) const FINAL;
+
+  bool AreReadOnlyParamsPresent(
+      const smart_objects::SmartObject& module_data,
+      const std::string& module_type,
+      ModuleTypeCapability& module_data_capabilities) const FINAL;
+
+  bool AreAllParamsReadOnly(const smart_objects::SmartObject& module_data,
+                            const std::string& module_type) const FINAL;
+
+  const std::string GetDefaultModuleIdFromCapabilities(
+      const std::string& module_type) const FINAL;
+
+  const std::vector<ModuleUid> GetResources() const FINAL;
+
+  Grid GetModuleServiceArea(const ModuleUid& module) const FINAL;
+
+  bool IsMultipleAccessAllowed(const ModuleUid& module) const FINAL;
+
+  const Grid GetDriverLocationFromSeatLocationCapability() const FINAL;
+
+  bool IsSeatLocationCapabilityProvided() const FINAL;
+
+  const std::string GetModuleIdForSeatLocation(
+      mobile_apis::SupportedSeat::eType id) const FINAL;
+
+ private:
+  const std::map<std::string, std::string> GetLightCapabilitiesMapping() const;
+
+  const std::map<std::string, std::string> GetModuleDataToCapabilitiesMapping()
+      const;
+
+  /**
+   * @brief Check whether the exists light data related to correspondent
+   * capabilities
+   * @param capabilities smart object of capabilities
+   * @param control_data smart object of control_data
+   * @return pair of state and capability status - ModuleTypeCapability
+   */
+  ModuleTypeCapability GetControlDataCapabilities(
+      const smart_objects::SmartObject& capabilities,
+      const smart_objects::SmartObject& control_data) const;
+
+  /**
+   * @brief Check whether the parameter exist in capabilities
+   * @param capabilities smart object of capabilities
+   * @param mapping - map of module data and capabilities
+   * @param request_parameter - string
+   * @param switched_off_result - ref of mobile_apis::Result
+   * @return success if the parameter exists in capabilities,
+   * otherwise - missedParam
+   */
+  capabilitiesStatus GetItemCapability(
+      const smart_objects::SmartObject& capabilities,
+      const std::map<std::string, std::string>& mapping,
+      const std::string& request_parameter,
+      const mobile_apis::Result::eType& switched_off_result) const;
+
+  /**
+   * @brief Check whether the capabilities for light are allowed
+   * @param capabilities smart object of capabilities
+   * @param control_data smart object of control_data
+   * @return pair of state and capability status - ModuleTypeCapability
+   */
+  ModuleTypeCapability GetLightDataCapabilities(
+      const smart_objects::SmartObject& capabilities,
+      const smart_objects::SmartObject& control_data) const;
+
+  /**
+   * @brief Check whether the light name exists in capabilities
+   * @param capabilities_status smart object of capabilities_status
+   * @param light_data smart object of light_data
+   * @return pair of state and capability status - ModuleTypeCapability
+   */
+  ModuleTypeCapability GetLightNameCapabilities(
+      const smart_objects::SmartObject& capabilities_status,
+      const smart_objects::SmartObject& light_data) const;
+
+  ModuleTypeCapability GetRadioBandByCapabilities(
+      const smart_objects::SmartObject& capabilities_status,
+      const smart_objects::SmartObject& request_parameter) const;
+
+  bool CheckReadOnlyParamsForAudio(
+      const smart_objects::SmartObject& module_type_params) const;
+
+  bool CheckReadOnlyParamsForLight(
+      const smart_objects::SmartObject& module_type_params) const;
+
+  smart_objects::SmartObject GetCapabilitiesByModuleIdFromArray(
+      const smart_objects::SmartObject& module_data_capabilities,
+      const std::string& module_id) const;
+
+  const bool CheckModuleIdWithCapabilities(
+      const smart_objects::SmartObject& rc_capabilities,
+      const ModuleUid& module) const;
+
+  const bool CheckModuleIdWithCapabilitiesArrays(
+      const smart_objects::SmartObject& control_capabilities,
+      const std::string& module_id) const;
+
+  const bool CheckModuleIdWithCapabilitiesStructure(
+      const smart_objects::SmartObject& control_capabilities,
+      const std::string& module_id) const;
+
+  const std::string GetDefaultModuleIdFromCapabilitiesStructure(
+      const smart_objects::SmartObject& control_capabilities,
+      const std::string& module_type) const;
+
+  const std::string GetDefaultModuleIdFromCapabilitiesArray(
+      const smart_objects::SmartObject& control_capabilities,
+      const std::string& module_type) const;
+
+  const std::vector<std::string> GetCapabilitiesList() const;
+
+  const std::function<std::string(const std::string& control_cap)>
+  GetCapabilitiesToModuleTypeMapping() const;
+
+  void GetResourcesFromCapabilitiesStructure(
+      const smart_objects::SmartObject& control_capabilities,
+      const std::string& capabitity_key,
+      std::vector<ModuleUid>& out_resources) const;
+
+  void GetResourcesFromCapabilitiesArray(
+      const smart_objects::SmartObject& control_capabilities,
+      const std::string& capability_key,
+      std::vector<ModuleUid>& out_resources) const;
+
+  Grid GetModuleServiceAreaFromControlCapability(
+      const smart_objects::SmartObject& control_capabilities) const;
+
+  Grid GetModuleLocationFromControlCapability(
+      const smart_objects::SmartObject& control_capabilities) const;
+
+  bool IsMultipleAccessAllowedInControlCaps(
+      const smart_objects::SmartObject& control_capabilities) const;
+
+  Grid GetWholeVehicleArea() const;
+
+  application_manager::HMICapabilities& hmi_capabilities_;
+};
+
+}  // namespace rc_rpc_plugin
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_CAPABILITIES_MANAGER_IMPL_H_
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager.h
new file mode 100644
index 0000000000..c8b99cc724
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_CONSENT_MANAGER_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_CONSENT_MANAGER_H
+
+#include <string>
+
+#include "rc_rpc_types.h"
+
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
+class SmartObject;
+}  // namespace ns_smart_objects
+}  // namespace ns_smart_device_link
+
+namespace rc_rpc_plugin {
+
+class RCConsentManager {
+ public:
+  /**
+   * @brief Saves consents (is_consented + date_of_consent) for module resources
+   * (module_type + module_id) for specified application
+   * @param policy_app_id Application id which module consents should be saved
+   * @param mac_address Device mac address
+   * @param module_consents - Module resources consents
+   */
+  virtual void SaveModuleConsents(
+      const std::string& policy_app_id,
+      const std::string& mac_address,
+      const rc_rpc_types::ModuleIdConsentVector& module_consents) = 0;
+
+  /**
+   * @brief Retrieves saved consent for specified module resource (module_type
+   * + module_id)
+   * @param app_id Application which related to specified module resource
+   * @param mac_address Device mac address
+   * @param module_id Module resource (module_type + module_id)
+   * @return Module consent state
+   */
+  virtual rc_rpc_plugin::rc_rpc_types::ModuleConsent GetModuleConsent(
+      const std::string& app_id,
+      const std::string& mac_address,
+      const rc_rpc_types::ModuleUid& module_id) = 0;
+
+  /**
+   * @brief Remove modules consents from LastState if they exist
+   */
+  virtual void RemoveAllConsents() = 0;
+
+  /**
+   * @brief Remove all expired module consents from LastState
+   * if they exist
+   */
+  virtual void RemoveExpiredConsents() = 0;
+
+  virtual ~RCConsentManager() {}
+};
+
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_CONSENT_MANAGER_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h
new file mode 100644
index 0000000000..5cbc4b977e
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_consent_manager_impl.h
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_CONSENT_MANAGER_IMPL_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_CONSENT_MANAGER_IMPL_H
+
+#include "rc_consent_manager.h"
+#include "resumption/last_state_wrapper.h"
+#include "utils/lock.h"
+
+namespace Json {
+class Value;
+}  // namespace Json
+
+namespace rc_rpc_plugin {
+
+class RCConsentManagerImpl : public RCConsentManager {
+ public:
+  RCConsentManagerImpl(
+      resumption::LastStateWrapperPtr last_state,
+      application_manager::ApplicationManager& application_manager,
+      const uint32_t period_of_consent_expired);
+
+  DEPRECATED
+  RCConsentManagerImpl(
+      resumption::LastState& last_state,
+      application_manager::ApplicationManager& application_manager,
+      const uint32_t period_of_consent_expired);
+
+  void SaveModuleConsents(
+      const std::string& policy_app_id,
+      const std::string& mac_address,
+      const rc_rpc_types::ModuleIdConsentVector& module_consents) OVERRIDE;
+
+  rc_rpc_types::ModuleConsent GetModuleConsent(
+      const std::string& app_id,
+      const std::string& mac_address,
+      const rc_rpc_types::ModuleUid& module_id) OVERRIDE;
+
+  void RemoveExpiredConsents() OVERRIDE;
+
+  void RemoveAllConsents() OVERRIDE;
+
+  ~RCConsentManagerImpl() OVERRIDE;
+
+ private:
+  /**
+   * @brief Saves module consents for specified application
+   * @param app_module_consents Application consents for which new
+   * consents should be added or existing ones should be overwritten
+   * @param consent_to_save module consents which should be saved
+   */
+  void SaveAppModuleConsent(
+      Json::Value& app_module_consents,
+      const rc_rpc_types::ModuleIdConsent& consent_to_save);
+
+  /**
+   * @brief Checks if module consent is expired
+   * @param module_consent Module consent
+   * @return ModuleConsentState
+   */
+  rc_rpc_types::ModuleConsentState CheckModuleConsentState(
+      const Json::Value& module_consent) const;
+
+  /**
+   * @brief Removes devices expired consents
+   * @param device Device section in AppConsensts section of LastState in Json
+   */
+  void RemoveDeviceExpiredConsents(Json::Value& device);
+
+  /**
+   * @brief Remove expired module consents which are related to specified
+   * application
+   * @param app_consents Application consents
+   */
+  void RemoveAppExpiredConsents(Json::Value& app_consents);
+
+  /**
+   * @brief Remove expired module consents which are related to specified
+   * module type
+   * @param module_consents Module consents wich should be checked for expired
+   * consents
+   */
+  void RemoveModuleExpiredConsents(Json::Value& module_consents);
+
+  /**
+   * @brief Get Remote Control section of LastState.
+   * In case the section is absent, will be appended a new empty section.
+   * @return Remote Control section of LastState in Json
+   */
+  Json::Value& GetRemoteControlDataOrAppend(Json::Value& last_state_data);
+
+  /**
+   * @brief Gets Device applications section for specified device mac adress
+   * In case the section is absent, will be appended a new empty section.
+   * @param mac_aress Device MAC adress
+   * @return Device applications section of LastState in Json
+   */
+  Json::Value& GetDeviceApplicationsOrAppend(const std::string& mac_address,
+                                             Json::Value& last_state_data);
+
+  /**
+   * @brief Get AppConsentsList section of LastState for specified application.
+   * In case the consent list is absent, will be appended a new empty section.
+   * @param policy_app_id Application policy ID
+   * @param mac_address Device MAC address
+   * @return AppConsentsList of LastState in Json
+   */
+  Json::Value& GetAppConsentsListOrAppend(const std::string& policy_app_id,
+                                          const std::string& mac_address,
+                                          Json::Value& last_state_data);
+
+  /**
+   * @brief Get Application consents section of Remote Control section of
+   * LastState with all consents for all applications. In case if this section
+   * is absent, will be created a new empty section
+   * @return AppConsents section of RemoteControl section of LastState in Jason
+   */
+  Json::Value& GetAppsConsentsOrAppend(Json::Value& last_state_data);
+
+  /**
+   * @brief Get all module resource consents for specified application and
+   * module type. In case if section with specified module type consents is
+   * absent, will be created a new empty section
+   * @param policy_app_id Application id which contains specified module type
+   * @param mac_adress MAC address of mobile device that needs user consent for
+   * acquiring resource
+   * @param module_type Module type with consents
+   */
+  Json::Value& GetModuleTypeConsentsOrAppend(const std::string& policy_app_id,
+                                             const std::string& mac_address,
+                                             const std::string& module_type,
+                                             Json::Value& last_state_data);
+
+ private:
+  application_manager::ApplicationManager& app_manager_;
+  resumption::LastStateWrapperPtr last_state_;
+  const uint32_t period_of_consent_expired_;
+  mutable sync_primitives::Lock dictionary_control_lock_;
+  mutable sync_primitives::Lock remote_control_lock_;
+  mutable sync_primitives::Lock device_applications_lock_;
+  mutable sync_primitives::Lock applications_lock_;
+  mutable sync_primitives::Lock app_consents_lock_;
+  mutable sync_primitives::Lock module_consents_lock_;
+};
+
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_CONSENT_MANAGER_IMPL_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
index e85ab758ad..eed860fc7f 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_helpers.h
@@ -37,6 +37,7 @@
 #include <string>
 #include "application_manager/application.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
+#include "rc_rpc_plugin/rc_rpc_types.h"
 
 namespace rc_rpc_plugin {
 class RCRPCPlugin;
@@ -65,10 +66,10 @@ class RCHelpers {
   GetModuleTypeToCapabilitiesMapping();
 
   /**
-   * @brief GetModulesList get list of all known modules
-   * @return vector contains all known modules
+   * @brief GetModuleTypesList get list of all known module types
+   * @return vector contains all known module types
    */
-  static const std::vector<std::string> GetModulesList();
+  static const std::vector<std::string> GetModuleTypesList();
 
   /**
    * @brief GetRCExtension extract RC extension from application
@@ -80,7 +81,11 @@ class RCHelpers {
       application_manager::Application& app);
 
   static smart_objects::SmartObjectSPtr CreateUnsubscribeRequestToHMI(
-      const std::string& module_type, const uint32_t correlation_id);
+      const ModuleUid& module, const uint32_t correlation_id);
+
+  static std::vector<application_manager::ApplicationSharedPtr>
+  AppsSubscribedToModule(application_manager::ApplicationManager& app_mngr,
+                         const ModuleUid& module);
 
   static std::vector<application_manager::ApplicationSharedPtr>
   AppsSubscribedToModuleType(application_manager::ApplicationManager& app_mngr,
@@ -88,10 +93,51 @@ class RCHelpers {
 
   typedef std::map<application_manager::ApplicationSharedPtr,
                    std::vector<std::string> >
-      AppsModules;
-  static AppsModules GetApplicationsAllowedModules(
+      AppsModuleTypes;
+
+  static AppsModuleTypes GetApplicationsAllowedModuleTypes(
       application_manager::ApplicationManager& app_mngr);
 
+  typedef std::map<std::string, mobile_apis::ButtonName::eType> ButtonsMap;
+
+  static const std::vector<std::string> buttons_climate();
+
+  static const std::vector<std::string> buttons_radio();
+
+  static const ButtonsMap buttons_map();
+
+  static std::vector<std::string> GetModuleReadOnlyParams(
+      const std::string& module_type);
+
+  /**
+   * @brief Combines module ids and alloweds for these ids and fills vector with
+   * ModuleConsents
+   * @param module_type Module type as string
+   * @param module_ids Modules ids which needed consents from driver
+   * @param allowed Consents for modules
+   */
+  static rc_rpc_types::ModuleIdConsentVector FillModuleConsents(
+      const std::string& module_type,
+      const std::vector<std::string>& module_ids,
+      const std::vector<bool> allowed);
+
+  /**
+   * @brief Retrieves module ids from SmartObject.
+   * @param moduleIds Smartobject which contains collection of module ids
+   * @return Collection of module ids
+   */
+  static std::vector<std::string> RetrieveModuleIds(
+      const smart_objects::SmartObject& moduleIds);
+
+  /**
+   * @brief Retrieves module ids consents from SmartObject.
+   * @param moduleIds Smartobject which contains collection of module ids
+   * consents
+   * @return Collection of module ids consents.
+   */
+  static std::vector<bool> RetrieveModuleConsents(
+      const smart_objects::SmartObject& consents);
+
   /**
    * @brief RemoveRedundantGPSDataFromVIDataMsg removes redundant GPS data
    * params from interior vehicle data response message if one contains radio
@@ -100,6 +146,29 @@ class RCHelpers {
    */
   static void RemoveRedundantGPSDataFromIVDataMsg(
       smart_objects::SmartObject& msg_params);
+
+  /**
+   * @brief MergeModuleData all keys and values from first parameter and
+   * update and append keys and values from the second
+   * @param data1 - initial data
+   * @param data2 - updated data
+   * @return updated data1 with data2 keys and values
+   */
+  static smart_objects::SmartObject MergeModuleData(
+      const smart_objects::SmartObject& data1,
+      const smart_objects::SmartObject& data2);
+
+  /**
+   * @brief MergeArray merge two arrays if their elements contain an `id`
+   * parameter
+   * @param data1 - initial data
+   * @param data2 - updated data
+   * @return updated data1 with any values in data2 if the arrays can be merged,
+   * otherwise data2
+   */
+  static smart_objects::SmartObject MergeArray(
+      const smart_objects::SmartObject& data1,
+      const smart_objects::SmartObject& data2);
 };
 
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
index b9f922a1be..5ee2e0725c 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
@@ -46,10 +46,43 @@ const char khmiSettingsControlCapabilities[] = "hmiSettingsControlCapabilities";
 const char kseatControlCapabilities[] = "seatControlCapabilities";
 // RemoteControlCapabilities constants
 
-const char kRadioControlData[] = "radioControlData";
-const char kClimateControlData[] = "climateControlData";
+const char kServiceArea[] = "serviceArea";
+const char kLocation[] = "location";
+const char kCol[] = "col";
+const char kRow[] = "row";
+const char kLevel[] = "level";
+const char kColspan[] = "colspan";
+const char kRowspan[] = "rowspan";
+const char kLevelspan[] = "levelspan";
+
+// SeatLocationCapability constants
+const char kCols[] = "columns";
+const char kRows[] = "rows";
+const char kLevels[] = "levels";
+const char kSeats[] = "seats";
+const char kGrid[] = "grid";
+// SeatLocationCapability constants
+
+const char kAllowMultipleAccess[] = "allowMultipleAccess";
+
 const char kSupportedLights[] = "supportedLights";
 
+// ClimateControlCapabilities
+const char kFanSpeedAvailable[] = "fanSpeedAvailable";
+const char kCurrentTemperatureAvailable[] = "currentTemperatureAvailable";
+const char kDesiredTemperatureAvailable[] = "desiredTemperatureAvailable";
+const char kAcEnableAvailable[] = "acEnableAvailable";
+const char kCirculateAirEnableAvailable[] = "circulateAirEnableAvailable";
+const char kAutoModeEnableAvailable[] = "autoModeEnableAvailable";
+const char kDefrostZoneAvailable[] = "defrostZoneAvailable";
+const char kDualModeEnableAvailable[] = "dualModeEnableAvailable";
+const char kAcMaxEnableAvailable[] = "acMaxEnableAvailable";
+const char kVentilationModeAvailable[] = "ventilationModeAvailable";
+const char kHeatedSteeringWheelAvailable[] = "heatedSteeringWheelAvailable";
+const char kHeatedWindshieldAvailable[] = "heatedWindshieldAvailable";
+const char kHeatedMirrorsAvailable[] = "heatedMirrorsAvailable";
+const char kHeatedRearWindowAvailable[] = "heatedRearWindowAvailable";
+
 // LightControlCapabilities
 const char kName[] = "name";
 const char kStatusAvailable[] = "statusAvailable";
@@ -57,7 +90,50 @@ const char kDensityAvailable[] = "densityAvailable";
 const char kRGBColorSpaceAvailable[] = "rgbColorSpaceAvailable";
 
 // RadioControlCapabilities
+const char kRadioBandAvailable[] = "radioBandAvailable";
+const char kRadioFrequencyAvailable[] = "radioFrequencyAvailable";
+const char kRdsDataAvailable[] = "rdsDataAvailable";
+const char kAvailableHDsAvailable[] = "availableHDsAvailable";
+const char kHdRadioEnableAvailable[] = "hdRadioEnableAvailable";
+const char kSignalStrengthAvailable[] = "signalStrengthAvailable";
+const char kSignalChangeThresholdAvailable[] = "signalChangeThresholdAvailable";
+const char kRadioEnableAvailable[] = "radioEnableAvailable";
+const char kStateAvailable[] = "stateAvailable";
+const char kSisDataAvailable[] = "sisDataAvailable";
+
 const char kSiriusxmRadioAvailable[] = "siriusxmRadioAvailable";
+
+// SeatControlCapabilities
+const char kHeatingEnabledAvailable[] = "heatingEnabledAvailable";
+const char kCoolingEnabledAvailable[] = "coolingEnabledAvailable";
+const char kHeatingLevelAvailable[] = "heatingLevelAvailable";
+const char kCoolingLevelAvailable[] = "coolingLevelAvailable";
+const char kHorizontalPositionAvailable[] = "horizontalPositionAvailable";
+const char kVerticalPositionAvailable[] = "verticalPositionAvailable";
+const char kFrontVerticalPositionAvailable[] = "frontVerticalPositionAvailable";
+const char kBackVerticalPositionAvailable[] = "backVerticalPositionAvailable";
+const char kBackTiltAngleAvailable[] = "backTiltAngleAvailable";
+const char kHeadSupportHorizontalPositionAvailable[] =
+    "headSupportHorizontalPositionAvailable";
+const char kHeadSupportVerticalPositionAvailable[] =
+    "headSupportVerticalPositionAvailable";
+const char kMassageEnabledAvailable[] = "massageEnabledAvailable";
+const char kMassageModeAvailable[] = "massageModeAvailable";
+const char kMassageCushionFirmnessAvailable[] =
+    "massageCushionFirmnessAvailable";
+const char kMemoryAvailable[] = "memoryAvailable";
+
+// AudioControlCapabilities
+const char kSourceAvailable[] = "sourceAvailable";
+const char kKeepContextAvailable[] = "keepContextAvailable";
+const char kVolumeAvailable[] = "volumeAvailable";
+const char kEqualizerAvailable[] = "equalizerAvailable";
+
+// HmiSettingsCapabilities
+const char kDistanceUnitAvailable[] = "distanceUnitAvailable";
+const char kTemperatureUnitAvailable[] = "temperatureUnitAvailable";
+const char kDisplayModeUnitAvailable[] = "displayModeUnitAvailable";
+
 }  // namespace strings
 
 namespace result_codes {
@@ -106,6 +182,20 @@ namespace message_params {
 const char kName[] = "name";
 const char kId[] = "id";
 
+// RCConsentManager, ResumptionCtrl, GetInteriorVehicleDataConsent request
+const char kModuleId[] = "moduleId";
+const char kModuleInfo[] = "moduleInfo";
+const char kAppConsents[] = "appConsents";
+const char kAppConsentList[] = "appConsentsList";
+const char kConsent[] = "consent";
+const char kConsentDate[] = "consentDate";
+const char kModuleConsents[] = "moduleConsents";
+const char kAppId[] = "appId";
+const char kModuleIds[] = "moduleIds";
+const char kMacAddress[] = "macAddress";
+const char kApplications[] = "applications";
+// RCConsentManager, ResumptionCtrl, GetInteriorVehicleDataConsent request
+
 // SetInteriorVehicleData request
 const char kModuleData[] = "moduleData";
 // SetInteriorVehicleData request
@@ -153,6 +243,7 @@ const char kRdsData[] = "rdsData";
 const char kHdRadioEnable[] = "hdRadioEnable";
 const char kAvailableHDs[] = "availableHDs";
 const char kAvailableHdChannels[] = "availableHdChannels";
+const char kAvailableHdChannelsAvailable[] = "availableHdChannelsAvailable";
 const char kHdChannel[] = "hdChannel";
 const char kSignalStrength[] = "signalStrength";
 const char kSignalChangeThreshold[] = "signalChangeThreshold";
@@ -181,6 +272,23 @@ const char kClimateEnable[] = "climateEnable";
 const char kClimateEnableAvailable[] = "climateEnableAvailable";
 // ClimateControlData struct
 
+// SeatControlData
+const char kHeatingEnabled[] = "heatingEnabled";
+const char kCoolingEnabled[] = "coolingEnabled";
+const char kHeatingLevele[] = "heatingLevel";
+const char kCoolingLevel[] = "coolingLevel";
+const char kHorizontalPosition[] = "horizontalPosition";
+const char kVerticalPosition[] = "verticalPosition";
+const char kFrontVerticalPosition[] = "frontVerticalPosition";
+const char kBackVerticalPosition[] = "backVerticalPosition";
+const char kBackTiltAngle[] = "backTiltAngle";
+const char kHeadSupportHorizontalPosition[] = "headSupportHorizontalPosition";
+const char kHeadSupportVerticalPosition[] = "headSupportVerticalPosition";
+const char kMassageEnabled[] = "massageEnabled";
+const char kMassageMode[] = "massageMode";
+const char kMassageCushionFirmness[] = "massageCushionFirmness";
+const char kMemory[] = "memory";
+
 // LightControlData
 const char kLightState[] = "lightState";
 const char kLightStatus[] = "status";
@@ -189,10 +297,15 @@ const char kLightColor[] = "color";
 
 // AudioControlData
 const char kSource[] = "source";
+const char kVolume[] = "volume";
 const char kKeepContext[] = "keepContext";
 const char kEqualizerSettings[] = "equalizerSettings";
 const char kChannelName[] = "channelName";
 
+// HmiSettingsControlData
+const char kDistanceUnit[] = "distanceUnit";
+const char kDisplayMode[] = "displayMode";
+
 // ModuleData struct
 const char kRadioControlData[] = "radioControlData";
 const char kClimateControlData[] = "climateControlData";
@@ -206,6 +319,15 @@ const char kHMIAppID[] = "appID";
 const char kHmiLevel[] = "hmiLevel";
 const char kSysContext[] = "systemContext";
 const char kAudioState[] = "audioStreamingState";
+
+// Grid struct
+const char kCol[] = "col";
+const char kRow[] = "row";
+const char kLevel[] = "level";
+const char kColspan[] = "colspan";
+const char kRowspan[] = "rowspan";
+const char kLevelspan[] = "levelspan";
+
 }  //  namespace message_params
 
 namespace enums_value {
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h
index 303b31f857..e12bd88e58 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_plugin.h
@@ -39,6 +39,8 @@
 #include "application_manager/plugin_manager/rpc_plugin.h"
 #include "rc_rpc_plugin/interior_data_cache.h"
 #include "rc_rpc_plugin/interior_data_manager.h"
+#include "rc_rpc_plugin/rc_capabilities_manager.h"
+#include "rc_rpc_plugin/rc_consent_manager.h"
 #include "rc_rpc_plugin/resource_allocation_manager.h"
 
 namespace rc_rpc_plugin {
@@ -58,7 +60,15 @@ class RCRPCPlugin : public plugins::RPCPlugin {
   bool Init(app_mngr::ApplicationManager& app_manager,
             app_mngr::rpc_service::RPCService& rpc_service,
             app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler) OVERRIDE;
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastStateWrapperPtr last_state) OVERRIDE;
+
+  DEPRECATED
+  bool Init(app_mngr::ApplicationManager& app_manager,
+            app_mngr::rpc_service::RPCService& rpc_service,
+            app_mngr::HMICapabilities& hmi_capabilities,
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastState& last_state) OVERRIDE;
   /**
    * @param int32_t command id
    * @param CommandSource source
@@ -101,13 +111,16 @@ class RCRPCPlugin : public plugins::RPCPlugin {
  private:
   application_manager::rpc_service::RPCService* rpc_service_;
   application_manager::ApplicationManager* app_mngr_;
+  std::unique_ptr<rc_rpc_plugin::RCConsentManager> rc_consent_manager_;
   std::unique_ptr<application_manager::CommandFactory> command_factory_;
   std::unique_ptr<ResourceAllocationManager> resource_allocation_manager_;
   std::unique_ptr<InteriorDataCache> interior_data_cache_;
   std::unique_ptr<InteriorDataManager> interior_data_manager_;
+  std::unique_ptr<RCCapabilitiesManager> rc_capabilities_manager_;
 };
 }  // namespace rc_rpc_plugin
 
 extern "C" application_manager::plugin_manager::RPCPlugin* Create();
+extern "C" void Delete(application_manager::plugin_manager::RPCPlugin* data);
 
 #endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RC_RPC_PLUGIN_H_
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_types.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_types.h
new file mode 100644
index 0000000000..3698728aa6
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_rpc_types.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_TYPES_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_TYPES_H
+
+#include <ctime>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace resumption {
+class LastState;
+}  // namespace resumption
+
+namespace application_manager {
+class ApplicationManager;
+}  // namespace application_manager
+
+namespace rc_rpc_plugin {
+namespace rc_rpc_types {
+/**
+ * @brief Module resource (module_type(first) + module_id(second))
+ */
+typedef std::pair<std::string, std::string> ModuleUid;
+
+/**
+ * @brief Module consent enum.
+ */
+enum class ModuleConsent {
+  NOT_EXISTS = 0, /**< Consent is absent for specified module resource */
+  CONSENTED,      /**< Module resource is consented */
+  NOT_CONSENTED   /**< Module resource isn't consented */
+};
+
+enum class ModuleConsentState {
+  NOT_EXISTS = 0, /**< Consent is absent for specified module resource */
+  EXPIRED,        /**< Module resource is expired */
+  ACTIVE          /**< Module resource isn't expired */
+};
+
+/**
+ * @brief Module consent
+ * @param module_id - Module resource for consent
+ * @param consent - Is module resource consented by driver
+ * @param date_of_consent - Date, when module resource has been consented (in
+ * seconds [UNIX time])
+ */
+struct ModuleIdConsent {
+  ModuleUid module_id;
+  ModuleConsent consent;
+  std::time_t date_of_consent;
+};
+
+/**
+ * @brief ModuleIdConsent collection
+ */
+typedef std::vector<ModuleIdConsent> ModuleIdConsentVector;
+}  // namespace rc_rpc_types
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_TYPES_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h
index 6dfc794648..ee0bd11885 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h
@@ -69,55 +69,84 @@ enum eType { APP_REGISTRATION = 0, MODULE_ALLOCATION, RC_STATE_CHANGING };
 }  // namespace NotificationTrigger
 
 /**
+ * Defines result of releasing specified module type resource.
+ */
+namespace ResourceReleasedState {
+/**
+ * NOT_ALLOCATED Module's resource is not allocated
+ * IS_ALLOCATED Module's resource is already allocated by
+ * different application
+ * IS_RELEASED Module's resource is released.
+ */
+enum eType { NOT_ALLOCATED = 0, IS_ALLOCATED, IS_RELEASED };
+}  // namespace ResourceReleasedState
+
+/**
+ * @brief ModuleUid uniquely identify a module
+ * moduleType + moduleID
+ */
+typedef std::pair<std::string, std::string> ModuleUid;
+
+/**
  * @brief Resources defines list of resources
  */
-typedef std::vector<std::string> Resources;
+typedef std::vector<ModuleUid> Resources;
 
 class ResourceAllocationManager {
  public:
   /**
    * @brief AcquireResource acquires resource by application
    * @param module_type resource to acquire
+   * @param module_id uuid of a resource
    * @param app_id application that acquire resource
    * @return ALLOWED if resource acquired \
    *         IN_USE  if resource already acquired
    *         ASK_DRIVER if driver confirmation is required
    */
   virtual AcquireResult::eType AcquireResource(const std::string& module_type,
+                                               const std::string& module_id,
                                                const uint32_t app_id) = 0;
 
   /**
    * @brief SetResourceState changes resource state. Resource must be acquired
    * beforehand.
    * @param module_type Resource to change its state
+   * @param module_id uuid of a resource
    * @param app_id Application aquired resource before
    * @param state State to set for resource
    */
   virtual void SetResourceState(const std::string& module_type,
+                                const std::string& module_id,
                                 const uint32_t app_id,
                                 const ResourceState::eType state) = 0;
 
   /**
    * @brief IsResourceFree check resource state
    * @param module_type Resource name
+   * @param module_id uuid of a resource
    * @return True if free, otherwise - false
    */
-  virtual bool IsResourceFree(const std::string& module_type) const = 0;
+  virtual bool IsResourceFree(const std::string& module_type,
+                              const std::string& module_id) const = 0;
 
   /**
    * @brief AcquireResource forces acquiring resource by application
    * @param module_type resource to acquire
+   * @param module_id uuid of a resource
    * @param app_id application that acquire resource
    */
   virtual void ForceAcquireResource(const std::string& module_type,
+                                    const std::string& module_id,
                                     const uint32_t app_id) = 0;
 
   /**
    * @brief OnDriverDisallowed callback for rejecting acquiring resource
    * @param module_type resource type
+   * @param module_id uuid of a resource
    * @param app_id application id
    */
   virtual void OnDriverDisallowed(const std::string& module_type,
+                                  const std::string& module_id,
                                   const uint32_t app_id) = 0;
 
   /**
@@ -171,6 +200,42 @@ class ResourceAllocationManager {
 
   virtual void set_rc_enabled(const bool value) = 0;
 
+  /**
+   * @brief ReleaseResource Releases resource acquired by application
+   * @param module_type Module name
+   * @param module_id uuid of a module
+   * @param application_id Application id
+   */
+  virtual ResourceReleasedState::eType ReleaseResource(
+      const std::string& module_type,
+      const std::string& module_id,
+      const uint32_t application_id) = 0;
+
+  /**
+   * @brief SetResourceAquired mark resourse as aquired and process logic of
+   * changing state of aquired resources
+   * @param module_type resource name
+   * @param module_id uuid of a resource
+   * @param app applicastion that aquire resource
+   */
+  virtual void SetResourceAcquired(const std::string& module_type,
+                                   const std::string& module_id,
+                                   const uint32_t app_id) = 0;
+
+  /**
+   * @brief Checks if specific resource is already aquired by specific
+   * application
+   * @param moduleUid Module resurce (module type + module ID)
+   * @param app_id Application ID which try to aquire resource
+   * @return true In case when resource is already aquired by specific
+   * application
+   * @return false In case when isn't aquired by specific
+   * application
+   */
+  virtual bool IsResourceAlreadyAcquiredByApp(
+      const rc_rpc_plugin::ModuleUid& moduleUid,
+      const uint32_t app_id) const = 0;
+
   virtual ~ResourceAllocationManager() {}
 };
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
index c0ef971235..0fd5449912 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager_impl.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_INCLUDE_RC_RPC_PLUGIN_RESOURCE_ALLOCATION_MANAGER_IMPL_H_
 #include "application_manager/application_impl.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
+#include "rc_rpc_plugin/rc_capabilities_manager.h"
 #include "rc_rpc_plugin/resource_allocation_manager.h"
 #include "utils/lock.h"
 #include "utils/macro.h"
@@ -46,43 +47,52 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
  public:
   ResourceAllocationManagerImpl(
       application_manager::ApplicationManager& app_mngr,
-      application_manager::rpc_service::RPCService& rpc_service);
+      application_manager::rpc_service::RPCService& rpc_service,
+      rc_rpc_plugin::RCCapabilitiesManager& rc_capabilities_manager);
 
   ~ResourceAllocationManagerImpl();
 
   /**
    * @brief AcquireResource forces acquiring resource by application
    * @param module_type resource to acquire
+   * @param module_id uuid of a resource
    * @param app_id application that acquire resourc
    * @return result of acauiring resources
    */
   AcquireResult::eType AcquireResource(const std::string& module_type,
+                                       const std::string& module_id,
                                        const uint32_t app_id) OVERRIDE FINAL;
   /**
    * @brief ForceAcquireResource forces acquiring resource by application
    * @param module_type resource to acquire
+   * @param module_id uuid of a resource
    * @param app_id application that acquire resource
    */
   void ForceAcquireResource(const std::string& module_type,
+                            const std::string& module_id,
                             const uint32_t app_id) FINAL;
 
   /**
    * @brief SetResourceState changes resource state. Resource must be acquired
    * beforehand.
    * @param module_type Resource to change its state
+   * @param module_id uuid of a resource
    * @param app_id Application aquired resource before
    * @param state State to set for resource
    */
   void SetResourceState(const std::string& module_type,
+                        const std::string& module_id,
                         const uint32_t app_id,
                         const ResourceState::eType state) FINAL;
 
   /**
    * @brief IsResourceFree check resource state
    * @param module_type Resource name
+   * @param module_id uuid of a resource
    * @return True if free, otherwise - false
    */
-  bool IsResourceFree(const std::string& module_type) const FINAL;
+  bool IsResourceFree(const std::string& module_type,
+                      const std::string& module_id) const FINAL;
 
   void SetAccessMode(
       const hmi_apis::Common_RCAccessMode::eType access_mode) FINAL;
@@ -90,6 +100,7 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
   hmi_apis::Common_RCAccessMode::eType GetAccessMode() const FINAL;
 
   void OnDriverDisallowed(const std::string& module_type,
+                          const std::string& module_id,
                           const uint32_t app_id) FINAL;
 
   /**
@@ -118,6 +129,18 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
 
   void set_rc_enabled(const bool value) FINAL;
 
+  ResourceReleasedState::eType ReleaseResource(
+      const std::string& module_type,
+      const std::string& module_id,
+      const uint32_t application_id) FINAL;
+
+  void SetResourceAcquired(const std::string& module_type,
+                           const std::string& module_id,
+                           const uint32_t app_id) FINAL;
+
+  bool IsResourceAlreadyAcquiredByApp(const rc_rpc_plugin::ModuleUid& moduleUid,
+                                      const uint32_t app_id) const FINAL;
+
  private:
   typedef std::vector<application_manager::ApplicationSharedPtr> Apps;
 
@@ -137,20 +160,23 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
    * @brief IsModuleTypeRejected check if current resource was rejected by
    * driver for current application
    * @param module_type resource to check
+   * @param module_id uuid of a resource
    * @param app_id application id
    * @return true if current resource was rejected by driver for current
    * application, otherwise - false
    */
   bool IsModuleTypeRejected(const std::string& module_type,
+                            const std::string& module_id,
                             const uint32_t app_id);
 
   /**
-   * @brief ReleaseResource Releases resource acquired by application
+   * @brief ReleaseModuleType Releases all resources related to
+   * the corresponding module type acquired by application
    * @param module_type Module name
    * @param application_id Application id
    */
-  void ReleaseResource(const std::string& module_type,
-                       const uint32_t application_id);
+  void ReleaseModuleType(const std::string& module_type,
+                         const uint32_t application_id);
 
   /**
    * @brief GetAcquiredResources Provides resources acquired by particular
@@ -161,6 +187,15 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
   Resources GetAcquiredResources(const uint32_t application_id) const;
 
   /**
+   * @brief GetAcquiredModuleTypes Provides module types acquired by particular
+   * application currently
+   * @param application_id Application id
+   * @return List of acquired module types by specific application
+   */
+  std::set<std::string> GetAcquiredModuleTypes(
+      const uint32_t application_id) const;
+
+  /**
    * @brief ProcessApplicationPolicyUpdate Checks if allowed modules list is
    * changed for registered RC applications and releases in case some modules
    * now out of the list
@@ -175,33 +210,38 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
   void RemoveAppsSubscriptions(const Apps& apps);
 
   /**
-   * @brief SetResourceAquired mark resourse as aquired and process logic of
+   * @brief SetResourceFree mark resourse as free and process logic of
    * changing state of aquired resources
    * @param module_type resource name
+   * @param module_id uuid of a resource
    * @param app applicastion that aquire resource
    */
-  void SetResourceAquired(const std::string& module_type,
-                          const uint32_t app_id);
+  ResourceReleasedState::eType SetResourceFree(const std::string& module_type,
+                                               const std::string& module_id,
+                                               const uint32_t app_id);
   /**
-   * @brief SetResourceFree mark resourse as free and process logic of
-   * changing state of aquired resources
-   * @param module_type resource name
-   * @param app applicastion that aquire resource
+   * @brief CheckLocation checks if the user's grid is equal to or is within the
+   * service area of the module, or user location is driver's seat
+   * @param module module type + module id
+   * @return true if the user's grid equals to or is within module service
+   * area or user location is driver's seat, otherwise - false
    */
-  void SetResourceFree(const std::string& module_type, const uint32_t app_id);
+  bool IsUserLocationValid(ModuleUid& module,
+                           application_manager::ApplicationSharedPtr app);
 
   /**
    * @brief AllocatedResources contains link between resource and application
    * owning that resource
    */
-  typedef std::map<std::string, uint32_t> AllocatedResources;
+
+  typedef std::map<ModuleUid, uint32_t> AllocatedResources;
   AllocatedResources allocated_resources_;
   mutable sync_primitives::Lock allocated_resources_lock_;
 
   /**
    * @brief ResourcesState contains states of ALLOCATED resources
    */
-  typedef std::map<std::string, ResourceState::eType> ResourcesState;
+  typedef std::map<ModuleUid, ResourceState::eType> ResourcesState;
   ResourcesState resources_state_;
   mutable sync_primitives::Lock resources_state_lock_;
 
@@ -210,13 +250,14 @@ class ResourceAllocationManagerImpl : public ResourceAllocationManager {
    * driver for application
    * application_id : [vector of rejected resources]
    */
-  typedef std::map<uint32_t, std::vector<std::string> > RejectedResources;
+  typedef std::map<uint32_t, std::vector<ModuleUid> > RejectedResources;
   RejectedResources rejected_resources_for_application_;
   mutable sync_primitives::Lock rejected_resources_for_application_lock_;
 
   hmi_apis::Common_RCAccessMode::eType current_access_mode_;
   application_manager::ApplicationManager& app_mngr_;
   application_manager::rpc_service::RPCService& rpc_service_;
+  rc_rpc_plugin::RCCapabilitiesManager& rc_capabilities_manager_;
   bool is_rc_enabled_;
 };
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc
index 643e98213c..45b0d13582 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_on_remote_control_settings_notification.cc
@@ -59,7 +59,8 @@ RCOnRemoteControlSettingsNotification::RCOnRemoteControlSettingsNotification(
           params.hmi_capabilities_,
           params.policy_handler_)
     , resource_allocation_manager_(params.resource_allocation_manager_)
-    , interior_data_manager_(params.interior_data_manager_) {}
+    , interior_data_manager_(params.interior_data_manager_)
+    , rc_consent_manager_(params.rc_consent_manager_) {}
 
 RCOnRemoteControlSettingsNotification::
     ~RCOnRemoteControlSettingsNotification() {}
@@ -132,6 +133,7 @@ void RCOnRemoteControlSettingsNotification::Run() {
     DisallowRCFunctionality();
     resource_allocation_manager_.ResetAllAllocations();
     resource_allocation_manager_.set_rc_enabled(false);
+    rc_consent_manager_.RemoveAllConsents();
   }
 }
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_set_global_properties_request.cc
new file mode 100644
index 0000000000..2f203afc2d
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_set_global_properties_request.cc
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rc_rpc_plugin/commands/hmi/rc_set_global_properties_request.h"
+
+namespace rc_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+RCSetGlobalPropertiesRequest::RCSetGlobalPropertiesRequest(
+    const app_mngr::commands::MessageSharedPtr& message,
+    const RCCommandParams& params)
+    : app_mngr::commands::RequestToHMI(message,
+                                       params.application_manager_,
+                                       params.rpc_service_,
+                                       params.hmi_capabilities_,
+                                       params.policy_handler_) {}
+
+void RCSetGlobalPropertiesRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  SendRequest();
+}
+
+RCSetGlobalPropertiesRequest::~RCSetGlobalPropertiesRequest() {}
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_set_global_properties_response.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_set_global_properties_response.cc
new file mode 100644
index 0000000000..c31314ec21
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/hmi/rc_set_global_properties_response.cc
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rc_rpc_plugin/commands/hmi/rc_set_global_properties_response.h"
+
+namespace rc_rpc_plugin {
+namespace commands {
+
+RCSetGlobalPropertiesResponse::RCSetGlobalPropertiesResponse(
+    const app_mngr::commands::MessageSharedPtr& message,
+    const RCCommandParams& params)
+    : application_manager::commands::ResponseFromHMI(
+          message,
+          params.application_manager_,
+          params.rpc_service_,
+          params.hmi_capabilities_,
+          params.policy_handler_) {}
+
+void RCSetGlobalPropertiesResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  app_mngr::event_engine::Event event(
+      hmi_apis::FunctionID::RC_SetGlobalProperties);
+  event.set_smart_object(*message_);
+  event.raise(application_manager_.event_dispatcher());
+}
+
+RCSetGlobalPropertiesResponse::~RCSetGlobalPropertiesResponse() {}
+}  // namespace commands
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc
index b85f092252..3adc48dfbf 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc
@@ -33,6 +33,7 @@
 #include "rc_rpc_plugin/commands/mobile/button_press_request.h"
 #include "interfaces/MOBILE_API.h"
 #include "json/json.h"
+#include "rc_rpc_plugin/rc_helpers.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "smart_objects/enum_schema_item.h"
 #include "utils/helpers.h"
@@ -46,8 +47,6 @@ using namespace message_params;
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule")
 
-typedef std::map<std::string, mobile_apis::ButtonName::eType> ButtonsMap;
-
 ButtonPressRequest::ButtonPressRequest(
     const app_mngr::commands::MessageSharedPtr& message,
     const RCCommandParams& params)
@@ -55,147 +54,44 @@ ButtonPressRequest::ButtonPressRequest(
 
 ButtonPressRequest::~ButtonPressRequest() {}
 
-const std::vector<std::string> buttons_climate() {
-  std::vector<std::string> data;
-  data.push_back(enums_value::kACMax);
-  data.push_back(enums_value::kAC);
-  data.push_back(enums_value::kRecirculate);
-  data.push_back(enums_value::kFanUp);
-  data.push_back(enums_value::kFanDown);
-  data.push_back(enums_value::kTempUp);
-  data.push_back(enums_value::kTempDown);
-  data.push_back(enums_value::kDefrostMax);
-  data.push_back(enums_value::kDefrost);
-  data.push_back(enums_value::kDefrostRear);
-  data.push_back(enums_value::kUpperVent);
-  data.push_back(enums_value::kLowerVent);
-  return data;
-}
-
-const std::vector<std::string> buttons_radio() {
-  std::vector<std::string> data;
-  data.push_back(enums_value::kVolumeUp);
-  data.push_back(enums_value::kVolumeDown);
-  data.push_back(enums_value::kEject);
-  data.push_back(enums_value::kSource);
-  data.push_back(enums_value::kShuffle);
-  data.push_back(enums_value::kRepeat);
-  return data;
-}
-
-const ButtonsMap buttons_map() {
-  using namespace mobile_apis;
-
-  ButtonsMap buttons_map;
-  buttons_map[enums_value::kACMax] = ButtonName::AC_MAX;
-  buttons_map[enums_value::kAC] = ButtonName::AC;
-  buttons_map[enums_value::kRecirculate] = ButtonName::RECIRCULATE;
-  buttons_map[enums_value::kFanUp] = ButtonName::FAN_UP;
-  buttons_map[enums_value::kFanDown] = ButtonName::FAN_DOWN;
-  buttons_map[enums_value::kTempUp] = ButtonName::TEMP_UP;
-  buttons_map[enums_value::kTempDown] = ButtonName::TEMP_DOWN;
-  buttons_map[enums_value::kDefrostMax] = ButtonName::DEFROST_MAX;
-  buttons_map[enums_value::kDefrost] = ButtonName::DEFROST;
-  buttons_map[enums_value::kDefrostRear] = ButtonName::DEFROST_REAR;
-  buttons_map[enums_value::kUpperVent] = ButtonName::UPPER_VENT;
-  buttons_map[enums_value::kLowerVent] = ButtonName::LOWER_VENT;
-  buttons_map[enums_value::kVolumeUp] = ButtonName::VOLUME_UP;
-  buttons_map[enums_value::kVolumeDown] = ButtonName::VOLUME_DOWN;
-  buttons_map[enums_value::kEject] = ButtonName::EJECT;
-  buttons_map[enums_value::kSource] = ButtonName::SOURCE;
-  buttons_map[enums_value::kShuffle] = ButtonName::SHUFFLE;
-  buttons_map[enums_value::kRepeat] = ButtonName::REPEAT;
-
-  return buttons_map;
-}
-
-bool CheckIfButtonExistInRCCaps(
-    const smart_objects::SmartObject& rc_capabilities,
-    const mobile_apis::ButtonName::eType button) {
-  if (rc_capabilities.keyExists(strings::kbuttonCapabilities)) {
-    const smart_objects::SmartObject& button_caps =
-        rc_capabilities[strings::kbuttonCapabilities];
-    auto it = button_caps.asArray()->begin();
-    for (; it != button_caps.asArray()->end(); ++it) {
-      smart_objects::SmartObject& so = *it;
-      int64_t current_id = so[message_params::kName].asInt();
-      if (-1 == current_id) {
-        // capabilities received from HMI contains enum values
-        // capabilities loaded from file contains string values
-        // TODO : unificate capabilities storing
-        const std::string& bt_name = so[message_params::kName].asString();
-        static ButtonsMap btn_map = buttons_map();
-        current_id = btn_map[bt_name];
-      }
-      const mobile_apis::ButtonName::eType current_button =
-          static_cast<mobile_apis::ButtonName::eType>(current_id);
-      if (current_button == button) {
-        LOG4CXX_TRACE(
-            logger_,
-            "Button id " << current_button << " exist in capabilities");
-        return true;
-      }
-    }
-  }
-  LOG4CXX_TRACE(logger_,
-                "Button id " << button << " do not exist in capabilities");
-  return false;
+std::string ButtonPressRequest::GetButtonName() const {
+  mobile_apis::ButtonName::eType button_name =
+      static_cast<mobile_apis::ButtonName::eType>(
+          (*message_)[app_mngr::strings::msg_params]
+                     [message_params::kButtonName]
+                         .asUInt());
+  const char* str;
+  const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper<
+      mobile_apis::ButtonName::eType>::EnumToCString(button_name, &str);
+  return ok ? str : "unknown";
 }
 
-bool CheckButtonName(const std::string& module_type,
-                     const std::string& button_name,
-                     const smart_objects::SmartObject* rc_capabilities) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  if (rc_capabilities == NULL) {
-    LOG4CXX_ERROR(logger_, "No remote controll capabilities available");
-    return false;
-  }
-
-  if (enums_value::kRadio == module_type) {
-    if (!helpers::in_range(buttons_radio(), button_name)) {
-      LOG4CXX_WARN(logger_,
-                   "Trying to acceess climate button with module type radio");
-      return false;
-    }
-  }
-
-  if (enums_value::kClimate == module_type) {
-    if (!helpers::in_range(buttons_climate(), button_name)) {
-      LOG4CXX_WARN(logger_,
-                   "Trying to acceess radio button with module type climate");
-      return false;
-    }
+const mobile_apis::ButtonName::eType ButtonPressRequest::GetButtonId() const {
+  const auto button_name = GetButtonName();
+  static RCHelpers::ButtonsMap btn_map = RCHelpers::buttons_map();
+  mobile_apis::ButtonName::eType button_id =
+      mobile_apis::ButtonName::INVALID_ENUM;
+  if (btn_map.end() != btn_map.find(button_name)) {
+    button_id = btn_map[button_name];
   }
-  return true;
+  return button_id;
 }
 
 void ButtonPressRequest::Execute() {
   LOG4CXX_AUTO_TRACE(logger_);
-
-  const char* button_name;
-  ns_smart_device_link::ns_smart_objects::
-      EnumConversionHelper<mobile_apis::ButtonName::eType>::EnumToCString(
-          static_cast<mobile_apis::ButtonName::eType>(
-              (*message_)[app_mngr::strings::msg_params]
-                         [message_params::kButtonName]
-                             .asUInt()),
-          &button_name);
-
   const std::string module_type = ModuleType();
-  static ButtonsMap btn_map = buttons_map();
-  mobile_apis::ButtonName::eType button_id =
-      mobile_apis::ButtonName::INVALID_ENUM;
-  if (btn_map.end() != btn_map.find(button_name)) {
-    button_id = btn_map[button_name];
-  }
 
-  const smart_objects::SmartObject* rc_capabilities =
-      hmi_capabilities_.rc_capability();
   const bool button_name_matches_module_type =
-      CheckButtonName(module_type, button_name, rc_capabilities);
-  const bool button_id_exist_in_caps =
-      rc_capabilities &&
-      CheckIfButtonExistInRCCaps(*rc_capabilities, button_id);
+      rc_capabilities_manager_.CheckButtonName(module_type, GetButtonName());
+
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
+  const bool is_module_exists =
+      rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module);
+
+  const bool button_valid_by_caps =
+      is_module_exists &&
+      rc_capabilities_manager_.CheckIfButtonExistInRCCaps(GetButtonId());
 
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(connection_key());
@@ -203,7 +99,9 @@ void ButtonPressRequest::Execute() {
   (*message_)[app_mngr::strings::msg_params][app_mngr::strings::app_id] =
       app->app_id();
 
-  if (button_name_matches_module_type && button_id_exist_in_caps) {
+  if (button_name_matches_module_type && button_valid_by_caps) {
+    (*message_)[app_mngr::strings::msg_params][message_params::kModuleId] =
+        module_id;
     SendHMIRequest(hmi_apis::FunctionID::Buttons_ButtonPress,
                    &(*message_)[app_mngr::strings::msg_params],
                    true);
@@ -214,11 +112,12 @@ void ButtonPressRequest::Execute() {
                  mobile_apis::Result::INVALID_DATA,
                  "Request module type and button name mismatch!");
   } else {
-    LOG4CXX_WARN(logger_, "Requested button is not exists in capabilities!");
+    LOG4CXX_WARN(logger_,
+                 "Requested button or module does not exist in capabilities!");
     SetResourceState(module_type, ResourceState::FREE);
     SendResponse(false,
                  mobile_apis::Result::UNSUPPORTED_RESOURCE,
-                 "Requested button is not exists in capabilities!");
+                 "Requested button or module does not exist in capabilities!");
   }
 }
 
@@ -228,13 +127,15 @@ AcquireResult::eType ButtonPressRequest::AcquireResource(
   const std::string module_type = ModuleType();
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(CommandRequestImpl::connection_key());
-  return resource_allocation_manager_.AcquireResource(module_type,
-                                                      app->app_id());
+
+  return resource_allocation_manager_.AcquireResource(
+      module_type, ModuleId(), app->app_id());
 }
 
-bool ButtonPressRequest::IsResourceFree(const std::string& module_type) const {
+bool ButtonPressRequest::IsResourceFree(const std::string& module_type,
+                                        const std::string& module_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  return resource_allocation_manager_.IsResourceFree(module_type);
+  return resource_allocation_manager_.IsResourceFree(module_type, module_id);
 }
 
 void ButtonPressRequest::SetResourceState(const std::string& module_type,
@@ -242,8 +143,9 @@ void ButtonPressRequest::SetResourceState(const std::string& module_type,
   LOG4CXX_AUTO_TRACE(logger_);
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(CommandRequestImpl::connection_key());
+
   resource_allocation_manager_.SetResourceState(
-      module_type, app->app_id(), state);
+      module_type, ModuleId(), app->app_id(), state);
 }
 
 void ButtonPressRequest::on_event(const app_mngr::event_engine::Event& event) {
@@ -270,13 +172,43 @@ void ButtonPressRequest::on_event(const app_mngr::event_engine::Event& event) {
     result = false;
     result_code = mobile_apis::Result::GENERIC_ERROR;
   }
+
+  const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+
+  const rc_rpc_types::ModuleUid resource{module_type, module_id};
+  auto app = application_manager_.application(connection_key());
+
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "NULL pointer.");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED, "");
+    return;
+  }
+
+  const auto app_id = app->app_id();
+
+  bool is_resource_acquired = false;
+
+  if (result && !resource_allocation_manager_.IsResourceAlreadyAcquiredByApp(
+                    resource, app_id)) {
+    resource_allocation_manager_.SetResourceAcquired(
+        module_type, module_id, app_id);
+
+    is_resource_acquired = true;
+  }
+
   std::string response_info;
   GetInfo(message, response_info);
-  SetResourceState(ModuleType(), ResourceState::FREE);
   SendResponse(result, result_code, response_info.c_str());
+
+  if (is_resource_acquired) {
+    resource_allocation_manager_.SendOnRCStatusNotifications(
+        NotificationTrigger::MODULE_ALLOCATION,
+        std::shared_ptr<application_manager::Application>());
+  }
 }
 
-std::string ButtonPressRequest::ModuleType() {
+std::string ButtonPressRequest::ModuleType() const {
   mobile_apis::ModuleType::eType module_type =
       static_cast<mobile_apis::ModuleType::eType>(
           (*message_)[app_mngr::strings::msg_params]
@@ -288,5 +220,16 @@ std::string ButtonPressRequest::ModuleType() {
   return ok ? str : "unknown";
 }
 
+std::string ButtonPressRequest::ModuleId() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto msg_params = (*message_)[app_mngr::strings::msg_params];
+  if (msg_params.keyExists(message_params::kModuleId)) {
+    return msg_params[message_params::kModuleId].asString();
+  }
+  const std::string module_id =
+      rc_capabilities_manager_.GetDefaultModuleIdFromCapabilities(ModuleType());
+  return module_id;
+}
+
 }  // namespace commands
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc
new file mode 100644
index 0000000000..fd661afd5f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc
@@ -0,0 +1,472 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <algorithm>
+#include <ctime>
+#include <numeric>
+#include <vector>
+
+#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_request.h"
+#include "rc_rpc_plugin/rc_helpers.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+#include "rc_rpc_plugin/rc_rpc_types.h"
+#include "smart_objects/enum_schema_item.h"
+
+namespace rc_rpc_plugin {
+namespace app_mngr = application_manager;
+namespace commands {
+
+GetInteriorVehicleDataConsentRequest::GetInteriorVehicleDataConsentRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    const RCCommandParams& params)
+    : RCCommandRequest(message, params) {}
+
+void GetInteriorVehicleDataConsentRequest::Execute() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto& msg_params = (*message_)[app_mngr::strings::msg_params];
+
+  const bool module_ids_exists =
+      msg_params.keyExists(message_params::kModuleIds);
+  if (!module_ids_exists) {
+    SendResponse(false,
+                 mobile_apis::Result::INVALID_DATA,
+                 "ModuleIds collection is absent in request message");
+    return;
+  }
+
+  if (msg_params[message_params::kModuleIds].empty()) {
+    LOG4CXX_DEBUG(logger_,
+                  "ModuleIds collection is empty. Will be add default "
+                  "module_id from capabilities");
+
+    const auto module_id =
+        rc_capabilities_manager_.GetDefaultModuleIdFromCapabilities(
+            ModuleType());
+
+    msg_params[message_params::kModuleIds][0] = module_id;
+  }
+
+  const std::string module_type = ModuleType();
+  for (const auto module_id :
+       *(msg_params[message_params::kModuleIds].asArray())) {
+    const ModuleUid module(module_type, module_id.asString());
+    if (!rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) {
+      LOG4CXX_WARN(logger_,
+                   "Accessing not supported module: " << module_type << " "
+                                                      << module_id.asString());
+      SetResourceState(module_type, ResourceState::FREE);
+      SendResponse(false,
+                   mobile_apis::Result::UNSUPPORTED_RESOURCE,
+                   "Accessing not supported module data");
+      return;
+    }
+  }
+
+  smart_objects::SmartObject response_params;
+  if (GetCalculatedVehicleDataConsent(response_params)) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "No need to send request to HMI. Sending cached consents to mobile");
+    SendResponse(true, mobile_apis::Result::SUCCESS, nullptr, &response_params);
+    return;
+  }
+
+  (*message_)[application_manager::strings::msg_params]
+             [application_manager::strings::app_id] = connection_key();
+
+  hmi_request_consents_ =
+      smart_objects::SmartObject(response_params[message_params::kAllowed]);
+
+  LOG4CXX_DEBUG(
+      logger_, "Filtering out module ids with successfully calculated consent");
+
+  smart_objects::SmartObject hmi_msg_params(msg_params);
+  auto module_ids_for_consent =
+      hmi_msg_params[message_params::kModuleIds].asArray();
+  module_ids_for_consent->clear();
+
+  auto module_ids = msg_params[message_params::kModuleIds].asArray();
+  for (uint32_t i = 0; i < module_ids->size(); i++) {
+    // Only add modules whose consent is unknown(needs to be sent to the hmi)
+    bool is_consent_undefined =
+        (*hmi_request_consents_.asArray())[i].getType() ==
+        smart_objects::SmartType::SmartType_Null;
+    if (is_consent_undefined) {
+      module_ids_for_consent->push_back((*module_ids)[i]);
+    }
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Forwarding request to HMI with moduleIds for modules with "
+                "unknown consent");
+  SendHMIRequest(hmi_apis::FunctionID::RC_GetInteriorVehicleDataConsent,
+                 (&hmi_msg_params),
+                 true);
+}
+
+void GetInteriorVehicleDataConsentRequest::on_event(
+    const app_mngr::event_engine::Event& event) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (event.id() != hmi_apis::FunctionID::RC_GetInteriorVehicleDataConsent) {
+    LOG4CXX_ERROR(logger_, "Received wrong event. FunctionID: " << event.id());
+    return;
+  }
+
+  auto temp_response = event.smart_object();
+
+  auto result_code =
+      GetMobileResultCode(static_cast<hmi_apis::Common_Result::eType>(
+          temp_response[app_mngr::strings::params][app_mngr::hmi_response::code]
+              .asUInt()));
+
+  const bool success_result =
+      helpers::Compare<mobile_apis::Result::eType, helpers::EQ, helpers::ONE>(
+          result_code,
+          mobile_apis::Result::SUCCESS,
+          mobile_apis::Result::WARNINGS);
+
+  if (!success_result) {
+    std::string info;
+    GetInfo(temp_response, info);
+    SendResponse(false, result_code, info.c_str(), nullptr);
+    return;
+  }
+
+  if (!temp_response[app_mngr::strings::msg_params].keyExists(
+          message_params::kAllowed) ||
+      temp_response[app_mngr::strings::msg_params][message_params::kAllowed]
+          .empty()) {
+    std::string info_out =
+        "Collection of consents is absent in HMI response or empty";
+    LOG4CXX_ERROR(logger_, info_out);
+    SendResponse(false, mobile_apis::Result::GENERIC_ERROR, info_out.c_str());
+    return;
+  }
+
+  uint32_t number_of_expected_response_consents = std::accumulate(
+      hmi_request_consents_.asArray()->begin(),
+      hmi_request_consents_.asArray()->end(),
+      uint32_t(0),
+      [](uint32_t num_consents, smart_objects::SmartObject& consent) {
+        // Only module ids with valid location consents were sent to the hmi
+        bool is_consent_undefined =
+            consent.getType() == smart_objects::SmartType::SmartType_Null;
+        return (is_consent_undefined) ? num_consents + 1 : num_consents;
+      });
+
+  const auto response_consents =
+      temp_response[app_mngr::strings::msg_params][message_params::kAllowed]
+          .asArray();
+
+  if (number_of_expected_response_consents != response_consents->size()) {
+    std::string info_out =
+        "HMI response has incorrect number of consents expected: " +
+        std::to_string(number_of_expected_response_consents) +
+        ", actual: " + std::to_string(response_consents->size());
+    LOG4CXX_ERROR(logger_, info_out);
+    SendResponse(false, mobile_apis::Result::GENERIC_ERROR, info_out.c_str());
+    return;
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Adding back filtered out module ids for response to mobile");
+  uint32_t response_consents_counter = 0;
+  for (auto& consent : *(hmi_request_consents_.asArray())) {
+    // Only modify consent for moduleIds allowed by location constraints
+    bool is_consent_undefined =
+        consent.getType() == smart_objects::SmartType::SmartType_Null;
+    if (is_consent_undefined) {
+      consent = (*response_consents)[response_consents_counter];
+      response_consents_counter++;
+    }
+  }
+
+  temp_response[app_mngr::strings::msg_params][message_params::kAllowed] =
+      hmi_request_consents_;
+
+  const auto hmi_response = temp_response;
+  std::string response_info;
+  const bool result_of_saving = SaveModuleIdConsents(
+      response_info, hmi_response[app_mngr::strings::msg_params]);
+
+  if (!result_of_saving) {
+    LOG4CXX_DEBUG(logger_, "Consent saving failed");
+    SendResponse(
+        false, mobile_apis::Result::GENERIC_ERROR, response_info.c_str());
+    return;
+  }
+
+  smart_objects::SmartObject response_params =
+      hmi_response[app_mngr::strings::msg_params];
+  std::string info;
+  GetInfo(hmi_response, info);
+  SendResponse(success_result, result_code, info.c_str(), &response_params);
+}
+
+std::string GetInteriorVehicleDataConsentRequest::ModuleType() const {
+  mobile_apis::ModuleType::eType module_type =
+      static_cast<mobile_apis::ModuleType::eType>(
+          (*message_)[app_mngr::strings::msg_params]
+                     [message_params::kModuleType]
+                         .asUInt());
+
+  const char* str;
+  const bool ok = smart_objects::EnumConversionHelper<
+      mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str);
+  return ok ? str : "unknown";
+}
+
+std::string GetInteriorVehicleDataConsentRequest::ModuleId() const {
+  return std::string();
+}
+
+GetInteriorVehicleDataConsentRequest::~GetInteriorVehicleDataConsentRequest() {}
+
+bool GetInteriorVehicleDataConsentRequest::IsUserLocationValid(
+    const ModuleUid& module_uid) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!rc_capabilities_manager_.IsSeatLocationCapabilityProvided()) {
+    return true;
+  }
+  const auto app_ptr = application_manager_.application(connection_key());
+  const auto extension = RCHelpers::GetRCExtension(*app_ptr);
+  const auto module_service_area =
+      rc_capabilities_manager_.GetModuleServiceArea(module_uid);
+  const auto user_location = extension->GetUserLocation();
+  const auto driver =
+      rc_capabilities_manager_.GetDriverLocationFromSeatLocationCapability();
+  const bool is_driver = (user_location == driver);
+  if (is_driver || user_location.IntersectionExists(module_service_area)) {
+    return true;
+  }
+  return false;
+}
+
+rc_rpc_types::ModuleConsent
+GetInteriorVehicleDataConsentRequest::GetModuleConsentByAccessMode(
+    const ModuleUid& module_uid,
+    const hmi_apis::Common_RCAccessMode::eType access_mode) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto get_auto_allow_consent = [](const ModuleUid& module_uid) {
+    return rc_rpc_types::ModuleConsent::CONSENTED;
+  };
+
+  auto get_auto_deny_consent = [this](const ModuleUid& module_uid) {
+    auto app = application_manager_.application(connection_key());
+    const uint32_t app_id = app->app_id();
+    const bool is_resource_available =
+        (resource_allocation_manager_.AcquireResource(
+             module_uid.first, module_uid.second, app_id) ==
+         AcquireResult::ALLOWED);
+    return (is_resource_available) ? rc_rpc_types::ModuleConsent::CONSENTED
+                                   : rc_rpc_types::ModuleConsent::NOT_CONSENTED;
+  };
+
+  auto get_ask_driver_consent = [this](const ModuleUid& module_uid) {
+    auto app = application_manager_.application(connection_key());
+    const std::string policy_app_id = app->policy_app_id();
+    const std::string mac_address = app->mac_address();
+
+    auto consent = rc_consent_manager_.GetModuleConsent(
+        policy_app_id, mac_address, module_uid);
+
+    if (rc_rpc_types::ModuleConsent::NOT_EXISTS == consent) {
+      auto acquire_result = resource_allocation_manager_.AcquireResource(
+          module_uid.first, module_uid.second, app->app_id());
+      const bool is_resource_available =
+          (acquire_result == AcquireResult::ALLOWED);
+      const bool is_resource_rejected =
+          (acquire_result == AcquireResult::REJECTED);
+
+      if (!is_resource_available && !is_resource_rejected) {
+        return rc_rpc_types::ModuleConsent::NOT_EXISTS;
+      }
+
+      return (is_resource_available)
+                 ? rc_rpc_types::ModuleConsent::CONSENTED
+                 : rc_rpc_types::ModuleConsent::NOT_CONSENTED;
+    }
+
+    const bool is_consent_allowed =
+        (rc_rpc_types::ModuleConsent::CONSENTED == consent);
+    return (is_consent_allowed) ? rc_rpc_types::ModuleConsent::CONSENTED
+                                : rc_rpc_types::ModuleConsent::NOT_CONSENTED;
+  };
+
+  switch (access_mode) {
+    case hmi_apis::Common_RCAccessMode::AUTO_ALLOW: {
+      LOG4CXX_DEBUG(logger_,
+                    "Calculating consent for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << ") in accessMode: AUTO_ALLOW");
+      return get_auto_allow_consent(module_uid);
+    }
+    case hmi_apis::Common_RCAccessMode::AUTO_DENY: {
+      LOG4CXX_DEBUG(logger_,
+                    "Calculating consent for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << ") in accessMode: AUTO_DENY");
+      return get_auto_deny_consent(module_uid);
+    }
+    case hmi_apis::Common_RCAccessMode::ASK_DRIVER: {
+      LOG4CXX_DEBUG(logger_,
+                    "Calculating consent for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << ") in accessMode: ASK_DRIVER");
+      return get_ask_driver_consent(module_uid);
+    }
+    default: {
+      LOG4CXX_DEBUG(logger_,
+                    "Unknown accessMode specified. Denying consent for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << ")");
+      return rc_rpc_types::ModuleConsent::NOT_CONSENTED;
+    }
+  }
+}
+
+bool GetInteriorVehicleDataConsentRequest::GetCalculatedVehicleDataConsent(
+    smart_objects::SmartObject& out_response) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  out_response =
+      smart_objects::SmartObject(smart_objects::SmartType::SmartType_Map);
+  out_response[message_params::kAllowed] =
+      smart_objects::SmartObject(smart_objects::SmartType::SmartType_Array);
+
+  auto modules_consent_array = out_response[message_params::kAllowed].asArray();
+  const auto module_ids =
+      (*message_)[app_mngr::strings::msg_params][message_params::kModuleIds]
+          .asArray();
+  const std::string module_type = ModuleType();
+  bool can_handle_internally = true;
+
+  auto get_disallowed_multiple_access_consent =
+      [this](const ModuleUid& module_uid) {
+        auto app = application_manager_.application(connection_key());
+        const uint32_t app_id = app->app_id();
+        const bool is_resource_available =
+            (resource_allocation_manager_.AcquireResource(
+                 module_uid.first, module_uid.second, app_id) ==
+             AcquireResult::ALLOWED);
+        return (is_resource_available)
+                   ? rc_rpc_types::ModuleConsent::CONSENTED
+                   : rc_rpc_types::ModuleConsent::NOT_CONSENTED;
+      };
+
+  for (const auto module_id : *(module_ids)) {
+    const ModuleUid module_uid(module_type, module_id.asString());
+    // Check if the user_location is covered by the module's serviceArea
+    if (!IsUserLocationValid(module_uid)) {
+      LOG4CXX_DEBUG(logger_,
+                    "User is outside the serviceArea for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << "). Denying consent");
+      modules_consent_array->push_back(smart_objects::SmartObject(false));
+      continue;
+    }
+
+    rc_rpc_types::ModuleConsent module_consent;
+
+    const bool is_multiple_access_allowed =
+        rc_capabilities_manager_.IsMultipleAccessAllowed(module_uid);
+    if (!is_multiple_access_allowed) {
+      LOG4CXX_DEBUG(logger_,
+                    "multipleAccess disallowed for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << ")");
+      module_consent = get_disallowed_multiple_access_consent(module_uid);
+      modules_consent_array->push_back(smart_objects::SmartObject(
+          module_consent == rc_rpc_types::ModuleConsent::CONSENTED));
+      continue;
+    }
+
+    const auto access_mode = resource_allocation_manager_.GetAccessMode();
+
+    module_consent = GetModuleConsentByAccessMode(module_uid, access_mode);
+    if (module_consent == rc_rpc_types::ModuleConsent::NOT_EXISTS) {
+      LOG4CXX_DEBUG(logger_,
+                    "Unable to calculate consent for module("
+                        << module_uid.first << ", " << module_uid.second
+                        << "), should send moduleId to HMI for consent");
+      modules_consent_array->push_back(smart_objects::SmartObject());
+      can_handle_internally = false;
+      continue;
+    }
+    modules_consent_array->push_back(smart_objects::SmartObject(
+        module_consent == rc_rpc_types::ModuleConsent::CONSENTED));
+  }
+  return can_handle_internally;
+}
+
+bool GetInteriorVehicleDataConsentRequest::SaveModuleIdConsents(
+    std::string& info_out, const smart_objects::SmartObject& msg_params) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto& allowed = msg_params[message_params::kAllowed];
+  const auto& moduleIds =
+      (*message_)[app_mngr::strings::msg_params][message_params::kModuleIds];
+
+  if (allowed.length() != moduleIds.length()) {
+    info_out =
+        "The received module_id collection from mobile and received consent "
+        "collection from HMI are not equal by size.";
+    LOG4CXX_ERROR(logger_, info_out);
+    return false;
+  }
+  std::string module_type = ModuleType();
+  auto module_ids = RCHelpers::RetrieveModuleIds(moduleIds);
+  auto module_allowed = RCHelpers::RetrieveModuleConsents(allowed);
+
+  auto module_consents =
+      RCHelpers::FillModuleConsents(module_type, module_ids, module_allowed);
+
+  auto application = application_manager_.application(connection_key());
+  if (!application) {
+    LOG4CXX_ERROR(logger_,
+                  "Application with connection key:" << connection_key()
+                                                     << " isn't registered");
+    return false;
+  }
+  std::string policy_app_id = application->policy_app_id();
+  const auto mac_address = application->mac_address();
+  rc_consent_manager_.SaveModuleConsents(
+      policy_app_id, mac_address, module_consents);
+  return true;
+}
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_response.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_response.cc
new file mode 100644
index 0000000000..3e197fbdea
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_response.cc
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_response.h"
+
+namespace rc_rpc_plugin {
+namespace commands {
+
+GetInteriorVehicleDataConsentResponse::GetInteriorVehicleDataConsentResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    const RCCommandParams& params)
+    : application_manager::commands::CommandResponseImpl(
+          message,
+          params.application_manager_,
+          params.rpc_service_,
+          params.hmi_capabilities_,
+          params.policy_handler_) {}
+
+void GetInteriorVehicleDataConsentResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  application_manager_.GetRPCService().SendMessageToMobile(message_);
+}
+
+GetInteriorVehicleDataConsentResponse::
+    ~GetInteriorVehicleDataConsentResponse() {}
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
index ded96461f5..10f6303ac9 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
@@ -50,36 +50,21 @@ GetInteriorVehicleDataRequest::GetInteriorVehicleDataRequest(
     const app_mngr::commands::MessageSharedPtr& message,
     const RCCommandParams& params)
     : RCCommandRequest(message, params)
-
     , excessive_subscription_occured_(false) {}
 
-bool CheckIfModuleTypeExistInCapabilities(
-    const smart_objects::SmartObject& rc_capabilities,
-    const std::string& module_type) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  const auto& mapping = RCHelpers::GetModuleTypeToCapabilitiesMapping();
-  const auto& module_list = RCHelpers::GetModulesList();
-  bool is_module_type_valid = false;
-  for (const auto& module : module_list) {
-    if (module == module_type) {
-      if (rc_capabilities.keyExists(mapping(module))) {
-        is_module_type_valid = true;
-        break;
-      }
-    }
-  }
-  return is_module_type_valid;
-}
-
 bool GetInteriorVehicleDataRequest::ProcessCapabilities() {
   LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject* rc_capabilities =
       hmi_capabilities_.rc_capability();
 
   const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
   if (rc_capabilities &&
-      !CheckIfModuleTypeExistInCapabilities(*rc_capabilities, module_type)) {
-    LOG4CXX_WARN(logger_, "Accessing not supported module data");
+      !rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Accessing not supported module: " << module_type << " " << module_id);
     SetResourceState(ModuleType(), ResourceState::FREE);
     SendResponse(false,
                  mobile_apis::Result::UNSUPPORTED_RESOURCE,
@@ -118,14 +103,20 @@ void GetInteriorVehicleDataRequest::ProcessResponseToMobileFromCache(
     app_mngr::ApplicationSharedPtr app) {
   LOG4CXX_AUTO_TRACE(logger_);
   const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
-  auto data = interior_data_cache_.Retrieve(ModuleType());
+  const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
+  auto data = interior_data_cache_.Retrieve(module);
   FilterDisabledModuleData(data);
   auto response_msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
-  response_msg_params[message_params::kModuleData][data_mapping(ModuleType())] =
+  response_msg_params[message_params::kModuleData][data_mapping(module_type)] =
       data;
   response_msg_params[message_params::kModuleData]
-                     [message_params::kModuleType] = ModuleType();
+                     [message_params::kModuleType] = module_type;
+
+  response_msg_params[message_params::kModuleData][message_params::kModuleId] =
+      module_id;
 
   const auto& request_msg_params = (*message_)[app_mngr::strings::msg_params];
   LOG4CXX_DEBUG(logger_,
@@ -137,7 +128,7 @@ void GetInteriorVehicleDataRequest::ProcessResponseToMobileFromCache(
     if (request_msg_params[message_params::kSubscribe].asBool()) {
       auto extension = RCHelpers::GetRCExtension(*app);
       DCHECK(extension);
-      extension->SubscribeToInteriorVehicleData(ModuleType());
+      extension->SubscribeToInteriorVehicleData(module);
     }
   }
   SendResponse(
@@ -145,13 +136,16 @@ void GetInteriorVehicleDataRequest::ProcessResponseToMobileFromCache(
   if (AppShouldBeUnsubscribed()) {
     auto extension = RCHelpers::GetRCExtension(*app);
     DCHECK(extension);
-    extension->UnsubscribeFromInteriorVehicleData(ModuleType());
+    extension->UnsubscribeFromInteriorVehicleData(module);
   }
 }
 
 bool GetInteriorVehicleDataRequest::CheckRateLimits() {
   LOG4CXX_AUTO_TRACE(logger_);
-  return interior_data_manager_.CheckRequestsToHMIFrequency(ModuleType());
+  const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
+  return interior_data_manager_.CheckRequestsToHMIFrequency(module);
 }
 
 bool GetInteriorVehicleDataRequest::AppShouldBeUnsubscribed() {
@@ -167,13 +161,16 @@ bool GetInteriorVehicleDataRequest::TheLastAppShouldBeUnsubscribed(
     app_mngr::ApplicationSharedPtr app) {
   LOG4CXX_AUTO_TRACE(logger_);
   if (AppShouldBeUnsubscribed()) {
+    const std::string module_type = ModuleType();
+    const std::string module_id = ModuleId();
+    const ModuleUid module(module_type, module_id);
     const auto subscribed_to_module_type =
-        RCHelpers::AppsSubscribedToModuleType(application_manager_,
-                                              ModuleType());
+        RCHelpers::AppsSubscribedToModule(application_manager_, module);
     if (subscribed_to_module_type.size() == 1 &&
         subscribed_to_module_type.front() == app) {
       LOG4CXX_DEBUG(logger_,
-                    "The last application unsubscribes from " << ModuleType());
+                    "The last application unsubscribes from "
+                        << module_type << " " << module_id);
       return true;
     }
   }
@@ -189,9 +186,12 @@ void GetInteriorVehicleDataRequest::Execute() {
 
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(connection_key());
+  const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
 
   if (TheLastAppShouldBeUnsubscribed(app) ||
-      !interior_data_cache_.Contains(ModuleType())) {
+      !interior_data_cache_.Contains(module)) {
     if (HasRequestExcessiveSubscription()) {
       excessive_subscription_occured_ = true;
       is_subscribed =
@@ -204,7 +204,9 @@ void GetInteriorVehicleDataRequest::Execute() {
       SendResponse(false, mobile_apis::Result::REJECTED);
       return;
     }
-    interior_data_manager_.StoreRequestToHMITime(ModuleType());
+    interior_data_manager_.StoreRequestToHMITime(module);
+    (*message_)[app_mngr::strings::msg_params][message_params::kModuleId] =
+        ModuleId();
     SendHMIRequest(hmi_apis::FunctionID::RC_GetInteriorVehicleData,
                    &(*message_)[app_mngr::strings::msg_params],
                    true);
@@ -242,20 +244,32 @@ void GetInteriorVehicleDataRequest::on_event(
   }
 
   if (result) {
+    if (!IsModuleIdProvided(hmi_response)) {
+      LOG4CXX_WARN(logger_,
+                   "conditional mandatory parameter "
+                       << message_params::kModuleId
+                       << " missed in hmi response");
+      result = false;
+      result_code = mobile_apis::Result::GENERIC_ERROR;
+    }
     app_mngr::ApplicationSharedPtr app =
         application_manager_.application(connection_key());
 
     DCHECK_OR_RETURN_VOID(app);
+    const std::string module_type = ModuleType();
+    const std::string module_id = ModuleId();
+    const ModuleUid module(module_type, module_id);
+
     if (TheLastAppShouldBeUnsubscribed(app)) {
-      interior_data_cache_.Remove(ModuleType());
+      interior_data_cache_.Remove(module);
     }
     ProccessSubscription(hmi_response);
     if (is_subscribed) {
       const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
       const auto module_data =
           hmi_response[app_mngr::strings::msg_params]
-                      [message_params::kModuleData][data_mapping(ModuleType())];
-      interior_data_cache_.Add(ModuleType(), module_data);
+                      [message_params::kModuleData][data_mapping(module_type)];
+      interior_data_cache_.Add(module, module_data);
     }
   } else {
     hmi_response[app_mngr::strings::msg_params].erase(
@@ -301,8 +315,15 @@ void GetInteriorVehicleDataRequest::ProccessSubscription(
                           [message_params::kModuleType]
                               .asUInt()),
           &module_type);
+
+  const std::string module_id =
+      hmi_response[app_mngr::strings::msg_params][message_params::kModuleData]
+                  [message_params::kModuleId]
+                      .asString();
+  const ModuleUid module(module_type, module_id);
+
   if (excessive_subscription_occured_) {
-    is_subscribed = extension->IsSubscibedToInteriorVehicleData(module_type);
+    is_subscribed = extension->IsSubscribedToInteriorVehicleData(module);
     temp_hmi_response[app_mngr::strings::msg_params]
                      [message_params::kIsSubscribed] = is_subscribed;
     return;
@@ -317,7 +338,7 @@ void GetInteriorVehicleDataRequest::ProccessSubscription(
                      << message_params::kIsSubscribed
                      << " missed in hmi response");
 
-    is_subscribed = extension->IsSubscibedToInteriorVehicleData(module_type);
+    is_subscribed = extension->IsSubscribedToInteriorVehicleData(module);
     temp_hmi_response[app_mngr::strings::msg_params]
                      [message_params::kIsSubscribed] = is_subscribed;
     return;
@@ -348,16 +369,21 @@ void GetInteriorVehicleDataRequest::ProccessSubscription(
   LOG4CXX_TRACE(logger_, "response_subscribe = " << response_subscribe);
   if (request_subscribe == response_subscribe) {
     const std::string module_type = ModuleType();
+    const std::string module_id = ModuleId();
+    const ModuleUid module(module_type, module_id);
+
     if (response_subscribe) {
       LOG4CXX_DEBUG(logger_,
                     "SubscribeToInteriorVehicleData " << app->app_id() << " "
-                                                      << module_type);
-      extension->SubscribeToInteriorVehicleData(module_type);
+                                                      << module_type << " "
+                                                      << module_id);
+      extension->SubscribeToInteriorVehicleData(module);
     } else {
       LOG4CXX_DEBUG(logger_,
                     "UnsubscribeFromInteriorVehicleData "
-                        << app->app_id() << " " << module_type);
-      extension->UnsubscribeFromInteriorVehicleData(module_type);
+                        << app->app_id() << " " << module_type << " "
+                        << module_id);
+      extension->UnsubscribeFromInteriorVehicleData(module);
     }
   }
 }
@@ -373,8 +399,12 @@ bool GetInteriorVehicleDataRequest::HasRequestExcessiveSubscription() {
         application_manager_.application(CommandRequestImpl::connection_key());
     const auto extension = RCHelpers::GetRCExtension(*app);
 
+    const std::string module_type = ModuleType();
+    const std::string module_id = ModuleId();
+    const ModuleUid module(module_type, module_id);
+
     const bool is_app_already_subscribed =
-        extension->IsSubscibedToInteriorVehicleData(ModuleType());
+        extension->IsSubscribedToInteriorVehicleData(module);
     const bool app_wants_to_subscribe =
         (*message_)[app_mngr::strings::msg_params][message_params::kSubscribe]
             .asBool();
@@ -391,7 +421,8 @@ void GetInteriorVehicleDataRequest::RemoveExcessiveSubscription() {
   (*message_)[app_mngr::strings::msg_params].erase(message_params::kSubscribe);
 }
 
-std::string GetInteriorVehicleDataRequest::ModuleType() {
+std::string GetInteriorVehicleDataRequest::ModuleType() const {
+  LOG4CXX_AUTO_TRACE(logger_);
   mobile_apis::ModuleType::eType module_type =
       static_cast<mobile_apis::ModuleType::eType>(
           (*message_)[app_mngr::strings::msg_params]
@@ -403,5 +434,16 @@ std::string GetInteriorVehicleDataRequest::ModuleType() {
   return ok ? str : "unknown";
 }
 
+std::string GetInteriorVehicleDataRequest::ModuleId() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto msg_params = (*message_)[app_mngr::strings::msg_params];
+  if (msg_params.keyExists(message_params::kModuleId)) {
+    return msg_params[message_params::kModuleId].asString();
+  }
+  const std::string module_id =
+      rc_capabilities_manager_.GetDefaultModuleIdFromCapabilities(ModuleType());
+  return module_id;
+}
+
 }  // namespace commands
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
index 06b5218bb3..91ecbe77eb 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/on_interior_vehicle_data_notification.cc
@@ -50,27 +50,31 @@ OnInteriorVehicleDataNotification::OnInteriorVehicleDataNotification(
                                                   params.rpc_service_,
                                                   params.hmi_capabilities_,
                                                   params.policy_handler_)
-    , interior_data_cache_(params.interior_data_cache_) {}
+    , interior_data_cache_(params.interior_data_cache_)
+    , rc_capabilities_manager_(params.rc_capabilities_manager_) {}
 
 OnInteriorVehicleDataNotification::~OnInteriorVehicleDataNotification() {}
 
 void OnInteriorVehicleDataNotification::AddDataToCache(
-    const std::string& module_type) {
+    const ModuleUid& module) {
   const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
   const auto module_data =
       (*message_)[app_mngr::strings::msg_params][message_params::kModuleData]
-                 [data_mapping(module_type)];
-  interior_data_cache_.Add(module_type, module_data);
+                 [data_mapping(module.first)];
+  interior_data_cache_.Add(module, module_data);
 }
 
 void OnInteriorVehicleDataNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
+
   auto apps_subscribed =
-      RCHelpers::AppsSubscribedToModuleType(application_manager_, module_type);
+      RCHelpers::AppsSubscribedToModule(application_manager_, module);
   if (!apps_subscribed.empty()) {
-    AddDataToCache(module_type);
+    AddDataToCache(module);
   }
   typedef std::vector<application_manager::ApplicationSharedPtr> AppPtrs;
   AppPtrs apps = RCRPCPlugin::GetRCApplications(application_manager_);
@@ -84,17 +88,36 @@ void OnInteriorVehicleDataNotification::Run() {
     const auto extension = RCHelpers::GetRCExtension(app);
     DCHECK(extension);
     LOG4CXX_TRACE(logger_,
-                  "Check subscription for "
-                      << app.app_id() << "and module type " << module_type);
-    if (extension->IsSubscibedToInteriorVehicleData(module_type)) {
+                  "Check subscription for " << app.app_id()
+                                            << "and module type " << module_type
+                                            << " " << module_id);
+
+    if (extension->IsSubscribedToInteriorVehicleData(module)) {
       (*message_)[app_mngr::strings::params]
                  [app_mngr::strings::connection_key] = app.app_id();
+
+      (*message_)[app_mngr::strings::msg_params][message_params::kModuleData]
+                 [message_params::kModuleId] = module_id;
+
       SendNotification();
     }
   }
 }
 
-std::string OnInteriorVehicleDataNotification::ModuleType() {
+std::string OnInteriorVehicleDataNotification::ModuleId() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto msg_params = (*message_)[app_mngr::strings::msg_params];
+  if (msg_params[message_params::kModuleData].keyExists(
+          message_params::kModuleId)) {
+    return msg_params[message_params::kModuleData][message_params::kModuleId]
+        .asString();
+  }
+  const std::string module_id =
+      rc_capabilities_manager_.GetDefaultModuleIdFromCapabilities(ModuleType());
+  return module_id;
+}
+
+std::string OnInteriorVehicleDataNotification::ModuleType() const {
   mobile_apis::ModuleType::eType module_type =
       static_cast<mobile_apis::ModuleType::eType>(
           (*message_)[app_mngr::strings::msg_params]
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc
new file mode 100644
index 0000000000..e30d7869bd
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <string>
+
+#include "application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/resource_allocation_manager.h"
+#include "rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_request.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+#include "smart_objects/enum_schema_item.h"
+
+namespace rc_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+namespace {
+struct ResponseParams {
+  std::string response_info;
+  std::string module_type;
+  std::string module_id;
+  mobile_apis::Result::eType result_code;
+  uint32_t app_id;
+  bool success_result;
+};
+
+void PrepareResponseResult(
+    ResponseParams& response_params_out,
+    rc_rpc_plugin::ResourceReleasedState::eType& released_result) {
+  std::stringstream ss;
+  auto info_inserter = [&ss, response_params_out](std::string info) {
+    ss << "Module [" << response_params_out.module_type << ":"
+       << response_params_out.module_id << "] " << info;
+  };
+  switch (released_result) {
+    case rc_rpc_plugin::ResourceReleasedState::eType::IS_RELEASED: {
+      response_params_out.success_result = true;
+      response_params_out.result_code = mobile_apis::Result::eType::SUCCESS;
+      info_inserter("is released successfully.");
+      break;
+    }
+    case rc_rpc_plugin::ResourceReleasedState::eType::IS_ALLOCATED: {
+      response_params_out.success_result = false;
+      response_params_out.result_code = mobile_apis::Result::eType::REJECTED;
+      info_inserter("is allocated to a different application.");
+      break;
+    }
+    case rc_rpc_plugin::ResourceReleasedState::eType::NOT_ALLOCATED: {
+      response_params_out.success_result = false;
+      response_params_out.result_code = mobile_apis::Result::eType::IGNORED;
+      info_inserter("is not allocated to any application.");
+      break;
+    }
+  }
+  response_params_out.response_info = ss.str();
+}
+}  // namespace
+
+ReleaseInteriorVehicleDataModuleRequest::
+    ReleaseInteriorVehicleDataModuleRequest(
+        const application_manager::commands::MessageSharedPtr& message,
+        const RCCommandParams& params)
+    : RCCommandRequest(message, params) {}
+
+bool ReleaseInteriorVehicleDataModuleRequest::ProcessCapabilities() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const smart_objects::SmartObject* rc_capabilities =
+      hmi_capabilities_.rc_capability();
+
+  const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+  const ModuleUid module(module_type, module_id);
+  if (rc_capabilities &&
+      !rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Accessing not supported module: " << module_type << " " << module_id);
+    SendResponse(false,
+                 mobile_apis::Result::UNSUPPORTED_RESOURCE,
+                 "Accessing not supported module");
+    return false;
+  }
+  return true;
+}
+
+void ReleaseInteriorVehicleDataModuleRequest::Execute() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!ProcessCapabilities()) {
+    return;
+  }
+
+  const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
+
+  ApplicationSharedPtr app = application_manager_.application(connection_key());
+
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
+
+  const uint32_t app_id = app->app_id();
+
+  ResourceReleasedState::eType released_result =
+      resource_allocation_manager_.ReleaseResource(
+          module_type, module_id, app_id);
+
+  bool success_result = true;
+  mobile_apis::Result::eType result_code = mobile_apis::Result::eType::SUCCESS;
+  std::string response_info;
+  ResponseParams response_params{response_info,
+                                 ModuleType(),
+                                 module_id,
+                                 result_code,
+                                 app_id,
+                                 success_result};
+  PrepareResponseResult(response_params, released_result);
+
+  if (response_params.success_result) {
+    resource_allocation_manager_.SendOnRCStatusNotifications(
+        NotificationTrigger::MODULE_ALLOCATION, app);
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Resource for module: "
+                    << ModuleType() << " with id: " << module_id
+                    << " was released with result " << std::boolalpha
+                    << response_params.success_result
+                    << " and result_code: " << response_params.result_code);
+
+  SendResponse(response_params.success_result,
+               response_params.result_code,
+               response_params.response_info.c_str());
+}
+
+std::string ReleaseInteriorVehicleDataModuleRequest::ModuleType() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  mobile_apis::ModuleType::eType module_type =
+      static_cast<mobile_apis::ModuleType::eType>(
+          (*message_)[app_mngr::strings::msg_params]
+                     [message_params::kModuleType]
+                         .asUInt());
+
+  const char* str;
+  const bool ok = ns_smart_device_link::ns_smart_objects::EnumConversionHelper<
+      mobile_apis::ModuleType::eType>::EnumToCString(module_type, &str);
+  return ok ? str : "unknown";
+}
+
+std::string ReleaseInteriorVehicleDataModuleRequest::ModuleId() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto msg_params = (*message_)[app_mngr::strings::msg_params];
+  if (msg_params.keyExists(message_params::kModuleId)) {
+    return msg_params[message_params::kModuleId].asString();
+  }
+  const std::string module_id =
+      rc_capabilities_manager_.GetDefaultModuleIdFromCapabilities(ModuleType());
+  return module_id;
+}
+
+ReleaseInteriorVehicleDataModuleRequest::
+    ~ReleaseInteriorVehicleDataModuleRequest() {}
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_response.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_response.cc
new file mode 100644
index 0000000000..fae792f143
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_response.cc
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_response.h"
+
+namespace rc_rpc_plugin {
+namespace commands {
+
+ReleaseInteriorVehicleDataModuleResponse::
+    ReleaseInteriorVehicleDataModuleResponse(
+        const application_manager::commands::MessageSharedPtr& message,
+        const RCCommandParams& params)
+    : application_manager::commands::CommandResponseImpl(
+          message,
+          params.application_manager_,
+          params.rpc_service_,
+          params.hmi_capabilities_,
+          params.policy_handler_) {}
+
+void ReleaseInteriorVehicleDataModuleResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  application_manager_.GetRPCService().SendMessageToMobile(message_);
+}
+
+ReleaseInteriorVehicleDataModuleResponse::
+    ~ReleaseInteriorVehicleDataModuleResponse() {}
+
+}  // namespace commands
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
index 44d302276d..c3e5e807d7 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
@@ -45,106 +45,6 @@ namespace commands {
 
 using namespace json_keys;
 using namespace message_params;
-
-namespace {
-std::vector<std::string> GetModuleReadOnlyParams(
-    const std::string& module_type) {
-  std::vector<std::string> module_ro_params;
-  if (enums_value::kClimate == module_type) {
-    module_ro_params.push_back(kCurrentTemperature);
-  } else if (enums_value::kRadio == module_type) {
-    module_ro_params.push_back(kRdsData);
-    module_ro_params.push_back(kAvailableHDs);
-    module_ro_params.push_back(kAvailableHdChannels);
-    module_ro_params.push_back(kSignalStrength);
-    module_ro_params.push_back(kSignalChangeThreshold);
-    module_ro_params.push_back(kState);
-    module_ro_params.push_back(kSisData);
-  } else if (enums_value::kLight == module_type) {
-    module_ro_params.push_back(kLightStatus);
-  }
-
-  return module_ro_params;
-}
-
-const std::map<std::string, std::string> GetLightCapabilitiesMapping() {
-  std::map<std::string, std::string> mapping = {
-      {message_params::kId, strings::kName},
-      {message_params::kLightStatus, strings::kStatusAvailable},
-      {message_params::kLightDensity, strings::kDensityAvailable},
-      {message_params::kLightColor, strings::kRGBColorSpaceAvailable}};
-  return mapping;
-}
-
-const std::map<std::string, std::string> GetModuleDataToCapabilitiesMapping() {
-  std::map<std::string, std::string> mapping;
-  // climate
-  mapping["fanSpeed"] = "fanSpeedAvailable";
-  mapping["currentTemperature"] = "currentTemperatureAvailable";
-  mapping["desiredTemperature"] = "desiredTemperatureAvailable";
-  mapping["acEnable"] = "acEnableAvailable";
-  mapping["circulateAirEnable"] = "circulateAirEnableAvailable";
-  mapping["autoModeEnable"] = "autoModeEnableAvailable";
-  mapping["defrostZone"] = "defrostZoneAvailable";
-  mapping["dualModeEnable"] = "dualModeEnableAvailable";
-  mapping["acMaxEnable"] = "acMaxEnableAvailable";
-  mapping["ventilationMode"] = "ventilationModeAvailable";
-  mapping["heatedSteeringWheelEnable"] = "heatedSteeringWheelAvailable";
-  mapping["heatedWindshieldEnable"] = "heatedWindshieldAvailable";
-  mapping["heatedMirrorsEnable"] = "heatedMirrorsAvailable";
-  mapping["heatedRearWindowEnable"] = "heatedRearWindowAvailable";
-  mapping["climateEnable"] = "climateEnableAvailable";
-  mapping["climateEnableAvailable"] = "climateEnableAvailable";
-
-  // radio
-  mapping["band"] = "radioBandAvailable";
-  mapping["frequencyInteger"] = "radioFrequencyAvailable";
-  mapping["frequencyFraction"] = "radioFrequencyAvailable";
-  mapping["rdsData"] = "rdsDataAvailable";
-  mapping["availableHDs"] = "availableHDsAvailable";
-  mapping["availableHdChannels"] = "availableHdChannelsAvailable";
-  mapping["hdChannel"] = "availableHdChannelsAvailable";
-  mapping["hdRadioEnable"] = "hdRadioEnableAvailable";
-  mapping["signalStrength"] = "signalStrengthAvailable";
-  mapping["signalChangeThreshold"] = "signalChangeThresholdAvailable";
-  mapping["radioEnable"] = "radioEnableAvailable";
-  mapping["state"] = "stateAvailable";
-  mapping["sisData"] = "sisDataAvailable";
-
-  // seat
-  mapping["heatingEnabled"] = "heatingEnabledAvailable";
-  mapping["coolingEnabled"] = "coolingEnabledAvailable";
-  mapping["heatingLevel"] = "heatingLevelAvailable";
-  mapping["coolingLevel"] = "coolingLevelAvailable";
-  mapping["horizontalPosition"] = "horizontalPositionAvailable";
-  mapping["verticalPosition"] = "verticalPositionAvailable";
-  mapping["frontVerticalPosition"] = "frontVerticalPositionAvailable";
-  mapping["backVerticalPosition"] = "backVerticalPositionAvailable";
-  mapping["backTiltAngle"] = "backTiltAngleAvailable";
-  mapping["headSupportHorizontalPosition"] =
-      "headSupportHorizontalPositionAvailable";
-  mapping["headSupportVerticalPosition"] =
-      "headSupportVerticalPositionAvailable";
-  mapping["massageEnabled"] = "massageEnabledAvailable";
-  mapping["massageMode"] = "massageModeAvailable";
-  mapping["massageCushionFirmness"] = "massageCushionFirmnessAvailable";
-  mapping["memory"] = "memoryAvailable";
-
-  // audio
-  mapping["source"] = "sourceAvailable";
-  mapping["keepContext"] = "keepContextAvailable";
-  mapping["volume"] = "volumeAvailable";
-  mapping["equalizerSettings"] = "equalizerAvailable";
-
-  // hmi settings
-  mapping["distanceUnit"] = "distanceUnitAvailable";
-  mapping["temperatureUnit"] = "temperatureUnitAvailable";
-  mapping["displayMode"] = "displayModeUnitAvailable";
-
-  return mapping;
-}
-}  // namespace
-
 CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule")
 
 SetInteriorVehicleDataRequest::SetInteriorVehicleDataRequest(
@@ -154,250 +54,6 @@ SetInteriorVehicleDataRequest::SetInteriorVehicleDataRequest(
 
 SetInteriorVehicleDataRequest::~SetInteriorVehicleDataRequest() {}
 
-const std::string LightName(const smart_objects::SmartObject& light_name) {
-  const char* name;
-  const bool ok = ns_smart_device_link::ns_smart_objects::
-      EnumConversionHelper<mobile_apis::LightName::eType>::EnumToCString(
-          static_cast<mobile_apis::LightName::eType>(light_name.asUInt()),
-          &name);
-  return ok ? name : "unknown";
-}
-
-/**
- * @brief Check whether the parameter exist in capabilities
- * @param smart object of capabilities
- * @param mapping - map of module data and capabilities
- * @param request_parameter - string
- * @param switched_off_result - ref of mobile_apis::Result
- * @return success if parameter exist in capabilities missedParam otherwise
- */
-capabilitiesStatus GetItemCapability(
-    const smart_objects::SmartObject& capabilities,
-    const std::map<std::string, std::string>& mapping,
-    const std::string& request_parameter,
-    const mobile_apis::Result::eType& switched_off_result) {
-  const auto it = mapping.find(request_parameter);
-
-  if (it == mapping.end()) {
-    LOG4CXX_DEBUG(
-        logger_,
-        "Parameter " << request_parameter << " doesn't exist in capabilities.");
-    return capabilitiesStatus::missedParam;
-  }
-
-  const std::string& caps_key = it->second;
-
-  LOG4CXX_DEBUG(logger_,
-                "Checking request parameter "
-                    << request_parameter
-                    << " with capabilities. Appropriate key is " << caps_key);
-
-  if (!capabilities.keyExists(caps_key)) {
-    LOG4CXX_DEBUG(logger_,
-                  "Capability " << caps_key
-                                << " is missed in RemoteControl capabilities");
-    return capabilitiesStatus::missedParam;
-  }
-
-  if (!capabilities[caps_key].asBool()) {
-    LOG4CXX_DEBUG(logger_,
-                  "Capability "
-                      << caps_key
-                      << " is switched off in RemoteControl capabilities");
-    capabilitiesStatus status = capabilitiesStatus::missedParam;
-    if (mobile_apis::Result::READ_ONLY == switched_off_result) {
-      status = capabilitiesStatus::readOnly;
-    }
-    return status;
-  }
-
-  return capabilitiesStatus::success;
-}
-
-/**
- * @brief Check whether the cpabilities for light allowed
- * @param smart object of capabilities
- * @param smart object of control_data
- * @return pair of state and capability status - ModuleCapability
- */
-ModuleCapability GetLightDataCapabilities(
-    const smart_objects::SmartObject& capabilities,
-    const smart_objects::SmartObject& control_data) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  std::map<std::string, std::string> mapping = GetLightCapabilitiesMapping();
-
-  for (auto it = control_data.map_begin(); it != control_data.map_end(); ++it) {
-    const std::string& request_parameter = it->first;
-
-    if (message_params::kId == request_parameter) {
-      continue;
-    }
-
-    const capabilitiesStatus status_item_capability =
-        GetItemCapability(capabilities,
-                          mapping,
-                          request_parameter,
-                          mobile_apis::Result::READ_ONLY);
-
-    if (capabilitiesStatus::success != status_item_capability) {
-      return std::make_pair(message_params::kLightState,
-                            status_item_capability);
-    }
-  }
-
-  return std::make_pair("", capabilitiesStatus::success);
-}
-
-/**
- * @brief Check whether the light name exists in capabilities
- * @param smart object of capabilities_status
- * @param smart object of light_data
- * @return pair of state and capability status - ModuleCapability
- */
-ModuleCapability GetLightNameCapabilities(
-    const smart_objects::SmartObject& capabilities_status,
-    const smart_objects::SmartObject& light_data) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  auto it = capabilities_status.asArray()->begin();
-  for (; it != capabilities_status.asArray()->end(); ++it) {
-    const smart_objects::SmartObject& so = *it;
-    const int64_t current_id = so[message_params::kName].asInt();
-    if (current_id == light_data[message_params::kId].asInt()) {
-      return GetLightDataCapabilities(so, light_data);
-    }
-  }
-  LOG4CXX_DEBUG(logger_, "There is no such light name in capabilities");
-  return std::make_pair(message_params::kLightState,
-                        capabilitiesStatus::missedLightName);
-}
-
-ModuleCapability GetRadioBandByCapabilities(
-    const smart_objects::SmartObject& capabilities_status,
-    const smart_objects::SmartObject& request_parameter) {
-  mobile_apis::RadioBand::eType radio_band =
-      static_cast<mobile_apis::RadioBand::eType>(request_parameter.asUInt());
-  if (mobile_apis::RadioBand::XM == radio_band) {
-    if (!capabilities_status.keyExists(strings::kSiriusxmRadioAvailable)) {
-      LOG4CXX_DEBUG(logger_,
-                    "Capability "
-                        << strings::kSiriusxmRadioAvailable
-                        << " is missed in RemoteControl capabilities");
-      return std::make_pair(strings::kSiriusxmRadioAvailable,
-                            capabilitiesStatus::missedParam);
-    }
-    if (!capabilities_status[strings::kSiriusxmRadioAvailable].asBool()) {
-      LOG4CXX_DEBUG(logger_,
-                    "Capability "
-                        << strings::kSiriusxmRadioAvailable
-                        << " is switched off in RemoteControl capabilities");
-      return std::make_pair(strings::kSiriusxmRadioAvailable,
-                            capabilitiesStatus::missedParam);
-    }
-  }
-  return std::make_pair("", capabilitiesStatus::success);
-}
-
-/**
- * @brief Check whether the exists light data related to correspondent
- * capabilities
- * @param smart object of capabilities
- * @param smart object of control_data
- * @return pair of state and capability status - ModuleCapability
- */
-ModuleCapability GetControlDataCapabilities(
-    const smart_objects::SmartObject& capabilities,
-    const smart_objects::SmartObject& control_data) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  std::map<std::string, std::string> mapping =
-      GetModuleDataToCapabilitiesMapping();
-
-  for (auto it = control_data.map_begin(); it != control_data.map_end(); ++it) {
-    const std::string& request_parameter = it->first;
-    if (message_params::kId == request_parameter) {
-      continue;
-    }
-    if (message_params::kLightState == request_parameter) {
-      auto light_data = control_data[request_parameter].asArray()->begin();
-      ModuleCapability light_capability =
-          std::make_pair("", capabilitiesStatus::success);
-
-      for (; light_data != control_data[request_parameter].asArray()->end();
-           ++light_data) {
-        light_capability = GetLightNameCapabilities(
-            capabilities[strings::kSupportedLights], *light_data);
-
-        if (capabilitiesStatus::success != light_capability.second) {
-          return light_capability;
-        }
-      }
-
-      return light_capability;
-    }
-    if (message_params::kBand == request_parameter) {
-      ModuleCapability radio_capability = GetRadioBandByCapabilities(
-          capabilities, control_data[request_parameter]);
-      if (capabilitiesStatus::success != radio_capability.second) {
-        return radio_capability;
-      }
-    }
-
-    const capabilitiesStatus status_item_capability =
-        GetItemCapability(capabilities,
-                          mapping,
-                          request_parameter,
-                          mobile_apis::Result::UNSUPPORTED_RESOURCE);
-
-    if (capabilitiesStatus::success != status_item_capability) {
-      return std::make_pair("", status_item_capability);
-    }
-  }
-
-  return std::make_pair("", capabilitiesStatus::success);
-}
-
-/**
- * @brief Check whether rc module data capabilities are presented
- * @param smart object of rc_capabilities
- * @param smart object of module_data
- * @return pair of state and capability status - ModuleCapability
- */
-ModuleCapability GetModuleDataCapabilities(
-    const smart_objects::SmartObject& rc_capabilities,
-    const smart_objects::SmartObject& module_data) {
-  LOG4CXX_AUTO_TRACE(logger_);
-
-  const auto& all_module_types = RCHelpers::GetModulesList();
-  const auto& get_module_data_key = RCHelpers::GetModuleTypeToDataMapping();
-  const auto& get_capabilities_key =
-      RCHelpers::GetModuleTypeToCapabilitiesMapping();
-  ModuleCapability module_data_capabilities =
-      std::make_pair("", capabilitiesStatus::missedParam);
-
-  for (const auto& module_type : all_module_types) {
-    const auto module_data_key = get_module_data_key(module_type);
-    const auto capabilities_key = get_capabilities_key(module_type);
-    if (module_data.keyExists(module_data_key)) {
-      if (!rc_capabilities.keyExists(capabilities_key)) {
-        LOG4CXX_DEBUG(logger_, module_data_key << " capabilities not present");
-        return module_data_capabilities;
-      }
-      const smart_objects::SmartObject& caps =
-          rc_capabilities[capabilities_key];
-
-      if (message_params::kHmiSettingsControlData == module_data_key ||
-          message_params::kLightControlData == module_data_key) {
-        module_data_capabilities =
-            GetControlDataCapabilities(caps, module_data[module_data_key]);
-      } else {
-        module_data_capabilities =
-            GetControlDataCapabilities(caps[0], module_data[module_data_key]);
-      }
-    }
-  }
-
-  return module_data_capabilities;
-}
-
 /**
  * @brief Clears unrelated module data parameters
  * @param module type in request
@@ -407,7 +63,7 @@ ModuleCapability GetModuleDataCapabilities(
 bool ClearUnrelatedModuleData(const std::string& module_type,
                               smart_objects::SmartObject& module_data) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const auto& all_module_types = RCHelpers::GetModulesList();
+  const auto& all_module_types = RCHelpers::GetModuleTypesList();
   const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
   bool module_type_and_data_match = false;
   for (const auto& type : all_module_types) {
@@ -423,7 +79,7 @@ bool ClearUnrelatedModuleData(const std::string& module_type,
 }
 
 mobile_apis::Result::eType PrepareResultCodeAndInfo(
-    const ModuleCapability module_data_capabilities, std::string& info) {
+    const ModuleTypeCapability module_data_capabilities, std::string& info) {
   mobile_apis::Result::eType result_code =
       mobile_apis::Result::UNSUPPORTED_RESOURCE;
   if (message_params::kLightState == module_data_capabilities.first) {
@@ -459,25 +115,35 @@ void SetInteriorVehicleDataRequest::Execute() {
   const std::string module_type = ModuleType();
 
   if (ClearUnrelatedModuleData(module_type, module_data)) {
-    const smart_objects::SmartObject* rc_capabilities =
-        hmi_capabilities_.rc_capability();
-    ModuleCapability module_data_capabilities;
+    const std::string module_id = ModuleId();
+    const ModuleUid module(module_type, module_id);
+    if (!rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) {
+      LOG4CXX_WARN(logger_,
+                   "Accessing not supported module: " << module_type << " "
+                                                      << module_id);
+      SetResourceState(ModuleType(), ResourceState::FREE);
+      SendResponse(false,
+                   mobile_apis::Result::UNSUPPORTED_RESOURCE,
+                   "Accessing not supported module data");
+      return;
+    }
 
-    if (rc_capabilities) {
-      module_data_capabilities =
-          GetModuleDataCapabilities(*rc_capabilities, module_data);
+    ModuleTypeCapability module_data_capabilities;
+    module_data_capabilities =
+        rc_capabilities_manager_.GetModuleDataCapabilities(module_data,
+                                                           module_id);
 
-      if (capabilitiesStatus::success != module_data_capabilities.second) {
-        SetResourceState(ModuleType(), ResourceState::FREE);
-        std::string info;
-        mobile_apis::Result::eType result =
-            PrepareResultCodeAndInfo(module_data_capabilities, info);
-        SendResponse(false, result, info.c_str());
-        return;
-      }
+    if (capabilitiesStatus::success != module_data_capabilities.second) {
+      SetResourceState(ModuleType(), ResourceState::FREE);
+      std::string info;
+      mobile_apis::Result::eType result =
+          PrepareResultCodeAndInfo(module_data_capabilities, info);
+      SendResponse(false, result, info.c_str());
+      return;
     }
 
-    if (AreAllParamsReadOnly(module_data)) {
+    if (rc_capabilities_manager_.AreAllParamsReadOnly(module_data,
+                                                      module_type)) {
       LOG4CXX_WARN(logger_, "All request params in module type are READ ONLY!");
       SetResourceState(ModuleType(), ResourceState::FREE);
       SendResponse(false,
@@ -488,7 +154,8 @@ void SetInteriorVehicleDataRequest::Execute() {
 
     module_data_capabilities = std::make_pair("", capabilitiesStatus::success);
 
-    if (AreReadOnlyParamsPresent(module_data, module_data_capabilities)) {
+    if (rc_capabilities_manager_.AreReadOnlyParamsPresent(
+            module_data, module_type, module_data_capabilities)) {
       LOG4CXX_DEBUG(logger_, "Request module type has READ ONLY parameters");
 
       if (enums_value::kLight == module_data_capabilities.first &&
@@ -535,11 +202,14 @@ void SetInteriorVehicleDataRequest::Execute() {
       }
     }
 
+    (*message_)[app_mngr::strings::msg_params][message_params::kModuleData]
+               [message_params::kModuleId] = module_id;
     SendHMIRequest(hmi_apis::FunctionID::RC_SetInteriorVehicleData,
                    &(*message_)[app_mngr::strings::msg_params],
                    true);
   } else {
     LOG4CXX_WARN(logger_, "Request module type & data mismatch!");
+    SetResourceState(ModuleType(), ResourceState::FREE);
     SendResponse(false,
                  mobile_apis::Result::INVALID_DATA,
                  "Request module type & data mismatch!");
@@ -568,13 +238,45 @@ void SetInteriorVehicleDataRequest::on_event(
           mobile_apis::Result::WARNINGS);
 
   smart_objects::SmartObject response_params;
+  bool is_resource_acquired = false;
+
   if (result) {
+    if (!IsModuleIdProvided(hmi_response)) {
+      LOG4CXX_WARN(logger_,
+                   "conditional mandatory parameter "
+                       << message_params::kModuleId
+                       << " missed in hmi response");
+      result = false;
+      result_code = mobile_apis::Result::GENERIC_ERROR;
+    }
     response_params = hmi_response[app_mngr::strings::msg_params];
     if (enums_value::kAudio == ModuleType()) {
       CheckAudioSource((
           *message_)[app_mngr::strings::msg_params][message_params::kModuleData]
                     [message_params::kAudioControlData]);
     }
+
+    const std::string module_type = ModuleType();
+    const std::string module_id = ModuleId();
+
+    const rc_rpc_types::ModuleUid resource{module_type, module_id};
+    auto app = application_manager_.application(connection_key());
+
+    if (!app) {
+      LOG4CXX_ERROR(logger_, "NULL pointer.");
+      SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED, "");
+      return;
+    }
+
+    const auto app_id = app->app_id();
+
+    if (!resource_allocation_manager_.IsResourceAlreadyAcquiredByApp(resource,
+                                                                     app_id)) {
+      resource_allocation_manager_.SetResourceAcquired(
+          module_type, module_id, app_id);
+      is_resource_acquired = true;
+    }
+
   } else {
     app_mngr::ApplicationSharedPtr app =
         application_manager_.application(connection_key());
@@ -584,21 +286,12 @@ void SetInteriorVehicleDataRequest::on_event(
   GetInfo(hmi_response, info);
   SendResponse(
       result, result_code, info.c_str(), result ? &response_params : nullptr);
-}
-
-const smart_objects::SmartObject& SetInteriorVehicleDataRequest::ControlData(
-    const smart_objects::SmartObject& module_data) {
-  const std::string module_type = ModuleType();
 
-  const auto& all_module_types = RCHelpers::GetModulesList();
-  const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
-  for (const auto& type : all_module_types) {
-    if (type == module_type) {
-      return module_data[data_mapping(type)];
-    }
+  if (is_resource_acquired) {
+    resource_allocation_manager_.SendOnRCStatusNotifications(
+        NotificationTrigger::MODULE_ALLOCATION,
+        std::shared_ptr<application_manager::Application>());
   }
-  NOTREACHED();
-  return module_data[0];
 }
 
 void SetInteriorVehicleDataRequest::CheckAudioSource(
@@ -610,116 +303,12 @@ void SetInteriorVehicleDataRequest::CheckAudioSource(
   }
 }
 
-bool SetInteriorVehicleDataRequest::AreAllParamsReadOnly(
-    const smart_objects::SmartObject& module_data) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  const smart_objects::SmartObject& module_type_params =
-      ControlData(module_data);
-  auto it = module_type_params.map_begin();
-  std::vector<std::string> ro_params = GetModuleReadOnlyParams(ModuleType());
-  for (; it != module_type_params.map_end(); ++it) {
-    if (!helpers::in_range(ro_params, it->first)) {
-      return false;
-    }
-  }
-
-  LOG4CXX_DEBUG(logger_, "All params are ReadOnly");
-  return true;
-}
-
-bool CheckReadOnlyParamsForAudio(
-    const smart_objects::SmartObject& module_type_params) {
-  if (module_type_params.keyExists(message_params::kEqualizerSettings)) {
-    const auto& equalizer_settings =
-        module_type_params[message_params::kEqualizerSettings];
-    auto it = equalizer_settings.asArray()->begin();
-
-    for (; it != equalizer_settings.asArray()->end(); ++it) {
-      if (it->keyExists(message_params::kChannelName)) {
-        LOG4CXX_DEBUG(logger_,
-                      "READ ONLY parameter. ChannelName = "
-                          << (*it)[message_params::kChannelName].asString());
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-bool CheckReadOnlyParamsForLight(
-    const smart_objects::SmartObject& module_type_params) {
-  if (module_type_params.keyExists(message_params::kLightState)) {
-    const auto& light_state = module_type_params[message_params::kLightState];
-    auto it = light_state.asArray()->begin();
-
-    for (; it != light_state.asArray()->end(); ++it) {
-      if (it->keyExists(message_params::kLightStatus)) {
-        const mobile_apis::LightStatus::eType light_status =
-            static_cast<mobile_apis::LightStatus::eType>(
-                (*it)[message_params::kLightStatus].asUInt());
-
-        if (helpers::Compare<mobile_apis::LightStatus::eType,
-                             helpers::EQ,
-                             helpers::ONE>(light_status,
-                                           mobile_apis::LightStatus::RAMP_UP,
-                                           mobile_apis::LightStatus::RAMP_DOWN,
-                                           mobile_apis::LightStatus::UNKNOWN,
-                                           mobile_apis::LightStatus::INVALID)) {
-          LOG4CXX_DEBUG(logger_,
-                        "READ ONLY parameter. Status = "
-                            << (*it)[message_params::kLightStatus].asInt());
-          return true;
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-bool SetInteriorVehicleDataRequest::AreReadOnlyParamsPresent(
-    const smart_objects::SmartObject& module_data,
-    ModuleCapability& module_data_capabilities) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  const smart_objects::SmartObject& module_type_params =
-      ControlData(module_data);
-  const std::string module_type = ModuleType();
-
-  if (enums_value::kAudio == module_type) {
-    return CheckReadOnlyParamsForAudio(module_type_params);
-  }
-
-  if (enums_value::kLight == module_type) {
-    const bool result = CheckReadOnlyParamsForLight(module_type_params);
-
-    if (result) {
-      module_data_capabilities =
-          std::make_pair(module_type, capabilitiesStatus::readOnly);
-    }
-
-    return result;
-  }
-
-  const std::vector<std::string> ro_params =
-      GetModuleReadOnlyParams(module_type);
-  auto it = module_type_params.map_begin();
-
-  for (; it != module_type_params.map_end(); ++it) {
-    if (helpers::in_range(ro_params, it->first)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
 void SetInteriorVehicleDataRequest::CutOffReadOnlyParams(
     smart_objects::SmartObject& module_data) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const smart_objects::SmartObject& module_type_params =
-      ControlData(module_data);
   const std::string module_type = ModuleType();
+  const auto& module_type_params =
+      rc_capabilities_manager_.ControlDataForType(module_data, module_type);
 
   if (enums_value::kAudio == module_type) {
     auto& equalizer_settings = module_data[message_params::kAudioControlData]
@@ -735,7 +324,8 @@ void SetInteriorVehicleDataRequest::CutOffReadOnlyParams(
     }
   }
 
-  std::vector<std::string> ro_params = GetModuleReadOnlyParams(module_type);
+  std::vector<std::string> ro_params =
+      RCHelpers::GetModuleReadOnlyParams(module_type);
   const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
   for (const auto& param : ro_params) {
     if (module_type_params.keyExists(param)) {
@@ -745,7 +335,8 @@ void SetInteriorVehicleDataRequest::CutOffReadOnlyParams(
   }
 }
 
-std::string SetInteriorVehicleDataRequest::ModuleType() {
+std::string SetInteriorVehicleDataRequest::ModuleType() const {
+  LOG4CXX_AUTO_TRACE(logger_);
   mobile_apis::ModuleType::eType module_type =
       static_cast<mobile_apis::ModuleType::eType>(
           (*message_)[app_mngr::strings::msg_params]
@@ -757,19 +348,40 @@ std::string SetInteriorVehicleDataRequest::ModuleType() {
   return ok ? str : "unknown";
 }
 
+std::string SetInteriorVehicleDataRequest::ModuleId() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto msg_params = (*message_)[app_mngr::strings::msg_params];
+  if (msg_params[message_params::kModuleData].keyExists(
+          message_params::kModuleId)) {
+    return msg_params[message_params::kModuleData][message_params::kModuleId]
+        .asString();
+  }
+  if (enums_value::kSeat == ModuleType()) {
+    const auto id = static_cast<mobile_apis::SupportedSeat::eType>(
+        msg_params[message_params::kModuleData]
+                  [message_params::kSeatControlData][message_params::kId]
+                      .asUInt());
+    return rc_capabilities_manager_.GetModuleIdForSeatLocation(id);
+  }
+  const std::string module_id =
+      rc_capabilities_manager_.GetDefaultModuleIdFromCapabilities(ModuleType());
+  return module_id;
+}
+
 AcquireResult::eType SetInteriorVehicleDataRequest::AcquireResource(
     const app_mngr::commands::MessageSharedPtr& message) {
   LOG4CXX_AUTO_TRACE(logger_);
   const std::string module_type = ModuleType();
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(CommandRequestImpl::connection_key());
-  return resource_allocation_manager_.AcquireResource(module_type,
-                                                      app->app_id());
+
+  return resource_allocation_manager_.AcquireResource(
+      module_type, ModuleId(), app->app_id());
 }
 
 bool SetInteriorVehicleDataRequest::IsResourceFree(
-    const std::string& module_type) const {
-  return resource_allocation_manager_.IsResourceFree(module_type);
+    const std::string& module_type, const std::string& module_id) const {
+  return resource_allocation_manager_.IsResourceFree(module_type, module_id);
 }
 
 void SetInteriorVehicleDataRequest::SetResourceState(
@@ -778,7 +390,7 @@ void SetInteriorVehicleDataRequest::SetResourceState(
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(CommandRequestImpl::connection_key());
   resource_allocation_manager_.SetResourceState(
-      module_type, app->app_id(), state);
+      module_type, ModuleId(), app->app_id(), state);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc
index 065425dd02..885c5ac0dd 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/rc_command_request.cc
@@ -31,9 +31,13 @@
  */
 
 #include "rc_rpc_plugin/commands/rc_command_request.h"
+#include <sstream>
 #include "application_manager/hmi_interfaces.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
+#include "rc_rpc_plugin/commands/rc_command_request.h"
 #include "rc_rpc_plugin/interior_data_cache.h"
+#include "rc_rpc_plugin/rc_helpers.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "smart_objects/enum_schema_item.h"
 
@@ -55,7 +59,9 @@ RCCommandRequest::RCCommandRequest(
     , auto_allowed_(false)
     , resource_allocation_manager_(params.resource_allocation_manager_)
     , interior_data_cache_(params.interior_data_cache_)
-    , interior_data_manager_(params.interior_data_manager_) {}
+    , interior_data_manager_(params.interior_data_manager_)
+    , rc_capabilities_manager_(params.rc_capabilities_manager_)
+    , rc_consent_manager_(params.rc_consent_manager_) {}
 
 RCCommandRequest::~RCCommandRequest() {}
 
@@ -100,6 +106,14 @@ rc_rpc_plugin::TypeAccess RCCommandRequest::CheckModule(
              : rc_rpc_plugin::TypeAccess::kDisallowed;
 }
 
+bool RCCommandRequest::IsModuleIdProvided(
+    const smart_objects::SmartObject& hmi_response) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return hmi_response[app_mngr::strings::msg_params]
+                     [message_params::kModuleData]
+                         .keyExists(message_params::kModuleId);
+}
+
 void RCCommandRequest::SendDisallowed(rc_rpc_plugin::TypeAccess access) {
   LOG4CXX_AUTO_TRACE(logger_);
   std::string info;
@@ -143,6 +157,15 @@ void RCCommandRequest::Run() {
                  "Remote control is disabled by user");
     return;
   }
+  auto rc_capabilities = hmi_capabilities_.rc_capability();
+  if (!rc_capabilities || rc_capabilities->empty()) {
+    LOG4CXX_WARN(logger_, "Accessing not supported module: " << ModuleType());
+    SetResourceState(ModuleType(), ResourceState::FREE);
+    SendResponse(false,
+                 mobile_apis::Result::UNSUPPORTED_RESOURCE,
+                 "Accessing not supported module");
+    return;
+  }
 
   if (CheckDriverConsent()) {
     if (AcquireResources()) {
@@ -157,8 +180,9 @@ void RCCommandRequest::Run() {
 bool RCCommandRequest::AcquireResources() {
   LOG4CXX_AUTO_TRACE(logger_);
   const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
 
-  if (!IsResourceFree(module_type)) {
+  if (!IsResourceFree(module_type, module_id)) {
     LOG4CXX_WARN(logger_, "Resource is busy.");
     SendResponse(false, mobile_apis::Result::IN_USE, "");
     return false;
@@ -175,7 +199,7 @@ bool RCCommandRequest::AcquireResources() {
       return false;
     }
     case AcquireResult::ASK_DRIVER: {
-      SendGetUserConsent(module_type);
+      ProcessAskDriverMode(module_type, module_id);
       return false;
     }
     case AcquireResult::REJECTED: {
@@ -203,6 +227,7 @@ void RCCommandRequest::ProcessAccessResponse(
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(CommandRequestImpl::connection_key());
   const std::string module_type = ModuleType();
+  const std::string module_id = ModuleId();
   if (!app) {
     LOG4CXX_ERROR(logger_, "NULL pointer.");
     SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED, "");
@@ -227,23 +252,18 @@ void RCCommandRequest::ProcessAccessResponse(
     if (message[app_mngr::strings::msg_params].keyExists(
             message_params::kAllowed)) {
       is_allowed =
-          message[app_mngr::strings::msg_params][message_params::kAllowed]
+          message[app_mngr::strings::msg_params][message_params::kAllowed][0]
               .asBool();
     }
-    if (is_allowed) {
-      resource_allocation_manager_.ForceAcquireResource(module_type,
-                                                        app->app_id());
-      SetResourceState(module_type, ResourceState::BUSY);
-      Execute();  // run child's logic
-    } else {
-      resource_allocation_manager_.OnDriverDisallowed(module_type,
-                                                      app->app_id());
-      SendResponse(
-          false,
-          mobile_apis::Result::REJECTED,
-          "The resource is in use and the driver disallows this remote "
-          "control RPC");
-    }
+    std::string policy_app_id = app->policy_app_id();
+    const auto mac_address = app->mac_address();
+    std::vector<std::string> module_ids{module_id};
+    std::vector<bool> module_allowed{is_allowed};
+    auto module_consents =
+        RCHelpers::FillModuleConsents(module_type, module_ids, module_allowed);
+    rc_consent_manager_.SaveModuleConsents(
+        policy_app_id, mac_address, module_consents);
+    ProcessConsentResult(is_allowed, module_type, module_id, app->app_id());
   } else {
     std::string response_info;
     GetInfo(message, response_info);
@@ -251,7 +271,56 @@ void RCCommandRequest::ProcessAccessResponse(
   }
 }
 
-void RCCommandRequest::SendGetUserConsent(const std::string& module_type) {
+void RCCommandRequest::ProcessConsentResult(const bool is_allowed,
+                                            const std::string& module_type,
+                                            const std::string& module_id,
+                                            const uint32_t app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (is_allowed) {
+    SetResourceState(module_type, ResourceState::BUSY);
+    Execute();  // run child's logic
+  } else {
+    resource_allocation_manager_.OnDriverDisallowed(
+        module_type, module_id, app_id);
+
+    std::stringstream ss;
+    ss << "The resource [" << module_type << ":" << module_id
+       << "] is in use and the driver disallows this remote "
+          "control RPC";
+    SendResponse(false, mobile_apis::Result::REJECTED, ss.str().c_str());
+  }
+}
+
+void RCCommandRequest::ProcessAskDriverMode(const std::string& module_type,
+                                            const std::string& module_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto app =
+      application_manager_.application(CommandRequestImpl::connection_key());
+  const std::string policy_app_id = app->policy_app_id();
+  const std::string mac_address = app->mac_address();
+
+  auto consent = rc_consent_manager_.GetModuleConsent(
+      policy_app_id, mac_address, {module_type, module_id});
+  switch (consent) {
+    case rc_rpc_types::ModuleConsent::NOT_EXISTS: {
+      smart_objects::SmartObject module_ids(
+          smart_objects::SmartType::SmartType_Array);
+      module_ids[0] = module_id;
+      SendGetUserConsent(module_type, module_ids);
+      break;
+    }
+    case rc_rpc_types::ModuleConsent::NOT_CONSENTED:
+    case rc_rpc_types::ModuleConsent::CONSENTED: {
+      const bool is_allowed = rc_rpc_types::ModuleConsent::CONSENTED == consent;
+      ProcessConsentResult(is_allowed, module_type, module_id, app->app_id());
+      break;
+    }
+  };
+}
+
+void RCCommandRequest::SendGetUserConsent(
+    const std::string& module_type,
+    const smart_objects::SmartObject& module_ids) {
   LOG4CXX_AUTO_TRACE(logger_);
   app_mngr::ApplicationSharedPtr app =
       application_manager_.application(CommandRequestImpl::connection_key());
@@ -260,6 +329,8 @@ void RCCommandRequest::SendGetUserConsent(const std::string& module_type) {
       smart_objects::SmartObject(smart_objects::SmartType_Map);
   msg_params[app_mngr::strings::app_id] = app->app_id();
   msg_params[message_params::kModuleType] = module_type;
+  msg_params[message_params::kModuleIds] = module_ids;
+
   SendHMIRequest(hmi_apis::FunctionID::RC_GetInteriorVehicleDataConsent,
                  &msg_params,
                  true);
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
index 2c8683f84a..3e50818210 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <thread>
 #include "application_manager/smart_object_keys.h"
+#include "rc_rpc_plugin/rc_helpers.h"
 #include "utils/date_time.h"
 #include "utils/logger.h"
 
@@ -46,138 +47,72 @@ InteriorDataCacheImpl::InteriorDataCacheImpl() {}
 
 InteriorDataCacheImpl::~InteriorDataCacheImpl() {}
 
-/**
- * @brief MergeModuleData all keys and values from first parameter and
- * update and append keys and values from the second
- * @param data1 - initial data
- * @param data2 - updated data
- * @return updated data1 with data2 keys and values
- */
-smart_objects::SmartObject MergeModuleData(
-    const smart_objects::SmartObject& data1,
-    const smart_objects::SmartObject& data2);
-
-/**
- * @brief MergeArray merge two arrays if their elements contain an `id`
- * parameter
- * @param data1 - initial data
- * @param data2 - updated data
- * @return updated data1 with any values in data2 if the arrays can be merged,
- * otherwise data2
- */
-smart_objects::SmartObject MergeArray(const smart_objects::SmartObject& data1,
-                                      const smart_objects::SmartObject& data2);
-
-smart_objects::SmartObject MergeModuleData(
-    const smart_objects::SmartObject& data1,
-    const smart_objects::SmartObject& data2) {
-  smart_objects::SmartObject result = data1;
-  auto it = data2.map_begin();
-  for (; it != data2.map_end(); ++it) {
-    const std::string& key = it->first;
-    smart_objects::SmartObject& value = it->second;
-    if (!result.keyExists(key) || value.getType() != result[key].getType()) {
-      result[key] = value;
-      continue;
-    }
-
-    // Merge maps and arrays with `id` param included, replace other types
-    if (value.getType() == smart_objects::SmartType::SmartType_Map) {
-      value = MergeModuleData(result[key], value);
-    } else if (value.getType() == smart_objects::SmartType::SmartType_Array) {
-      value = MergeArray(result[key], value);
-    }
-    result[key] = value;
-  }
-  return result;
-}
-
-smart_objects::SmartObject MergeArray(const smart_objects::SmartObject& data1,
-                                      const smart_objects::SmartObject& data2) {
-  // Merge data only in the case where each value in the array is an Object with
-  // an ID included, otherwise replace
-  bool array_contains_objects =
-      !data2.empty() &&
-      data2.getElement(0).getType() != smart_objects::SmartType::SmartType_Map;
-  bool can_merge_arrays =
-      array_contains_objects &&
-      data2.getElement(0).keyExists(application_manager::strings::id);
-  if (!can_merge_arrays) {
-    return data2;
-  }
-
-  smart_objects::SmartObject result = data1;
-  smart_objects::SmartArray* result_array = result.asArray();
-  smart_objects::SmartArray* data_array = data2.asArray();
-  auto data_it = data_array->begin();
-  auto find_by_id = [](smart_objects::SmartArray* array,
-                       const smart_objects::SmartObject& id)
-      -> smart_objects::SmartArray::iterator {
-    auto it = std::find_if(array->begin(),
-                           array->end(),
-                           [&id](smart_objects::SmartObject& obj) -> bool {
-                             return obj[application_manager::strings::id] == id;
-                           });
-    return it;
-  };
-
-  for (; data_it != data_array->end(); ++data_it) {
-    const smart_objects::SmartObject element_id =
-        (*data_it)[application_manager::strings::id];
-    auto result_it = find_by_id(result_array, element_id);
-
-    if (result_it != result_array->end()) {
-      *result_it = MergeModuleData(*result_it, *data_it);
-    } else {
-      result_array->push_back(*data_it);
-    }
-  }
-  return result;
-}
-
-void InteriorDataCacheImpl::Add(const std::string& module_type,
+void InteriorDataCacheImpl::Add(const ModuleUid& module,
                                 const smart_objects::SmartObject& module_data) {
-  LOG4CXX_TRACE(logger_, "module_type : " << module_type);
+  LOG4CXX_TRACE(
+      logger_,
+      "module_type : " << module.first << " module_id : " << module.second);
   sync_primitives::AutoLock autolock(cached_data_lock_);
-  auto it = cached_data_.find(module_type);
+  auto it = cached_data_.find(module);
   if (cached_data_.end() == it) {
-    cached_data_[module_type] = module_data;
+    cached_data_[module] = module_data;
     return;
   }
-  cached_data_[module_type] = MergeModuleData(it->second, module_data);
+  cached_data_[module] = RCHelpers::MergeModuleData(it->second, module_data);
 }
 
 smart_objects::SmartObject InteriorDataCacheImpl::Retrieve(
-    const std::string& module_type) const {
+    const ModuleUid& module) const {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(cached_data_lock_);
-  auto it = cached_data_.find(module_type);
+  auto it = cached_data_.find(module);
   if (it == cached_data_.end()) {
     LOG4CXX_WARN(logger_,
-                 "Module type " << module_type << " was not found in cache");
+                 "Module with type: " << module.first
+                                      << " and id: " << module.second
+                                      << " was not found in cache");
     return smart_objects::SmartObject(smart_objects::SmartType_Null);
   }
-  LOG4CXX_TRACE(logger_, "module_type : " << module_type);
+  LOG4CXX_TRACE(
+      logger_,
+      "module_type : " << module.first << " module_id : " << module.second);
   return it->second;
 }
 
-bool InteriorDataCacheImpl::Contains(const std::string& module_type) const {
+std::vector<ModuleUid> InteriorDataCacheImpl::GetCachedModulesByType(
+    const std::string& module_type) const {
+  std::vector<ModuleUid> modules;
+  for (auto& item : cached_data_) {
+    auto& module = item.first;
+    if (module_type == module.first) {
+      modules.push_back(module);
+    }
+  }
+  return modules;
+}
+
+bool InteriorDataCacheImpl::Contains(const ModuleUid& module) const {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(cached_data_lock_);
-  auto it = cached_data_.find(module_type);
+  auto it = cached_data_.find(module);
   const bool contains = it != cached_data_.end();
-  LOG4CXX_TRACE(
-      logger_,
-      "module_type : " << module_type << " " << (contains ? "true" : "false"));
+  LOG4CXX_TRACE(logger_,
+                "module_type : " << module.first
+                                 << " module_id : " << module.second << " "
+                                 << (contains ? "true" : "false"));
   return contains;
 }
 
-void InteriorDataCacheImpl::Remove(const std::string& module_type) {
-  LOG4CXX_TRACE(logger_, "module_type : " << module_type);
+void InteriorDataCacheImpl::Remove(const ModuleUid& module) {
+  LOG4CXX_TRACE(
+      logger_,
+      "module_type : " << module.first << " module_id : " << module.second);
   sync_primitives::AutoLock autolock(cached_data_lock_);
-  auto it = cached_data_.find(module_type);
+  auto it = cached_data_.find(module);
   if (cached_data_.end() == it) {
-    LOG4CXX_TRACE(logger_, "Not existing module_type : " << module_type);
+    LOG4CXX_TRACE(
+        logger_,
+        "Not existing module : " << module.first << " " << module.second);
     return;
   }
   cached_data_.erase(it);
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc
index cb800a6081..50568de63a 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc
@@ -33,7 +33,7 @@ void InteriorDataManagerImpl::OnApplicationEvent(
 void InteriorDataManagerImpl::OnDisablingRC() {
   LOG4CXX_AUTO_TRACE(logger_);
   auto existing_subscription = AppsSubscribedModules();
-  std::set<std::string> subscribed_modules;
+  std::set<ModuleUid> subscribed_modules;
   for (auto& pair : existing_subscription) {
     auto& app = pair.first;
     auto rc_extension = RCHelpers::GetRCExtension(*app);
@@ -43,36 +43,37 @@ void InteriorDataManagerImpl::OnDisablingRC() {
     }
   }
   for (auto& module : subscribed_modules) {
-    LOG4CXX_TRACE(logger_, "unsubscribe " << module);
+    LOG4CXX_TRACE(logger_,
+                  "unsubscribe from module type: " << module.first
+                                                   << " id: " << module.second);
     UnsubscribeFromInteriorVehicleData(module);
   }
 }
 
-void InteriorDataManagerImpl::StoreRequestToHMITime(
-    const std::string& module_type) {
+void InteriorDataManagerImpl::StoreRequestToHMITime(const ModuleUid& module) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(requests_to_hmi_history_lock_);
-  requests_to_hmi_history_[module_type].push_back(date_time::getCurrentTime());
+  requests_to_hmi_history_[module].push_back(date_time::getCurrentTime());
 }
 
 bool InteriorDataManagerImpl::CheckRequestsToHMIFrequency(
-    const std::string& module_type) {
+    const ModuleUid& module) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(requests_to_hmi_history_lock_);
   ClearOldRequestsToHMIHistory();
-  const auto& history = requests_to_hmi_history_[module_type];
+  const auto& history = requests_to_hmi_history_[module];
   const auto limit =
       app_mngr_.get_settings().get_interior_vehicle_data_frequency().first;
   return history.size() < limit;
 }
 
 void InteriorDataManagerImpl::UpdateHMISubscriptionsOnPolicyUpdated() {
-  auto apps_allowed_modules =
-      RCHelpers::GetApplicationsAllowedModules(app_mngr_);
-  auto apps_subscribed_modules = AppsSubscribedModules();
-  InteriorDataManagerImpl::AppsModules apps_disallowed_modules;
-  for (auto& pair : apps_subscribed_modules) {
-    auto& allowed = apps_allowed_modules[pair.first];
+  auto apps_allowed_module_types =
+      RCHelpers::GetApplicationsAllowedModuleTypes(app_mngr_);
+  auto apps_subscribed_module_types = AppsSubscribedModuleTypes();
+  InteriorDataManagerImpl::AppsModuleTypes apps_disallowed_modules;
+  for (auto& pair : apps_subscribed_module_types) {
+    auto& allowed = apps_allowed_module_types[pair.first];
     auto& subscribed = pair.second;
     std::vector<std::string> disallowed_modules;
     std::set_difference(subscribed.begin(),
@@ -80,18 +81,25 @@ void InteriorDataManagerImpl::UpdateHMISubscriptionsOnPolicyUpdated() {
                         allowed.begin(),
                         allowed.end(),
                         std::back_inserter(disallowed_modules));
+
+    std::sort(disallowed_modules.begin(), disallowed_modules.end());
+
+    auto unique_result =
+        std::unique(disallowed_modules.begin(), disallowed_modules.end());
+
+    disallowed_modules.erase(unique_result, disallowed_modules.end());
     apps_disallowed_modules[pair.first] = disallowed_modules;
   }
 
   for (auto& pair : apps_disallowed_modules) {
     auto& app = pair.first;
     auto rc_extension = RCHelpers::GetRCExtension(*app);
-    for (const auto& module : pair.second) {
-      rc_extension->UnsubscribeFromInteriorVehicleData(module);
+    for (const auto& module_type : pair.second) {
+      rc_extension->UnsubscribeFromInteriorVehicleDataOfType(module_type);
       auto apps_subscribed =
-          RCHelpers::AppsSubscribedToModuleType(app_mngr_, module);
+          RCHelpers::AppsSubscribedToModuleType(app_mngr_, module_type);
       if (apps_subscribed.empty()) {
-        UnsubscribeFromInteriorVehicleData(module);
+        UnsubscribeFromInteriorVehicleDataOfType(module_type);
       }
     }
   }
@@ -104,8 +112,7 @@ void InteriorDataManagerImpl::UpdateHMISubscriptionsOnAppUnregistered(
   auto subscribed_data = rc_extension->InteriorVehicleDataSubscriptions();
   rc_extension->UnsubscribeFromInteriorVehicleData();
   for (auto& data : subscribed_data) {
-    auto apps_subscribed =
-        RCHelpers::AppsSubscribedToModuleType(app_mngr_, data);
+    auto apps_subscribed = RCHelpers::AppsSubscribedToModule(app_mngr_, data);
     if (apps_subscribed.empty()) {
       UnsubscribeFromInteriorVehicleData(data);
     }
@@ -117,14 +124,31 @@ void InteriorDataManagerImpl::UpdateHMISubscriptionsOnAppUnregistered(
 }
 
 void InteriorDataManagerImpl::UnsubscribeFromInteriorVehicleData(
-    const std::string& module_type) {
-  cache_.Remove(module_type);
+    const ModuleUid& module) {
+  cache_.Remove(module);
   auto unsubscribe_request = RCHelpers::CreateUnsubscribeRequestToHMI(
-      module_type, app_mngr_.GetNextHMICorrelationID());
-  LOG4CXX_DEBUG(logger_, "Send Unsubscribe from " << module_type);
+      module, app_mngr_.GetNextHMICorrelationID());
+  LOG4CXX_DEBUG(logger_,
+                "Send Unsubscribe from module type: " << module.first << " id: "
+                                                      << module.second);
   rpc_service_.ManageHMICommand(unsubscribe_request);
 }
 
+void InteriorDataManagerImpl::UnsubscribeFromInteriorVehicleDataOfType(
+    const std::string& module_type) {
+  const auto& modules = cache_.GetCachedModulesByType(module_type);
+
+  for (const auto& module : modules) {
+    cache_.Remove(module);
+    auto unsubscribe_request = RCHelpers::CreateUnsubscribeRequestToHMI(
+        module, app_mngr_.GetNextHMICorrelationID());
+    LOG4CXX_DEBUG(logger_,
+                  "Send Unsubscribe from module type: "
+                      << module.first << " id: " << module.second);
+    rpc_service_.ManageHMICommand(unsubscribe_request);
+  }
+}
+
 void InteriorDataManagerImpl::ClearOldRequestsToHMIHistory() {
   auto limit =
       app_mngr_.get_settings().get_interior_vehicle_data_frequency().second;
@@ -148,11 +172,30 @@ InteriorDataManagerImpl::AppsSubscribedModules() {
   for (auto& app_ptr : apps_list) {
     const auto rc_extension = RCHelpers::GetRCExtension(*app_ptr);
     auto app_subscriptions = rc_extension->InteriorVehicleDataSubscriptions();
-    result[app_ptr] = std::vector<std::string>(app_subscriptions.size());
+    result[app_ptr] = std::vector<ModuleUid>(app_subscriptions.size());
     std::copy(app_subscriptions.begin(),
               app_subscriptions.end(),
               result[app_ptr].begin());
   }
   return result;
 }
+
+InteriorDataManagerImpl::AppsModuleTypes
+InteriorDataManagerImpl::AppsSubscribedModuleTypes() {
+  auto apps_list = RCRPCPlugin::GetRCApplications(app_mngr_);
+  RCHelpers::AppsModuleTypes result;
+  for (auto& app_ptr : apps_list) {
+    const auto rc_extension = RCHelpers::GetRCExtension(*app_ptr);
+    auto app_subscriptions = rc_extension->InteriorVehicleDataSubscriptions();
+    std::vector<std::string> app_module_types;
+
+    for (auto& app_subscription : app_subscriptions) {
+      app_module_types.push_back(app_subscription.first);
+    }
+
+    std::sort(app_module_types.begin(), app_module_types.end());
+    result[app_ptr] = app_module_types;
+  }
+  return result;
+}
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
index 5282da8d83..ea9c13113c 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
@@ -31,29 +31,51 @@
  */
 
 #include "rc_rpc_plugin/rc_app_extension.h"
+#include <algorithm>
+#include "rc_rpc_plugin/rc_module_constants.h"
+#include "smart_objects/smart_object.h"
 
 namespace rc_rpc_plugin {
 RCAppExtension::RCAppExtension(application_manager::AppExtensionUID uid)
     : AppExtension(uid) {}
 
-void RCAppExtension::SubscribeToInteriorVehicleData(
-    const std::string& module_type) {
-  subscribed_interior_vehicle_data_.insert(module_type);
+void RCAppExtension::SubscribeToInteriorVehicleData(const ModuleUid& module) {
+  subscribed_interior_vehicle_data_.insert(module);
 }
 
 void RCAppExtension::UnsubscribeFromInteriorVehicleData(
+    const ModuleUid& module) {
+  subscribed_interior_vehicle_data_.erase(module);
+}
+
+void RCAppExtension::UnsubscribeFromInteriorVehicleDataOfType(
     const std::string& module_type) {
-  subscribed_interior_vehicle_data_.erase(module_type);
+  for (auto& item : subscribed_interior_vehicle_data_) {
+    if (module_type == item.first) {
+      subscribed_interior_vehicle_data_.erase(item);
+    }
+  }
 }
 
 void RCAppExtension::UnsubscribeFromInteriorVehicleData() {
   subscribed_interior_vehicle_data_.clear();
 }
 
-bool RCAppExtension::IsSubscibedToInteriorVehicleData(
+bool RCAppExtension::IsSubscribedToInteriorVehicleDataOfType(
     const std::string& module_type) {
-  std::set<std::string>::iterator it =
-      subscribed_interior_vehicle_data_.find(module_type);
+  auto it = std::find_if(subscribed_interior_vehicle_data_.begin(),
+                         subscribed_interior_vehicle_data_.end(),
+                         [&module_type](ModuleUid module) -> bool {
+                           return module_type == module.first;
+                         });
+
+  return (it != subscribed_interior_vehicle_data_.end());
+}
+
+bool RCAppExtension::IsSubscribedToInteriorVehicleData(
+    const ModuleUid& module) {
+  std::set<ModuleUid>::iterator it =
+      subscribed_interior_vehicle_data_.find(module);
 
   return (it != subscribed_interior_vehicle_data_.end());
 }
@@ -65,9 +87,29 @@ void RCAppExtension::ProcessResumption(
     const ns_smart_device_link::ns_smart_objects::SmartObject&
         resumption_data) {}
 
-std::set<std::string> RCAppExtension::InteriorVehicleDataSubscriptions() const {
+std::set<ModuleUid> RCAppExtension::InteriorVehicleDataSubscriptions() const {
   return subscribed_interior_vehicle_data_;
 }
 
+Grid RCAppExtension::GetUserLocation() const {
+  return user_location_;
+}
+
+void RCAppExtension::SetUserLocation(
+    const ns_smart_device_link::ns_smart_objects::SmartObject& user_location) {
+  const auto grid = user_location[strings::kGrid];
+  const int32_t col = grid[strings::kCol].asInt();
+  const int32_t row = grid[strings::kRow].asInt();
+  const int32_t level = grid[strings::kLevel].asInt();
+  const int32_t colspan = grid[strings::kColspan].asInt();
+  const int32_t rowspan = grid[strings::kRowspan].asInt();
+  const int32_t levelspan = grid[strings::kLevelspan].asInt();
+  user_location_ = Grid(col, row, level, colspan, rowspan, levelspan);
+}
+
+void RCAppExtension::SetUserLocation(const Grid& grid) {
+  user_location_ = grid;
+}
+
 RCAppExtension::~RCAppExtension() {}
 }  //  namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc
new file mode 100644
index 0000000000..dbedd0167f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc
@@ -0,0 +1,925 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the copyright holders nor the names of their contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rc_rpc_plugin/rc_capabilities_manager_impl.h"
+#include "rc_rpc_plugin/rc_helpers.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+
+namespace rc_rpc_plugin {
+CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule")
+
+RCCapabilitiesManagerImpl::RCCapabilitiesManagerImpl(
+    application_manager::HMICapabilities& hmi_capabilities)
+    : hmi_capabilities_(hmi_capabilities) {}
+
+const std::string
+RCCapabilitiesManagerImpl::GetDefaultModuleIdFromCapabilitiesStructure(
+    const smart_objects::SmartObject& control_capabilities,
+    const std::string& module_type) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (control_capabilities.keyExists(message_params::kModuleInfo)) {
+    // moduleId - mandatory param for ModuleInfo structure
+    const auto module_id = control_capabilities[message_params::kModuleInfo]
+                                               [message_params::kModuleId]
+                                                   .asString();
+    LOG4CXX_WARN(logger_,
+                 "Use default moduleId from hmi capabilities: "
+                     << module_id
+                     << " for requested moduleType: " << module_type);
+    return module_id;
+  }
+  LOG4CXX_WARN(logger_,
+               "There are no moduleInfo in hmi capabilities for requested "
+               "moduleType "
+                   << module_type);
+  return "";
+}
+
+const std::string
+RCCapabilitiesManagerImpl::GetDefaultModuleIdFromCapabilitiesArray(
+    const smart_objects::SmartObject& control_capabilities,
+    const std::string& module_type) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  for (auto& cap_item : *(control_capabilities.asArray())) {
+    if (cap_item.keyExists(message_params::kModuleInfo)) {
+      // moduleId - mandatory param for ModuleInfo structure
+      const auto module_id =
+          cap_item[message_params::kModuleInfo][message_params::kModuleId]
+              .asString();
+      LOG4CXX_WARN(logger_,
+                   "Use default moduleId from hmi capabilities: "
+                       << module_id
+                       << " for requested moduleType: " << module_type);
+      return module_id;
+    }
+  }
+  LOG4CXX_WARN(logger_,
+               "There are no moduleInfo in hmi capabilities for requested "
+               "moduleType "
+                   << module_type);
+  return "";
+}
+
+const std::string RCCapabilitiesManagerImpl::GetDefaultModuleIdFromCapabilities(
+    const std::string& module_type) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  const auto& mapping = RCHelpers::GetModuleTypeToCapabilitiesMapping();
+  if (!rc_capabilities.keyExists(mapping(module_type))) {
+    LOG4CXX_WARN(
+        logger_,
+        "There is no RC capability for requested module_type " << module_type);
+    return "";
+  }
+  if (enums_value::kHmiSettings == module_type ||
+      enums_value::kLight == module_type) {
+    return GetDefaultModuleIdFromCapabilitiesStructure(
+        rc_capabilities[mapping(module_type)], module_type);
+  }
+  return GetDefaultModuleIdFromCapabilitiesArray(
+      rc_capabilities[mapping(module_type)], module_type);
+}
+
+const bool RCCapabilitiesManagerImpl::CheckModuleIdWithCapabilitiesStructure(
+    const smart_objects::SmartObject& control_capabilities,
+    const std::string& module_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (control_capabilities.keyExists(message_params::kModuleInfo) &&
+      (module_id == control_capabilities[message_params::kModuleInfo]
+                                        [message_params::kModuleId]
+                                            .asString())) {
+    return true;
+  }
+  LOG4CXX_WARN(logger_,
+               "There are no moduleInfo in hmi capabilities for requested "
+               "moduleId "
+                   << module_id);
+  return false;
+}
+
+const bool RCCapabilitiesManagerImpl::CheckModuleIdWithCapabilitiesArrays(
+    const smart_objects::SmartObject& control_capabilities,
+    const std::string& module_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  for (auto& cap_item : *(control_capabilities.asArray())) {
+    if (cap_item.keyExists(message_params::kModuleInfo) &&
+        (module_id ==
+         cap_item[message_params::kModuleInfo][message_params::kModuleId]
+             .asString())) {
+      return true;
+    }
+  }
+  LOG4CXX_WARN(logger_,
+               "There are no moduleInfo in hmi capabilities for requested "
+               "moduleId "
+                   << module_id);
+  return false;
+}
+
+const bool RCCapabilitiesManagerImpl::CheckModuleIdWithCapabilities(
+    const smart_objects::SmartObject& rc_capabilities,
+    const ModuleUid& module) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (module.second.empty()) {
+    return true;
+  }
+  const auto& mapping = RCHelpers::GetModuleTypeToCapabilitiesMapping();
+  if (enums_value::kHmiSettings == module.first ||
+      enums_value::kLight == module.first) {
+    return CheckModuleIdWithCapabilitiesStructure(
+        rc_capabilities[mapping(module.first)], module.second);
+  }
+  return CheckModuleIdWithCapabilitiesArrays(
+      rc_capabilities[mapping(module.first)], module.second);
+}
+
+bool RCCapabilitiesManagerImpl::CheckIfModuleExistsInCapabilities(
+    const ModuleUid& module) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  const auto& mapping = RCHelpers::GetModuleTypeToCapabilitiesMapping();
+  const auto& resource_list = GetResources();
+  bool is_module_type_valid = false;
+  for (const auto& resource : resource_list) {
+    if (resource.first == module.first) {
+      if (rc_capabilities.keyExists(mapping(module.first)) &&
+          CheckModuleIdWithCapabilities(rc_capabilities, module)) {
+        is_module_type_valid = true;
+        break;
+      }
+    }
+  }
+  return is_module_type_valid;
+}
+
+const std::vector<std::string> RCCapabilitiesManagerImpl::GetCapabilitiesList()
+    const {
+  using namespace enums_value;
+  return {strings::kclimateControlCapabilities,
+          strings::kradioControlCapabilities,
+          strings::kseatControlCapabilities,
+          strings::kaudioControlCapabilities,
+          strings::klightControlCapabilities,
+          strings::khmiSettingsControlCapabilities};
+}
+
+const std::function<std::string(const std::string& control_cap)>
+RCCapabilitiesManagerImpl::GetCapabilitiesToModuleTypeMapping() const {
+  auto mapping_lambda = [](const std::string& control_cap) -> std::string {
+    static std::map<std::string, std::string> mapping = {
+        {strings::kclimateControlCapabilities, enums_value::kClimate},
+        {strings::kradioControlCapabilities, enums_value::kRadio},
+        {strings::kseatControlCapabilities, enums_value::kSeat},
+        {strings::kaudioControlCapabilities, enums_value::kAudio},
+        {strings::klightControlCapabilities, enums_value::kLight},
+        {strings::khmiSettingsControlCapabilities, enums_value::kHmiSettings}};
+    auto it = mapping.find(control_cap);
+    if (mapping.end() == it) {
+      LOG4CXX_ERROR(logger_, "Unknown control capability " << control_cap);
+      return std::string();
+    }
+    return it->second;
+  };
+
+  return mapping_lambda;
+}
+
+void RCCapabilitiesManagerImpl::GetResourcesFromCapabilitiesStructure(
+    const smart_objects::SmartObject& control_capabilities,
+    const std::string& capability_key,
+    std::vector<ModuleUid>& out_resources) const {
+  const auto& mapping = GetCapabilitiesToModuleTypeMapping();
+  if (control_capabilities.keyExists(message_params::kModuleInfo)) {
+    std::string module_id = control_capabilities[message_params::kModuleInfo]
+                                                [message_params::kModuleId]
+                                                    .asString();
+    out_resources.push_back(std::make_pair(mapping(capability_key), module_id));
+  } else {
+    LOG4CXX_WARN(logger_, "There are no moduleId in " << capability_key);
+    out_resources.push_back(std::make_pair(mapping(capability_key), ""));
+  }
+}
+
+void RCCapabilitiesManagerImpl::GetResourcesFromCapabilitiesArray(
+    const smart_objects::SmartObject& control_capabilities,
+    const std::string& capability_key,
+    std::vector<ModuleUid>& out_resources) const {
+  const auto& mapping = GetCapabilitiesToModuleTypeMapping();
+  for (auto cap_item : *(control_capabilities.asArray())) {
+    if (cap_item.keyExists(message_params::kModuleInfo)) {
+      std::string module_id =
+          cap_item[message_params::kModuleInfo][message_params::kModuleId]
+              .asString();
+      out_resources.push_back(
+          std::make_pair(mapping(capability_key), module_id));
+    } else {
+      LOG4CXX_WARN(logger_,
+                   "There are no moduleId for item from " << capability_key);
+      out_resources.push_back(std::make_pair(mapping(capability_key), ""));
+    }
+  }
+}
+
+const std::vector<ModuleUid> RCCapabilitiesManagerImpl::GetResources() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  std::vector<ModuleUid> resources;
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  const auto& control_caps_list = GetCapabilitiesList();
+  for (const auto& capability_key : control_caps_list) {
+    if (rc_capabilities.keyExists(capability_key)) {
+      if (strings::khmiSettingsControlCapabilities == capability_key ||
+          strings::klightControlCapabilities == capability_key) {
+        GetResourcesFromCapabilitiesStructure(
+            rc_capabilities[capability_key], capability_key, resources);
+      } else {
+        GetResourcesFromCapabilitiesArray(
+            rc_capabilities[capability_key], capability_key, resources);
+      }
+    }
+  }
+  return resources;
+}
+
+const std::string RCCapabilitiesManagerImpl::GetModuleIdForSeatLocation(
+    const mobile_apis::SupportedSeat::eType id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  const auto seat_capabilities =
+      rc_capabilities[strings::kseatControlCapabilities];
+  if (seat_capabilities.length() > 0) {
+    if (mobile_apis::SupportedSeat::DRIVER == id) {
+      return seat_capabilities[0][message_params::kModuleInfo]
+                              [message_params::kModuleId]
+                                  .asString();
+    }
+    if ((seat_capabilities.length() > 1) &&
+        mobile_apis::SupportedSeat::FRONT_PASSENGER == id) {
+      return seat_capabilities[1][message_params::kModuleInfo]
+                              [message_params::kModuleId]
+                                  .asString();
+    }
+  }
+  LOG4CXX_DEBUG(logger_, "There are no capabitities for requested id: " << id);
+  return "";
+}
+
+bool RCCapabilitiesManagerImpl::CheckIfButtonExistInRCCaps(
+    const mobile_apis::ButtonName::eType button) const {
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  if (rc_capabilities.keyExists(strings::kbuttonCapabilities)) {
+    const smart_objects::SmartObject& button_caps =
+        rc_capabilities[strings::kbuttonCapabilities];
+    for (auto& button_cap : *(button_caps.asArray())) {
+      int64_t current_id = button_cap[message_params::kName].asInt();
+      if (-1 == current_id) {
+        // capabilities received from HMI contains enum values
+        // capabilities loaded from file contains string values
+        // TODO : unificate capabilities storing
+        const std::string& bt_name =
+            button_cap[message_params::kName].asString();
+        static RCHelpers::ButtonsMap btn_map = RCHelpers::buttons_map();
+        current_id = btn_map[bt_name];
+      }
+      const mobile_apis::ButtonName::eType current_button =
+          static_cast<mobile_apis::ButtonName::eType>(current_id);
+      if (current_button == button) {
+        LOG4CXX_TRACE(
+            logger_,
+            "Button id " << current_button << " exist in capabilities");
+        return true;
+      }
+    }
+  }
+  LOG4CXX_TRACE(logger_,
+                "Button id " << button << " do not exist in capabilities");
+  return false;
+}
+
+smart_objects::SmartObject
+RCCapabilitiesManagerImpl::GetCapabilitiesByModuleIdFromArray(
+    const smart_objects::SmartObject& module_data_capabilities,
+    const std::string& module_id) const {
+  for (auto& cap_item : *(module_data_capabilities.asArray())) {
+    std::string current_id =
+        cap_item[message_params::kModuleInfo][message_params::kModuleId]
+            .asString();
+    if (module_id == current_id) {
+      return cap_item;
+    }
+  }
+  LOG4CXX_WARN(logger_,
+               "Capabilities for moduleId " << module_id
+                                            << " do not exist in capabilities");
+  return smart_objects::SmartObject(smart_objects::SmartType_Null);
+}
+
+bool RCCapabilitiesManagerImpl::CheckButtonName(
+    const std::string& module_type, const std::string& button_name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto rc_capabilities = hmi_capabilities_.rc_capability();
+  if (!rc_capabilities) {
+    LOG4CXX_ERROR(logger_, "No remote controll capabilities available");
+    return false;
+  }
+
+  if (enums_value::kRadio == module_type) {
+    if (!helpers::in_range(RCHelpers::buttons_radio(), button_name)) {
+      LOG4CXX_WARN(logger_,
+                   "Trying to acceess climate button with module type radio");
+      return false;
+    }
+  }
+
+  if (enums_value::kClimate == module_type) {
+    if (!helpers::in_range(RCHelpers::buttons_climate(), button_name)) {
+      LOG4CXX_WARN(logger_,
+                   "Trying to acceess radio button with module type climate");
+      return false;
+    }
+  }
+  return true;
+}
+
+const std::map<std::string, std::string>
+RCCapabilitiesManagerImpl::GetLightCapabilitiesMapping() const {
+  std::map<std::string, std::string> mapping = {
+      {message_params::kId, strings::kName},
+      {message_params::kLightStatus, strings::kStatusAvailable},
+      {message_params::kLightDensity, strings::kDensityAvailable},
+      {message_params::kLightColor, strings::kRGBColorSpaceAvailable}};
+  return mapping;
+}
+
+const std::map<std::string, std::string>
+RCCapabilitiesManagerImpl::GetModuleDataToCapabilitiesMapping() const {
+  std::map<std::string, std::string> mapping;
+  using namespace message_params;
+  using namespace rc_rpc_plugin::strings;
+  // climate
+  mapping[kFanSpeed] = kFanSpeedAvailable;
+  mapping[kCurrentTemperature] = kCurrentTemperatureAvailable;
+  mapping[kDesiredTemperature] = kDesiredTemperatureAvailable;
+  mapping[kACEnable] = kAcEnableAvailable;
+  mapping[kCirculateAirEnable] = kCirculateAirEnableAvailable;
+  mapping[kAutoModeEnable] = kAutoModeEnableAvailable;
+  mapping[kDefrostZone] = kDefrostZoneAvailable;
+  mapping[kDualModeEnable] = kDualModeEnableAvailable;
+  mapping[kACMaxEnable] = kAcMaxEnableAvailable;
+  mapping[kVentilationMode] = kVentilationModeAvailable;
+  mapping[kHeatedSteeringWheelEnable] = kHeatedSteeringWheelAvailable;
+  mapping[kHeatedWindshieldEnable] = kHeatedWindshieldAvailable;
+  mapping[kHeatedMirrorsEnable] = kHeatedMirrorsAvailable;
+  mapping[kHeatedRearWindowEnable] = kHeatedRearWindowAvailable;
+  mapping[kClimateEnable] = kClimateEnableAvailable;
+  mapping[kClimateEnableAvailable] = kClimateEnableAvailable;
+
+  // radio
+  mapping[kBand] = kRadioBandAvailable;
+  mapping[kFrequencyInteger] = kRadioFrequencyAvailable;
+  mapping[kFrequencyFraction] = kRadioFrequencyAvailable;
+  mapping[kRdsData] = kRdsDataAvailable;
+  mapping[kAvailableHDs] = kAvailableHDsAvailable;
+  mapping[kAvailableHdChannels] = kAvailableHdChannelsAvailable;
+  mapping[kHdChannel] = kAvailableHdChannelsAvailable;
+  mapping[kHdRadioEnable] = kHdRadioEnableAvailable;
+  mapping[kSignalStrength] = kSignalStrengthAvailable;
+  mapping[kSignalChangeThreshold] = kSignalChangeThresholdAvailable;
+  mapping[kRadioEnable] = kRadioEnableAvailable;
+  mapping[kState] = kStateAvailable;
+  mapping[kSisData] = kSisDataAvailable;
+
+  // seat
+  mapping[kHeatingEnabled] = kHeatingEnabledAvailable;
+  mapping[kCoolingEnabled] = kCoolingEnabledAvailable;
+  mapping[kHeatingLevele] = kHeatingLevelAvailable;
+  mapping[kCoolingLevel] = kCoolingLevelAvailable;
+  mapping[kHorizontalPosition] = kHorizontalPositionAvailable;
+  mapping[kVerticalPosition] = kVerticalPositionAvailable;
+  mapping[kFrontVerticalPosition] = kFrontVerticalPositionAvailable;
+  mapping[kBackVerticalPosition] = kBackVerticalPositionAvailable;
+  mapping[kBackTiltAngle] = kBackTiltAngleAvailable;
+  mapping[kHeadSupportHorizontalPosition] =
+      kHeadSupportHorizontalPositionAvailable;
+  mapping[kHeadSupportVerticalPosition] = kHeadSupportVerticalPositionAvailable;
+  mapping[kMassageEnabled] = kMassageEnabledAvailable;
+  mapping[kMassageMode] = kMassageModeAvailable;
+  mapping[kMassageCushionFirmness] = kMassageCushionFirmnessAvailable;
+  mapping[kMemory] = kMemoryAvailable;
+
+  // audio
+  mapping[kSource] = kSourceAvailable;
+  mapping[kKeepContext] = kKeepContextAvailable;
+  mapping[kVolume] = kVolumeAvailable;
+  mapping[kEqualizerSettings] = kEqualizerAvailable;
+
+  // hmi settings
+  mapping[kDistanceUnit] = kDistanceUnitAvailable;
+  mapping[kTemperatureUnit] = kTemperatureUnitAvailable;
+  mapping[kDisplayMode] = kDisplayModeUnitAvailable;
+
+  return mapping;
+}
+
+ModuleTypeCapability RCCapabilitiesManagerImpl::GetModuleDataCapabilities(
+    const smart_objects::SmartObject& module_data,
+    const std::string& module_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+
+  const auto& all_module_types = RCHelpers::GetModuleTypesList();
+  const auto& get_module_data_key = RCHelpers::GetModuleTypeToDataMapping();
+  const auto& get_capabilities_key =
+      RCHelpers::GetModuleTypeToCapabilitiesMapping();
+  ModuleTypeCapability module_data_capabilities =
+      std::make_pair("", capabilitiesStatus::missedParam);
+
+  for (const auto& module_type : all_module_types) {
+    const auto module_data_key = get_module_data_key(module_type);
+    const auto capabilities_key = get_capabilities_key(module_type);
+    if (module_data.keyExists(module_data_key)) {
+      if (!rc_capabilities.keyExists(capabilities_key)) {
+        LOG4CXX_DEBUG(logger_, module_data_key << " capabilities not present");
+        return module_data_capabilities;
+      }
+      const auto& caps = rc_capabilities[capabilities_key];
+
+      if (message_params::kHmiSettingsControlData == module_data_key ||
+          message_params::kLightControlData == module_data_key) {
+        module_data_capabilities =
+            GetControlDataCapabilities(caps, module_data[module_data_key]);
+      } else {
+        module_data_capabilities = GetControlDataCapabilities(
+            GetCapabilitiesByModuleIdFromArray(caps, module_id),
+            module_data[module_data_key]);
+      }
+    }
+  }
+
+  return module_data_capabilities;
+}
+
+ModuleTypeCapability RCCapabilitiesManagerImpl::GetControlDataCapabilities(
+    const smart_objects::SmartObject& capabilities,
+    const smart_objects::SmartObject& control_data) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  std::map<std::string, std::string> mapping =
+      GetModuleDataToCapabilitiesMapping();
+
+  for (auto it = control_data.map_begin(); it != control_data.map_end(); ++it) {
+    const std::string& request_parameter = it->first;
+    if (message_params::kId == request_parameter) {
+      continue;
+    }
+    if (message_params::kLightState == request_parameter) {
+      ModuleTypeCapability light_capability =
+          std::make_pair("", capabilitiesStatus::success);
+
+      for (auto& light_data : *(control_data[request_parameter].asArray())) {
+        light_capability = GetLightNameCapabilities(
+            capabilities[strings::kSupportedLights], light_data);
+
+        if (capabilitiesStatus::success != light_capability.second) {
+          return light_capability;
+        }
+      }
+
+      return light_capability;
+    }
+    if (message_params::kBand == request_parameter) {
+      ModuleTypeCapability radio_capability = GetRadioBandByCapabilities(
+          capabilities, control_data[request_parameter]);
+      if (capabilitiesStatus::success != radio_capability.second) {
+        return radio_capability;
+      }
+    }
+
+    const capabilitiesStatus status_item_capability =
+        GetItemCapability(capabilities,
+                          mapping,
+                          request_parameter,
+                          mobile_apis::Result::UNSUPPORTED_RESOURCE);
+
+    if (capabilitiesStatus::success != status_item_capability) {
+      return std::make_pair("", status_item_capability);
+    }
+  }
+
+  return std::make_pair("", capabilitiesStatus::success);
+}
+
+capabilitiesStatus RCCapabilitiesManagerImpl::GetItemCapability(
+    const smart_objects::SmartObject& capabilities,
+    const std::map<std::string, std::string>& mapping,
+    const std::string& request_parameter,
+    const mobile_apis::Result::eType& switched_off_result) const {
+  const auto it = mapping.find(request_parameter);
+
+  if (it == mapping.end()) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "Parameter " << request_parameter << " doesn't exist in capabilities.");
+    return capabilitiesStatus::missedParam;
+  }
+
+  const std::string& caps_key = it->second;
+
+  LOG4CXX_DEBUG(logger_,
+                "Checking request parameter "
+                    << request_parameter
+                    << " with capabilities. Appropriate key is " << caps_key);
+
+  if (!capabilities.keyExists(caps_key)) {
+    LOG4CXX_DEBUG(logger_,
+                  "Capability " << caps_key
+                                << " is missed in RemoteControl capabilities");
+    return capabilitiesStatus::missedParam;
+  }
+
+  if (!capabilities[caps_key].asBool()) {
+    LOG4CXX_DEBUG(logger_,
+                  "Capability "
+                      << caps_key
+                      << " is switched off in RemoteControl capabilities");
+    capabilitiesStatus status = capabilitiesStatus::missedParam;
+    if (mobile_apis::Result::READ_ONLY == switched_off_result) {
+      status = capabilitiesStatus::readOnly;
+    }
+    return status;
+  }
+
+  return capabilitiesStatus::success;
+}
+
+ModuleTypeCapability RCCapabilitiesManagerImpl::GetLightDataCapabilities(
+    const smart_objects::SmartObject& capabilities,
+    const smart_objects::SmartObject& control_data) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  std::map<std::string, std::string> mapping = GetLightCapabilitiesMapping();
+
+  for (auto it = control_data.map_begin(); it != control_data.map_end(); ++it) {
+    const std::string& request_parameter = it->first;
+
+    if (message_params::kId == request_parameter) {
+      continue;
+    }
+
+    const capabilitiesStatus status_item_capability =
+        GetItemCapability(capabilities,
+                          mapping,
+                          request_parameter,
+                          mobile_apis::Result::READ_ONLY);
+
+    if (capabilitiesStatus::success != status_item_capability) {
+      return std::make_pair(message_params::kLightState,
+                            status_item_capability);
+    }
+  }
+
+  return std::make_pair("", capabilitiesStatus::success);
+}
+
+ModuleTypeCapability RCCapabilitiesManagerImpl::GetLightNameCapabilities(
+    const smart_objects::SmartObject& capabilities_status,
+    const smart_objects::SmartObject& light_data) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  for (auto& so : *(capabilities_status.asArray())) {
+    const int64_t current_id = so[message_params::kName].asInt();
+    if (current_id == light_data[message_params::kId].asInt()) {
+      return GetLightDataCapabilities(so, light_data);
+    }
+  }
+  LOG4CXX_DEBUG(logger_, "There is no such light name in capabilities");
+  return std::make_pair(message_params::kLightState,
+                        capabilitiesStatus::missedLightName);
+}
+
+ModuleTypeCapability RCCapabilitiesManagerImpl::GetRadioBandByCapabilities(
+    const smart_objects::SmartObject& capabilities_status,
+    const smart_objects::SmartObject& request_parameter) const {
+  mobile_apis::RadioBand::eType radio_band =
+      static_cast<mobile_apis::RadioBand::eType>(request_parameter.asUInt());
+  if (mobile_apis::RadioBand::XM == radio_band) {
+    if (!capabilities_status.keyExists(strings::kSiriusxmRadioAvailable)) {
+      LOG4CXX_DEBUG(logger_,
+                    "Capability "
+                        << strings::kSiriusxmRadioAvailable
+                        << " is missed in RemoteControl capabilities");
+      return std::make_pair(strings::kSiriusxmRadioAvailable,
+                            capabilitiesStatus::missedParam);
+    }
+    if (!capabilities_status[strings::kSiriusxmRadioAvailable].asBool()) {
+      LOG4CXX_DEBUG(logger_,
+                    "Capability "
+                        << strings::kSiriusxmRadioAvailable
+                        << " is switched off in RemoteControl capabilities");
+      return std::make_pair(strings::kSiriusxmRadioAvailable,
+                            capabilitiesStatus::missedParam);
+    }
+  }
+  return std::make_pair("", capabilitiesStatus::success);
+}
+
+const smart_objects::SmartObject& RCCapabilitiesManagerImpl::ControlDataForType(
+    const smart_objects::SmartObject& module_data,
+    const std::string& module_type) const {
+  const auto& all_module_types = RCHelpers::GetModuleTypesList();
+  const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
+  for (const auto& type : all_module_types) {
+    if (type == module_type) {
+      return module_data[data_mapping(type)];
+    }
+  }
+  NOTREACHED();
+  return module_data[0];
+}
+
+bool RCCapabilitiesManagerImpl::CheckReadOnlyParamsForAudio(
+    const smart_objects::SmartObject& module_type_params) const {
+  if (module_type_params.keyExists(message_params::kEqualizerSettings)) {
+    const auto& equalizer_settings =
+        module_type_params[message_params::kEqualizerSettings];
+
+    for (auto& so : *(equalizer_settings.asArray())) {
+      if (so.keyExists(message_params::kChannelName)) {
+        LOG4CXX_DEBUG(logger_,
+                      "READ ONLY parameter. ChannelName = "
+                          << so[message_params::kChannelName].asString());
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+bool RCCapabilitiesManagerImpl::CheckReadOnlyParamsForLight(
+    const smart_objects::SmartObject& module_type_params) const {
+  if (module_type_params.keyExists(message_params::kLightState)) {
+    const auto& light_state = module_type_params[message_params::kLightState];
+
+    for (auto& light_data : *(light_state.asArray())) {
+      if (light_data.keyExists(message_params::kLightStatus)) {
+        const mobile_apis::LightStatus::eType light_status =
+            static_cast<mobile_apis::LightStatus::eType>(
+                light_data[message_params::kLightStatus].asUInt());
+
+        if (helpers::Compare<mobile_apis::LightStatus::eType,
+                             helpers::EQ,
+                             helpers::ONE>(light_status,
+                                           mobile_apis::LightStatus::RAMP_UP,
+                                           mobile_apis::LightStatus::RAMP_DOWN,
+                                           mobile_apis::LightStatus::UNKNOWN,
+                                           mobile_apis::LightStatus::INVALID)) {
+          LOG4CXX_DEBUG(
+              logger_,
+              "READ ONLY parameter. Status = "
+                  << light_data[message_params::kLightStatus].asInt());
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+bool RCCapabilitiesManagerImpl::AreReadOnlyParamsPresent(
+    const smart_objects::SmartObject& module_data,
+    const std::string& module_type,
+    ModuleTypeCapability& module_data_capabilities) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const smart_objects::SmartObject& module_type_params =
+      ControlDataForType(module_data, module_type);
+
+  if (enums_value::kAudio == module_type) {
+    return CheckReadOnlyParamsForAudio(module_type_params);
+  }
+
+  if (enums_value::kLight == module_type) {
+    const bool result = CheckReadOnlyParamsForLight(module_type_params);
+
+    if (result) {
+      module_data_capabilities =
+          std::make_pair(module_type, capabilitiesStatus::readOnly);
+    }
+    return result;
+  }
+
+  const std::vector<std::string> ro_params =
+      RCHelpers::GetModuleReadOnlyParams(module_type);
+  auto it = module_type_params.map_begin();
+
+  for (; it != module_type_params.map_end(); ++it) {
+    if (helpers::in_range(ro_params, it->first)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool RCCapabilitiesManagerImpl::AreAllParamsReadOnly(
+    const smart_objects::SmartObject& module_data,
+    const std::string& module_type) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const smart_objects::SmartObject& module_type_params =
+      ControlDataForType(module_data, module_type);
+  auto it = module_type_params.map_begin();
+  std::vector<std::string> ro_params =
+      RCHelpers::GetModuleReadOnlyParams(module_type);
+  for (; it != module_type_params.map_end(); ++it) {
+    if (!helpers::in_range(ro_params, it->first)) {
+      return false;
+    }
+  }
+
+  LOG4CXX_DEBUG(logger_, "All params are ReadOnly");
+  return true;
+}
+
+bool RCCapabilitiesManagerImpl::IsSeatLocationCapabilityProvided() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto seat_location_capability = hmi_capabilities_.seat_location_capability();
+  if (!seat_location_capability || seat_location_capability->empty()) {
+    LOG4CXX_DEBUG(logger_, "Seat Location capability is not provided by HMI");
+    return false;
+  }
+
+  if (seat_location_capability->keyExists(strings::kRows) &&
+      seat_location_capability->keyExists(strings::kCols) &&
+      seat_location_capability->keyExists(strings::kLevels) &&
+      seat_location_capability->keyExists(strings::kSeats)) {
+    const auto* seats = (*seat_location_capability)[strings::kSeats].asArray();
+    if (!seats->empty()) {
+      return true;
+    }
+  }
+
+  LOG4CXX_DEBUG(
+      logger_,
+      "Seat Location capability doesn't contain all necessary parameters");
+  return false;
+}
+
+const Grid
+RCCapabilitiesManagerImpl::GetDriverLocationFromSeatLocationCapability() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  Grid grid;
+  if (IsSeatLocationCapabilityProvided()) {
+    auto seat_location_capability =
+        hmi_capabilities_.seat_location_capability();
+    const auto* seats = (*seat_location_capability)[strings::kSeats].asArray();
+    const auto& driver_seat = (*seats)[0];
+    if (driver_seat.keyExists(strings::kGrid)) {
+      const auto& driver_location = driver_seat[strings::kGrid];
+      grid = Grid(driver_location[strings::kCol].asInt(),
+                  driver_location[strings::kRow].asInt(),
+                  driver_location[strings::kLevel].asInt(),
+                  driver_location[strings::kColspan].asInt(),
+                  driver_location[strings::kRowspan].asInt(),
+                  driver_location[strings::kLevelspan].asInt());
+    } else {
+      LOG4CXX_DEBUG(logger_, "Driver's location doesn't provided");
+    }
+  }
+  return grid;
+}
+
+Grid RCCapabilitiesManagerImpl::GetWholeVehicleArea() const {
+  auto seat_location_capability =
+      *(hmi_capabilities_.seat_location_capability());
+  int32_t colspan = seat_location_capability.keyExists(strings::kCols)
+                        ? seat_location_capability[strings::kCols].asInt()
+                        : 0;
+
+  int32_t rowspan = seat_location_capability.keyExists(strings::kRows)
+                        ? seat_location_capability[strings::kRows].asInt()
+                        : 0;
+
+  int32_t levelspan = seat_location_capability.keyExists(strings::kLevels)
+                          ? seat_location_capability[strings::kLevels].asInt()
+                          : 0;
+  return Grid(0, 0, 0, colspan, rowspan, levelspan);
+}
+
+Grid RCCapabilitiesManagerImpl::GetModuleLocationFromControlCapability(
+    const smart_objects::SmartObject& control_capabilities) const {
+  if (control_capabilities[message_params::kModuleInfo].keyExists(
+          strings::kLocation)) {
+    const auto& location =
+        control_capabilities[message_params::kModuleInfo][strings::kLocation];
+
+    return Grid(location[strings::kCol].asInt(),
+                location[strings::kRow].asInt(),
+                location[strings::kLevel].asInt(),
+                location[strings::kColspan].asInt(),
+                location[strings::kRowspan].asInt(),
+                location[strings::kLevelspan].asInt());
+  }
+  return GetWholeVehicleArea();
+}
+
+Grid RCCapabilitiesManagerImpl::GetModuleServiceAreaFromControlCapability(
+    const smart_objects::SmartObject& control_capabilities) const {
+  if (control_capabilities.keyExists(message_params::kModuleInfo)) {
+    if (control_capabilities[message_params::kModuleInfo].keyExists(
+            strings::kServiceArea)) {
+      const auto& serviceArea =
+          control_capabilities[message_params::kModuleInfo]
+                              [strings::kServiceArea];
+
+      return Grid(serviceArea[strings::kCol].asInt(),
+                  serviceArea[strings::kRow].asInt(),
+                  serviceArea[strings::kLevel].asInt(),
+                  serviceArea[strings::kColspan].asInt(),
+                  serviceArea[strings::kRowspan].asInt(),
+                  serviceArea[strings::kLevelspan].asInt());
+    }
+  }
+  return GetModuleLocationFromControlCapability(control_capabilities);
+}
+
+Grid RCCapabilitiesManagerImpl::GetModuleServiceArea(
+    const ModuleUid& module) const {
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  const auto& mapping = RCHelpers::GetModuleTypeToCapabilitiesMapping();
+  const auto& module_type = module.first;
+  const auto& capabilities_key = mapping(module_type);
+  if (!rc_capabilities.keyExists(capabilities_key)) {
+    LOG4CXX_DEBUG(logger_, module_type << "control capabilities not present");
+    return Grid();
+  }
+  const auto& caps = rc_capabilities[capabilities_key];
+
+  if (strings::khmiSettingsControlCapabilities == capabilities_key ||
+      strings::klightControlCapabilities == capabilities_key) {
+    return GetModuleServiceAreaFromControlCapability(caps);
+  } else {
+    const auto& capability_item =
+        GetCapabilitiesByModuleIdFromArray(caps, module.second);
+    return GetModuleServiceAreaFromControlCapability(capability_item);
+  }
+}
+
+bool RCCapabilitiesManagerImpl::IsMultipleAccessAllowedInControlCaps(
+    const smart_objects::SmartObject& control_capabilities) const {
+  if (control_capabilities.keyExists(message_params::kModuleInfo) &&
+      control_capabilities[message_params::kModuleInfo].keyExists(
+          strings::kAllowMultipleAccess)) {
+    return control_capabilities[message_params::kModuleInfo]
+                               [strings::kAllowMultipleAccess]
+                                   .asBool();
+  }
+  return true;
+}
+
+bool RCCapabilitiesManagerImpl::IsMultipleAccessAllowed(
+    const ModuleUid& module) const {
+  auto rc_capabilities = *(hmi_capabilities_.rc_capability());
+  const auto& mapping = RCHelpers::GetModuleTypeToCapabilitiesMapping();
+  const auto& module_type = module.first;
+  const auto& capabilities_key = mapping(module_type);
+  if (!rc_capabilities.keyExists(capabilities_key)) {
+    LOG4CXX_DEBUG(logger_, module_type << "control capabilities not present");
+    return false;
+  }
+  const auto& caps = rc_capabilities[capabilities_key];
+
+  if (strings::khmiSettingsControlCapabilities == capabilities_key ||
+      strings::klightControlCapabilities == capabilities_key) {
+    return IsMultipleAccessAllowedInControlCaps(caps);
+  } else {
+    return IsMultipleAccessAllowedInControlCaps(
+        GetCapabilitiesByModuleIdFromArray(caps, module.second));
+  }
+}
+
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc
index 93c230dfc3..4ca2cf5182 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc
@@ -39,13 +39,19 @@
 #include "rc_rpc_plugin/commands/hmi/rc_get_interior_vehicle_data_response.h"
 #include "rc_rpc_plugin/commands/hmi/rc_on_interior_vehicle_data_notification.h"
 #include "rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h"
+#include "rc_rpc_plugin/commands/hmi/rc_set_global_properties_request.h"
+#include "rc_rpc_plugin/commands/hmi/rc_set_global_properties_response.h"
 #include "rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_request.h"
 #include "rc_rpc_plugin/commands/hmi/rc_set_interior_vehicle_data_response.h"
 #include "rc_rpc_plugin/commands/mobile/button_press_request.h"
 #include "rc_rpc_plugin/commands/mobile/button_press_response.h"
+#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_request.h"
+#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_response.h"
 #include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_request.h"
 #include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_response.h"
 #include "rc_rpc_plugin/commands/mobile/on_interior_vehicle_data_notification.h"
+#include "rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_request.h"
+#include "rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_response.h"
 #include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_request.h"
 #include "rc_rpc_plugin/commands/mobile/set_interior_vehicle_data_response.h"
 #include "rc_rpc_plugin/rc_command_factory.h"
@@ -196,6 +202,20 @@ CommandCreator& RCCommandFactory::get_mobile_command_creator(
                  : rc_factory
                        .GetCreator<commands::SetInteriorVehicleDataResponse>();
     }
+    case mobile_apis::FunctionID::ReleaseInteriorVehicleDataModuleID: {
+      return mobile_apis::messageType::request == message_type
+                 ? rc_factory.GetCreator<
+                       commands::ReleaseInteriorVehicleDataModuleRequest>()
+                 : rc_factory.GetCreator<
+                       commands::ReleaseInteriorVehicleDataModuleResponse>();
+    }
+    case mobile_apis::FunctionID::GetInteriorVehicleDataConsentID: {
+      return mobile_apis::messageType::request == message_type
+                 ? rc_factory.GetCreator<
+                       commands::GetInteriorVehicleDataConsentRequest>()
+                 : rc_factory.GetCreator<
+                       commands::GetInteriorVehicleDataConsentResponse>();
+    }
     default: {}
   }
   return rc_factory.GetCreator<RCInvalidCommand>();
@@ -287,6 +307,13 @@ CommandCreator& RCCommandFactory::get_hmi_creator_factory(
       return rc_factory
           .GetCreator<commands::RCOnRemoteControlSettingsNotification>();
     }
+    case hmi_apis::FunctionID::RC_SetGlobalProperties: {
+      return hmi_apis::messageType::request == message_type
+                 ? rc_factory
+                       .GetCreator<commands::RCSetGlobalPropertiesRequest>()
+                 : rc_factory
+                       .GetCreator<commands::RCSetGlobalPropertiesResponse>();
+    }
     default: { return rc_factory.GetCreator<RCInvalidCommand>(); }
   }
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_consent_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_consent_manager_impl.cc
new file mode 100644
index 0000000000..1d7db181eb
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_consent_manager_impl.cc
@@ -0,0 +1,416 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <algorithm>
+
+#include "application_manager/application_manager.h"
+#include "application_manager/smart_object_keys.h"
+#include "json/json.h"
+#include "rc_rpc_plugin/rc_consent_manager_impl.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+#include "resumption/last_state.h"
+#include "smart_objects/smart_object.h"
+#include "utils/date_time.h"
+#include "utils/logger.h"
+
+namespace rc_rpc_plugin {
+namespace app_mngr = application_manager;
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "RCConsentManager")
+
+RCConsentManagerImpl::RCConsentManagerImpl(
+    resumption::LastStateWrapperPtr last_state,
+    application_manager::ApplicationManager& application_manager,
+    const uint32_t period_of_consent_expired)
+    : app_manager_(application_manager)
+    , last_state_(last_state)
+    , period_of_consent_expired_(period_of_consent_expired) {}
+
+void RCConsentManagerImpl::SaveModuleConsents(
+    const std::string& policy_app_id,
+    const std::string& mac_address,
+    const rc_rpc_types::ModuleIdConsentVector& module_consents) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  for (const auto& consent : module_consents) {
+    std::string module_type = consent.module_id.first;
+
+    auto last_state_accessor = last_state_->get_accessor();
+    auto last_state_dictionary = last_state_accessor.GetData().dictionary();
+
+    auto& app_module_consents = GetModuleTypeConsentsOrAppend(
+        policy_app_id, mac_address, module_type, last_state_dictionary);
+    SaveAppModuleConsent(app_module_consents, consent);
+
+    last_state_accessor.GetMutableData().set_dictionary(last_state_dictionary);
+  }
+}
+
+rc_rpc_types::ModuleConsent RCConsentManagerImpl::GetModuleConsent(
+    const std::string& app_id,
+    const std::string& mac_address,
+    const rc_rpc_types::ModuleUid& module_id) {
+  sync_primitives::AutoLock autolock(module_consents_lock_);
+
+  auto last_state_accessor = last_state_->get_accessor();
+  auto last_state_dictionary = last_state_accessor.GetData().dictionary();
+
+  auto& module_consents = GetModuleTypeConsentsOrAppend(
+      app_id, mac_address, module_id.first, last_state_dictionary);
+
+  last_state_accessor.GetMutableData().set_dictionary(last_state_dictionary);
+
+  if (module_consents.empty()) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "For app: " << app_id << " module type doesn't have any consents");
+    return rc_rpc_types::ModuleConsent::NOT_EXISTS;
+  }
+
+  for (const auto& conset_item : module_consents) {
+    if (conset_item[message_params::kModuleId].asString() == module_id.second) {
+      return static_cast<rc_rpc_types::ModuleConsent>(
+          conset_item[message_params::kConsent].asUInt());
+    }
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "For app: " << app_id << " and module resource ["
+                            << module_id.first << ":" << module_id.second
+                            << "] consent is absent");
+
+  return rc_rpc_types::ModuleConsent::NOT_EXISTS;
+}
+
+void RCConsentManagerImpl::RemoveExpiredConsents() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto last_state_accessor = last_state_->get_accessor();
+  auto last_state_dictionary = last_state_accessor.GetData().dictionary();
+
+  auto& remote_control = GetRemoteControlDataOrAppend(last_state_dictionary);
+  if (remote_control.empty()) {
+    last_state_accessor.GetMutableData().set_dictionary(last_state_dictionary);
+    return;
+  }
+
+  auto& devices = GetAppsConsentsOrAppend(last_state_dictionary);
+
+  sync_primitives::AutoLock autolock(device_applications_lock_);
+
+  for (auto& device_item : devices) {
+    RemoveDeviceExpiredConsents(device_item);
+  }
+
+  last_state_accessor.GetMutableData().set_dictionary(last_state_dictionary);
+}
+
+void RCConsentManagerImpl::RemoveAllConsents() {
+  auto last_state_accessor = last_state_->get_accessor();
+  auto last_state_dictionary = last_state_accessor.GetData().dictionary();
+
+  auto& remote_control = GetRemoteControlDataOrAppend(last_state_dictionary);
+  remote_control.removeMember(message_params::kAppConsents);
+
+  last_state_accessor.GetMutableData().set_dictionary(last_state_dictionary);
+}
+
+rc_rpc_types::ModuleConsentState RCConsentManagerImpl::CheckModuleConsentState(
+    const Json::Value& module_consent) const {
+  if (!module_consent.isMember(message_params::kConsentDate)) {
+    LOG4CXX_DEBUG(logger_, "Date of consent is absent");
+    return rc_rpc_types::ModuleConsentState::NOT_EXISTS;
+  }
+
+  const uint32_t period_for_expiring =
+      app_manager_.get_settings().period_for_consent_expiration();
+
+  const time_t consent_date = static_cast<time_t>(
+      module_consent[message_params::kConsentDate].asUInt());
+
+  const auto past_period_in_days =
+      date_time::calculateAmountDaysFromDate(consent_date);
+
+  LOG4CXX_DEBUG(
+      logger_,
+      "Keeping time of consent is: " << past_period_in_days << " days");
+  LOG4CXX_DEBUG(logger_, "Period for expired: " << period_for_expiring);
+
+  return (past_period_in_days >= period_for_expiring)
+             ? rc_rpc_types::ModuleConsentState::EXPIRED
+             : rc_rpc_types::ModuleConsentState::ACTIVE;
+}
+
+void RCConsentManagerImpl::RemoveDeviceExpiredConsents(Json::Value& device) {
+  sync_primitives::AutoLock autolock(applications_lock_);
+
+  if (device.isMember(message_params::kApplications)) {
+    auto& applications = device[message_params::kApplications];
+
+    for (auto& app : applications) {
+      if (app.isMember(message_params::kAppConsentList)) {
+        RemoveAppExpiredConsents(app[message_params::kAppConsentList]);
+      }
+    }
+  }
+}
+
+void RCConsentManagerImpl::RemoveAppExpiredConsents(Json::Value& app_consents) {
+  for (auto& module : app_consents) {
+    if (module.isMember(message_params::kModuleConsents)) {
+      auto& module_consents = module[message_params::kModuleConsents];
+      RemoveModuleExpiredConsents(module_consents);
+    }
+  }
+}
+
+void RCConsentManagerImpl::RemoveModuleExpiredConsents(
+    Json::Value& module_consents) {
+  sync_primitives::AutoLock autolock(module_consents_lock_);
+  Json::Value temp_consents;
+
+  for (auto& consent : module_consents) {
+    const bool is_module_id_exists =
+        consent.isMember(message_params::kModuleId);
+
+    const bool is_expired = rc_rpc_types::ModuleConsentState::EXPIRED ==
+                            CheckModuleConsentState(consent);
+    if (is_expired) {
+      LOG4CXX_DEBUG(logger_,
+                    "Consent for module resource ["
+                        << consent[message_params::kModuleId].asString()
+                        << "] is expired and will be removed");
+    }
+
+    if (is_module_id_exists && !is_expired) {
+      LOG4CXX_DEBUG(logger_,
+                    "Consent for module resource ["
+                        << consent[message_params::kModuleId].asString()
+                        << "] is actual.");
+      temp_consents.append(consent);
+    }
+  }
+
+  module_consents.clear();
+  if (!temp_consents.empty()) {
+    std::swap(module_consents, temp_consents);
+  }
+}
+
+Json::Value& RCConsentManagerImpl::GetRemoteControlDataOrAppend(
+    Json::Value& last_state_data) {
+  sync_primitives::AutoLock autolock(dictionary_control_lock_);
+  if (!last_state_data.isMember(app_mngr::strings::remote_control)) {
+    last_state_data[app_mngr::strings::remote_control] =
+        Json::Value(Json::objectValue);
+    LOG4CXX_DEBUG(logger_, "remote_control section is missed");
+  }
+
+  Json::Value& remote_control =
+      last_state_data[app_mngr::strings::remote_control];
+
+  if (!remote_control.isObject()) {
+    LOG4CXX_ERROR(logger_, "remote_control type INVALID rewrite");
+    remote_control = Json::Value(Json::objectValue);
+  }
+  return remote_control;
+}
+
+Json::Value& RCConsentManagerImpl::GetDeviceApplicationsOrAppend(
+    const std::string& mac_address, Json::Value& last_state_data) {
+  sync_primitives::AutoLock autolock(device_applications_lock_);
+
+  auto& apps_consents = GetAppsConsentsOrAppend(last_state_data);
+
+  if (!apps_consents.isArray()) {
+    LOG4CXX_DEBUG(logger_, "applications_consents type INVALID rewrite");
+    apps_consents = Json::Value(Json::arrayValue);
+  }
+
+  for (auto& device_applications_item : apps_consents) {
+    const bool is_device_section_exists =
+        device_applications_item.isMember(message_params::kMacAddress);
+
+    if (is_device_section_exists) {
+      auto saved_mac_adress =
+          device_applications_item[message_params::kMacAddress].asString();
+
+      if (saved_mac_adress == mac_address) {
+        return device_applications_item[message_params::kApplications];
+      }
+    }
+  }
+
+  auto device_applications = Json::Value(Json::objectValue);
+  device_applications[message_params::kMacAddress] = Json::Value(mac_address);
+  device_applications[message_params::kApplications] =
+      Json::Value(Json::arrayValue);
+
+  apps_consents.append(device_applications);
+  return apps_consents[apps_consents.size() - 1][message_params::kApplications];
+}
+
+Json::Value& RCConsentManagerImpl::GetAppConsentsListOrAppend(
+    const std::string& policy_app_id,
+    const std::string& mac_address,
+    Json::Value& last_state_data) {
+  auto& device_applications =
+      GetDeviceApplicationsOrAppend(mac_address, last_state_data);
+
+  sync_primitives::AutoLock autolock(applications_lock_);
+  if (!device_applications.isArray()) {
+    LOG4CXX_DEBUG(logger_, "applications_consents type INVALID rewrite");
+    device_applications = Json::Value(Json::arrayValue);
+  }
+
+  for (auto& application : device_applications) {
+    const bool is_app_id_section_exists =
+        application.isMember(message_params::kAppId);
+
+    if (is_app_id_section_exists) {
+      auto saved_app_id = application[message_params::kAppId].asString();
+
+      if (saved_app_id == policy_app_id) {
+        return application[message_params::kAppConsentList];
+      }
+    }
+  }
+
+  // In case when specified application section is absent in json file,
+  // will be created new section and added to dictionary.
+  auto application = Json::Value(Json::objectValue);
+  application[message_params::kAppId] = Json::Value(policy_app_id);
+  application[message_params::kAppConsentList] = Json::Value(Json::arrayValue);
+  device_applications.append(application);
+
+  // Returns last appended object
+  return device_applications[device_applications.size() - 1]
+                            [message_params::kAppConsentList];
+}
+
+Json::Value& RCConsentManagerImpl::GetAppsConsentsOrAppend(
+    Json::Value& last_state_data) {
+  Json::Value& remote_control = GetRemoteControlDataOrAppend(last_state_data);
+  sync_primitives::AutoLock autolock(remote_control_lock_);
+
+  if (!remote_control.isMember(message_params::kAppConsents)) {
+    LOG4CXX_DEBUG(logger_, "app_consents section is missed");
+    remote_control[message_params::kAppConsents] =
+        Json::Value(Json::arrayValue);
+  }
+
+  auto& app_consents = remote_control[message_params::kAppConsents];
+  if (!app_consents.isArray()) {
+    LOG4CXX_DEBUG(logger_, "applications_consents type INVALID rewrite");
+    app_consents = Json::Value(Json::arrayValue);
+  }
+  return app_consents;
+}
+
+Json::Value& RCConsentManagerImpl::GetModuleTypeConsentsOrAppend(
+    const std::string& policy_app_id,
+    const std::string& mac_address,
+    const std::string& module_type,
+    Json::Value& last_state_data) {
+  auto& app_consents_list =
+      GetAppConsentsListOrAppend(policy_app_id, mac_address, last_state_data);
+
+  sync_primitives::AutoLock autolock(app_consents_lock_);
+  for (auto& module_consents : app_consents_list) {
+    const bool module_exists =
+        module_consents.isMember(message_params::kModuleType);
+
+    if (module_exists &&
+        (module_consents[message_params::kModuleType].asString() ==
+         module_type)) {
+      return module_consents[message_params::kModuleConsents];
+    }
+  }
+
+  // In case of absent specified module_type in section of specified
+  // application, will be added empty section with this module type.
+  LOG4CXX_DEBUG(
+      logger_,
+      "Section module_type: " << module_type
+                              << " is missed for app_id:" << policy_app_id);
+  auto consent_item = Json::Value(Json::objectValue);
+  consent_item[message_params::kModuleType] = module_type;
+  consent_item[message_params::kModuleConsents] = Json::Value(Json::arrayValue);
+
+  app_consents_list.append(consent_item);
+
+  // Returns last (appended) object
+  return app_consents_list[app_consents_list.size() - 1]
+                          [message_params::kModuleConsents];
+}
+
+RCConsentManagerImpl::~RCConsentManagerImpl() {}
+
+void RCConsentManagerImpl::SaveAppModuleConsent(
+    Json::Value& app_module_consents,
+    const rc_rpc_types::ModuleIdConsent& consent_to_save) {
+  bool is_found = false;
+
+  sync_primitives::AutoLock autolock(app_consents_lock_);
+  for (auto& consent : app_module_consents) {
+    const bool is_module_id_exists =
+        consent.isMember(message_params::kModuleId);
+
+    // In case existing consent of specified ModuelResource (module_type +
+    // module_id), old value will be rewritten by new value.
+
+    if (is_module_id_exists && (consent[message_params::kModuleId].asString() ==
+                                consent_to_save.module_id.second)) {
+      is_found = true;
+      consent[message_params::kConsent] =
+          Json::Value(static_cast<uint32_t>(consent_to_save.consent));
+      consent[message_params::kConsentDate] = Json::Value(
+          static_cast<Json::UInt64>(consent_to_save.date_of_consent));
+    }
+  }
+
+  // Otherwise, new item will be added to the "consents" collection
+
+  if (!is_found) {
+    auto new_consent = Json::Value(Json::objectValue);
+    new_consent[message_params::kModuleId] =
+        Json::Value(consent_to_save.module_id.second);
+    new_consent[message_params::kConsent] =
+        Json::Value(static_cast<uint32_t>(consent_to_save.consent));
+    new_consent[message_params::kConsentDate] =
+        Json::Value(static_cast<Json::UInt64>(consent_to_save.date_of_consent));
+
+    app_module_consents.append(new_consent);
+  }
+}
+
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
index 5785e58e5b..f344dd15a7 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_helpers.cc
@@ -8,6 +8,124 @@
 namespace rc_rpc_plugin {
 CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule");
 
+const std::vector<std::string> RCHelpers::buttons_climate() {
+  std::vector<std::string> data;
+  data.push_back(enums_value::kACMax);
+  data.push_back(enums_value::kAC);
+  data.push_back(enums_value::kRecirculate);
+  data.push_back(enums_value::kFanUp);
+  data.push_back(enums_value::kFanDown);
+  data.push_back(enums_value::kTempUp);
+  data.push_back(enums_value::kTempDown);
+  data.push_back(enums_value::kDefrostMax);
+  data.push_back(enums_value::kDefrost);
+  data.push_back(enums_value::kDefrostRear);
+  data.push_back(enums_value::kUpperVent);
+  data.push_back(enums_value::kLowerVent);
+  return data;
+}
+
+const std::vector<std::string> RCHelpers::buttons_radio() {
+  std::vector<std::string> data;
+  data.push_back(enums_value::kVolumeUp);
+  data.push_back(enums_value::kVolumeDown);
+  data.push_back(enums_value::kEject);
+  data.push_back(enums_value::kSource);
+  data.push_back(enums_value::kShuffle);
+  data.push_back(enums_value::kRepeat);
+  return data;
+}
+
+const RCHelpers::ButtonsMap RCHelpers::buttons_map() {
+  using namespace mobile_apis;
+
+  ButtonsMap buttons_map;
+  buttons_map[enums_value::kACMax] = ButtonName::AC_MAX;
+  buttons_map[enums_value::kAC] = ButtonName::AC;
+  buttons_map[enums_value::kRecirculate] = ButtonName::RECIRCULATE;
+  buttons_map[enums_value::kFanUp] = ButtonName::FAN_UP;
+  buttons_map[enums_value::kFanDown] = ButtonName::FAN_DOWN;
+  buttons_map[enums_value::kTempUp] = ButtonName::TEMP_UP;
+  buttons_map[enums_value::kTempDown] = ButtonName::TEMP_DOWN;
+  buttons_map[enums_value::kDefrostMax] = ButtonName::DEFROST_MAX;
+  buttons_map[enums_value::kDefrost] = ButtonName::DEFROST;
+  buttons_map[enums_value::kDefrostRear] = ButtonName::DEFROST_REAR;
+  buttons_map[enums_value::kUpperVent] = ButtonName::UPPER_VENT;
+  buttons_map[enums_value::kLowerVent] = ButtonName::LOWER_VENT;
+  buttons_map[enums_value::kVolumeUp] = ButtonName::VOLUME_UP;
+  buttons_map[enums_value::kVolumeDown] = ButtonName::VOLUME_DOWN;
+  buttons_map[enums_value::kEject] = ButtonName::EJECT;
+  buttons_map[enums_value::kSource] = ButtonName::SOURCE;
+  buttons_map[enums_value::kShuffle] = ButtonName::SHUFFLE;
+  buttons_map[enums_value::kRepeat] = ButtonName::REPEAT;
+
+  return buttons_map;
+}
+
+std::vector<std::string> RCHelpers::GetModuleReadOnlyParams(
+    const std::string& module_type) {
+  using namespace message_params;
+  std::vector<std::string> module_ro_params;
+  if (enums_value::kClimate == module_type) {
+    module_ro_params.push_back(kCurrentTemperature);
+  } else if (enums_value::kRadio == module_type) {
+    module_ro_params.push_back(kRdsData);
+    module_ro_params.push_back(kAvailableHDs);
+    module_ro_params.push_back(kAvailableHdChannels);
+    module_ro_params.push_back(kSignalStrength);
+    module_ro_params.push_back(kSignalChangeThreshold);
+    module_ro_params.push_back(kState);
+    module_ro_params.push_back(kSisData);
+  } else if (enums_value::kLight == module_type) {
+    module_ro_params.push_back(kLightStatus);
+  }
+
+  return module_ro_params;
+}
+
+rc_rpc_types::ModuleIdConsentVector RCHelpers::FillModuleConsents(
+    const std::string& module_type,
+    const std::vector<std::string>& module_ids,
+    const std::vector<bool> allowed) {
+  using namespace rc_rpc_types;
+  if (module_ids.size() != allowed.size()) {
+    return rc_rpc_types::ModuleIdConsentVector();
+  }
+
+  rc_rpc_types::ModuleIdConsentVector module_consents;
+  std::time_t current_date = std::time(0);
+  size_t array_size = module_ids.size();
+
+  for (size_t i = 0; i < array_size; ++i) {
+    rc_rpc_types::ModuleIdConsent module_consent;
+    module_consent.module_id = {module_type, module_ids[i]};
+    module_consent.consent =
+        allowed[i] ? ModuleConsent::CONSENTED : ModuleConsent::NOT_CONSENTED;
+    module_consent.date_of_consent = current_date;
+
+    module_consents.push_back(module_consent);
+  }
+  return module_consents;
+}
+
+std::vector<std::string> RCHelpers::RetrieveModuleIds(
+    const ns_smart_device_link::ns_smart_objects::SmartObject& moduleIds) {
+  std::vector<std::string> module_ids;
+  for (const auto& module_id : (*moduleIds.asArray())) {
+    module_ids.push_back(module_id.asString());
+  }
+  return module_ids;
+}
+
+std::vector<bool> RCHelpers::RetrieveModuleConsents(
+    const ns_smart_device_link::ns_smart_objects::SmartObject& consents) {
+  std::vector<bool> module_consents;
+  for (const auto& allowed_item : (*consents.asArray())) {
+    module_consents.push_back(allowed_item.asBool());
+  }
+  return module_consents;
+}
+
 const std::function<std::string(const std::string& module_type)>
 RCHelpers::GetModuleTypeToDataMapping() {
   auto mapping_lambda = [](const std::string& module_type) -> std::string {
@@ -50,13 +168,14 @@ RCHelpers::GetModuleTypeToCapabilitiesMapping() {
   return mapping_lambda;
 }
 
-const std::vector<std::string> RCHelpers::GetModulesList() {
+const std::vector<std::string> RCHelpers::GetModuleTypesList() {
   using namespace enums_value;
   return {kClimate, kRadio, kSeat, kAudio, kLight, kHmiSettings};
 }
 
 RCAppExtensionPtr RCHelpers::GetRCExtension(
     application_manager::Application& app) {
+  LOG4CXX_AUTO_TRACE(logger_);
   auto extension_interface = app.QueryInterface(RCRPCPlugin::kRCPluginID);
   auto extension =
       std::static_pointer_cast<RCAppExtension>(extension_interface);
@@ -64,7 +183,7 @@ RCAppExtensionPtr RCHelpers::GetRCExtension(
 }
 
 smart_objects::SmartObjectSPtr RCHelpers::CreateUnsubscribeRequestToHMI(
-    const std::string& module_type, const uint32_t correlation_id) {
+    const ModuleUid& module, const uint32_t correlation_id) {
   using namespace smart_objects;
   namespace commands = application_manager::commands;
   namespace am_strings = application_manager::strings;
@@ -82,11 +201,28 @@ smart_objects::SmartObjectSPtr RCHelpers::CreateUnsubscribeRequestToHMI(
   params[am_strings::function_id] =
       hmi_apis::FunctionID::RC_GetInteriorVehicleData;
   msg_params[message_params::kSubscribe] = false;
-  msg_params[message_params::kModuleType] = module_type;
+  msg_params[message_params::kModuleType] = module.first;
+  msg_params[message_params::kModuleId] = module.second;
   return message;
 }
 
 std::vector<application_manager::ApplicationSharedPtr>
+RCHelpers::AppsSubscribedToModule(
+    application_manager::ApplicationManager& app_mngr,
+    const ModuleUid& module) {
+  std::vector<application_manager::ApplicationSharedPtr> result;
+  auto rc_apps = RCRPCPlugin::GetRCApplications(app_mngr);
+  for (auto& app : rc_apps) {
+    auto rc_ext = RCHelpers::GetRCExtension(*app);
+    DCHECK_OR_RETURN(rc_ext, result);
+    if (rc_ext->IsSubscribedToInteriorVehicleData(module)) {
+      result.push_back(app);
+    }
+  }
+  return result;
+}
+
+std::vector<application_manager::ApplicationSharedPtr>
 RCHelpers::AppsSubscribedToModuleType(
     application_manager::ApplicationManager& app_mngr,
     const std::string& module_type) {
@@ -95,17 +231,17 @@ RCHelpers::AppsSubscribedToModuleType(
   for (auto& app : rc_apps) {
     auto rc_ext = RCHelpers::GetRCExtension(*app);
     DCHECK_OR_RETURN(rc_ext, result);
-    if (rc_ext->IsSubscibedToInteriorVehicleData(module_type)) {
+    if (rc_ext->IsSubscribedToInteriorVehicleDataOfType(module_type)) {
       result.push_back(app);
     }
   }
   return result;
 }
 
-RCHelpers::AppsModules RCHelpers::GetApplicationsAllowedModules(
+RCHelpers::AppsModuleTypes RCHelpers::GetApplicationsAllowedModuleTypes(
     app_mngr::ApplicationManager& app_mngr) {
   auto apps_list = RCRPCPlugin::GetRCApplications(app_mngr);
-  RCHelpers::AppsModules result;
+  RCHelpers::AppsModuleTypes result;
   for (auto& app_ptr : apps_list) {
     std::vector<std::string> allowed_modules;
     app_mngr.GetPolicyHandler().GetModuleTypes(app_ptr->policy_app_id(),
@@ -122,6 +258,9 @@ void RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
   using namespace application_manager::strings;
 
   LOG4CXX_AUTO_TRACE(logger_);
+  if (!msg_params.keyExists(kModuleData)) {
+    return;
+  }
   auto& module_data = msg_params[kModuleData];
   if (!module_data.keyExists(kRadioControlData) ||
       !module_data[kRadioControlData].keyExists(kSisData) ||
@@ -141,4 +280,86 @@ void RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
     location_data = new_location_data;
   }
 }
+
+smart_objects::SmartObject RCHelpers::MergeModuleData(
+    const smart_objects::SmartObject& data1,
+    const smart_objects::SmartObject& data2) {
+  if (data1.getType() != smart_objects::SmartType::SmartType_Map ||
+      data2.getType() != smart_objects::SmartType::SmartType_Map) {
+    return data2;
+  }
+
+  smart_objects::SmartObject result = data1;
+
+  for (auto it = data2.map_begin(); it != data2.map_end(); ++it) {
+    const std::string& key = it->first;
+    smart_objects::SmartObject& value = it->second;
+    if (!result.keyExists(key) || value.getType() != result[key].getType()) {
+      result[key] = value;
+      continue;
+    }
+
+    // Merge maps and arrays with `id` param included, replace other types
+    if (value.getType() == smart_objects::SmartType::SmartType_Map) {
+      value = MergeModuleData(result[key], value);
+    } else if (value.getType() == smart_objects::SmartType::SmartType_Array) {
+      value = MergeArray(result[key], value);
+    }
+    result[key] = value;
+  }
+  return result;
+}
+
+smart_objects::SmartObject RCHelpers::MergeArray(
+    const smart_objects::SmartObject& data1,
+    const smart_objects::SmartObject& data2) {
+  // Merge data only in the case where each value in the array is an Object with
+  // an ID included, otherwise replace
+
+  if (data1.getType() != smart_objects::SmartType::SmartType_Array ||
+      data2.getType() != smart_objects::SmartType::SmartType_Array ||
+      data2.empty()) {
+    return data2;
+  }
+
+  auto& data2_array = *data2.asArray();
+  for (const auto& data_item : data2_array) {
+    if (data_item.getType() != smart_objects::SmartType_Map ||
+        !data_item.keyExists(application_manager::strings::id)) {
+      return data2;
+    }
+  }
+
+  smart_objects::SmartObject result = data1;
+  smart_objects::SmartArray* result_array = result.asArray();
+
+  auto find_by_id = [](smart_objects::SmartArray* array,
+                       const smart_objects::SmartObject& id)
+      -> smart_objects::SmartArray::iterator {
+    return std::find_if(array->begin(),
+                        array->end(),
+                        [&id](const smart_objects::SmartObject& obj) -> bool {
+                          return id == obj[application_manager::strings::id];
+                        });
+  };
+
+  auto merge = [&result_array,
+                &find_by_id](const smart_objects::SmartObject& data) -> void {
+    auto element_id = data[application_manager::strings::id];
+    auto result_it = find_by_id(result_array, element_id);
+
+    if (result_array->end() != result_it) {
+      *result_it = RCHelpers::MergeModuleData(*result_it, data);
+    } else {
+      result_array->push_back(data);
+    }
+  };
+
+  for (const auto& data : data2_array) {
+    merge(data);
+  }
+
+  return result;
+}
+
 }  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
index 026e03eeff..c2aa639fda 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
@@ -35,7 +35,9 @@
 #include "rc_rpc_plugin/interior_data_cache_impl.h"
 #include "rc_rpc_plugin/interior_data_manager_impl.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
+#include "rc_rpc_plugin/rc_capabilities_manager_impl.h"
 #include "rc_rpc_plugin/rc_command_factory.h"
+#include "rc_rpc_plugin/rc_consent_manager_impl.h"
 #include "rc_rpc_plugin/rc_helpers.h"
 #include "rc_rpc_plugin/resource_allocation_manager_impl.h"
 #include "utils/helpers.h"
@@ -49,26 +51,46 @@ bool RCRPCPlugin::Init(
     application_manager::ApplicationManager& app_manager,
     application_manager::rpc_service::RPCService& rpc_service,
     application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler) {
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastStateWrapperPtr last_state) {
+  rc_consent_manager_.reset(new rc_rpc_plugin::RCConsentManagerImpl(
+      last_state,
+      app_manager,
+      app_manager.get_settings().period_for_consent_expiration()));
   interior_data_cache_.reset(new InteriorDataCacheImpl());
   interior_data_manager_.reset(new InteriorDataManagerImpl(
       *this, *interior_data_cache_, app_manager, rpc_service));
-
-  resource_allocation_manager_.reset(
-      new ResourceAllocationManagerImpl(app_manager, rpc_service));
+  rc_capabilities_manager_.reset(
+      new RCCapabilitiesManagerImpl(hmi_capabilities));
+  resource_allocation_manager_.reset(new ResourceAllocationManagerImpl(
+      app_manager, rpc_service, *(rc_capabilities_manager_.get())));
   RCCommandParams params{app_manager,
                          rpc_service,
                          hmi_capabilities,
                          policy_handler,
                          *(resource_allocation_manager_.get()),
                          *(interior_data_cache_.get()),
-                         *(interior_data_manager_.get())};
+                         *(interior_data_manager_.get()),
+                         *(rc_capabilities_manager_.get()),
+                         *(rc_consent_manager_.get())};
   command_factory_.reset(new rc_rpc_plugin::RCCommandFactory(params));
   rpc_service_ = &rpc_service;
   app_mngr_ = &app_manager;
+
+  // Check all saved consents and remove expired
+  rc_consent_manager_->RemoveExpiredConsents();
+
   return true;
 }
 
+bool RCRPCPlugin::Init(application_manager::ApplicationManager&,
+                       application_manager::rpc_service::RPCService&,
+                       application_manager::HMICapabilities&,
+                       policy::PolicyHandlerInterface&,
+                       resumption::LastState&) {
+  return false;
+}
+
 bool RCRPCPlugin::IsAbleToProcess(
     const int32_t function_id,
     const application_manager::commands::Command::CommandSource
@@ -93,15 +115,23 @@ void RCRPCPlugin::OnPolicyEvent(
 void RCRPCPlugin::OnApplicationEvent(
     application_manager::plugin_manager::ApplicationEvent event,
     application_manager::ApplicationSharedPtr application) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!application->is_remote_control_supported()) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "Remote control is not supported for application with app_id: "
+            << application->app_id());
     return;
   }
   switch (event) {
     case plugins::kApplicationRegistered: {
-      application->AddExtension(
-          std::shared_ptr<RCAppExtension>(new RCAppExtension(kRCPluginID)));
-      resource_allocation_manager_->SendOnRCStatusNotifications(
-          NotificationTrigger::APP_REGISTRATION, application);
+      auto extension =
+          std::shared_ptr<RCAppExtension>(new RCAppExtension(kRCPluginID));
+      application->AddExtension(extension);
+      const auto driver_location =
+          rc_capabilities_manager_
+              ->GetDriverLocationFromSeatLocationCapability();
+      extension->SetUserLocation(driver_location);
       break;
     }
     case plugins::kApplicationExit: {
@@ -114,6 +144,17 @@ void RCRPCPlugin::OnApplicationEvent(
       interior_data_manager_->OnApplicationEvent(event, application);
       break;
     }
+    case plugins::kGlobalPropertiesUpdated: {
+      const auto user_location = application->get_user_location();
+      auto extension = RCHelpers::GetRCExtension(*application);
+      extension->SetUserLocation(user_location);
+      break;
+    }
+    case plugins::kRCStatusChanged: {
+      resource_allocation_manager_->SendOnRCStatusNotifications(
+          NotificationTrigger::APP_REGISTRATION, application);
+      break;
+    }
     default:
       break;
   }
@@ -136,6 +177,14 @@ RCRPCPlugin::Apps RCRPCPlugin::GetRCApplications(
 
 }  // namespace rc_rpc_plugin
 
-extern "C" application_manager::plugin_manager::RPCPlugin* Create() {
+extern "C" __attribute__((visibility("default")))
+application_manager::plugin_manager::RPCPlugin*
+Create() {
   return new rc_rpc_plugin::RCRPCPlugin();
 }  // namespace rc_rpc_plugin
+
+extern "C" __attribute__((visibility("default"))) void Delete(
+    application_manager::plugin_manager::RPCPlugin* data) {
+  delete data;
+  DELETE_THREAD_LOGGER(rc_rpc_plugin::logger_);
+}
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
index cf1df2cb68..049f9a3cf3 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
@@ -49,16 +49,20 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "RemoteControlModule")
 
 ResourceAllocationManagerImpl::ResourceAllocationManagerImpl(
     application_manager::ApplicationManager& app_mngr,
-    application_manager::rpc_service::RPCService& rpc_service)
+    application_manager::rpc_service::RPCService& rpc_service,
+    RCCapabilitiesManager& rc_capabilities_manager)
     : current_access_mode_(hmi_apis::Common_RCAccessMode::AUTO_ALLOW)
     , app_mngr_(app_mngr)
     , rpc_service_(rpc_service)
+    , rc_capabilities_manager_(rc_capabilities_manager)
     , is_rc_enabled_(true) {}
 
 ResourceAllocationManagerImpl::~ResourceAllocationManagerImpl() {}
 
 AcquireResult::eType ResourceAllocationManagerImpl::AcquireResource(
-    const std::string& module_type, const uint32_t app_id) {
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   const application_manager::ApplicationSharedPtr acquiring_app =
       app_mngr_.application(app_id);
@@ -67,40 +71,57 @@ AcquireResult::eType ResourceAllocationManagerImpl::AcquireResource(
     return AcquireResult::IN_USE;
   }
 
+  ModuleUid module(module_type, module_id);
+
+  if (rc_capabilities_manager_.IsSeatLocationCapabilityProvided() &&
+      !IsUserLocationValid(module, acquiring_app)) {
+    LOG4CXX_WARN(logger_,
+                 "Resource acquisition is not allowed "
+                 "according to location verification.");
+    return AcquireResult::REJECTED;
+  }
+
   sync_primitives::AutoLock lock(allocated_resources_lock_);
   const AllocatedResources::const_iterator allocated_it =
-      allocated_resources_.find(module_type);
+      allocated_resources_.find(module);
   if (allocated_resources_.end() == allocated_it) {
-    SetResourceAquired(module_type, app_id);
     LOG4CXX_DEBUG(logger_,
                   "Resource is not acquired yet. "
                       << "App: " << app_id << " is allowed to acquire "
-                      << module_type);
+                      << module_type << " " << module_id);
     return AcquireResult::ALLOWED;
   }
 
-  if (app_id == allocated_resources_[module_type]) {
-    LOG4CXX_DEBUG(
-        logger_,
-        "App: " << app_id << " is already acquired resource " << module_type);
+  if (app_id == allocated_resources_[module]) {
+    LOG4CXX_DEBUG(logger_,
+                  "App: " << app_id << " is already acquired resource "
+                          << module_type << " " << module_id);
     return AcquireResult::ALLOWED;
   }
 
-  if (IsModuleTypeRejected(module_type, app_id)) {
-    LOG4CXX_DEBUG(
-        logger_,
-        "Driver disallowed app: " << app_id << " to acquire " << module_type);
+  if (IsModuleTypeRejected(module_type, module_id, app_id)) {
+    LOG4CXX_DEBUG(logger_,
+                  "Driver disallowed app: " << app_id << " to acquire "
+                                            << module_type << " " << module_id);
     return AcquireResult::REJECTED;
   }
 
   const mobile_apis::HMILevel::eType acquiring_app_hmi_level =
-      acquiring_app->hmi_level();
+      acquiring_app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
 
   if (mobile_apis::HMILevel::HMI_FULL != acquiring_app_hmi_level) {
     LOG4CXX_DEBUG(logger_,
                   "Aquiring resources is not allowed in HMI level: "
                       << acquiring_app_hmi_level << ". App: " << app_id
-                      << " is disallowed to acquire " << module_type);
+                      << " is disallowed to acquire " << module_type << " "
+                      << module_id);
+    return AcquireResult::REJECTED;
+  }
+
+  if (!rc_capabilities_manager_.IsMultipleAccessAllowed(module)) {
+    LOG4CXX_DEBUG(logger_,
+                  "Multiple access for the: " << module_type << " " << module_id
+                                              << " isn't allowed");
     return AcquireResult::REJECTED;
   }
 
@@ -109,34 +130,58 @@ AcquireResult::eType ResourceAllocationManagerImpl::AcquireResource(
       LOG4CXX_DEBUG(logger_,
                     "Current access_mode is AUTO_DENY. "
                         << "App: " << app_id << " is disallowed to acquire "
-                        << module_type);
+                        << module_type << " " << module_id);
       return AcquireResult::IN_USE;
     }
     case hmi_apis::Common_RCAccessMode::ASK_DRIVER: {
       LOG4CXX_DEBUG(logger_,
                     "Current access_mode is ASK_DRIVER. "
                     "Driver confirmation is required for app: "
-                        << app_id << " to acquire " << module_type);
+                        << app_id << " to acquire " << module_type << " "
+                        << module_id);
       return AcquireResult::ASK_DRIVER;
     }
     case hmi_apis::Common_RCAccessMode::AUTO_ALLOW: {
       LOG4CXX_DEBUG(logger_,
                     "Current access_mode is AUTO_ALLOW. "
                         << "App: " << app_id << " is allowed to acquire "
-                        << module_type);
-
-      SetResourceAquired(module_type, app_id);
+                        << module_type << " " << module_id);
       return AcquireResult::ALLOWED;
     }
     default: { DCHECK_OR_RETURN(false, AcquireResult::IN_USE); }
   }
 }
 
-void ResourceAllocationManagerImpl::ReleaseResource(
+bool ResourceAllocationManagerImpl::IsUserLocationValid(
+    ModuleUid& module, application_manager::ApplicationSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto extension = RCHelpers::GetRCExtension(*app);
+  DCHECK_OR_RETURN(extension, false);
+  const auto user_location = extension->GetUserLocation();
+  const auto module_service_area =
+      rc_capabilities_manager_.GetModuleServiceArea(module);
+  const auto driver =
+      rc_capabilities_manager_.GetDriverLocationFromSeatLocationCapability();
+  const bool is_driver = user_location == driver;
+  if (is_driver || user_location.IntersectionExists(module_service_area)) {
+    return true;
+  }
+  LOG4CXX_DEBUG(logger_, "User location is not valid");
+  return false;
+}
+
+void ResourceAllocationManagerImpl::ReleaseModuleType(
     const std::string& module_type, const uint32_t application_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  LOG4CXX_DEBUG(logger_, "Release " << module_type << " by " << application_id);
-  SetResourceFree(module_type, application_id);
+  LOG4CXX_DEBUG(logger_,
+                "Release " << module_type << " "
+                           << " by " << application_id);
+  Resources allocated_resources = GetAcquiredResources(application_id);
+  for (const auto& resource : allocated_resources) {
+    if (module_type == resource.first) {
+      SetResourceFree(module_type, resource.second, application_id);
+    }
+  }
 }
 
 void ResourceAllocationManagerImpl::ProcessApplicationPolicyUpdate() {
@@ -147,10 +192,10 @@ void ResourceAllocationManagerImpl::ProcessApplicationPolicyUpdate() {
   for (; app_list.end() != app; ++app) {
     application_manager::ApplicationSharedPtr app_ptr = *app;
     const uint32_t application_id = app_ptr->app_id();
-    Resources acquired_modules = GetAcquiredResources(application_id);
-    std::sort(acquired_modules.begin(), acquired_modules.end());
+    std::set<std::string> acquired_modules =
+        GetAcquiredModuleTypes(application_id);
 
-    Resources allowed_modules;
+    std::vector<std::string> allowed_modules;
     app_mngr_.GetPolicyHandler().GetModuleTypes((*app)->policy_app_id(),
                                                 &allowed_modules);
     std::sort(allowed_modules.begin(), allowed_modules.end());
@@ -160,17 +205,16 @@ void ResourceAllocationManagerImpl::ProcessApplicationPolicyUpdate() {
                                        << " , allowed modules: "
                                        << allowed_modules.size());
 
-    Resources disallowed_modules;
+    std::vector<std::string> disallowed_modules;
     std::set_difference(acquired_modules.begin(),
                         acquired_modules.end(),
                         allowed_modules.begin(),
                         allowed_modules.end(),
                         std::back_inserter(disallowed_modules));
 
-    auto rc_extention = RCHelpers::GetRCExtension(**app);
-    Resources::const_iterator module = disallowed_modules.begin();
+    auto module = disallowed_modules.begin();
     for (; disallowed_modules.end() != module; ++module) {
-      ReleaseResource(*module, application_id);
+      ReleaseModuleType(*module, application_id);
     }
     if (!disallowed_modules.empty()) {
       SendOnRCStatusNotifications(
@@ -190,8 +234,8 @@ EnumType StringToEnum(const std::string& str) {
 
 void ConstructOnRCStatusNotificationParams(
     smart_objects::SmartObject& msg_params,
-    const std::map<std::string, uint32_t>& allocated_resources,
-    const std::vector<std::string>& supported_resources,
+    const std::map<ModuleUid, uint32_t>& allocated_resources,
+    const std::vector<ModuleUid>& supported_resources,
     const uint32_t app_id) {
   namespace strings = application_manager::strings;
   namespace message_params = rc_rpc_plugin::message_params;
@@ -201,12 +245,13 @@ void ConstructOnRCStatusNotificationParams(
   LOG4CXX_AUTO_TRACE(logger_);
 
   auto modules_inserter = [](SmartObject& result_modules) {
-    return [&result_modules](const std::string& module_name) {
+    return [&result_modules](const ModuleUid& module) {
       smart_objects::SmartObject module_data =
           SmartObject(smart_objects::SmartType_Map);
       auto module_type =
-          StringToEnum<mobile_apis::ModuleType::eType>(module_name);
+          StringToEnum<mobile_apis::ModuleType::eType>(module.first);
       module_data[message_params::kModuleType] = module_type;
+      module_data[message_params::kModuleId] = module.second;
       result_modules.asArray()->push_back(module_data);
     };
   };
@@ -236,10 +281,11 @@ ResourceAllocationManagerImpl::CreateOnRCStatusNotificationToMobile(
       mobile_apis::FunctionID::OnRCStatusID, app->app_id());
   auto& msg_params = (*msg_to_mobile)[application_manager::strings::msg_params];
   if (is_rc_enabled()) {
-    ConstructOnRCStatusNotificationParams(msg_params,
-                                          allocated_resources_,
-                                          RCHelpers::GetModulesList(),
-                                          app->app_id());
+    ConstructOnRCStatusNotificationParams(
+        msg_params,
+        allocated_resources_,
+        rc_capabilities_manager_.GetResources(),
+        app->app_id());
   } else {
     msg_params[message_params::kAllocatedModules] =
         smart_objects::SmartObject(smart_objects::SmartType_Array);
@@ -259,21 +305,12 @@ ResourceAllocationManagerImpl::CreateOnRCStatusNotificationToHmi(
   auto& msg_params = (*msg_to_hmi)[application_manager::strings::msg_params];
   ConstructOnRCStatusNotificationParams(msg_params,
                                         allocated_resources_,
-                                        RCHelpers::GetModulesList(),
+                                        rc_capabilities_manager_.GetResources(),
                                         app->app_id());
   msg_params[application_manager::strings::app_id] = app->hmi_app_id();
   return msg_to_hmi;
 }
 
-void ResourceAllocationManagerImpl::SetResourceAquired(
-    const std::string& module_type, const uint32_t app_id) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  allocated_resources_[module_type] = app_id;
-  SendOnRCStatusNotifications(
-      NotificationTrigger::MODULE_ALLOCATION,
-      std::shared_ptr<application_manager::Application>());
-}
-
 void ResourceAllocationManagerImpl::SendOnRCStatusNotifications(
     NotificationTrigger::eType event,
     application_manager::ApplicationSharedPtr application) {
@@ -310,25 +347,81 @@ void ResourceAllocationManagerImpl::set_rc_enabled(const bool value) {
       std::shared_ptr<application_manager::Application>());
 }
 
-void ResourceAllocationManagerImpl::SetResourceFree(
-    const std::string& module_type, const uint32_t app_id) {
+ResourceReleasedState::eType ResourceAllocationManagerImpl::ReleaseResource(
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t application_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_DEBUG(logger_,
+                "Release " << module_type << " " << module_id << " by "
+                           << application_id);
+  return SetResourceFree(module_type, module_id, application_id);
+}
+
+void ResourceAllocationManagerImpl::SetResourceAcquired(
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  ModuleUid module(module_type, module_id);
+  allocated_resources_[module] = app_id;
+}
+
+bool ResourceAllocationManagerImpl::IsResourceAlreadyAcquiredByApp(
+    const ModuleUid& moduleUid, const uint32_t app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto allocation = allocated_resources_.find(moduleUid);
+
+  if (allocated_resources_.end() == allocation) {
+    LOG4CXX_DEBUG(logger_,
+                  "Resource " << moduleUid.first
+                              << " is not allocated for any application.");
+    return false;
+  }
+
+  if (allocation->second != app_id) {
+    LOG4CXX_DEBUG(logger_,
+                  "Resource "
+                      << moduleUid.first
+                      << " is already allocated by app:" << allocation->second
+                      << ". Asquire has been asked for app:" << app_id);
+    return false;
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Resource " << moduleUid.first
+                            << " is allocated by app:" << allocation->second);
+
+  return true;
+}
+
+ResourceReleasedState::eType ResourceAllocationManagerImpl::SetResourceFree(
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t app_id) {
+  ModuleUid module(module_type, module_id);
   AllocatedResources::const_iterator allocation =
-      allocated_resources_.find(module_type);
+      allocated_resources_.find(module);
   if (allocated_resources_.end() == allocation) {
     LOG4CXX_DEBUG(logger_, "Resource " << module_type << " is not allocated.");
-    return;
+    return ResourceReleasedState::NOT_ALLOCATED;
   }
   if (app_id != allocation->second) {
     LOG4CXX_ERROR(logger_,
                   "Resource " << module_type
                               << " is allocated by different application "
                               << allocation->second);
+    return ResourceReleasedState::IS_ALLOCATED;
   }
   allocated_resources_.erase(allocation);
-  LOG4CXX_DEBUG(logger_, "Resource " << module_type << " is released.");
+  LOG4CXX_DEBUG(
+      logger_,
+      "Resource " << module_type << ":" << module_id << " is released.");
+  return ResourceReleasedState::IS_RELEASED;
 }
 
-std::vector<std::string> ResourceAllocationManagerImpl::GetAcquiredResources(
+std::vector<ModuleUid> ResourceAllocationManagerImpl::GetAcquiredResources(
     const uint32_t application_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
   Resources allocated_resources;
@@ -347,18 +440,37 @@ std::vector<std::string> ResourceAllocationManagerImpl::GetAcquiredResources(
   return allocated_resources;
 }
 
+std::set<std::string> ResourceAllocationManagerImpl::GetAcquiredModuleTypes(
+    const uint32_t application_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  Resources allocated_resources = GetAcquiredResources(application_id);
+  std::set<std::string> acquired_module_types;
+  for (const auto& resource : allocated_resources) {
+    acquired_module_types.insert(resource.first);
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Application " << application_id << " acquired "
+                               << acquired_module_types.size()
+                               << " module type(s).");
+
+  return acquired_module_types;
+}
+
 void ResourceAllocationManagerImpl::SetResourceState(
     const std::string& module_type,
+    const std::string& module_id,
     const uint32_t app_id,
     const ResourceState::eType state) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_,
                 "Setting state for " << module_type << " by app_id " << app_id
                                      << " to state " << state);
+  ModuleUid module(module_type, module_id);
   {
     sync_primitives::AutoLock lock(allocated_resources_lock_);
     const AllocatedResources::const_iterator allocated_it =
-        allocated_resources_.find(module_type);
+        allocated_resources_.find(module);
 
     const bool acquired = allocated_resources_.end() != allocated_it;
     if (acquired) {
@@ -374,16 +486,16 @@ void ResourceAllocationManagerImpl::SetResourceState(
   }
 
   sync_primitives::AutoLock lock(resources_state_lock_);
-  resources_state_[module_type] = state;
+  resources_state_[module] = state;
   LOG4CXX_DEBUG(logger_, "Resource " << module_type << " got state " << state);
 }
 
 bool ResourceAllocationManagerImpl::IsResourceFree(
-    const std::string& module_type) const {
+    const std::string& module_type, const std::string& module_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
+  ModuleUid module(module_type, module_id);
   sync_primitives::AutoLock lock(resources_state_lock_);
-  const ResourcesState::const_iterator resource =
-      resources_state_.find(module_type);
+  const ResourcesState::const_iterator resource = resources_state_.find(module);
 
   if (resources_state_.end() == resource) {
     LOG4CXX_DEBUG(logger_, "Resource " << module_type << " is free.");
@@ -411,15 +523,20 @@ ResourceAllocationManagerImpl::GetAccessMode() const {
 }
 
 void ResourceAllocationManagerImpl::ForceAcquireResource(
-    const std::string& module_type, const uint32_t app_id) {
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t app_id) {
   LOG4CXX_DEBUG(logger_, "Force " << app_id << " acquiring " << module_type);
   sync_primitives::AutoLock lock(allocated_resources_lock_);
-  SetResourceAquired(module_type, app_id);
+  SetResourceAcquired(module_type, module_id, app_id);
 }
 
 bool ResourceAllocationManagerImpl::IsModuleTypeRejected(
-    const std::string& module_type, const uint32_t app_id) {
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
+  ModuleUid module(module_type, module_id);
   sync_primitives::AutoLock lock(rejected_resources_for_application_lock_);
   RejectedResources::iterator it =
       rejected_resources_for_application_.find(app_id);
@@ -428,24 +545,27 @@ bool ResourceAllocationManagerImpl::IsModuleTypeRejected(
     return false;
   }
 
-  const std::vector<std::string>& list_of_rejected_resources =
+  const std::vector<ModuleUid>& list_of_rejected_resources =
       rejected_resources_for_application_[app_id];
 
-  return helpers::in_range(list_of_rejected_resources, module_type);
+  return helpers::in_range(list_of_rejected_resources, module);
 }
 
 void ResourceAllocationManagerImpl::OnDriverDisallowed(
-    const std::string& module_type, const uint32_t app_id) {
+    const std::string& module_type,
+    const std::string& module_id,
+    const uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
+  ModuleUid module(module_type, module_id);
   sync_primitives::AutoLock lock(rejected_resources_for_application_lock_);
   auto it = rejected_resources_for_application_.find(app_id);
 
   if (rejected_resources_for_application_.end() == it) {
-    rejected_resources_for_application_[app_id] = std::vector<std::string>();
+    rejected_resources_for_application_[app_id] = std::vector<ModuleUid>();
   }
-  std::vector<std::string>& list_of_rejected_resources =
+  std::vector<ModuleUid>& list_of_rejected_resources =
       rejected_resources_for_application_[app_id];
-  list_of_rejected_resources.push_back(module_type);
+  list_of_rejected_resources.push_back(module);
 }
 
 void ResourceAllocationManagerImpl::OnApplicationEvent(
@@ -458,10 +578,10 @@ void ResourceAllocationManagerImpl::OnApplicationEvent(
 
   if (ApplicationEvent::kApplicationExit == event ||
       ApplicationEvent::kApplicationUnregistered == event) {
-    Resources acquired_modules = GetAcquiredResources(application->app_id());
-    Resources::const_iterator module = acquired_modules.begin();
+    auto acquired_modules = GetAcquiredModuleTypes(application->app_id());
+    auto module = acquired_modules.begin();
     for (; acquired_modules.end() != module; ++module) {
-      ReleaseResource(*module, application->app_id());
+      ReleaseModuleType(*module, application->app_id());
     }
     if (!acquired_modules.empty()) {
       SendOnRCStatusNotifications(
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/CMakeLists.txt b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/CMakeLists.txt
index c1c59d7e78..bd46bdf11f 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/CMakeLists.txt
@@ -37,11 +37,14 @@ include_directories (
   ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/test/include/
   ${COMPONENTS_DIR}/include/test/application_manager/
   ${COMPONENTS_DIR}/rc_rpc_plugin/test/include
+  ${COMPONENTS_DIR}/resumption/include
   )
 
 set (RC_TEST_SOURCES
-${CMAKE_CURRENT_SOURCE_DIR}/resource_allocation_manager_impl_test.cc
 ${CMAKE_CURRENT_SOURCE_DIR}/interior_data_cache_test.cc
+${CMAKE_CURRENT_SOURCE_DIR}/rc_consent_manager_impl_test.cc
+${CMAKE_CURRENT_SOURCE_DIR}/grid_test.cc
+${CMAKE_CURRENT_SOURCE_DIR}/rc_helpers_test.cc
 )
 
 set(RC_COMMANDS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/commands)
@@ -52,17 +55,9 @@ file(GLOB SOURCES
 )
 
 set(LIBRARIES
-  RCRpcPluginStaticLib
-  ApplicationManager
-  connectionHandler
-  SmartObjects
-  ProtocolHandler
-  MessageHelper
-  connectionHandler
-  Utils
-  jsoncpp
+  rc_rpc_plugin_static
+  Resumption
   gmock_main
-  dl
 )
 
 if(ENABLE_LOG)
@@ -75,3 +70,4 @@ endif()
 create_test("rc_commands_test" "${SOURCES}" "${LIBRARIES}" )
 create_test("rc_plugin_test" "${RC_TEST_SOURCES}" "${LIBRARIES}")
 
+add_subdirectory(resource_allocation_manager)
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
index f2b86f43da..fb8de0bb9c 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc
@@ -40,6 +40,8 @@
 #include "interfaces/MOBILE_API.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
 #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
 #include "rc_rpc_plugin/rc_command_factory.h"
@@ -82,40 +84,9 @@ class ButtonPressRequestTest
       , rc_app_extention_(
             std::make_shared<rc_rpc_plugin::RCAppExtension>(kModuleId)) {}
 
-  smart_objects::SmartObject ButtonCapability(
-      const mobile_apis::ButtonName::eType button_name) {
-    smart_objects::SmartObject button(smart_objects::SmartType_Map);
-    button["name"] = button_name;
-    return button;
-  }
-
   void SetUp() OVERRIDE {
-    using namespace mobile_apis;
-
-    std::vector<ButtonName::eType> button_names = {ButtonName::AC_MAX,
-                                                   ButtonName::AC,
-                                                   ButtonName::RECIRCULATE,
-                                                   ButtonName::FAN_UP,
-                                                   ButtonName::FAN_DOWN,
-                                                   ButtonName::TEMP_UP,
-                                                   ButtonName::TEMP_DOWN,
-                                                   ButtonName::DEFROST_MAX,
-                                                   ButtonName::DEFROST,
-                                                   ButtonName::DEFROST_REAR,
-                                                   ButtonName::UPPER_VENT,
-                                                   ButtonName::LOWER_VENT,
-                                                   ButtonName::VOLUME_UP,
-                                                   ButtonName::VOLUME_DOWN,
-                                                   ButtonName::EJECT,
-                                                   ButtonName::SOURCE,
-                                                   ButtonName::SHUFFLE,
-                                                   ButtonName::REPEAT};
-
-    smart_objects::SmartObject button_caps(smart_objects::SmartType_Array);
-    for (size_t i = 0; i < button_names.size(); i++) {
-      button_caps[i] = ButtonCapability(button_names[i]);
-    }
-    rc_capabilities_[strings::kbuttonCapabilities] = button_caps;
+    smart_objects::SmartObject control_caps((smart_objects::SmartType_Array));
+    rc_capabilities_[strings::kradioControlCapabilities] = control_caps;
     ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app_));
     ON_CALL(*mock_app_, QueryInterface(RCRPCPlugin::kRCPluginID))
         .WillByDefault(Return(rc_app_extention_));
@@ -133,6 +104,12 @@ class ButtonPressRequestTest
         .WillByDefault(Return(true));
     ON_CALL(mock_allocation_manager_, is_rc_enabled())
         .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, CheckButtonName(_, _))
+        .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_))
+        .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfButtonExistInRCCaps(_))
+        .WillByDefault(Return(true));
   }
 
   MessageSharedPtr CreateBasicMessage() {
@@ -156,7 +133,9 @@ class ButtonPressRequestTest
                            mock_policy_handler_,
                            mock_allocation_manager_,
                            mock_interior_data_cache_,
-                           mock_interior_data_manager_};
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
     return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
   }
 
@@ -172,29 +151,36 @@ class ButtonPressRequestTest
       mock_interior_data_cache_;
   testing::NiceMock<rc_rpc_plugin_test::MockInteriorDataManager>
       mock_interior_data_manager_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  testing::NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
 };
 
 TEST_F(ButtonPressRequestTest,
        Execute_ButtonNameMatchesModuleType_ExpectCorrectMessageSentToHMI) {
   // Arrange
+  const std::string resource = "CLIMATE";
+  const std::string resource_id = "id1";
   MessageSharedPtr mobile_message = CreateBasicMessage();
   ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::CLIMATE;
+  msg_params[message_params::kModuleId] = resource_id;
   msg_params[message_params::kButtonName] = mobile_apis::ButtonName::AC;
   msg_params[message_params::kButtonPressMode] =
       mobile_apis::ButtonPressMode::SHORT;
 
   // Expectations
-  const std::string resource = "CLIMATE";
   ON_CALL(mock_policy_handler_, CheckModule(_, _)).WillByDefault(Return(true));
-  EXPECT_CALL(mock_allocation_manager_, IsResourceFree(resource))
+
+  EXPECT_CALL(mock_allocation_manager_, IsResourceFree(resource, resource_id))
       .WillOnce(Return(true));
-  EXPECT_CALL(mock_allocation_manager_, AcquireResource(resource, _))
+  EXPECT_CALL(mock_allocation_manager_, AcquireResource(resource, _, _))
       .WillOnce(Return(rc_rpc_plugin::AcquireResult::ALLOWED));
   EXPECT_CALL(
       mock_allocation_manager_,
-      SetResourceState(resource, kAppId, rc_rpc_plugin::ResourceState::BUSY));
+      SetResourceState(
+          resource, resource_id, kAppId, rc_rpc_plugin::ResourceState::BUSY));
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
@@ -213,22 +199,27 @@ TEST_F(
     ButtonPressRequestTest,
     Execute_ButtonNameDoesNotMatchModuleType_ExpectMessageNotSentToHMI_AndFalseSentToMobile) {
   // Arrange
+  const std::string resource = "RADIO";
+  const std::string resource_id = "id1";
   MessageSharedPtr mobile_message = CreateBasicMessage();
   ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
+  msg_params[message_params::kModuleId] = resource_id;
   msg_params[message_params::kButtonName] = mobile_apis::ButtonName::AC;
   msg_params[message_params::kButtonPressMode] =
       mobile_apis::ButtonPressMode::SHORT;
   // Expectations
 
-  const std::string resource = "RADIO";
+  EXPECT_CALL(mock_rc_capabilities_manager_, CheckButtonName(_, _))
+      .WillOnce(Return(false));
   ON_CALL(mock_policy_handler_, CheckModule(_, _)).WillByDefault(Return(true));
-  EXPECT_CALL(mock_allocation_manager_, IsResourceFree(resource))
+  EXPECT_CALL(mock_allocation_manager_, IsResourceFree(resource, resource_id))
       .WillOnce(Return(true));
-  EXPECT_CALL(mock_allocation_manager_, AcquireResource(resource, _))
+  EXPECT_CALL(mock_allocation_manager_, AcquireResource(resource, _, _))
       .WillOnce(Return(rc_rpc_plugin::AcquireResult::ALLOWED));
-  EXPECT_CALL(mock_allocation_manager_, SetResourceState(resource, kAppId, _))
+  EXPECT_CALL(mock_allocation_manager_,
+              SetResourceState(resource, resource_id, kAppId, _))
       .Times(2);
 
   EXPECT_CALL(
@@ -269,9 +260,10 @@ TEST_F(ButtonPressRequestTest, OnEvent_ExpectSuccessfullResponseSentToMobile) {
   hmi_msg_params[application_manager::strings::connection_key] = kConnectionKey;
 
   // Expectations
-  EXPECT_CALL(mock_allocation_manager_,
-              SetResourceState(_, kAppId, rc_rpc_plugin::ResourceState::FREE))
-      .Times(2);
+  EXPECT_CALL(
+      mock_allocation_manager_,
+      SetResourceState(_, _, kAppId, rc_rpc_plugin::ResourceState::FREE))
+      .Times(1);
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -308,9 +300,10 @@ TEST_F(ButtonPressRequestTest,
   hmi_msg_params[application_manager::strings::connection_key] = kConnectionKey;
 
   // Expectations
-  EXPECT_CALL(mock_allocation_manager_,
-              SetResourceState(_, kAppId, rc_rpc_plugin::ResourceState::FREE))
-      .Times(2);
+  EXPECT_CALL(
+      mock_allocation_manager_,
+      SetResourceState(_, _, kAppId, rc_rpc_plugin::ResourceState::FREE))
+      .Times(1);
 
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc
new file mode 100644
index 0000000000..29708d05bd
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc
@@ -0,0 +1,402 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <memory>
+#include <string>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "rc_rpc_plugin/commands/mobile/get_interior_vehicle_data_consent_request.h"
+
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/mock_application.h"
+#include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
+#include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
+#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+
+using application_manager::commands::MessageSharedPtr;
+using rc_rpc_plugin_test::MockInteriorDataCache;
+using rc_rpc_plugin_test::MockInteriorDataManager;
+using rc_rpc_plugin_test::MockRCCapabilitiesManager;
+using rc_rpc_plugin_test::MockRCConsentManager;
+using rc_rpc_plugin_test::MockResourceAllocationManager;
+using test::components::application_manager_test::MockApplication;
+using test::components::commands_test::CommandRequestTest;
+using test::components::commands_test::CommandsTestMocks;
+
+using ::testing::_;
+using ::testing::DoAll;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+using ::testing::SaveArg;
+
+typedef std::shared_ptr<
+    rc_rpc_plugin::commands::GetInteriorVehicleDataConsentRequest>
+    GIVDConsentPtr;
+
+namespace {
+const uint32_t kConnectionKey = 1u;
+const uint32_t kAppId = 2u;
+const std::string kPolicyAppId = "policy_app_id";
+const std::string kMacAddress = "device1";
+const std::string kModuleId_1 = "34045662-a9dc-4823-8435-91056d4c26cb";
+const std::string kModuleId_2 = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
+const std::string kModuleId_3 = "06cdec22-920e-4865-bf2e-9518463edc68";
+const mobile_apis::ModuleType::eType kModule_Type =
+    mobile_apis::ModuleType::eType::RADIO;
+}  // namespace
+
+namespace rc_rpc_plugin_test {
+namespace get_interior_vehicle_data_consent_request_test {
+using namespace rc_rpc_plugin;
+
+class GetInteriorVehicleDataConsentRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ public:
+  GetInteriorVehicleDataConsentRequestTest() : mock_app_(CreateMockApp()) {}
+
+  void SetUp() OVERRIDE {
+    TestPrecondition();
+  }
+
+  void TestPrecondition() {
+    message_ = CreateBasicMessage();
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_))
+        .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, IsMultipleAccessAllowed(_))
+        .WillByDefault(Return(true));
+  }
+
+  void PrepareNoConsentExistInCache() {
+    ON_CALL(mock_allocation_manager_, GetAccessMode())
+        .WillByDefault(Return(hmi_apis::Common_RCAccessMode::ASK_DRIVER));
+    ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app_));
+    ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
+    ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+    ON_CALL(*mock_app_, mac_address()).WillByDefault(ReturnRef(kMacAddress));
+    ON_CALL(mock_rc_consent_manger_,
+            GetModuleConsent(kPolicyAppId, kMacAddress, _))
+        .WillByDefault(Return(rc_rpc_types::ModuleConsent::NOT_EXISTS));
+    ON_CALL(mock_allocation_manager_,
+            AcquireResource(_, _, mock_app_->app_id()))
+        .WillByDefault(Return(AcquireResult::IN_USE));
+  }
+
+  void PrepareMobileMessage() {
+    auto& msg_params = (*message_)[application_manager::strings::msg_params];
+    msg_params[message_params::kModuleType] = kModule_Type;
+
+    msg_params[message_params::kModuleIds][0] = kModuleId_1;
+    msg_params[message_params::kModuleIds][1] = kModuleId_2;
+    msg_params[message_params::kModuleIds][2] = kModuleId_3;
+  }
+
+  /**
+   * @brief CreateBasicMessage creates message for
+   * GetInteriorVehicleData request for app1
+   * @return message shared ptr
+   */
+  MessageSharedPtr CreateBasicMessage() {
+    MessageSharedPtr message = CreateMessage();
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::function_id] =
+                  mobile_apis::FunctionID::GetInteriorVehicleDataID;
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::connection_key] = kConnectionKey;
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::app_id] = kAppId;
+    return message;
+  }
+
+  template <class Command>
+  std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
+    InitCommand(kDefaultTimeout_);
+    RCCommandParams params{app_mngr_,
+                           mock_rpc_service_,
+                           mock_hmi_capabilities_,
+                           mock_policy_handler_,
+                           mock_allocation_manager_,
+                           mock_interior_data_cache_,
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
+    return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
+  }
+
+ protected:
+  GIVDConsentPtr command_;
+  MessageSharedPtr message_;
+
+  MockAppPtr mock_app_;
+  NiceMock<MockResourceAllocationManager> mock_allocation_manager_;
+  NiceMock<MockInteriorDataCache> mock_interior_data_cache_;
+  NiceMock<MockInteriorDataManager> mock_interior_data_manager_;
+  NiceMock<MockRCCapabilitiesManager> mock_rc_capabilities_manager_;
+  NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
+};
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       ModuleIDReturnsEmptyString_SUCCESS) {
+  std::string empty_str;
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+
+  EXPECT_EQ(empty_str, command_->ModuleId());
+}
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       Execute_ModuleIdsIsAbsentInMessage_Response_INVALID_DATA) {
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+
+  auto response_to_mobile = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
+
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command_->Execute();
+
+  const bool result =
+      (*response_to_mobile)[application_manager::strings::msg_params]
+                           [application_manager::strings::success]
+                               .asBool();
+  const auto result_code = static_cast<mobile_apis::Result::eType>(
+      (*response_to_mobile)[application_manager::strings::msg_params]
+                           [application_manager::strings::result_code]
+                               .asUInt());
+  EXPECT_FALSE(result);
+  EXPECT_EQ(mobile_apis::Result::INVALID_DATA, result_code);
+}
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       Execute_ModuleIdsIsEmpty_AddDefaultModuleID) {
+  (*message_)[application_manager::strings::msg_params]
+             [message_params::kModuleIds] = smart_objects::SmartObject(
+                 smart_objects::SmartType::SmartType_Array);
+  (*message_)[application_manager::strings::msg_params]
+             [message_params::kModuleType] = kModule_Type;
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+
+  auto message_to_hmi = CreateMessage();
+
+  const std::string module_type = "RADIO";
+  const std::string default_module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
+  ON_CALL(mock_rc_capabilities_manager_,
+          GetDefaultModuleIdFromCapabilities(module_type))
+      .WillByDefault(Return(default_module_id));
+
+  PrepareNoConsentExistInCache();
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  command_->Execute();
+
+  ASSERT_FALSE((*message_to_hmi)[application_manager::strings::msg_params]
+                                [message_params::kModuleIds]
+                                    .empty());
+  const auto sent_module_id =
+      (*message_to_hmi)[application_manager::strings::msg_params]
+                       [message_params::kModuleIds][0]
+                           .asString();
+  EXPECT_EQ(sent_module_id, default_module_id);
+}
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       Execute_SDLForwardsMobileMessageToHMI_SUCCESS) {
+  auto message_to_hmi = CreateMessage();
+
+  PrepareMobileMessage();
+  PrepareNoConsentExistInCache();
+
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  command_->Execute();
+
+  auto outgoing_msg_params =
+      (*message_to_hmi)[application_manager::strings::msg_params];
+
+  auto module_type = static_cast<mobile_apis::ModuleType::eType>(
+      outgoing_msg_params[message_params::kModuleType].asUInt());
+
+  EXPECT_EQ(kModule_Type, module_type);
+  EXPECT_EQ(kModuleId_1,
+            outgoing_msg_params[message_params::kModuleIds][0].asString());
+  EXPECT_EQ(kModuleId_2,
+            outgoing_msg_params[message_params::kModuleIds][1].asString());
+  EXPECT_EQ(kModuleId_3,
+            outgoing_msg_params[message_params::kModuleIds][2].asString());
+}
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       On_Event_ConsentCollectionIsAbsentOrEmpty_Response_GENERIC_ERROR) {
+  PrepareMobileMessage();
+
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+
+  // Consent collection in HMI response is absent
+  auto event_message = CreateMessage();
+  application_manager::event_engine::Event event_collection_is_absent(
+      hmi_apis::FunctionID::RC_GetInteriorVehicleDataConsent);
+  event_collection_is_absent.set_smart_object(*event_message);
+
+  auto response_to_mobile = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command_->on_event(event_collection_is_absent);
+
+  const auto result_code_is_absent = static_cast<mobile_apis::Result::eType>(
+      (*response_to_mobile)[application_manager::strings::msg_params]
+                           [application_manager::strings::result_code]
+                               .asUInt());
+  EXPECT_EQ(mobile_apis::Result::GENERIC_ERROR, result_code_is_absent);
+
+  // Consent coolection in HMI response isn't absent but is empty
+  event_message = CreateMessage();
+  application_manager::event_engine::MobileEvent event_collection_is_empty(
+      mobile_apis::FunctionID::GetInteriorVehicleDataConsentID);
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed] = smart_objects::SmartObject(
+                      smart_objects::SmartType::SmartType_Array);
+  event_collection_is_empty.set_smart_object(*event_message);
+
+  response_to_mobile = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command_->on_event(event_collection_is_absent);
+
+  const auto result_code_is_empty = static_cast<mobile_apis::Result::eType>(
+      (*response_to_mobile)[application_manager::strings::msg_params]
+                           [application_manager::strings::result_code]
+                               .asUInt());
+  EXPECT_EQ(mobile_apis::Result::GENERIC_ERROR, result_code_is_empty);
+}
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       On_Event_ConsentsSizeIsNotEqualModuleIdsSize_Response_GENERIC_ERROR) {
+  PrepareMobileMessage();
+  PrepareNoConsentExistInCache();
+
+  // ModuleIds collection will be saved
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+  command_->Execute();
+
+  auto event_message = CreateMessage();
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed] = smart_objects::SmartObject(
+                      smart_objects::SmartType::SmartType_Array);
+
+  // Consent collection will contain only two items in collection
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed][0] = true;
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed][1] = false;
+
+  application_manager::event_engine::Event event(
+      hmi_apis::FunctionID::RC_GetInteriorVehicleDataConsent);
+  event.set_smart_object(*event_message);
+
+  auto response_to_mobile = CreateMessage();
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command_->on_event(event);
+
+  const auto result_code_is_empty = static_cast<mobile_apis::Result::eType>(
+      (*response_to_mobile)[application_manager::strings::msg_params]
+                           [application_manager::strings::result_code]
+                               .asUInt());
+  EXPECT_EQ(mobile_apis::Result::GENERIC_ERROR, result_code_is_empty);
+}
+
+TEST_F(GetInteriorVehicleDataConsentRequestTest,
+       On_Event_SaveModuleConsentsToLastState_Response_SUCCESS) {
+  PrepareMobileMessage();
+  PrepareNoConsentExistInCache();
+
+  // ModuleIds collection will be saved
+  command_ =
+      CreateRCCommand<commands::GetInteriorVehicleDataConsentRequest>(message_);
+  command_->Execute();
+
+  // Consent collection will have same size as moduelIds collection
+  auto event_message = CreateMessage();
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed][0] = true;
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed][1] = false;
+  (*event_message)[application_manager::strings::msg_params]
+                  [message_params::kAllowed][2] = false;
+
+  application_manager::event_engine::Event event(
+      hmi_apis::FunctionID::RC_GetInteriorVehicleDataConsent);
+  event.set_smart_object(*event_message);
+
+  ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app_));
+  ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+  ON_CALL(*mock_app_, mac_address()).WillByDefault(ReturnRef(kMacAddress));
+
+  EXPECT_CALL(mock_rc_consent_manger_, SaveModuleConsents(kPolicyAppId, _, _));
+
+  auto response_to_mobile = CreateMessage();
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command_->on_event(event);
+
+  const auto result_code_is_empty = static_cast<mobile_apis::Result::eType>(
+      (*response_to_mobile)[application_manager::strings::msg_params]
+                           [application_manager::strings::result_code]
+                               .asUInt());
+  EXPECT_EQ(mobile_apis::Result::SUCCESS, result_code_is_empty);
+}
+
+}  // namespace get_interior_vehicle_data_consent_request_test
+}  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
index 123c22b944..532a62df3b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
@@ -38,6 +38,8 @@
 #include "gtest/gtest.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
 #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
 #include "rc_rpc_plugin/rc_app_extension.h"
 #include "rc_rpc_plugin/rc_command_factory.h"
@@ -74,7 +76,9 @@ const int32_t kConnectionKey = 5u;
 const uint32_t kAppId = 0u;
 const uint32_t kAppId2 = 1u;
 const int kModuleId = 153u;
-const auto module_type = mobile_apis::ModuleType::RADIO;
+const auto module_eType = mobile_apis::ModuleType::RADIO;
+const auto module_type = "RADIO";
+const auto module_id = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
 const int32_t time_frame_of_allowed_requests = 1;
 const uint32_t max_request_in_time_frame = 5u;
 }  // namespace
@@ -91,7 +95,8 @@ class GetInteriorVehicleDataRequestTest
       , rc_app_extention_(std::make_shared<RCAppExtension>(kModuleId))
       , rc_app_extention2_(std::make_shared<RCAppExtension>(kModuleId))
       , apps_lock_(std::make_shared<sync_primitives::Lock>())
-      , apps_da_(apps_, apps_lock_) {
+      , apps_da_(apps_, apps_lock_)
+      , rc_capabilities_(smart_objects::SmartType::SmartType_Array) {
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
     ON_CALL(*mock_app2_, app_id()).WillByDefault(Return(kAppId2));
     ON_CALL(*mock_app_, is_remote_control_supported())
@@ -125,6 +130,8 @@ class GetInteriorVehicleDataRequestTest
     std::pair<uint32_t, int32_t> frequency;
     frequency.first = max_request_in_time_frame;
     frequency.second = time_frame_of_allowed_requests;
+    smart_objects::SmartObject control_caps((smart_objects::SmartType_Array));
+    rc_capabilities_[strings::kradioControlCapabilities] = control_caps;
     ON_CALL(app_mngr_, get_settings())
         .WillByDefault(ReturnRef(app_mngr_settings_));
     ON_CALL(app_mngr_settings_, get_interior_vehicle_data_frequency())
@@ -144,7 +151,7 @@ class GetInteriorVehicleDataRequestTest
     ON_CALL(app_mngr_, hmi_capabilities())
         .WillByDefault(ReturnRef(mock_hmi_capabilities_));
     ON_CALL(mock_hmi_capabilities_, rc_capability())
-        .WillByDefault(Return(nullptr));
+        .WillByDefault(Return(&rc_capabilities_));
     ON_CALL(mock_policy_handler_,
             CheckHMIType(
                 _, mobile_apis::AppHMIType::eType::REMOTE_CONTROL, nullptr))
@@ -153,6 +160,8 @@ class GetInteriorVehicleDataRequestTest
         .WillByDefault(Return(true));
     ON_CALL(mock_allocation_manager_, is_rc_enabled())
         .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_))
+        .WillByDefault(Return(true));
   }
 
   template <class Command>
@@ -164,7 +173,9 @@ class GetInteriorVehicleDataRequestTest
                            mock_policy_handler_,
                            mock_allocation_manager_,
                            mock_interior_data_cache_,
-                           mock_interior_data_manager_};
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
     return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
   }
 
@@ -182,6 +193,10 @@ class GetInteriorVehicleDataRequestTest
   application_manager::ApplicationSet apps_;
   const std::shared_ptr<sync_primitives::Lock> apps_lock_;
   DataAccessor<application_manager::ApplicationSet> apps_da_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  smart_objects::SmartObject rc_capabilities_;
+  testing::NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
 };
 
 TEST_F(GetInteriorVehicleDataRequestTest,
@@ -189,14 +204,16 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
-  ON_CALL(mock_interior_data_cache_, Contains(enums_value::kRadio))
+                   [message_params::kModuleType] = module_eType;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleType] = module_id;
+  const ModuleUid module(module_type, module_id);
+  ON_CALL(mock_interior_data_cache_, Contains(module))
       .WillByDefault(Return(false));
   ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
       .WillByDefault(Return(true));
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
 
   // Expectations
@@ -216,16 +233,18 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
+                   [message_params::kModuleType] = module_eType;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleId] = module_id;
   (*mobile_message)[application_manager::strings::msg_params]
                    [message_params::kSubscribe] = true;
-  ON_CALL(mock_interior_data_cache_, Contains(enums_value::kRadio))
+  const ModuleUid module(module_type, module_id);
+  ON_CALL(mock_interior_data_cache_, Contains(module))
       .WillByDefault(Return(false));
   ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
       .WillByDefault(Return(true));
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
 
   // Expectations
@@ -243,10 +262,13 @@ TEST_F(
     GetInteriorVehicleDataRequestTest,
     Execute_ExpectMessageNotSentToHMI_SuccessSentToMobile_AppSubscribed_DataFromCache) {
   // Arrange
-  rc_app_extention_->SubscribeToInteriorVehicleData(enums_value::kRadio);
+  const ModuleUid module(module_type, module_id);
+  rc_app_extention_->SubscribeToInteriorVehicleData(module);
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
+                   [message_params::kModuleType] = module_eType;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleId] = module_id;
   smart_objects::SmartObject radio_data;
   smart_objects::SmartObject sis_data;
   smart_objects::SmartObject gps_data;
@@ -261,15 +283,14 @@ TEST_F(
   radio_data[message_params::kBand] = enums_value::kAM;
   radio_data[message_params::kSisData] = sis_data;
 
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
 
   // Expectations
-  EXPECT_CALL(mock_interior_data_cache_, Contains(enums_value::kRadio))
+  EXPECT_CALL(mock_interior_data_cache_, Contains(module))
       .WillOnce(Return(true));
-  EXPECT_CALL(mock_interior_data_cache_, Retrieve(enums_value::kRadio))
+  EXPECT_CALL(mock_interior_data_cache_, Retrieve(module))
       .WillOnce(Return(radio_data));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
   MessageSharedPtr command_result;
@@ -291,13 +312,16 @@ TEST_F(
 
 TEST_F(
     GetInteriorVehicleDataRequestTest,
-    Execute_ExpectCorrectMessageSentToHMI_LastAppSubscribedUnsubscibe_ClearCache) {
+    Execute_ExpectCorrectMessageSentToHMI_LastAppSubscribedUnsubscribe_ClearCache) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
+                   [message_params::kModuleType] = module_eType;
   (*mobile_message)[application_manager::strings::msg_params]
                    [message_params::kSubscribe] = false;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleId] = module_id;
+  const ModuleUid module(module_type, module_id);
 
   MessageSharedPtr hmi_response = CreateBasicMessage();
   ns_smart_device_link::ns_smart_objects::SmartObject& hmi_msg_params =
@@ -306,9 +330,11 @@ TEST_F(
       hmi_apis::Common_Result::SUCCESS;
   hmi_msg_params[application_manager::hmi_response::code] = response_code;
   hmi_msg_params[application_manager::strings::connection_key] = kConnectionKey;
+  hmi_msg_params[message_params::kModuleData][message_params::kModuleId] =
+      module_id;
 
   apps_.insert(mock_app_);
-  rc_app_extention_->SubscribeToInteriorVehicleData(enums_value::kRadio);
+  rc_app_extention_->SubscribeToInteriorVehicleData(module);
   ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_da_));
   ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
       .WillByDefault(Return(true));
@@ -324,12 +350,11 @@ TEST_F(
       ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), _))
       .WillOnce(Return(true));
 
-  EXPECT_CALL(mock_interior_data_cache_, Remove(enums_value::kRadio));
+  EXPECT_CALL(mock_interior_data_cache_, Remove(module));
 
   // Act
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
   ASSERT_TRUE(command->Init());
   command->Run();
@@ -344,28 +369,30 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
+                   [message_params::kModuleType] = module_eType;
   (*mobile_message)[application_manager::strings::msg_params]
                    [message_params::kSubscribe] = false;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleId] = module_id;
+  const ModuleUid module(module_type, module_id);
 
   apps_.insert(mock_app_);
   apps_.insert(mock_app2_);
-  rc_app_extention_->SubscribeToInteriorVehicleData(enums_value::kRadio);
-  rc_app_extention2_->SubscribeToInteriorVehicleData(enums_value::kRadio);
+  rc_app_extention_->SubscribeToInteriorVehicleData(module);
+  rc_app_extention2_->SubscribeToInteriorVehicleData(module);
 
   smart_objects::SmartObject radio_data;
   radio_data[message_params::kBand] = enums_value::kAM;
   ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_da_));
 
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
 
   // Expectations
-  EXPECT_CALL(mock_interior_data_cache_, Contains(enums_value::kRadio))
+  EXPECT_CALL(mock_interior_data_cache_, Contains(module))
       .WillOnce(Return(true));
-  EXPECT_CALL(mock_interior_data_cache_, Retrieve(enums_value::kRadio))
+  EXPECT_CALL(mock_interior_data_cache_, Retrieve(module))
       .WillOnce(Return(radio_data));
 
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
@@ -380,8 +407,8 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   command->Run();
 
   // Assert
-  EXPECT_FALSE(
-      rc_app_extention_->IsSubscibedToInteriorVehicleData(enums_value::kRadio));
+  EXPECT_FALSE(rc_app_extention_->IsSubscribedToInteriorVehicleDataOfType(
+      enums_value::kRadio));
   EXPECT_EQ((*command_result)[application_manager::strings::msg_params]
                              [message_params::kModuleData]
                              [message_params::kRadioControlData],
@@ -395,14 +422,12 @@ TEST_F(
   MessageSharedPtr mobile_message = CreateBasicMessage();
   ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
-  msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  msg_params[message_params::kModuleType] = module_eType;
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
-  smart_objects::SmartObject rc_capabilities;
   ON_CALL(mock_hmi_capabilities_, rc_capability())
-      .WillByDefault(Return(&rc_capabilities));
+      .WillByDefault(Return(nullptr));
 
   // Expectations
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
@@ -423,10 +448,9 @@ TEST_F(
   MessageSharedPtr mobile_message = CreateBasicMessage();
   ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
-  msg_params[message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  msg_params[message_params::kModuleType] = module_eType;
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
   ON_CALL(mock_policy_handler_, CheckModule(_, _)).WillByDefault(Return(false));
 
@@ -451,12 +475,14 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   auto& msg_params = (*mobile_message)[strings::msg_params];
-  msg_params[message_params::kModuleType] = module_type;
+  msg_params[message_params::kModuleType] = module_eType;
 
   MessageSharedPtr hmi_response_message = CreateBasicMessage();
   auto& hmi_response_params = (*hmi_response_message)[strings::msg_params];
   hmi_response_params[hmi_response::code] = hmi_apis::Common_Result::SUCCESS;
   hmi_response_params[strings::connection_key] = kConnectionKey;
+  hmi_response_params[message_params::kModuleData][message_params::kModuleId] =
+      module_id;
 
   ON_CALL(mock_interior_data_cache_, Contains(_)).WillByDefault(Return(false));
   ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
@@ -494,7 +520,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   MessageSharedPtr mobile_message = CreateBasicMessage();
   auto& msg_params =
       (*mobile_message)[application_manager::strings::msg_params];
-  msg_params[message_params::kModuleType] = module_type;
+  msg_params[message_params::kModuleType] = module_eType;
 
   MessageSharedPtr hmi_message = CreateBasicMessage();
   auto& hmi_msg_params = (*hmi_message)[strings::params];
@@ -526,14 +552,16 @@ TEST_F(GetInteriorVehicleDataRequestTest,
 }
 
 TEST_F(GetInteriorVehicleDataRequestTest,
-       OnEvent_InvalidHmiResponse_DontUnsubscibeLastApp_NoClearCache) {
+       OnEvent_InvalidHmiResponse_DontUnsubscribeLastApp_NoClearCache) {
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
+                   [message_params::kModuleType] = module_eType;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleId] = module_id;
   (*mobile_message)[application_manager::strings::msg_params]
                    [message_params::kSubscribe] = false;
-
+  const ModuleUid module(module_type, module_id);
   MessageSharedPtr hmi_response = CreateBasicMessage();
   ns_smart_device_link::ns_smart_objects::SmartObject& hmi_msg_params =
       (*hmi_response)[application_manager::strings::params];
@@ -542,7 +570,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   hmi_msg_params[application_manager::strings::connection_key] = kConnectionKey;
 
   apps_.insert(mock_app_);
-  rc_app_extention_->SubscribeToInteriorVehicleData(enums_value::kRadio);
+  rc_app_extention_->SubscribeToInteriorVehicleData(module);
   ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_da_));
   ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
       .WillByDefault(Return(true));
@@ -561,9 +589,8 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   EXPECT_CALL(mock_interior_data_cache_, Clear()).Times(0);
 
   // Act
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
   ASSERT_TRUE(command->Init());
   command->Run();
@@ -573,32 +600,33 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   command->on_event(event);
 
   // Assert
-  EXPECT_TRUE(
-      rc_app_extention_->IsSubscibedToInteriorVehicleData(enums_value::kRadio));
+  EXPECT_TRUE(rc_app_extention_->IsSubscribedToInteriorVehicleData(module));
 }
 
 TEST_F(GetInteriorVehicleDataRequestTest,
        Execute_ExpectRejectDuToRequestLimitation_NoCahce) {
   // Arrange
-  rc_app_extention_->UnsubscribeFromInteriorVehicleData(enums_value::kRadio);
+  rc_app_extention_->UnsubscribeFromInteriorVehicleDataOfType(
+      enums_value::kRadio);
   MessageSharedPtr mobile_message = CreateBasicMessage();
   (*mobile_message)[application_manager::strings::msg_params]
-                   [message_params::kModuleType] = module_type;
+                   [message_params::kModuleType] = module_eType;
+  (*mobile_message)[application_manager::strings::msg_params]
+                   [message_params::kModuleId] = module_id;
   smart_objects::SmartObject radio_data;
   radio_data[message_params::kBand] = enums_value::kAM;
-  std::shared_ptr<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
+  const ModuleUid module(module_type, module_id);
   size_t i = 0;
   for (; i <= max_request_in_time_frame; ++i) {
     // Expectations
     EXPECT_CALL(mock_interior_data_manager_,
-                CheckRequestsToHMIFrequency(enums_value::kRadio))
+                CheckRequestsToHMIFrequency(module))
         .WillOnce(Return(true));
-    EXPECT_CALL(mock_interior_data_manager_,
-                StoreRequestToHMITime(enums_value::kRadio));
-    EXPECT_CALL(mock_interior_data_cache_, Contains(enums_value::kRadio))
+    EXPECT_CALL(mock_interior_data_manager_, StoreRequestToHMITime(module));
+    EXPECT_CALL(mock_interior_data_cache_, Contains(module))
         .WillRepeatedly(Return(false));
     EXPECT_CALL(
         mock_rpc_service_,
@@ -612,8 +640,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   }
 
   // Expectations
-  EXPECT_CALL(mock_interior_data_manager_,
-              CheckRequestsToHMIFrequency(enums_value::kRadio))
+  EXPECT_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(module))
       .WillOnce(Return(false));
   EXPECT_CALL(
       mock_rpc_service_,
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
index dcf36a34a0..d6771c534d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_interior_vehicle_data_notification_test.cc
@@ -38,6 +38,8 @@
 #include "interfaces/MOBILE_API.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
 #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
@@ -58,6 +60,8 @@ namespace {
 const uint32_t kAppId = 0u;
 const uint32_t kConnectionKey = 1u;
 const std::string kPolicyAppId = "Test";
+const std::string module_type = "CLIMATE";
+const std::string module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
 const int kModuleId = 153u;
 }  // namespace
 
@@ -93,6 +97,8 @@ class OnInteriorVehicleDataNotificationTest
         (*message)[application_manager::strings::msg_params];
     msg_param[message_params::kModuleData][message_params::kModuleType] =
         mobile_apis::ModuleType::CLIMATE;
+    msg_param[message_params::kModuleData][message_params::kModuleId] =
+        module_id;
     return message;
   }
 
@@ -105,7 +111,9 @@ class OnInteriorVehicleDataNotificationTest
                            mock_policy_handler_,
                            mock_allocation_manager_,
                            mock_interior_data_cache_,
-                           mock_interior_data_manager_};
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
     return ::std::make_shared<Command>(msg ? msg : msg = CreateMessage(),
                                        params);
   }
@@ -122,6 +130,9 @@ class OnInteriorVehicleDataNotificationTest
   application_manager::ApplicationSet apps_;
   const std::shared_ptr<sync_primitives::Lock> apps_lock_;
   DataAccessor<application_manager::ApplicationSet> apps_da_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  testing::NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
 };
 
 TEST_F(OnInteriorVehicleDataNotificationTest,
@@ -129,11 +140,12 @@ TEST_F(OnInteriorVehicleDataNotificationTest,
   // Arrange
   MessageSharedPtr mobile_message = CreateBasicMessage();
   apps_.insert(mock_app_);
-  rc_app_extention_->SubscribeToInteriorVehicleData(enums_value::kClimate);
+  const ModuleUid module(module_type, module_id);
+  rc_app_extention_->SubscribeToInteriorVehicleData(module);
   ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_da_));
 
   // Expectations
-  EXPECT_CALL(mock_interior_data_cache_, Add(enums_value::kClimate, _));
+  EXPECT_CALL(mock_interior_data_cache_, Add(module, _));
   MessageSharedPtr message;
   EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, false))
       .WillOnce(SaveArg<0>(&message));
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
index 6fbff118a4..62b726ac60 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/on_remote_control_settings_test.cc
@@ -39,6 +39,8 @@
 #include "rc_rpc_plugin/commands/hmi/rc_on_remote_control_settings_notification.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
 #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
@@ -95,7 +97,9 @@ class RCOnRemoteControlSettingsNotificationTest
                            mock_policy_handler_,
                            mock_allocation_manager_,
                            mock_interior_data_cache_,
-                           mock_interior_data_manager_};
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
     return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
   }
 
@@ -107,6 +111,9 @@ class RCOnRemoteControlSettingsNotificationTest
       mock_interior_data_cache_;
   testing::NiceMock<rc_rpc_plugin_test::MockInteriorDataManager>
       mock_interior_data_manager_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  testing::NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
 };
 
 TEST_F(RCOnRemoteControlSettingsNotificationTest,
@@ -141,6 +148,7 @@ TEST_F(RCOnRemoteControlSettingsNotificationTest,
 
   EXPECT_CALL(mock_allocation_manager_, ResetAllAllocations());
   EXPECT_CALL(mock_interior_data_manager_, OnDisablingRC());
+  EXPECT_CALL(mock_rc_consent_manger_, RemoveAllConsents());
 
   // Act
   std::shared_ptr<
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
index b28f2c972a..55be43f37b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc
@@ -41,6 +41,7 @@
 #include "application_manager/mock_request_controller_settings.h"
 #include "application_manager/mock_rpc_plugin.h"
 #include "application_manager/mock_rpc_plugin_manager.h"
+#include "application_manager/mock_rpc_protection_manager.h"
 #include "application_manager/request_controller.h"
 #include "application_manager/rpc_service_impl.h"
 #include "hmi_message_handler/mock_hmi_message_handler.h"
@@ -51,6 +52,8 @@
 #include "rc_rpc_plugin/commands/mobile/button_press_request.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
 #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
@@ -91,6 +94,9 @@ namespace {
 const uint32_t kConnectionKey = 2u;
 const uint32_t kAppId = 5u;
 const std::string kResource = "CLIMATE";
+const std::string kResourceId = "34045662-a9dc-4823-8435-91056d4c26cb";
+const std::string kPolicyAppId = "policy_app_id";
+const std::string kMacAddress = "device1";
 const uint32_t kPluginID = RCRPCPlugin::kRCPluginID;
 }  // namespace
 
@@ -100,17 +106,25 @@ class RCGetInteriorVehicleDataConsentTest
   RCGetInteriorVehicleDataConsentTest()
       : mock_app_(std::make_shared<NiceMock<MockApplication> >())
       , command_holder(app_mngr_)
+      , rc_capabilities_(smart_objects::SmartType::SmartType_Array)
       , request_controller(mock_request_controler)
+      , rpc_protection_manager_(
+            std::make_shared<application_manager::MockRPCProtectionManager>())
       , rpc_service_(app_mngr_,
                      request_controller,
                      &mock_protocol_handler,
                      &mock_hmi_handler,
-                     command_holder)
+                     command_holder,
+                     rpc_protection_manager_,
+                     hmi_so_factory_,
+                     mobile_so_factoy_)
       , rc_app_extention_(std::make_shared<RCAppExtension>(kPluginID))
       , mock_rpc_plugin_manager(
             std::make_shared<NiceMock<MockRPCPluginManager> >())
       , rpc_plugin(mock_rpc_plugin)
       , optional_mock_rpc_plugin(mock_rpc_plugin) {
+    smart_objects::SmartObject control_caps((smart_objects::SmartType_Array));
+    rc_capabilities_[strings::kradioControlCapabilities] = control_caps;
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
     ON_CALL(app_mngr_, hmi_interfaces())
         .WillByDefault(ReturnRef(mock_hmi_interfaces_));
@@ -140,10 +154,16 @@ class RCGetInteriorVehicleDataConsentTest
         .WillByDefault(ReturnRef(*mock_rpc_plugin_manager));
     ON_CALL(*mock_rpc_plugin_manager, FindPluginToProcess(_, _))
         .WillByDefault(Return(rpc_plugin));
-    ON_CALL(mock_allocation_manager_, IsResourceFree(kResource))
+    ON_CALL(mock_allocation_manager_, IsResourceFree(kResource, kResourceId))
         .WillByDefault(Return(true));
     ON_CALL(mock_allocation_manager_, is_rc_enabled())
         .WillByDefault(Return(true));
+    ON_CALL(mock_protocol_handler, IsRPCServiceSecure(_))
+        .WillByDefault(Return(false));
+    ON_CALL(*rpc_protection_manager_, CheckPolicyEncryptionFlag(_, _, _))
+        .WillByDefault(Return(false));
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_))
+        .WillByDefault(Return(true));
   }
 
   template <class Command>
@@ -155,7 +175,9 @@ class RCGetInteriorVehicleDataConsentTest
                            mock_policy_handler_,
                            mock_allocation_manager_,
                            mock_interior_data_cache_,
-                           mock_interior_data_manager_};
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
     return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
   }
 
@@ -168,6 +190,10 @@ class RCGetInteriorVehicleDataConsentTest
               [application_manager::strings::connection_key] = kConnectionKey;
     (*message)[application_manager::strings::params]
               [application_manager::strings::connection_key] = kAppId;
+    ns_smart_device_link::ns_smart_objects::SmartObject& msg_params =
+        (*message)[application_manager::strings::msg_params];
+    msg_params[message_params::kModuleType] = kResource;
+    msg_params[message_params::kModuleId] = kResourceId;
     return message;
   }
 
@@ -187,12 +213,19 @@ class RCGetInteriorVehicleDataConsentTest
   MockRPCPlugin mock_rpc_plugin;
   MockCommandFactory mock_command_factory;
   am::request_controller::RequestController request_controller;
+  std::shared_ptr<application_manager::MockRPCProtectionManager>
+      rpc_protection_manager_;
   am::rpc_service::RPCServiceImpl rpc_service_;
   std::shared_ptr<RCAppExtension> rc_app_extention_;
   std::shared_ptr<am::plugin_manager::MockRPCPluginManager>
       mock_rpc_plugin_manager;
   utils::Optional<RPCPlugin> rpc_plugin;
   utils::Optional<MockRPCPlugin> optional_mock_rpc_plugin;
+  hmi_apis::HMI_API hmi_so_factory_;
+  mobile_apis::MOBILE_API mobile_so_factoy_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  testing::NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
 };
 
 TEST_F(RCGetInteriorVehicleDataConsentTest,
@@ -201,8 +234,17 @@ TEST_F(RCGetInteriorVehicleDataConsentTest,
   auto mobile_message = CreateBasicMessage();
 
   // Expectations
-  EXPECT_CALL(mock_allocation_manager_, AcquireResource(_, _))
+  EXPECT_CALL(mock_allocation_manager_, AcquireResource(_, _, _))
       .WillOnce(Return(rc_rpc_plugin::AcquireResult::ASK_DRIVER));
+  ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
+  ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+  ON_CALL(*mock_app_, mac_address()).WillByDefault(ReturnRef(kMacAddress));
+
+  rc_rpc_types::ModuleUid moduleUid{kResource, kResourceId};
+  EXPECT_CALL(mock_rc_consent_manger_,
+              GetModuleConsent(kPolicyAppId, _, moduleUid))
+      .WillOnce(Return(rc_rpc_types::ModuleConsent::NOT_EXISTS));
+
   EXPECT_CALL(*optional_mock_rpc_plugin, GetCommandFactory())
       .WillOnce(ReturnRef(mock_command_factory));
   auto rc_consent_request =
@@ -223,15 +265,17 @@ TEST_F(RCGetInteriorVehicleDataConsentTest,
 
 TEST_F(RCGetInteriorVehicleDataConsentTest,
        Run_MobileSendButtonPressMessage_HMISendINUSEModeToMobile) {
-  // Arrange
-  auto mobile_message = CreateBasicMessage();
-
   // Expectations
-  EXPECT_CALL(mock_allocation_manager_, AcquireResource(_, _))
+  EXPECT_CALL(mock_allocation_manager_, AcquireResource(_, _, _))
       .WillOnce(Return(rc_rpc_plugin::AcquireResult::IN_USE));
 
+  auto msg_ver = utils::SemanticVersion();
+  ON_CALL(*mock_app_, msg_version()).WillByDefault(ReturnRef(msg_ver));
+
   EXPECT_CALL(*optional_mock_rpc_plugin, GetCommandFactory())
       .WillOnce(ReturnRef(mock_command_factory));
+
+  auto mobile_message = CreateBasicMessage();
   auto rc_consent_response =
       CreateRCCommand<commands::RCGetInteriorVehicleDataConsentResponse>(
           mobile_message);
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc
new file mode 100644
index 0000000000..200e458c17
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/release_interior_vehicle_data_module_request_test.cc
@@ -0,0 +1,243 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <memory>
+#include <string>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "rc_rpc_plugin/commands/mobile/release_interior_vehicle_data_module_request.h"
+
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/mock_application.h"
+#include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
+#include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
+#include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+
+using application_manager::commands::MessageSharedPtr;
+using rc_rpc_plugin_test::MockInteriorDataCache;
+using rc_rpc_plugin_test::MockInteriorDataManager;
+using rc_rpc_plugin_test::MockRCCapabilitiesManager;
+using rc_rpc_plugin_test::MockRCConsentManager;
+using rc_rpc_plugin_test::MockResourceAllocationManager;
+using test::components::application_manager_test::MockApplication;
+using test::components::commands_test::CommandRequestTest;
+using test::components::commands_test::CommandsTestMocks;
+
+using testing::_;
+using ::testing::DoAll;
+using ::testing::Mock;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::SaveArg;
+
+typedef std::shared_ptr<
+    rc_rpc_plugin::commands::ReleaseInteriorVehicleDataModuleRequest>
+    ReleaseCommandPtr;
+
+namespace {
+std::string kPolicyAppID = "app_id";
+std::uint32_t kAppID = 2u;
+std::uint32_t kConnectionKey = 1u;
+std::string kModuleType = "RADIO";
+std::string kModuleID = "76149d9b-5317-4cf5-9196-b8fac690fec5";
+std::string kDefaultModuleID = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
+}  // namespace
+
+namespace rc_rpc_plugin_test {
+namespace release_interior_vehicle_data_module_request {
+using namespace rc_rpc_plugin;
+
+class ReleaseInteriorVehicleDataModuleRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ public:
+  ReleaseInteriorVehicleDataModuleRequestTest() : mock_app_(CreateMockApp()) {}
+
+  void SetUp() OVERRIDE {
+    TestPreCondition();
+    ON_CALL(app_mngr_, application(kAppID)).WillByDefault(Return(mock_app_));
+    ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppID));
+    ON_CALL(mock_rc_capabilities_manager_,
+            GetDefaultModuleIdFromCapabilities(kModuleType))
+        .WillByDefault(Return(kDefaultModuleID));
+  }
+
+  MessageSharedPtr CreateBasicMessage() {
+    MessageSharedPtr message = CreateMessage();
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::function_id] =
+                  mobile_apis::FunctionID::ReleaseInteriorVehicleDataModuleID;
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::connection_key] = kConnectionKey;
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::connection_key] = kAppID;
+    (*message)[application_manager::strings::msg_params]
+              [message_params::kModuleType] = mobile_apis::ModuleType::RADIO;
+    (*message)[application_manager::strings::msg_params]
+              [message_params::kModuleId] = kModuleID;
+    return message;
+  }
+
+  void TestPreCondition() {
+    message_ = CreateBasicMessage();
+    command_ =
+        CreateRCCommand<commands::ReleaseInteriorVehicleDataModuleRequest>(
+            message_);
+  }
+
+  template <class Command>
+  std::shared_ptr<Command> CreateRCCommand(MessageSharedPtr& msg) {
+    InitCommand(kDefaultTimeout_);
+    RCCommandParams params{app_mngr_,
+                           mock_rpc_service_,
+                           mock_hmi_capabilities_,
+                           mock_policy_handler_,
+                           mock_allocation_manager_,
+                           mock_interior_data_cache_,
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
+    return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
+  }
+
+ protected:
+  MessageSharedPtr message_;
+  ReleaseCommandPtr command_;
+
+  MockAppPtr mock_app_;
+  NiceMock<MockResourceAllocationManager> mock_allocation_manager_;
+  MockInteriorDataCache mock_interior_data_cache_;
+  MockInteriorDataManager mock_interior_data_manager_;
+  NiceMock<MockRCCapabilitiesManager> mock_rc_capabilities_manager_;
+  MockRCConsentManager mock_rc_consent_manger_;
+};
+
+TEST_F(ReleaseInteriorVehicleDataModuleRequestTest,
+       ModuleIDIsAbsnetInMessage_ReturnsDefaultFromCapabilities) {
+  (*message_)[application_manager::strings::msg_params].erase(
+      message_params::kModuleId);
+
+  auto module_id = command_->ModuleId();
+  EXPECT_EQ(kDefaultModuleID, module_id);
+}
+
+TEST_F(ReleaseInteriorVehicleDataModuleRequestTest,
+       ResourceIsNotAllocated_ResponseToMobile_UNSUCCESS_IGNORED) {
+  ON_CALL(mock_allocation_manager_,
+          ReleaseResource(kModuleType, kModuleID, kAppID))
+      .WillByDefault(Return(ResourceReleasedState::eType::NOT_ALLOCATED));
+
+  MessageSharedPtr message_to_mobile = CreateMessage();
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(
+          _, application_manager::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mobile), Return(true)));
+
+  command_->Execute();
+
+  const bool success =
+      (*message_to_mobile)[application_manager::strings::msg_params]
+                          [application_manager::strings::success]
+                              .asBool();
+  auto result_code = static_cast<mobile_apis::Result::eType>(
+      (*message_to_mobile)[application_manager::strings::msg_params]
+                          [application_manager::strings::result_code]
+                              .asUInt());
+
+  EXPECT_FALSE(success);
+  EXPECT_EQ(mobile_apis::Result::eType::IGNORED, result_code);
+}
+
+TEST_F(ReleaseInteriorVehicleDataModuleRequestTest,
+       ResourceIsAllocated_ResponseToMobile_UNSUCCESS_REJECTED) {
+  ON_CALL(mock_allocation_manager_,
+          ReleaseResource(kModuleType, kModuleID, kAppID))
+      .WillByDefault(Return(ResourceReleasedState::eType::IS_ALLOCATED));
+  MessageSharedPtr message_to_mobile = CreateMessage();
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(
+          _, application_manager::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mobile), Return(true)));
+
+  command_->Execute();
+
+  const bool success =
+      (*message_to_mobile)[application_manager::strings::msg_params]
+                          [application_manager::strings::success]
+                              .asBool();
+  auto result_code = static_cast<mobile_apis::Result::eType>(
+      (*message_to_mobile)[application_manager::strings::msg_params]
+                          [application_manager::strings::result_code]
+                              .asUInt());
+
+  EXPECT_FALSE(success);
+  EXPECT_EQ(mobile_apis::Result::eType::REJECTED, result_code);
+}
+
+TEST_F(ReleaseInteriorVehicleDataModuleRequestTest,
+       ResourceIsReleased_ResponseToMobile_SUCCESS_SUCCESS) {
+  ON_CALL(mock_allocation_manager_,
+          ReleaseResource(kModuleType, kModuleID, kAppID))
+      .WillByDefault(Return(ResourceReleasedState::eType::IS_RELEASED));
+
+  MessageSharedPtr message_to_mobile = CreateMessage();
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(
+          _, application_manager::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mobile), Return(true)));
+
+  command_->Execute();
+
+  const bool success =
+      (*message_to_mobile)[application_manager::strings::msg_params]
+                          [application_manager::strings::success]
+                              .asBool();
+  auto result_code = static_cast<mobile_apis::Result::eType>(
+      (*message_to_mobile)[application_manager::strings::msg_params]
+                          [application_manager::strings::result_code]
+                              .asUInt());
+
+  EXPECT_TRUE(success);
+  EXPECT_EQ(mobile_apis::Result::eType::SUCCESS, result_code);
+}
+}  // namespace release_interior_vehicle_data_module_request
+}  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
index f7718a7248..5a822a2fe4 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
@@ -37,6 +37,8 @@
 #include "interfaces/MOBILE_API.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_consent_manager.h"
 #include "rc_rpc_plugin/mock/mock_resource_allocation_manager.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
@@ -71,9 +73,12 @@ class SetInteriorVehicleDataRequestTest
  public:
   SetInteriorVehicleDataRequestTest()
       : mock_app_(std::make_shared<NiceMock<MockApplication> >())
-      , rc_app_extention_(std::make_shared<RCAppExtension>(kModuleId)) {}
+      , rc_app_extention_(std::make_shared<RCAppExtension>(kModuleId))
+      , rc_capabilities_(smart_objects::SmartType::SmartType_Array) {}
 
   void SetUp() OVERRIDE {
+    smart_objects::SmartObject control_caps((smart_objects::SmartType_Array));
+    rc_capabilities_[strings::kradioControlCapabilities] = control_caps;
     ON_CALL(app_mngr_, hmi_interfaces())
         .WillByDefault(ReturnRef(mock_hmi_interfaces_));
     ON_CALL(
@@ -86,9 +91,9 @@ class SetInteriorVehicleDataRequestTest
         .WillByDefault(Return(rc_app_extention_));
 
     ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
-    ON_CALL(mock_allocation_manager_, IsResourceFree(_))
+    ON_CALL(mock_allocation_manager_, IsResourceFree(_, _))
         .WillByDefault(Return(true));
-    ON_CALL(mock_allocation_manager_, AcquireResource(_, _))
+    ON_CALL(mock_allocation_manager_, AcquireResource(_, _, _))
         .WillByDefault(Return(AcquireResult::ALLOWED));
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
     ON_CALL(mock_policy_handler_,
@@ -96,8 +101,14 @@ class SetInteriorVehicleDataRequestTest
                          mobile_apis::AppHMIType::eType::REMOTE_CONTROL,
                          nullptr))
         .WillByDefault(Return(true));
+    ON_CALL(mock_hmi_capabilities_, rc_capability())
+        .WillByDefault(Return(&rc_capabilities_));
     ON_CALL(mock_allocation_manager_, is_rc_enabled())
         .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_))
+        .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, GetModuleDataCapabilities(_, _))
+        .WillByDefault(Return(std::make_pair("", capabilitiesStatus::success)));
   }
 
   MessageSharedPtr CreateBasicMessage() {
@@ -121,7 +132,9 @@ class SetInteriorVehicleDataRequestTest
                            mock_policy_handler_,
                            mock_allocation_manager_,
                            mock_interior_data_cache_,
-                           mock_interior_data_manager_};
+                           mock_interior_data_manager_,
+                           mock_rc_capabilities_manager_,
+                           mock_rc_consent_manger_};
     return std::make_shared<Command>(msg ? msg : msg = CreateMessage(), params);
   }
 
@@ -134,6 +147,10 @@ class SetInteriorVehicleDataRequestTest
       mock_interior_data_manager_;
   std::shared_ptr<MockApplication> mock_app_;
   std::shared_ptr<RCAppExtension> rc_app_extention_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  smart_objects::SmartObject rc_capabilities_;
+  testing::NiceMock<MockRCConsentManager> mock_rc_consent_manger_;
 };
 
 TEST_F(SetInteriorVehicleDataRequestTest,
@@ -153,18 +170,14 @@ TEST_F(SetInteriorVehicleDataRequestTest,
   EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
       .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
 
-  EXPECT_CALL(mock_hmi_capabilities_, rc_capability())
-      .WillOnce(Return(nullptr));
-
   EXPECT_CALL(
       mock_rpc_service_,
       ManageHMICommand(
           HMIResultCodeIs(hmi_apis::FunctionID::RC_SetInteriorVehicleData), _))
       .WillOnce(Return(true));
   // Act
-  std::shared_ptr<rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>
-      command = CreateRCCommand<
-          rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
+  auto command =
+      CreateRCCommand<rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
           mobile_message);
   ASSERT_TRUE(command->Init());
   command->Run();
@@ -190,9 +203,6 @@ TEST_F(
   EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
       .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
 
-  EXPECT_CALL(mock_hmi_capabilities_, rc_capability())
-      .WillOnce(Return(nullptr));
-
   EXPECT_CALL(app_mngr_, RemoveHMIFakeParameters(_, _));
 
   EXPECT_CALL(
@@ -260,9 +270,6 @@ TEST_F(SetInteriorVehicleDataRequestTest,
   EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
       .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
 
-  EXPECT_CALL(mock_hmi_capabilities_, rc_capability())
-      .WillOnce(Return(nullptr));
-
   MessageSharedPtr message_from_mobile = CreateBasicMessage();
 
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
@@ -306,9 +313,6 @@ TEST_F(SetInteriorVehicleDataRequestTest,
   EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
       .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
 
-  EXPECT_CALL(mock_hmi_capabilities_, rc_capability())
-      .WillOnce(Return(nullptr));
-
   auto message_from_mobile = CreateBasicMessage();
 
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/grid_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/grid_test.cc
new file mode 100644
index 0000000000..b8a0d71203
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/grid_test.cc
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gtest/gtest.h"
+
+#include "rc_rpc_plugin/rc_app_extension.h"
+
+namespace rc_rpc_plugin_test {
+namespace grid_test {
+using namespace rc_rpc_plugin;
+
+TEST(Grid, IsLevelIntersectionExists) {
+  Grid grid_level0{1, 1, 0, 1, 1, 1};
+  Grid grid_level1{1, 1, 1, 1, 1, 1};
+  EXPECT_FALSE(grid_level0.LevelIntersectionExists(grid_level1));
+
+  Grid grid_level1_v2{1, 2, 1, 1, 2, 1};
+  EXPECT_TRUE(grid_level1.LevelIntersectionExists(grid_level1_v2));
+}
+
+TEST(Grid, TwoSameGrisAreEqual) {
+  Grid grid2{1, 1, 0, 1, 1, 1};
+  Grid grid1{1, 1, 0, 1, 1, 1};
+
+  EXPECT_EQ(grid1, grid2);
+}
+
+TEST(Grid, IsIntersectionExists) {
+  Grid grid_1{0, 1, 2, 1, 1, 1};
+  Grid grid_2{0, 0, 1, 0, 0, 1};
+
+  // There is intersection but levels missmatch
+  EXPECT_FALSE(grid_1.IntersectionExists(grid_2));
+
+  Grid grid_3{1, 0, 2, 0, 0, 0};
+  // There isn't intersection but level match
+  EXPECT_FALSE(grid_1.IntersectionExists(grid_3));
+
+  Grid grid_4{0, 1, 2, 1, 1, 1};
+  EXPECT_TRUE(grid_1.IntersectionExists(grid_4));
+}
+}  // namespace grid_test
+}  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_cache.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_cache.h
index 45465f96b0..025cef2165 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_cache.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_cache.h
@@ -42,10 +42,14 @@ namespace rc_rpc_plugin_test {
 class MockInteriorDataCache : public rc_rpc_plugin::InteriorDataCache {
  public:
   MOCK_METHOD2(Add,
-               void(const std::string&, const smart_objects::SmartObject&));
-  MOCK_CONST_METHOD1(Retrieve, smart_objects::SmartObject(const std::string&));
-  MOCK_CONST_METHOD1(Contains, bool(const std::string&));
-  MOCK_METHOD1(Remove, void(const std::string&));
+               void(const rc_rpc_plugin::ModuleUid&,
+                    const smart_objects::SmartObject&));
+  MOCK_CONST_METHOD1(
+      Retrieve, smart_objects::SmartObject(const rc_rpc_plugin::ModuleUid&));
+  MOCK_CONST_METHOD1(GetCachedModulesByType,
+                     std::vector<rc_rpc_plugin::ModuleUid>(const std::string&));
+  MOCK_CONST_METHOD1(Contains, bool(const rc_rpc_plugin::ModuleUid&));
+  MOCK_METHOD1(Remove, void(const rc_rpc_plugin::ModuleUid&));
   MOCK_METHOD0(Clear, void());
 };
 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_manager.h
index fc19c6a889..231ac2ae36 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_manager.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_interior_data_manager.h
@@ -46,8 +46,9 @@ class MockInteriorDataManager : public rc_rpc_plugin::InteriorDataManager {
                void(application_manager::plugin_manager::ApplicationEvent,
                     application_manager::ApplicationSharedPtr));
   MOCK_METHOD0(OnDisablingRC, void());
-  MOCK_METHOD1(StoreRequestToHMITime, void(const std::string&));
-  MOCK_METHOD1(CheckRequestsToHMIFrequency, bool(const std::string&));
+  MOCK_METHOD1(StoreRequestToHMITime, void(const rc_rpc_plugin::ModuleUid&));
+  MOCK_METHOD1(CheckRequestsToHMIFrequency,
+               bool(const rc_rpc_plugin::ModuleUid&));
 };
 
 }  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h
new file mode 100644
index 0000000000..6f1593dcbb
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RC_CAPABILITIES_MANAGER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RC_CAPABILITIES_MANAGER_H_
+#include "gmock/gmock.h"
+#include "rc_rpc_plugin/rc_capabilities_manager.h"
+
+namespace rc_rpc_plugin_test {
+class MockRCCapabilitiesManager : public rc_rpc_plugin::RCCapabilitiesManager {
+ public:
+  MOCK_CONST_METHOD2(CheckButtonName,
+                     bool(const std::string& module_type,
+                          const std::string& button_name));
+
+  MOCK_CONST_METHOD1(CheckIfModuleExistsInCapabilities,
+                     bool(const rc_rpc_plugin::ModuleUid& module_type));
+
+  MOCK_CONST_METHOD2(GetModuleDataCapabilities,
+                     rc_rpc_plugin::ModuleTypeCapability(
+                         const smart_objects::SmartObject& module_data,
+                         const std::string& module_id));
+
+  MOCK_CONST_METHOD2(ControlDataForType,
+                     const smart_objects::SmartObject&(
+                         const smart_objects::SmartObject& module_data,
+                         const std::string& module_type));
+
+  MOCK_CONST_METHOD3(
+      AreReadOnlyParamsPresent,
+      bool(const smart_objects::SmartObject& module_data,
+           const std::string& module_type,
+           rc_rpc_plugin::ModuleTypeCapability& module_data_capabilities));
+
+  MOCK_CONST_METHOD2(AreAllParamsReadOnly,
+                     bool(const smart_objects::SmartObject& module_data,
+                          const std::string& module_type));
+
+  MOCK_CONST_METHOD1(GetDefaultModuleIdFromCapabilities,
+                     const std::string(const std::string& module_type));
+
+  MOCK_CONST_METHOD1(CheckIfButtonExistInRCCaps,
+                     bool(const mobile_apis::ButtonName::eType button));
+
+  MOCK_CONST_METHOD0(GetResources,
+                     const std::vector<rc_rpc_plugin::ModuleUid>());
+
+  MOCK_CONST_METHOD1(GetModuleServiceArea,
+                     rc_rpc_plugin::Grid(const rc_rpc_plugin::ModuleUid&));
+
+  MOCK_CONST_METHOD1(IsMultipleAccessAllowed,
+                     bool(const rc_rpc_plugin::ModuleUid&));
+
+  MOCK_CONST_METHOD0(GetDriverLocationFromSeatLocationCapability,
+                     const rc_rpc_plugin::Grid());
+
+  MOCK_CONST_METHOD0(IsSeatLocationCapabilityProvided, bool());
+
+  MOCK_CONST_METHOD1(
+      GetModuleIdForSeatLocation,
+      const std::string(const mobile_apis::SupportedSeat::eType id));
+};
+}  // namespace rc_rpc_plugin_test
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RC_СAPABILITIES_MANAGER_H_
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_consent_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_consent_manager.h
new file mode 100644
index 0000000000..a89202b5f5
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_consent_manager.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RC_CONSENT_MANAGER_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RC_CONSENT_MANAGER_H
+
+#include <string>
+
+#include "gmock/gmock.h"
+#include "rc_rpc_plugin/rc_consent_manager.h"
+
+namespace rc_rpc_plugin_test {
+
+class MockRCConsentManager : public rc_rpc_plugin::RCConsentManager {
+ public:
+  MOCK_METHOD3(SaveModuleConsents,
+               void(const std::string&,
+                    const std::string&,
+                    const rc_rpc_plugin::rc_rpc_types::ModuleIdConsentVector&));
+  MOCK_METHOD3(GetModuleConsent,
+               rc_rpc_plugin::rc_rpc_types::ModuleConsent(
+                   const std::string&,
+                   const std::string&,
+                   const rc_rpc_plugin::rc_rpc_types::ModuleUid&));
+  MOCK_METHOD0(RemoveExpiredConsents, void());
+  MOCK_METHOD0(RemoveAllConsents, void());
+};
+
+}  // namespace rc_rpc_plugin_test
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_PLUGIN_MANAGER_MOCK_RC_CONSENT_MANAGER_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h
new file mode 100644
index 0000000000..c73472d2a8
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_helpers.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RC_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RC_HELPERS_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RC_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RC_HELPERS_H
+
+#include <functional>
+#include <map>
+#include <string>
+#include "gmock/gmock.h"
+
+#include "application_manager/application.h"
+#include "application_manager/application_manager.h"
+#include "rc_rpc_plugin/rc_helpers.h"
+
+namespace rc_rpc_plugin {
+
+class MockRCHelpers {
+ public:
+  MOCK_METHOD0(GetModuleTypeToDataMapping,
+               std::function<std::string(const std::string&)>());
+  MOCK_METHOD0(GetModuleTypeToCapabilitiesMapping,
+               std::function<std::string(const std::string&)>());
+  MOCK_METHOD0(GetModuleTypesList, const std::vector<std::string>());
+  MOCK_METHOD1(
+      GetRCExtension,
+      rc_rpc_plugin::RCAppExtensionPtr(application_manager::Application&));
+  MOCK_METHOD2(CreateUnsubscribeRequestToHMI,
+               smart_objects::SmartObjectSPtr(const rc_rpc_plugin::ModuleUid&,
+                                              const uint32_t));
+  MOCK_METHOD2(AppsSubscribedToModule,
+               std::vector<application_manager::ApplicationSharedPtr>(
+                   application_manager::ApplicationManager&,
+                   const rc_rpc_plugin::ModuleUid&));
+  MOCK_METHOD2(AppsSubscribedToModuleType,
+               std::vector<application_manager::ApplicationSharedPtr>(
+                   application_manager::ApplicationManager&,
+                   const std::string&));
+  MOCK_METHOD1(GetApplicationsAllowedModuleTypes,
+               rc_rpc_plugin::RCHelpers::AppsModuleTypes(
+                   application_manager::ApplicationManager&));
+  MOCK_METHOD0(buttons_climate, const std::vector<std::string>());
+  MOCK_METHOD0(buttons_radio, const std::vector<std::string>());
+  MOCK_METHOD0(buttons_map, const rc_rpc_plugin::RCHelpers::ButtonsMap());
+  MOCK_METHOD1(GetModuleReadOnlyParams,
+               std::vector<std::string>(const std::string&));
+  MOCK_METHOD3(
+      FillModuleConsents,
+      rc_rpc_types::ModuleIdConsentVector(const std::string&,
+                                          const std::vector<std::string>&,
+                                          const std::vector<bool>));
+  MOCK_METHOD1(RetrieveModuleIds,
+               std::vector<std::string>(const smart_objects::SmartObject&));
+  MOCK_METHOD1(RetrieveModuleConsents,
+               std::vector<bool>(const smart_objects::SmartObject& consents));
+  MOCK_METHOD1(RemoveRedundantGPSDataFromIVDataMsg,
+               void(smart_objects::SmartObject& msg_params));
+  MOCK_METHOD2(
+      MergeModuleData,
+      smart_objects::SmartObject(const smart_objects::SmartObject& data1,
+                                 const smart_objects::SmartObject& data2));
+
+  static MockRCHelpers* rc_helpers_mock();
+};
+
+}  // namespace rc_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RC_RPC_PLUGINS_RC_RPC_PLUGIN_TEST_INCLUDE_RC_RPC_PLUGIN_MOCK_MOCK_RC_HELPERS_H
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h
index 828e2eea11..fca6c9c77e 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_resource_allocation_manager.h
@@ -41,13 +41,19 @@ namespace rc_rpc_plugin_test {
 class MockResourceAllocationManager
     : public rc_rpc_plugin::ResourceAllocationManager {
  public:
-  MOCK_METHOD2(AcquireResource,
-               rc_rpc_plugin::AcquireResult::eType(
-                   const std::string& module_type, const uint32_t app_id));
-  MOCK_METHOD2(ForceAcquireResource,
-               void(const std::string& module_type, const uint32_t app_id));
-  MOCK_METHOD2(OnDriverDisallowed,
-               void(const std::string& module_type, const uint32_t app_id));
+  MOCK_METHOD3(
+      AcquireResource,
+      rc_rpc_plugin::AcquireResult::eType(const std::string& module_type,
+                                          const std::string& module_id,
+                                          const uint32_t app_id));
+  MOCK_METHOD3(ForceAcquireResource,
+               void(const std::string& module_type,
+                    const std::string& module_id,
+                    const uint32_t app_id));
+  MOCK_METHOD3(OnDriverDisallowed,
+               void(const std::string& module_type,
+                    const std::string& module_id,
+                    const uint32_t app_id));
   MOCK_METHOD2(OnApplicationEvent,
                void(application_manager::plugin_manager::ApplicationEvent event,
                     application_manager::ApplicationSharedPtr application));
@@ -56,17 +62,32 @@ class MockResourceAllocationManager
   MOCK_METHOD1(SetAccessMode,
                void(const hmi_apis::Common_RCAccessMode::eType access_mode));
   MOCK_CONST_METHOD0(GetAccessMode, hmi_apis::Common_RCAccessMode::eType());
-  MOCK_METHOD3(SetResourceState,
+  MOCK_METHOD4(SetResourceState,
                void(const std::string& module_type,
+                    const std::string& module_id,
                     const uint32_t app_id,
                     const rc_rpc_plugin::ResourceState::eType state));
-  MOCK_CONST_METHOD1(IsResourceFree, bool(const std::string& module_type));
+  MOCK_CONST_METHOD2(IsResourceFree,
+                     bool(const std::string& module_type,
+                          const std::string& module_id));
   MOCK_METHOD0(ResetAllAllocations, void());
   MOCK_METHOD2(SendOnRCStatusNotifications,
                void(rc_rpc_plugin::NotificationTrigger::eType,
                     application_manager::ApplicationSharedPtr application));
   MOCK_CONST_METHOD0(is_rc_enabled, bool());
   MOCK_METHOD1(set_rc_enabled, void(const bool value));
+  MOCK_METHOD3(ReleaseResource,
+               rc_rpc_plugin::ResourceReleasedState::eType(
+                   const std::string& module_type,
+                   const std::string& module_id,
+                   const uint32_t application_id));
+  MOCK_METHOD3(SetResourceAcquired,
+               void(const std::string& module_type,
+                    const std::string& module_id,
+                    const uint32_t app_id));
+  MOCK_CONST_METHOD2(IsResourceAlreadyAcquiredByApp,
+                     bool(const rc_rpc_plugin::ModuleUid& moduleUid,
+                          const uint32_t app_id));
 };
 
 }  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc
index b7eb4a554a..40a6bdf41d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/interior_data_cache_test.cc
@@ -29,6 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE. */
 
+#include "application_manager/smart_object_keys.h"
 #include "gtest/gtest.h"
 #include "rc_rpc_plugin/interior_data_cache_impl.h"
 
@@ -38,41 +39,49 @@ class InteriorDataCacheTest : public ::testing::Test {};
 
 namespace {
 const uint32_t time_frame_alowed_requests = 1;
+const std::string kValueKey = "value";
+const std::string kArray = "array";
 }  // namespace
 
 TEST_F(InteriorDataCacheTest,
        InteriorDataCacheDoesNotContainRandomDataInitialy) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
   std::string module_type_key = "random_module_type";
-  EXPECT_FALSE(cache.Contains(module_type_key));
-  auto retrieved_data = cache.Retrieve(module_type_key);
+  std::string module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module(module_type_key, module_id);
+  EXPECT_FALSE(cache.Contains(module));
+  auto retrieved_data = cache.Retrieve(module);
   EXPECT_EQ(smart_objects::SmartType_Null, retrieved_data.getType());
 }
 
 TEST_F(InteriorDataCacheTest, CheckThatCacheContansDataAfterAdding) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
   const std::string module_type_key = "random_module_type";
+  std::string module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module(module_type_key, module_id);
   smart_objects::SmartObject data;
   data["key"] = "value";
 
-  cache.Add(module_type_key, data);
-  EXPECT_TRUE(cache.Contains(module_type_key));
-  auto retrieved_data = cache.Retrieve(module_type_key);
+  cache.Add(module, data);
+  EXPECT_TRUE(cache.Contains(module));
+  auto retrieved_data = cache.Retrieve(module);
   EXPECT_EQ(data, retrieved_data);
 }
 
 TEST_F(InteriorDataCacheTest, DataDoesNotExistAfterClear) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
   const std::string module_type_key = "random_module_type";
+  std::string module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module(module_type_key, module_id);
   smart_objects::SmartObject data;
   data["key"] = "value";
 
-  cache.Add(module_type_key, data);
-  EXPECT_TRUE(cache.Contains(module_type_key));
-  auto Retrieved_data = cache.Retrieve(module_type_key);
+  cache.Add(module, data);
+  EXPECT_TRUE(cache.Contains(module));
+  auto Retrieved_data = cache.Retrieve(module);
   EXPECT_EQ(Retrieved_data, data);
   cache.Clear();
-  auto Retrieved_data_after_clear = cache.Retrieve(module_type_key);
+  auto Retrieved_data_after_clear = cache.Retrieve(module);
   EXPECT_EQ(smart_objects::SmartType_Null,
             Retrieved_data_after_clear.getType());
 }
@@ -81,19 +90,23 @@ TEST_F(InteriorDataCacheTest, MultipleDataCached) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
 
   const std::string module_type_key1 = "random_module_type";
+  std::string module_id1 = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module1(module_type_key1, module_id1);
   smart_objects::SmartObject data1;
   data1["key"] = "value1";
-  cache.Add(module_type_key1, data1);
-  EXPECT_TRUE(cache.Contains(module_type_key1));
-  auto retrieved_data1 = cache.Retrieve(module_type_key1);
+  cache.Add(module1, data1);
+  EXPECT_TRUE(cache.Contains(module1));
+  auto retrieved_data1 = cache.Retrieve(module1);
   EXPECT_EQ(data1, retrieved_data1);
 
   std::string module_type_key2 = "random_module_type2";
+  std::string module_id2 = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
+  rc_rpc_plugin::ModuleUid module2(module_type_key2, module_id2);
   smart_objects::SmartObject data2;
   data2["key"] = "value2";
-  cache.Add(module_type_key2, data2);
-  EXPECT_TRUE(cache.Contains(module_type_key2));
-  auto retrieved_data2 = cache.Retrieve(module_type_key2);
+  cache.Add(module2, data2);
+  EXPECT_TRUE(cache.Contains(module2));
+  auto retrieved_data2 = cache.Retrieve(module2);
   EXPECT_EQ(retrieved_data2, data2);
 
   ASSERT_TRUE(data1 != data2);
@@ -105,30 +118,36 @@ TEST_F(InteriorDataCacheTest, RemoveFromChacheSuccessful) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
 
   const std::string module_type = "random_module_type";
+  std::string module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module(module_type, module_id);
   smart_objects::SmartObject data;
   data["key"] = "value1";
-  cache.Add(module_type, data);
-  EXPECT_TRUE(cache.Contains(module_type));
-  auto retrieved_data1 = cache.Retrieve(module_type);
+  cache.Add(module, data);
+  EXPECT_TRUE(cache.Contains(module));
+  auto retrieved_data1 = cache.Retrieve(module);
   EXPECT_EQ(data, retrieved_data1);
 
-  cache.Remove(module_type);
-  EXPECT_FALSE(cache.Contains(module_type));
-  auto retreived = cache.Retrieve(module_type);
+  cache.Remove(module);
+  EXPECT_FALSE(cache.Contains(module));
+  auto retreived = cache.Retrieve(module);
   EXPECT_EQ(smart_objects::SmartType_Null, retreived.getType());
 }
 
 TEST_F(InteriorDataCacheTest, RemoveNotExistingNoSideEffects) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
   const std::string module_type_key = "random_module_type";
+  std::string module_id = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module(module_type_key, module_id);
   smart_objects::SmartObject data;
   data["key"] = "value";
 
-  cache.Add(module_type_key, data);
-  cache.Remove("some other module_type");
+  cache.Add(module, data);
+  rc_rpc_plugin::ModuleUid other_module("some other module_type",
+                                        "some other module id");
+  cache.Remove(other_module);
 
-  EXPECT_TRUE(cache.Contains(module_type_key));
-  auto retrieved_data = cache.Retrieve(module_type_key);
+  EXPECT_TRUE(cache.Contains(module));
+  auto retrieved_data = cache.Retrieve(module);
   EXPECT_EQ(data, retrieved_data);
 }
 
@@ -136,25 +155,72 @@ TEST_F(InteriorDataCacheTest, Exist2ModuleTypesRemoveOneAnotherOneLeft) {
   rc_rpc_plugin::InteriorDataCacheImpl cache;
 
   const std::string module_type_key1 = "random_module_type";
+  std::string module_id1 = "34045662-a9dc-4823-8435-91056d4c26cb";
+  rc_rpc_plugin::ModuleUid module1(module_type_key1, module_id1);
   smart_objects::SmartObject data1;
   data1["key"] = "value1";
-  cache.Add(module_type_key1, data1);
+  cache.Add(module1, data1);
 
   std::string module_type_key2 = "random_module_type2";
+  std::string module_id2 = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
+  rc_rpc_plugin::ModuleUid module2(module_type_key2, module_id2);
   smart_objects::SmartObject data2;
   data2["key"] = "value2";
-  cache.Add(module_type_key2, data2);
+  cache.Add(module2, data2);
 
   ASSERT_TRUE(data1 != data2);
 
-  cache.Remove(module_type_key1);
-  EXPECT_FALSE(cache.Contains(module_type_key1));
-  EXPECT_TRUE(cache.Contains(module_type_key2));
+  cache.Remove(module1);
+  EXPECT_FALSE(cache.Contains(module1));
+  EXPECT_TRUE(cache.Contains(module2));
 
-  auto retrieved_data1 = cache.Retrieve(module_type_key1);
+  auto retrieved_data1 = cache.Retrieve(module1);
   EXPECT_EQ(smart_objects::SmartType_Null, retrieved_data1.getType());
-  auto retrieved_data2 = cache.Retrieve(module_type_key2);
+  auto retrieved_data2 = cache.Retrieve(module2);
   EXPECT_EQ(data2, retrieved_data2);
 }
 
+TEST_F(InteriorDataCacheTest, CheckCacheDataMerge) {
+  using namespace smart_objects;
+  const std::string module_type_key = "random_module_type";
+  const std::string module_id = "random_module_id";
+  rc_rpc_plugin::ModuleUid module(module_type_key, module_id);
+
+  auto gen_smart_object = [](const std::string& id,
+                             const std::string& value) -> SmartObject {
+    SmartObject result(SmartType_Map);
+    result[application_manager::strings::id] = id;
+    result[kValueKey] = value;
+    return result;
+  };
+
+  SmartObject data1;
+  SmartObject data1_array(SmartType_Array);
+  (*data1_array.asArray()) = SmartArray{gen_smart_object("id1", "value1"),
+                                        gen_smart_object("id2", "value2")};
+  data1[kArray] = data1_array;
+
+  SmartObject data2(SmartType_Map);
+  SmartObject data2_array(SmartType_Array);
+  (*data2_array.asArray()) = SmartArray{gen_smart_object("id1", "value3"),
+                                        gen_smart_object("id3", "value4")};
+  data2[kArray] = data2_array;
+
+  SmartObject expected_data(SmartType_Map);
+  SmartObject expected_array(SmartType_Array);
+  (*expected_array.asArray()) = SmartArray{gen_smart_object("id1", "value3"),
+                                           gen_smart_object("id2", "value2"),
+                                           gen_smart_object("id3", "value4")};
+  expected_data[kArray] = expected_array;
+
+  rc_rpc_plugin::InteriorDataCacheImpl cache;
+  cache.Add(module, data1);
+  cache.Add(module, data2);
+
+  const auto retrieved_data = cache.Retrieve(module);
+
+  EXPECT_TRUE(cache.Contains(module));
+  EXPECT_EQ(expected_data, retrieved_data);
+}
+
 }  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc
new file mode 100644
index 0000000000..3e60591c6b
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "rc_rpc_plugin/mock/mock_rc_helpers.h"
+
+namespace rc_rpc_plugin {
+
+smart_objects::SmartObject RCHelpers::MergeModuleData(
+    const smart_objects::SmartObject& data1,
+    const smart_objects::SmartObject& data2) {
+  return MockRCHelpers::rc_helpers_mock()->MergeModuleData(data1, data2);
+}
+
+const std::function<std::string(const std::string&)>
+rc_rpc_plugin::RCHelpers::GetModuleTypeToDataMapping() {
+  return MockRCHelpers::rc_helpers_mock()->GetModuleTypeToDataMapping();
+}
+
+const std::function<std::string(const std::string&)>
+rc_rpc_plugin::RCHelpers::GetModuleTypeToCapabilitiesMapping() {
+  return MockRCHelpers::rc_helpers_mock()->GetModuleTypeToCapabilitiesMapping();
+}
+
+const std::vector<std::string> rc_rpc_plugin::RCHelpers::GetModuleTypesList() {
+  return MockRCHelpers::rc_helpers_mock()->GetModuleTypesList();
+}
+
+rc_rpc_plugin::RCAppExtensionPtr rc_rpc_plugin::RCHelpers::GetRCExtension(
+    application_manager::Application& app) {
+  return MockRCHelpers::rc_helpers_mock()->GetRCExtension(app);
+}
+
+smart_objects::SmartObjectSPtr
+rc_rpc_plugin::RCHelpers::CreateUnsubscribeRequestToHMI(
+    const ModuleUid& module, const uint32_t correlation_id) {
+  return MockRCHelpers::rc_helpers_mock()->CreateUnsubscribeRequestToHMI(
+      module, correlation_id);
+}
+
+std::vector<application_manager::ApplicationSharedPtr>
+rc_rpc_plugin::RCHelpers::AppsSubscribedToModule(
+    application_manager::ApplicationManager& app_mngr,
+    const ModuleUid& module) {
+  return MockRCHelpers::rc_helpers_mock()->AppsSubscribedToModule(app_mngr,
+                                                                  module);
+}
+
+std::vector<application_manager::ApplicationSharedPtr>
+rc_rpc_plugin::RCHelpers::AppsSubscribedToModuleType(
+    application_manager::ApplicationManager& app_mngr,
+    const std::string& module_type) {
+  return MockRCHelpers::rc_helpers_mock()->AppsSubscribedToModuleType(
+      app_mngr, module_type);
+}
+
+rc_rpc_plugin::RCHelpers::AppsModuleTypes
+rc_rpc_plugin::RCHelpers::GetApplicationsAllowedModuleTypes(
+    application_manager::ApplicationManager& app_mngr) {
+  return MockRCHelpers::rc_helpers_mock()->GetApplicationsAllowedModuleTypes(
+      app_mngr);
+}
+
+const std::vector<std::string> RCHelpers::buttons_climate() {
+  return MockRCHelpers::rc_helpers_mock()->buttons_climate();
+}
+
+const std::vector<std::string> RCHelpers::buttons_radio() {
+  return MockRCHelpers::rc_helpers_mock()->buttons_radio();
+}
+
+const rc_rpc_plugin::RCHelpers::ButtonsMap RCHelpers::buttons_map() {
+  return MockRCHelpers::rc_helpers_mock()->buttons_map();
+}
+
+std::vector<std::string> RCHelpers::GetModuleReadOnlyParams(
+    const std::string& module_type) {
+  return MockRCHelpers::rc_helpers_mock()->GetModuleReadOnlyParams(module_type);
+}
+
+rc_rpc_types::ModuleIdConsentVector RCHelpers::FillModuleConsents(
+    const std::string& module_type,
+    const std::vector<std::string>& module_ids,
+    const std::vector<bool> allowed) {
+  return MockRCHelpers::rc_helpers_mock()->FillModuleConsents(
+      module_type, module_ids, allowed);
+}
+
+std::vector<std::string> RCHelpers::RetrieveModuleIds(
+    const smart_objects::SmartObject& moduleIds) {
+  return MockRCHelpers::rc_helpers_mock()->RetrieveModuleIds(moduleIds);
+}
+
+std::vector<bool> RCHelpers::RetrieveModuleConsents(
+    const smart_objects::SmartObject& consents) {
+  return MockRCHelpers::rc_helpers_mock()->RetrieveModuleConsents(consents);
+}
+
+void RCHelpers::RemoveRedundantGPSDataFromIVDataMsg(
+    smart_objects::SmartObject& msg_params) {
+  return MockRCHelpers::rc_helpers_mock()->RemoveRedundantGPSDataFromIVDataMsg(
+      msg_params);
+}
+
+MockRCHelpers* MockRCHelpers::rc_helpers_mock() {
+  static ::testing::NiceMock<MockRCHelpers> mock_rc_helpers;
+  return &mock_rc_helpers;
+}
+
+}  // namespace rc_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/rc_consent_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/rc_consent_manager_impl_test.cc
new file mode 100644
index 0000000000..a2e9f6d83b
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/rc_consent_manager_impl_test.cc
@@ -0,0 +1,346 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ctime>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include "application_manager/mock_application_manager_settings.h"
+#include "rc_rpc_plugin/rc_consent_manager_impl.h"
+#include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
+#include "utils/date_time.h"
+#include "utils/file_system.h"
+
+#include "application_manager/mock_application_manager.h"
+
+using test::components::application_manager_test::MockApplicationManager;
+using test::components::application_manager_test::
+    MockApplicationManagerSettings;
+
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace {
+const std::string kPolicyApp1Id = "app1_id";
+const std::string kPolicyApp2Id = "app2_id";
+const std::string kMacAddress1 = "device1";
+const std::string kMacAddress2 = "device2";
+const std::string kClimateModule = "CLIMATE";
+const std::string kRadioModule = "RADIO";
+const std::string kAppTestStorageFolder = "app_test_storage_folder";
+const std::string kAppTestInfoStorage = "app_test_info_storage";
+const uint32_t kPeriodOfConsentExpired = 30;  // in days
+}  // namespace
+
+namespace rc_rpc_plugin_test {
+namespace rc_consent_manager_test {
+using namespace rc_rpc_plugin::rc_rpc_types;
+using namespace rc_rpc_plugin;
+
+class RCConsentManagerImplTest : public ::testing::Test {
+ public:
+  RCConsentManagerImplTest()
+      : current_date_(0u)
+      , last_state_(std::make_shared<resumption::LastStateWrapperImpl>(
+            std::make_shared<resumption::LastStateImpl>(kAppTestStorageFolder,
+                                                        kAppTestInfoStorage)))
+      , rc_consent_manager_(new rc_rpc_plugin::RCConsentManagerImpl(
+            last_state_, mock_app_mngr_, kPeriodOfConsentExpired)) {}
+
+  void SetUp() OVERRIDE {
+    current_date_ = std::time(0);
+    RemoveTemproraryTetsFiles();
+
+    ON_CALL(mock_app_mngr_, get_settings())
+        .WillByDefault(ReturnRef(mock_app_mnrg_settings_));
+    ON_CALL(mock_app_mnrg_settings_, period_for_consent_expiration())
+        .WillByDefault(Return(kPeriodOfConsentExpired));
+  }
+
+  void RemoveTemproraryTetsFiles() {
+    // Remove exists storage file
+    if (file_system::FileExists(kAppTestInfoStorage)) {
+      file_system::DeleteFile(kAppTestInfoStorage);
+    }
+
+    // Remove exists storage folder
+    if (file_system::DirectoryExists(kAppTestStorageFolder)) {
+      file_system::RemoveDirectory(kAppTestStorageFolder);
+    }
+
+    auto last_state_accessor = last_state_->get_accessor();
+    last_state_accessor.GetMutableData().set_dictionary(Json::Value());
+  }
+
+  void SaveStateToFileSystem() {
+    auto last_state_accessor = last_state_->get_accessor();
+    last_state_accessor.GetMutableData().SaveToFileSystem();
+  }
+
+ protected:
+  time_t current_date_;
+  NiceMock<MockApplicationManagerSettings> mock_app_mnrg_settings_;
+  NiceMock<MockApplicationManager> mock_app_mngr_;
+  resumption::LastStateWrapperPtr last_state_;
+  std::unique_ptr<rc_rpc_plugin::RCConsentManagerImpl> rc_consent_manager_;
+};
+
+TEST_F(RCConsentManagerImplTest, SaveAndGetModuleConsents_SUCCESS) {
+  const std::string radio_moduleId = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
+  const std::string climate_moduleId = "34045662-a9dc-4823-8435-91056d4c26cb";
+
+  ModuleIdConsent radio_module_consent{
+      {kRadioModule, radio_moduleId}, ModuleConsent::CONSENTED, current_date_};
+
+  ModuleIdConsent climate_module_consent{{kClimateModule, climate_moduleId},
+                                         ModuleConsent::NOT_CONSENTED,
+                                         current_date_};
+
+  ModuleIdConsentVector module_consents{radio_module_consent,
+                                        climate_module_consent};
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents);
+  SaveStateToFileSystem();
+
+  auto radio_consent = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, {kRadioModule, radio_moduleId});
+  auto climate_consent = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, {kClimateModule, climate_moduleId});
+
+  EXPECT_EQ(ModuleConsent::CONSENTED, radio_consent);
+  EXPECT_EQ(ModuleConsent::NOT_CONSENTED, climate_consent);
+}
+
+TEST_F(RCConsentManagerImplTest, ModuleId_NOT_EXISTS) {
+  const std::string radio_moduleId = "eb7739ea-b263-4fe1-af9c-9311d1acac2d";
+  const std::string climate_moduleId = "34045662-a9dc-4823-8435-91056d4c26cb";
+
+  ModuleIdConsent radio_module_consent{
+      {kRadioModule, radio_moduleId}, ModuleConsent::CONSENTED, current_date_};
+  ModuleIdConsent climate_module_consent{{kClimateModule, climate_moduleId},
+                                         ModuleConsent::CONSENTED,
+                                         current_date_};
+
+  const std::string uknown_moduleId = "639f1b7f-1d25-4dca-a2ce-00530860adea";
+  const std::string uknown_moduleType = "UNKNOWN_TYPE";
+
+  ModuleUid unknown_module{uknown_moduleId, uknown_moduleType};
+
+  ModuleIdConsentVector module_consents{radio_module_consent,
+                                        climate_module_consent};
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents);
+  SaveStateToFileSystem();
+
+  ModuleConsent consent = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, unknown_module);
+
+  EXPECT_EQ(ModuleConsent::NOT_EXISTS, consent);
+}
+
+TEST_F(RCConsentManagerImplTest, ConsentIsExpired) {
+  time_t expired_date_45_days =
+      current_date_ - (date_time::SECONDS_IN_DAY * 45);
+  time_t expired_date_30_days =
+      current_date_ - (date_time::SECONDS_IN_DAY * 30);
+  time_t not_expired_date_29_days =
+      current_date_ - (date_time::SECONDS_IN_DAY * 29);
+
+  const std::string moduleId1 = "dbef7693-adf9-42f1-95c7-5dff314d9985";
+  const std::string moduleId2 = "1536b2ac-213f-463f-8589-a11453cd3729";
+  const std::string moduleId3 = "e8b8169a-9f29-4499-a60b-2d126a1beffc";
+
+  ModuleUid module_resource1{kRadioModule, moduleId1};
+  ModuleUid module_resource2{kRadioModule, moduleId2};
+  ModuleUid module_resource3{kRadioModule, moduleId3};
+
+  ModuleIdConsent module_consent_expired1{
+      module_resource1, ModuleConsent::CONSENTED, expired_date_45_days};
+  ModuleIdConsent module_consent_expired2{
+      module_resource2, ModuleConsent::CONSENTED, expired_date_30_days};
+
+  ModuleIdConsent module_consent_not_expired{
+      module_resource3, ModuleConsent::CONSENTED, not_expired_date_29_days};
+
+  ModuleIdConsentVector module_consents{module_consent_expired1,
+                                        module_consent_expired2,
+                                        module_consent_not_expired};
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents);
+  SaveStateToFileSystem();
+
+  // All consents, which consent has been saved more than 30 days, will be
+  // removed.
+  rc_consent_manager_->RemoveExpiredConsents();
+
+  ModuleConsent expired_consent_45_days = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, module_resource1);
+  EXPECT_EQ(ModuleConsent::NOT_EXISTS, expired_consent_45_days);
+
+  ModuleConsent expired_consent_30_days = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, module_resource2);
+  EXPECT_EQ(ModuleConsent::NOT_EXISTS, expired_consent_30_days);
+
+  ModuleConsent not_expired_consent = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, module_resource3);
+  EXPECT_EQ(ModuleConsent::CONSENTED, not_expired_consent);
+}
+
+TEST_F(RCConsentManagerImplTest,
+       SaveModuleConsents_SameAppID_DifferentDeviceID_NotReplaced) {
+  const std::string moduleId = "cef4eae6-e22c-4943-bdc3-60e792414c4c";
+  ModuleUid module_resource{kRadioModule, moduleId};
+
+  ModuleIdConsent radio_module_consent_app1_deviceId1{
+      module_resource, ModuleConsent::CONSENTED, current_date_};
+
+  ModuleIdConsent radio_module_consent_app1_deviceId2{
+      module_resource, ModuleConsent::NOT_CONSENTED, current_date_};
+
+  ModuleIdConsentVector module_consents_app1{
+      radio_module_consent_app1_deviceId1};
+  ModuleIdConsentVector module_consents_app2{
+      radio_module_consent_app1_deviceId2};
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents_app1);
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress2, module_consents_app2);
+
+  SaveStateToFileSystem();
+
+  // Module consents for same app ids and different device_id (mac_adress) will
+  // haven't been replaced each other
+
+  ModuleConsent module_consent_deviceID1 =
+      rc_consent_manager_->GetModuleConsent(
+          kPolicyApp1Id, kMacAddress1, module_resource);
+
+  ModuleConsent module_consent_deviceID2 =
+      rc_consent_manager_->GetModuleConsent(
+          kPolicyApp1Id, kMacAddress2, module_resource);
+
+  EXPECT_EQ(ModuleConsent::CONSENTED, module_consent_deviceID1);
+
+  //  // Module consent for app_id2 has different value as has been saved above
+  EXPECT_EQ(ModuleConsent::NOT_CONSENTED, module_consent_deviceID2);
+}
+
+TEST_F(RCConsentManagerImplTest,
+       SaveModuleConsents_SameAppID_SameDeviceID_Replaced) {
+  const std::string moduleId = "194aee9e-26cb-4f48-a775-8841a658002d";
+
+  ModuleUid radio_module_resource_consented{kRadioModule, moduleId};
+  ModuleUid radio_module_resource_not_consented{kRadioModule, moduleId};
+
+  ModuleIdConsent radio_module_consent_app1_deviceId1{
+      radio_module_resource_consented, ModuleConsent::CONSENTED, current_date_};
+
+  ModuleIdConsent radio_module_consent_app1_deviceId2{
+      radio_module_resource_not_consented,
+      ModuleConsent::NOT_CONSENTED,
+      current_date_};
+
+  ModuleIdConsentVector module_consents_app1{
+      radio_module_consent_app1_deviceId1};
+  ModuleIdConsentVector module_consents_app2{
+      radio_module_consent_app1_deviceId2};
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents_app1);
+
+  SaveStateToFileSystem();
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents_app2);
+
+  SaveStateToFileSystem();
+
+  // Module consents for same app ids and same device_id (mac_adress) will
+  // have been replaced each other
+
+  ModuleConsent module_consent = rc_consent_manager_->GetModuleConsent(
+      kPolicyApp1Id, kMacAddress1, radio_module_resource_not_consented);
+
+  EXPECT_EQ(ModuleConsent::NOT_CONSENTED, module_consent);
+}
+
+TEST_F(RCConsentManagerImplTest, RemoveAllModuleConsents_SUCCESS) {
+  const std::string moduleId = "1c5408f2-9766-464c-a7bf-d834b62f43fa";
+
+  ModuleUid module_resource{kRadioModule, moduleId};
+
+  ModuleIdConsent radio_module_consent_app1_deviceId1{
+      module_resource, ModuleConsent::CONSENTED, current_date_};
+
+  ModuleIdConsent radio_module_consent_app1_deviceId2{
+      module_resource, ModuleConsent::NOT_CONSENTED, current_date_};
+
+  ModuleIdConsentVector module_consents_app1{
+      radio_module_consent_app1_deviceId1};
+  ModuleIdConsentVector module_consents_app2{
+      radio_module_consent_app1_deviceId2};
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress1, module_consents_app1);
+
+  rc_consent_manager_->SaveModuleConsents(
+      kPolicyApp1Id, kMacAddress2, module_consents_app2);
+
+  SaveStateToFileSystem();
+
+  rc_consent_manager_->RemoveAllConsents();
+
+  ModuleConsent module_consent_deviceID1 =
+      rc_consent_manager_->GetModuleConsent(
+          kPolicyApp1Id, kMacAddress1, module_resource);
+
+  ModuleConsent module_consent_deviceID2 =
+      rc_consent_manager_->GetModuleConsent(
+          kPolicyApp1Id, kMacAddress2, module_resource);
+
+  EXPECT_EQ(ModuleConsent::NOT_EXISTS, module_consent_deviceID1);
+
+  EXPECT_EQ(ModuleConsent::NOT_EXISTS, module_consent_deviceID2);
+}
+
+}  // namespace rc_consent_manager_test
+}  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/rc_helpers_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/rc_helpers_test.cc
new file mode 100644
index 0000000000..21876c4c19
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/rc_helpers_test.cc
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE. */
+
+#include "rc_rpc_plugin/rc_helpers.h"
+#include <map>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <vector>
+#include "gtest/gtest.h"
+#include "rc_rpc_plugin/rc_module_constants.h"
+
+namespace {
+const std::string kKeyId = "id";
+const std::string kKeyStatus = "status";
+const std::string kKeyDensity = "density";
+const std::string kKeyValue = "value";
+const std::string kArray = "array";
+}  // namespace
+
+namespace rc_rpc_plugin_test {
+
+using namespace rc_rpc_plugin;
+using namespace smart_objects;
+
+class RCHelpersTest : public ::testing::Test {
+ public:
+  /**
+   * @brief Generates smart object with next structure:
+   * {
+   *    "status": "status<n>",
+   *    "value": "value<n>",
+   *    "id": "id<n>"
+   * }
+   * where <n> is number specified with 'object_number' param.
+   *
+   * @param int object_number - number of object
+   * @param bool use_id_key - defines, whether "id" key must be added to smart
+   * object
+   *
+   * @return smart_objects::SmartObject - generated smart object
+   */
+  smart_objects::SmartObject gen_smart_object(int object_number,
+                                              bool use_id_key) {
+    smart_objects::SmartObject result(smart_objects::SmartType_Map);
+    result[kKeyStatus] = kKeyStatus + std::to_string(object_number);
+    result[kKeyValue] = kKeyValue + std::to_string(object_number);
+    if (use_id_key) {
+      result[kKeyId] = kKeyId + std::to_string(object_number);
+    }
+    return result;
+  }
+};
+
+TEST_F(RCHelpersTest,
+       MergeModuleData_OneOfParamsNotSmartMap_ExpectDataReplacedWithNewOne) {
+  SmartObject data1(SmartType_Map);
+  SmartObject data2(SmartType_Array);
+
+  const auto result = RCHelpers::MergeModuleData(data1, data2);
+  EXPECT_NE(result, data1);
+  EXPECT_EQ(result, data2);
+}
+
+TEST_F(RCHelpersTest,
+       MergeModuleData_FirstObjectDontContainKey_ExpectDataAppendedWithNewOne) {
+  SmartObject data1(SmartType_Map);
+  SmartObject data2(SmartType_Map);
+
+  std::map<std::string, std::string> expected_keys_values = {
+      {"key1", "value1"}, {"key2", "value2"}};
+  auto it = expected_keys_values.begin();
+
+  data1[it->first] = it->second;
+  ++it;
+  data2[it->first] = it->second;
+
+  const auto result = RCHelpers::MergeModuleData(data1, data2);
+  for (auto& item : expected_keys_values) {
+    EXPECT_TRUE(result.keyExists(item.first));
+    EXPECT_EQ(result[item.first], expected_keys_values[item.first]);
+  }
+}
+
+TEST_F(
+    RCHelpersTest,
+    MergeModuleData_SecondObjectContainsDifferentValueType_ExpectDataReplacedWithNewOne) {
+  SmartObject data1(SmartType_Map);
+  SmartObject data2(SmartType_Map);
+
+  data1["key1"] = "value1";
+  data2["key1"] = 30;
+
+  const auto result = RCHelpers::MergeModuleData(data1, data2);
+  EXPECT_EQ(data2["key1"], result["key1"]);
+}
+
+TEST_F(RCHelpersTest, MergeModuleData_Recursive) {
+  SmartObject data1(SmartType_Map);
+  SmartObject data2(SmartType_Map);
+
+  data1["key1"]["subkey1"] = "subvalue1";
+  data2["key1"]["subkey2"] = 30;
+
+  const auto result = RCHelpers::MergeModuleData(data1, data2);
+  EXPECT_EQ(result["key1"]["subkey1"], data1["key1"]["subkey1"]);
+  EXPECT_EQ(result["key1"]["subkey2"], data2["key1"]["subkey2"]);
+}
+
+TEST_F(
+    RCHelpersTest,
+    MergeModuleData_MergeObjectsThatContainArrays_ExpectDataReplacedWithNewOne) {
+  SmartObject data1(SmartType_Map);
+  SmartObject data1_array(SmartType_Array);
+  (*data1_array.asArray()) =
+      SmartArray{gen_smart_object(1, true), gen_smart_object(2, false)};
+  data1[kArray] = data1_array;
+
+  SmartObject data2(SmartType_Map);
+  SmartObject data2_array(SmartType_Array);
+  (*data2_array.asArray()) =
+      SmartArray{gen_smart_object(3, true), gen_smart_object(4, false)};
+  data2[kArray] = data2_array;
+
+  SmartObject expected_result(SmartType_Map);
+  SmartObject expected_result_array(SmartType_Array);
+  (*expected_result_array.asArray()) =
+      SmartArray{data2[kArray].getElement(0), data2[kArray].getElement(1)};
+
+  expected_result[kArray] = expected_result_array;
+
+  const auto result = RCHelpers::MergeModuleData(data1, data2);
+  EXPECT_EQ(expected_result, result);
+}
+
+TEST_F(RCHelpersTest,
+       MergeArray_OneOfParamsNotSmartArray_ExpectDataReplacedWithSecond) {
+  SmartObject data1(SmartType_Array);
+  SmartObject data2(SmartType_Map);
+
+  const auto result = RCHelpers::MergeArray(data1, data2);
+  EXPECT_NE(result, data1);
+  EXPECT_EQ(result, data2);
+}
+
+TEST_F(RCHelpersTest, MergeArray_FirstArrayEmpty_ExpectDataReplacedWithSecond) {
+  SmartObject data1(SmartType_Array);
+  SmartObject data2(SmartType_Array);
+  for (int object : {0, 1}) {
+    data2.asArray()->emplace(data2.asArray()->begin(), SmartObject(object));
+  }
+
+  ASSERT_EQ(0u, data1.length());
+  ASSERT_EQ(2u, data2.length());
+
+  const auto result = RCHelpers::MergeArray(data1, data2);
+  EXPECT_NE(result, data1);
+  EXPECT_EQ(result, data2);
+}
+
+TEST_F(RCHelpersTest,
+       MergeArray_SecondArrayEmpty_ExpectDataReplacedWithSecond) {
+  SmartObject data1(SmartType_Array);
+  for (int object : {0, 1}) {
+    data1.asArray()->emplace(data1.asArray()->begin(), SmartObject(object));
+  }
+  SmartObject data2(SmartType_Array);
+
+  ASSERT_EQ(2u, data1.length());
+  ASSERT_EQ(0u, data2.length());
+
+  const auto result = RCHelpers::MergeArray(data1, data2);
+  EXPECT_NE(result, data1);
+  EXPECT_EQ(result, data2);
+}
+
+TEST_F(RCHelpersTest, MergeArray_SimpleArrays_ExpectDataReplacedWithSecond) {
+  SmartObject data1(SmartType_Array);
+  for (int object : {0, 1, 2, 3, 4, 5}) {
+    data1.asArray()->emplace(data1.asArray()->begin(), SmartObject(object));
+  }
+
+  SmartObject data2(SmartType_Array);
+  for (int object : {0, 1}) {
+    data2.asArray()->emplace(data2.asArray()->begin(), SmartObject(object));
+  }
+
+  ASSERT_EQ(6u, data1.length());
+  ASSERT_EQ(2u, data2.length());
+
+  const auto result = RCHelpers::MergeArray(data1, data2);
+  EXPECT_NE(result, data1);
+  EXPECT_EQ(result, data2);
+}
+
+TEST_F(RCHelpersTest,
+       MergeArray_ObjectsHaveNotEqualIds_ExpectDataAppendedWithNewOne) {
+  SmartObject data1 = gen_smart_object(1, true);
+  SmartObject data2 = gen_smart_object(2, true);
+
+  SmartObject array1(SmartType_Array);
+  array1.asArray()->push_back(data1);
+  SmartObject array2(SmartType_Array);
+  array2.asArray()->push_back(data2);
+
+  SmartObject expected_array(SmartType_Array);
+  expected_array.asArray()->push_back(data1);
+  expected_array.asArray()->push_back(data2);
+  ASSERT_EQ(2u, expected_array.length());
+
+  const auto result = RCHelpers::MergeArray(array1, array2);
+  EXPECT_EQ(expected_array, result);
+}
+
+TEST_F(RCHelpersTest,
+       MergeArray_SomeObjectsDontHaveIdKey_ExpectDataReplacedWithSecond) {
+  int object_number = 1;
+
+  SmartObject array1(SmartType_Array);
+  array1.asArray()->push_back(gen_smart_object(object_number++, true));
+
+  SmartObject array2(SmartType_Array);
+  array2.asArray()->push_back(gen_smart_object(object_number++, false));
+  array2.asArray()->push_back(gen_smart_object(object_number++, true));
+
+  const auto result = RCHelpers::MergeArray(array1, array2);
+  EXPECT_EQ(array2, result);
+}
+
+TEST_F(
+    RCHelpersTest,
+    MergeArray_SomeObjectsHaveEqualIds_ExpectDataWithSameIdUpdateValueOnlyNewDataAdded) {
+  SmartObject temp = gen_smart_object(1, true);
+
+  SmartObject data1(SmartType_Array);
+  auto& data1_array = *data1.asArray();
+
+  data1_array.push_back(temp);
+  data1_array.push_back(gen_smart_object(2, true));
+
+  SmartObject data2(SmartType_Array);
+  auto& data2_array = *data2.asArray();
+
+  temp[kKeyValue] = "CUSTOM VALUE";
+  data2_array.push_back(temp);
+  data2_array.push_back(gen_smart_object(3, true));
+
+  SmartObject expected_result(SmartType_Array);
+  expected_result.asArray()->push_back(temp);
+  expected_result.asArray()->push_back(data1_array[1]);
+  expected_result.asArray()->push_back(data2_array[1]);
+
+  const auto result = RCHelpers::MergeArray(data1, data2);
+  EXPECT_EQ(expected_result, result);
+}
+
+}  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt
new file mode 100644
index 0000000000..4b10d34643
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/CMakeLists.txt
@@ -0,0 +1,83 @@
+# Copyright (c) 2019, Ford Motor Company
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided with the
+# distribution.
+
+# Neither the name of the copyright holders nor the names of their contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
+
+include_directories (
+  ${GMOCK_INCLUDE_DIRECTORY}
+  ${COMPONENTS_DIR}/application_manager/test/include
+  ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/include
+  ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/test/include/
+  ${COMPONENTS_DIR}/include/test/application_manager/
+  ${COMPONENTS_DIR}/rc_rpc_plugin/test/include
+)
+
+set (RESOURCE_ALLOC_MANAGER_TEST_SOURCES
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_manager_impl.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/interior_data_cache_impl.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_rpc_plugin.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_app_extension.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_consent_manager_impl.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_command_factory.cc
+${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/test/mock_rc_helpers.cc
+${CMAKE_CURRENT_SOURCE_DIR}/resource_allocation_manager_impl_test.cc
+)
+
+set(RC_COMMANDS_TEST_SOURCE_DIR ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/test/commands)
+set(RC_COMMANDS_SOURCE_DIR ${COMPONENTS_DIR}/application_manager/rpc_plugins/rc_rpc_plugin/src/commands)
+collect_sources(COMMANDS_SOURCES "${RC_COMMANDS_SOURCE_DIR}" "${RC_COMMANDS_TEST_SOURCE_DIR}")
+
+set(LIBRARIES
+  ApplicationManager
+  connectionHandler
+  SmartObjects
+  ProtocolHandler
+  MessageHelper
+  connectionHandler
+  Utils
+  Resumption
+  jsoncpp
+  gmock_main
+  dl
+)
+
+if(ENABLE_LOG)
+  list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
+  list(APPEND LIBRARIES apr-1 -L${APR_LIBS_DIRECTORY})
+  list(APPEND LIBRARIES aprutil-1 -L${APR_UTIL_LIBS_DIRECTORY})
+  list(APPEND LIBRARIES expat -L${EXPAT_LIBS_DIRECTORY})
+endif()
+
+list(APPEND COMMANDS_SOURCES ${RESOURCE_ALLOC_MANAGER_TEST_SOURCES})
+
+create_test("resource_allocation_manager_test" "${COMMANDS_SOURCES}" "${LIBRARIES}")
+
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/resource_allocation_manager_impl_test.cc
index a72b89b9de..70ed832cb1 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager_impl_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/resource_allocation_manager/resource_allocation_manager_impl_test.cc
@@ -30,14 +30,18 @@
  * POSSIBILITY OF SUCH DAMAGE. */
 
 #include <algorithm>
+#include <memory>
 #include "gtest/gtest.h"
 
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
+#include "application_manager/mock_hmi_capabilities.h"
 #include "application_manager/mock_rpc_service.h"
 #include "application_manager/policies/mock_policy_handler_interface.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
+#include "rc_rpc_plugin/mock/mock_rc_capabilities_manager.h"
+#include "rc_rpc_plugin/mock/mock_rc_helpers.h"
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
 #include "rc_rpc_plugin/resource_allocation_manager_impl.h"
@@ -50,6 +54,7 @@ using ::application_manager::ApplicationSharedPtr;
 using ::application_manager::Message;
 using ::application_manager::MessageType;
 using ::protocol_handler::MessagePriority;
+using ::rc_rpc_plugin::MockRCHelpers;
 using ::testing::_;
 using ::testing::DoAll;
 using ::testing::Eq;
@@ -65,6 +70,7 @@ namespace {
 const bool kDeviceHandle = 1u;
 const std::string kModuleType1 = "CLIMATE";
 const std::string kModuleType2 = "RADIO";
+const std::string kModuleId = "id1";
 const int32_t kConnectionKey = 5;
 const int32_t kCorrelationId = 5;
 const uint32_t kAppId1 = 11u;
@@ -72,12 +78,27 @@ const uint32_t kHMIAppId1 = 1u;
 const uint32_t kAppId2 = 22u;
 const std::string policy_app_id_1_ = "policy_id_1";
 const uint32_t kSizeOfModules = 6u;
+const application_manager::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const rc_rpc_plugin::Grid KDefaultUserLocation = {2, 0, 0, 1, 1, 1};
+const rc_rpc_plugin::Grid kDriverLocation = {0, 0, 0, 1, 1, 1};
+const rc_rpc_plugin::Grid kInvalidLocation = {0, 0, 0, 0, 0, 0};
+const std::vector<std::string> kModuleList = {
+    rc_rpc_plugin::enums_value::kClimate,
+    rc_rpc_plugin::enums_value::kRadio,
+    rc_rpc_plugin::enums_value::kSeat,
+    rc_rpc_plugin::enums_value::kAudio,
+    rc_rpc_plugin::enums_value::kLight,
+    rc_rpc_plugin::enums_value::kHmiSettings};
+
 }  // namespace
 
 namespace rc_rpc_plugin_test {
 
 using namespace rc_rpc_plugin;
 
+typedef std::shared_ptr<MockRCHelpers> MockRCHelpersPtr;
+
 class RAManagerTest : public ::testing::Test {
  public:
   RAManagerTest()
@@ -86,22 +107,58 @@ class RAManagerTest : public ::testing::Test {
       , mock_app_1_(std::make_shared<NiceMock<MockApplication> >())
       , mock_app_2_(std::make_shared<NiceMock<MockApplication> >())
       , apps_lock_ptr_(std::make_shared<sync_primitives::Lock>())
-      , apps_da_(apps_, apps_lock_ptr_) {
+      , apps_da_(apps_, apps_lock_ptr_)
+      , module_service_area_(0, 0, 0, 3, 2, 1)
+      , mock_rc_helpers_(MockRCHelpers::rc_helpers_mock()) {
     ON_CALL(mock_app_mngr_, GetPolicyHandler())
         .WillByDefault(ReturnRef(mock_policy_handler_));
     auto plugin_id = rc_rpc_plugin::RCRPCPlugin::kRCPluginID;
     app_ext_ptr_ = std::make_shared<rc_rpc_plugin::RCAppExtension>(plugin_id);
     ON_CALL(*mock_app_1_, app_id()).WillByDefault(Return(kAppId1));
 
+    PrepareResources();
+    ON_CALL(mock_rc_capabilities_manager_, GetResources())
+        .WillByDefault(Return(resources_));
+    ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+        .WillByDefault(Return(false));
+    ON_CALL(mock_rc_capabilities_manager_, IsMultipleAccessAllowed(_))
+        .WillByDefault(Return(true));
+    ON_CALL(mock_rc_capabilities_manager_, GetModuleServiceArea(_))
+        .WillByDefault(Return(module_service_area_));
+
+    ON_CALL(mock_app_mngr_, application(kAppId1))
+        .WillByDefault(Return(mock_app_1_));
+    ON_CALL(*mock_app_1_,
+            QueryInterface(rc_rpc_plugin::RCRPCPlugin::kRCPluginID))
+        .WillByDefault(Return(app_ext_ptr_));
+
+    ON_CALL(mock_app_mngr_, application(kAppId2))
+        .WillByDefault(Return(mock_app_2_));
+    ON_CALL(*mock_app_2_,
+            QueryInterface(rc_rpc_plugin::RCRPCPlugin::kRCPluginID))
+        .WillByDefault(Return(app_ext_ptr_));
+
     OnRCStatusNotificationExpectations();
   }
 
+  void SetUp() OVERRIDE {
+    rc_app_extension_ = std::make_shared<rc_rpc_plugin::RCAppExtension>(
+        static_cast<application_manager::AppExtensionUID>(
+            rc_rpc_plugin::RCRPCPlugin::kRCPluginID));
+    ON_CALL(mock_rc_capabilities_manager_,
+            GetDriverLocationFromSeatLocationCapability())
+        .WillByDefault(Return(kDriverLocation));
+    ON_CALL(*mock_rc_helpers_, GetRCExtension(_))
+        .WillByDefault(Return(rc_app_extension_));
+  }
+
   void CheckResultWithHMILevelAndAccessMode(
       ResourceAllocationManagerImpl& ra_manager,
       mobile_apis::HMILevel::eType app_level,
       const rc_rpc_plugin::AcquireResult::eType expected_result,
       const hmi_apis::Common_RCAccessMode::eType access_mode);
 
+  void PrepareResources();
   void OnRCStatusNotificationExpectations();
 
  protected:
@@ -117,6 +174,12 @@ class RAManagerTest : public ::testing::Test {
   application_manager::ApplicationSet apps_;
   std::shared_ptr<sync_primitives::Lock> apps_lock_ptr_;
   DataAccessor<application_manager::ApplicationSet> apps_da_;
+  testing::NiceMock<rc_rpc_plugin_test::MockRCCapabilitiesManager>
+      mock_rc_capabilities_manager_;
+  std::vector<ModuleUid> resources_;
+  Grid module_service_area_;
+  RCAppExtensionPtr rc_app_extension_;
+  MockRCHelpers* mock_rc_helpers_;
 };
 
 void RAManagerTest::CheckResultWithHMILevelAndAccessMode(
@@ -131,19 +194,27 @@ void RAManagerTest::CheckResultWithHMILevelAndAccessMode(
   ra_manager.SetAccessMode(access_mode);
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
+
   EXPECT_CALL(mock_app_mngr_, application(kAppId2))
       .WillOnce(Return(mock_app_2_));
-  EXPECT_CALL(*mock_app_2_, hmi_level()).WillOnce(Return(app_level));
+  EXPECT_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
+      .WillOnce(Return(app_level));
   // Second app tries to get already acquired resource by 1st app
-  EXPECT_EQ(expected_result, ra_manager.AcquireResource(kModuleType1, kAppId2));
+  EXPECT_EQ(expected_result,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
+}
+
+void RAManagerTest::PrepareResources() {
+  for (auto& module_type : kModuleList) {
+    ModuleUid module(module_type, kModuleId);
+    resources_.push_back(module);
+  }
 }
 
 void RAManagerTest::OnRCStatusNotificationExpectations() {
-  ON_CALL(mock_app_mngr_, application(kAppId1))
-      .WillByDefault(Return(mock_app_1_));
-  ON_CALL(*mock_app_1_, QueryInterface(rc_rpc_plugin::RCRPCPlugin::kRCPluginID))
-      .WillByDefault(Return(app_ext_ptr_));
   apps_.insert(mock_app_1_);
   ON_CALL(mock_app_mngr_, applications()).WillByDefault(Return(apps_da_));
 }
@@ -152,19 +223,21 @@ TEST_F(RAManagerTest, AcquireResource_NoAppRegistered_Expect_InUse) {
   // Arrange
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillOnce(Return(ApplicationSharedPtr()));
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   // Act & Assert
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::IN_USE,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
 }
 
 TEST_F(RAManagerTest,
        AcquireResource_AppRegisteredAnyHmiLevelResourceFree_Expect_Allowed) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   // Act & Assert
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
 }
 
 TEST_F(
@@ -173,14 +246,15 @@ TEST_F(
   // Arrange
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillOnce(Return(mock_app_1_));
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillOnce(Return(mock_app_1_));
   // Same app tries to get already acquired resource
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
 }
 
 TEST_F(
@@ -193,7 +267,8 @@ TEST_F(
   const AcquireResult::eType expected_result = AcquireResult::REJECTED;
   const Common_RCAccessMode::eType access_mode =
       Common_RCAccessMode::eType::AUTO_ALLOW;
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   CheckResultWithHMILevelAndAccessMode(
       ra_manager, app_level, expected_result, access_mode);
 }
@@ -208,7 +283,8 @@ TEST_F(
   const AcquireResult::eType expected_result = AcquireResult::IN_USE;
   const Common_RCAccessMode::eType access_mode =
       Common_RCAccessMode::eType::AUTO_DENY;
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   CheckResultWithHMILevelAndAccessMode(
       ra_manager, app_level, expected_result, access_mode);
 }
@@ -223,7 +299,8 @@ TEST_F(
   const AcquireResult::eType expected_result = AcquireResult::ALLOWED;
   const Common_RCAccessMode::eType access_mode =
       Common_RCAccessMode::eType::AUTO_ALLOW;
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   CheckResultWithHMILevelAndAccessMode(
       ra_manager, app_level, expected_result, access_mode);
 }
@@ -238,7 +315,8 @@ TEST_F(
   const AcquireResult::eType expected_result = AcquireResult::ASK_DRIVER;
   const Common_RCAccessMode::eType access_mode =
       Common_RCAccessMode::eType::ASK_DRIVER;
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   CheckResultWithHMILevelAndAccessMode(
       ra_manager, app_level, expected_result, access_mode);
 }
@@ -246,32 +324,36 @@ TEST_F(
 TEST_F(RAManagerTest,
        AcquireResource_AcquiredModuleIsRejectedForApp2_ExpectApp2Rejected) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillRepeatedly(Return(mock_app_1_));
   EXPECT_EQ(AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
 
   // Act
-  ra_manager.OnDriverDisallowed(kModuleType1, kAppId2);
+  ra_manager.OnDriverDisallowed(kModuleType1, kModuleId, kAppId2);
 
   // Assert
   EXPECT_CALL(mock_app_mngr_, application(kAppId2))
       .WillOnce(Return(mock_app_2_));
   EXPECT_EQ(AcquireResult::REJECTED,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
 }
 
 TEST_F(RAManagerTest, AppExit_ReleaseResource) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::eType::AUTO_DENY);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillRepeatedly(Return(mock_app_1_));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
 
   // Act
   ra_manager.OnApplicationEvent(
@@ -281,19 +363,22 @@ TEST_F(RAManagerTest, AppExit_ReleaseResource) {
       .WillRepeatedly(Return(mock_app_2_));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
 }
 
 TEST_F(RAManagerTest, AnotherAppExit_NoReleaseResource) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::eType::AUTO_DENY);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillOnce(Return(mock_app_1_));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId2))
       .WillRepeatedly(Return(mock_app_2_));
@@ -306,15 +391,16 @@ TEST_F(RAManagerTest, AnotherAppExit_NoReleaseResource) {
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId2))
       .WillOnce(Return(mock_app_2_));
-  EXPECT_CALL(*mock_app_2_, hmi_level())
+  EXPECT_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_FULL));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::IN_USE,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
 }
 
 TEST_F(RAManagerTest, AppUnregistered_ReleaseResource) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::eType::AUTO_DENY);
 
   RCAppExtensionPtr rc_extention_ptr =
@@ -322,7 +408,7 @@ TEST_F(RAManagerTest, AppUnregistered_ReleaseResource) {
           rc_rpc_plugin::RCRPCPlugin::kRCPluginID));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
 
   // Act
   application_manager::ApplicationSharedPtr app_ptr(mock_app_1_);
@@ -335,18 +421,21 @@ TEST_F(RAManagerTest, AppUnregistered_ReleaseResource) {
       .WillOnce(Return(mock_app_2_));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
 }
 
 TEST_F(RAManagerTest, AnotherAppUnregistered_NoReleaseResource) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::eType::AUTO_DENY);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillOnce(Return(mock_app_1_));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillRepeatedly(Return(mock_app_2_));
@@ -360,24 +449,25 @@ TEST_F(RAManagerTest, AnotherAppUnregistered_NoReleaseResource) {
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId2))
       .WillOnce(Return(mock_app_2_));
-  EXPECT_CALL(*mock_app_2_, hmi_level())
+  EXPECT_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_FULL));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::IN_USE,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
 }
 
 TEST_F(RAManagerTest, AppsDisallowed_ReleaseAllResources) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::eType::AUTO_DENY);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
       .WillRepeatedly(Return(mock_app_1_));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType2, kAppId1));
+            ra_manager.AcquireResource(kModuleType2, kModuleId, kAppId1));
 
   application_manager::ApplicationSet apps;
   apps.insert(mock_app_1_);
@@ -400,18 +490,19 @@ TEST_F(RAManagerTest, AppsDisallowed_ReleaseAllResources) {
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId2))
       .WillRepeatedly(Return(mock_app_2_));
-  EXPECT_CALL(*mock_app_2_, hmi_level())
+  EXPECT_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType2, kAppId2));
+            ra_manager.AcquireResource(kModuleType2, kModuleId, kAppId2));
   Mock::VerifyAndClearExpectations(&mock_app_mngr_);
 }
 
 TEST_F(RAManagerTest, AppGotRevokedModulesWithPTU_ReleaseRevokedResource) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::eType::AUTO_DENY);
 
   EXPECT_CALL(mock_app_mngr_, application(kAppId1))
@@ -437,9 +528,13 @@ TEST_F(RAManagerTest, AppGotRevokedModulesWithPTU_ReleaseRevokedResource) {
       .WillRepeatedly(Return(policy_app_id_1_));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
+
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType2, kAppId1));
+            ra_manager.AcquireResource(kModuleType2, kModuleId, kAppId1));
+  ra_manager.SetResourceAcquired(kModuleType2, kModuleId, kAppId1);
 
   application_manager::ApplicationSet apps;
   apps.insert(mock_app_1_);
@@ -449,29 +544,31 @@ TEST_F(RAManagerTest, AppGotRevokedModulesWithPTU_ReleaseRevokedResource) {
 
   EXPECT_CALL(mock_app_mngr_, applications()).WillRepeatedly(Return(apps_da));
 
-  Resources allowed_modules;
+  std::vector<std::string> allowed_modules;
   allowed_modules.push_back(kModuleType1);
 
   EXPECT_CALL(mock_policy_handler_, GetModuleTypes(policy_app_id_1_, _))
       .WillOnce(DoAll(SetArgPointee<1>(allowed_modules), Return(true)));
 
+  EXPECT_CALL(mock_app_mngr_, application(kAppId2))
+      .WillRepeatedly(Return(mock_app_2_));
+  EXPECT_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
+      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
+
   // Act
   ra_manager.OnPolicyEvent(application_manager::plugin_manager::PolicyEvent::
                                kApplicationPolicyUpdated);
 
-  EXPECT_CALL(mock_app_mngr_, application(kAppId2))
-      .WillRepeatedly(Return(mock_app_2_));
-  EXPECT_CALL(*mock_app_2_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::IN_USE,
-            ra_manager.AcquireResource(kModuleType1, kAppId2));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType2, kAppId2));
+            ra_manager.AcquireResource(kModuleType2, kModuleId, kAppId2));
   Mock::VerifyAndClearExpectations(&mock_app_mngr_);
 }
 
 TEST_F(RAManagerTest, GetAccessMode_ExpectedSameAsHadSet) {
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
 
   ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::AUTO_DENY);
   EXPECT_EQ(hmi_apis::Common_RCAccessMode::AUTO_DENY,
@@ -492,7 +589,8 @@ TEST_F(RAManagerTest, GetAccessMode_ExpectedSameAsHadSet) {
 
 TEST_F(RAManagerTest, OnRCStatus_AppRegistation_RC_allowed) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ON_CALL((*mock_app_1_), is_remote_control_supported())
       .WillByDefault(Return(true));
   ON_CALL((*mock_app_1_), hmi_app_id()).WillByDefault(Return(kHMIAppId1));
@@ -521,7 +619,8 @@ TEST_F(RAManagerTest, OnRCStatus_AppRegistation_RC_allowed) {
 
 TEST_F(RAManagerTest, OnRCStatus_AppRegistation_RC_disallowed) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ra_manager.set_rc_enabled(false);
 
   ON_CALL((*mock_app_1_), is_remote_control_supported())
@@ -549,7 +648,8 @@ TEST_F(RAManagerTest, OnRCStatus_AppRegistation_RC_disallowed) {
 
 TEST_F(RAManagerTest, OnRCStatus_RCStateChanging_RC_disabling) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ON_CALL((*mock_app_1_), is_remote_control_supported())
       .WillByDefault(Return(true));
   ON_CALL((*mock_app_1_), hmi_app_id()).WillByDefault(Return(kHMIAppId1));
@@ -586,7 +686,8 @@ TEST_F(RAManagerTest, OnRCStatus_RCStateChanging_RC_disabling) {
 
 TEST_F(RAManagerTest, OnRCStatus_RCStateChanging_RC_enabling) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
   ON_CALL((*mock_app_1_), is_remote_control_supported())
       .WillByDefault(Return(true));
   ON_CALL((*mock_app_1_), hmi_app_id()).WillByDefault(Return(kHMIAppId1));
@@ -623,14 +724,17 @@ TEST_F(RAManagerTest, OnRCStatus_RCStateChanging_RC_enabling) {
 
 TEST_F(RAManagerTest, OnRCStatus_ModuleAllocation) {
   // Arrange
-  ResourceAllocationManagerImpl ra_manager(mock_app_mngr_, mock_rpc_service_);
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
 
   ON_CALL((*mock_app_1_), is_remote_control_supported())
       .WillByDefault(Return(true));
   ON_CALL((*mock_app_1_), hmi_app_id()).WillByDefault(Return(kHMIAppId1));
 
   EXPECT_EQ(rc_rpc_plugin::AcquireResult::ALLOWED,
-            ra_manager.AcquireResource(kModuleType1, kAppId1));
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
 
   application_manager::commands::MessageSharedPtr message_to_mob;
   EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, false))
@@ -665,4 +769,118 @@ TEST_F(RAManagerTest, OnRCStatus_ModuleAllocation) {
             kHMIAppId1);
 }
 
+// UL - User Location
+// If User Location is invalid, in any case AcquireResult will be REJECTED
+TEST_F(RAManagerTest, AcquireResource_UL_IsInvalid_REJECTED) {
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
+
+  ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+      .WillByDefault(Return(true));
+  rc_app_extension_->SetUserLocation(kInvalidLocation);
+
+  EXPECT_EQ(AcquireResult::REJECTED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+}
+
+// UL - User Location, MA - Multiple Access
+TEST_F(RAManagerTest,
+       AcquireResource_UL_IsValid_ResourceIsFree_MA_False_ALLOWED) {
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
+
+  ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+      .WillByDefault(Return(true));
+  rc_app_extension_->SetUserLocation(KDefaultUserLocation);
+
+  EXPECT_EQ(AcquireResult::ALLOWED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+}
+
+// UL - User Location,  MA - Multiple Access
+TEST_F(RAManagerTest,
+       AcquireResource_UL_IsValid_ResourceIsAcquired_MA_False_REJECTED) {
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
+
+  ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+      .WillByDefault(Return(true));
+  rc_app_extension_->SetUserLocation(KDefaultUserLocation);
+
+  EXPECT_EQ(AcquireResult::ALLOWED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
+  ON_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
+      .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
+  ON_CALL(mock_rc_capabilities_manager_, IsMultipleAccessAllowed(_))
+      .WillByDefault(Return(false));
+  EXPECT_EQ(AcquireResult::REJECTED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
+}
+
+// UL - User Location,  MA - Multiple Access
+TEST_F(RAManagerTest,
+       AcquireResource_UL_IsValid_ResourceIsFree_MA_True_ALLOWED) {
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
+
+  ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+      .WillByDefault(Return(true));
+  rc_app_extension_->SetUserLocation(KDefaultUserLocation);
+
+  EXPECT_EQ(AcquireResult::ALLOWED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ON_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
+      .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
+  EXPECT_EQ(AcquireResult::ALLOWED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
+}
+
+// UL - User Location,  MA - Multiple Access, AM - Access Mode
+TEST_F(RAManagerTest,
+       AcquireResource_UL_IsValid_ResourceIsAcquired_MA_True_AM_AUTO_DENY) {
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
+
+  ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+      .WillByDefault(Return(true));
+  rc_app_extension_->SetUserLocation(KDefaultUserLocation);
+
+  EXPECT_EQ(AcquireResult::ALLOWED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
+
+  ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::AUTO_DENY);
+
+  ON_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
+      .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
+  EXPECT_EQ(AcquireResult::IN_USE,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
+}
+
+TEST_F(RAManagerTest,
+       AcquireResource_UL_IsValid_ResourceIsAcquired_MA_True_AM_ASK_DRIVER) {
+  ResourceAllocationManagerImpl ra_manager(
+      mock_app_mngr_, mock_rpc_service_, mock_rc_capabilities_manager_);
+
+  ON_CALL(mock_rc_capabilities_manager_, IsSeatLocationCapabilityProvided())
+      .WillByDefault(Return(true));
+  rc_app_extension_->SetUserLocation(KDefaultUserLocation);
+
+  EXPECT_EQ(AcquireResult::ALLOWED,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId1));
+
+  ra_manager.SetResourceAcquired(kModuleType1, kModuleId, kAppId1);
+
+  ra_manager.SetAccessMode(hmi_apis::Common_RCAccessMode::ASK_DRIVER);
+
+  ON_CALL(*mock_app_2_, hmi_level(kDefaultWindowId))
+      .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
+  EXPECT_EQ(AcquireResult::ASK_DRIVER,
+            ra_manager.AcquireResource(kModuleType1, kModuleId, kAppId2));
+}
+
 }  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
index fdf02b57cb..fe8857b6b1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/CMakeLists.txt
@@ -51,21 +51,27 @@ collect_sources(APP_EXTENSIONS "${EXTENSIONS_SOURCE_DIR}")
 collect_sources(RPC_PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
 set(LIBRARIES
+  ApplicationManager
   HMI_API
   MOBILE_API
-  ApplicationManager
+  MessageHelper
+  connectionHandler
   v4_protocol_v1_2_no_extra
   SmartObjects
   Utils
-  Policy
+  PolicyStatic
+  jsoncpp
 )
 
 if(ENABLE_LOG)
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 
-add_library("sdl_rpc_plugin" SHARED ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${RPC_PLUGIN_SOURCES} ${APP_EXTENSIONS})
-target_link_libraries("sdl_rpc_plugin" ${LIBRARIES})
+add_library("sdl_rpc_plugin_static" ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${RPC_PLUGIN_SOURCES} ${APP_EXTENSIONS})
+target_link_libraries("sdl_rpc_plugin_static" ${LIBRARIES})
+
+add_library("sdl_rpc_plugin" SHARED "src/sdl_rpc_plugin.cc")
+target_link_libraries("sdl_rpc_plugin" sdl_rpc_plugin_static)
 
 set(INSTALL_DESTINATION bin)
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_get_app_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_get_app_properties_request.h
new file mode 100644
index 0000000000..484a82ca4c
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_get_app_properties_request.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_GET_APP_PROPERTIES_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_GET_APP_PROPERTIES_REQUEST_H_
+
+#include "application_manager/commands/request_from_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief BCGetAppPropertiesRequest command class
+ **/
+class BCGetAppPropertiesRequest : public app_mngr::commands::RequestFromHMI {
+ public:
+  /**
+   * @brief BCGetAppPropertiesRequest class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  BCGetAppPropertiesRequest(const app_mngr::commands::MessageSharedPtr& message,
+                            app_mngr::ApplicationManager& application_manager,
+                            app_mngr::rpc_service::RPCService& rpc_service,
+                            app_mngr::HMICapabilities& hmi_capabilities,
+                            policy::PolicyHandlerInterface& policy_handler);
+
+  /**
+   * @brief BCGetAppPropertiesRequest class destructor
+   **/
+  virtual ~BCGetAppPropertiesRequest() = default;
+
+  /**
+   * @brief Execute command
+   **/
+  void Run() FINAL;
+
+ private:
+  void FillAppProperties(const std::string& policy_app_id,
+                         smart_objects::SmartObject& out_properties) const;
+
+  DISALLOW_COPY_AND_ASSIGN(BCGetAppPropertiesRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_GET_APP_PROPERTIES_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_get_app_properties_response.h
index 06af3c6ea5..5634663254 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls_response.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_get_app_properties_response.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Ford Motor Company
+ * Copyright (c) 2020, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,43 +30,49 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_GET_APP_PROPERTIES_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_GET_APP_PROPERTIES_RESPONSE_H_
 
 #include "application_manager/commands/response_to_hmi.h"
 
 namespace sdl_rpc_plugin {
 namespace app_mngr = application_manager;
+
 namespace commands {
 
-class GetUrlsResponse : public app_mngr::commands::ResponseToHMI {
+/**
+ * @brief BCGetAppPropertiesResponse command class
+ **/
+class BCGetAppPropertiesResponse : public app_mngr::commands::ResponseToHMI {
  public:
   /**
-   * @brief GetUrlsResponse class constructor
+   * @brief BCGetAppPropertiesResponse class constructor
    *
    * @param message Incoming SmartObject message
    **/
-  GetUrlsResponse(const app_mngr::commands::MessageSharedPtr& message,
-                  app_mngr::ApplicationManager& application_manager,
-                  app_mngr::rpc_service::RPCService& rpc_service,
-                  app_mngr::HMICapabilities& hmi_capabilities,
-                  policy::PolicyHandlerInterface& policy_handle);
+  BCGetAppPropertiesResponse(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
 
   /**
-   * @brief GetUrlsResponse class destructor
+   * @brief BCGetAppPropertiesResponse class destructor
    **/
-  virtual ~GetUrlsResponse();
+  virtual ~BCGetAppPropertiesResponse() = default;
 
   /**
    * @brief Execute command
    **/
-  virtual void Run();
+  void Run() FINAL;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(GetUrlsResponse);
+  DISALLOW_COPY_AND_ASSIGN(BCGetAppPropertiesResponse);
 };
 
 }  // namespace commands
+
 }  // namespace sdl_rpc_plugin
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_RESPONSE_H_
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_GET_APP_PROPERTIES_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_set_app_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_set_app_properties_request.h
new file mode 100644
index 0000000000..491d2196e5
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_set_app_properties_request.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_SET_APP_PROPERTIES_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_SET_APP_PROPERTIES_REQUEST_H_
+
+#include "application_manager/commands/request_from_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief BCSetAppPropertiesRequest command class
+ **/
+class BCSetAppPropertiesRequest : public app_mngr::commands::RequestFromHMI {
+ public:
+  /**
+   * @brief BCSetAppPropertiesRequest class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  BCSetAppPropertiesRequest(const app_mngr::commands::MessageSharedPtr& message,
+                            app_mngr::ApplicationManager& application_manager,
+                            app_mngr::rpc_service::RPCService& rpc_service,
+                            app_mngr::HMICapabilities& hmi_capabilities,
+                            policy::PolicyHandlerInterface& policy_handler);
+
+  /**
+   * @brief BCSetAppPropertiesRequest class destructor
+   **/
+  virtual ~BCSetAppPropertiesRequest() = default;
+
+  /**
+   * @brief Execute command
+   **/
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BCSetAppPropertiesRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_SET_APP_PROPERTIES_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_set_app_properties_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_set_app_properties_response.h
new file mode 100644
index 0000000000..e9872196c9
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/bc_set_app_properties_response.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_SET_APP_PROPERTIES_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_SET_APP_PROPERTIES_RESPONSE_H_
+
+#include "application_manager/commands/response_to_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief BCSetAppPropertiesResponse command class
+ **/
+class BCSetAppPropertiesResponse : public app_mngr::commands::ResponseToHMI {
+ public:
+  /**
+   * @brief BCSetAppPropertiesResponse class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  BCSetAppPropertiesResponse(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
+
+  /**
+   * @brief BCSetAppPropertiesResponse class destructor
+   **/
+  virtual ~BCSetAppPropertiesResponse() = default;
+
+  /**
+   * @brief Execute command
+   **/
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BCSetAppPropertiesResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_BC_SET_APP_PROPERTIES_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_properties_change_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_properties_change_notification.h
new file mode 100644
index 0000000000..7feb2ef85e
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_app_properties_change_notification.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PROPERTIES_CHANGE_NOTIFICATION_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PROPERTIES_CHANGE_NOTIFICATION_H_
+
+#include "application_manager/commands/notification_to_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief OnAppPropertiesChangeNotification command class
+ **/
+class OnAppPropertiesChangeNotification
+    : public app_mngr::commands::NotificationToHMI {
+ public:
+  /**
+   * @brief OnAppPropertiesChangeNotification class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  OnAppPropertiesChangeNotification(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief OnAppPropertiesChangeNotification class destructor
+   **/
+  virtual ~OnAppPropertiesChangeNotification() = default;
+
+  /**
+   * @brief Execute command
+   **/
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(OnAppPropertiesChangeNotification);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_APP_PROPERTIES_CHANGE_NOTIFICATION_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.h
new file mode 100644
index 0000000000..39b5c3aee3
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BC_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_FROM_HMI_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BC_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_FROM_HMI_H_
+
+#include "application_manager/commands/notification_from_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief OnBCSystemCapabilityUpdatedNotificationFromHMI command class
+ **/
+class OnBCSystemCapabilityUpdatedNotificationFromHMI
+    : public app_mngr::commands::NotificationFromHMI {
+ public:
+  /**
+   * @brief OnBCSystemCapabilityUpdatedNotificationFromHMI class constructor
+   * @param message Incoming SmartObject message from HMI
+   * @note all parameters described below required for base class
+   * @param application_manager Application manager instance to interact with
+   * related application
+   * @param rpc_service - service to handle appropriate RPC
+   * @param hmi_capabilities - HMI capabilities
+   * @param policy_handle - instance which allows interaction between
+   * application manager and application policies
+   **/
+  OnBCSystemCapabilityUpdatedNotificationFromHMI(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief OnBCSystemCapabilityUpdatedNotificationFromHMI class destructor
+   **/
+  ~OnBCSystemCapabilityUpdatedNotificationFromHMI() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  enum ProcessSystemDisplayCapabilitiesResult {
+    SUCCESS,
+    FAIL,
+    CAPABILITIES_CACHED
+  };
+  /**
+   * @brief ProcessSystemDisplayCapabilities processes provided display
+   * capabilities according to its structure
+   * @param display_capabilities display capabilities to process
+   * @return true if display capabilities have been processed properly,
+   * otherwise returns false
+   */
+  ProcessSystemDisplayCapabilitiesResult ProcessSystemDisplayCapabilities(
+      const smart_objects::SmartObject& display_capabilities);
+
+  DISALLOW_COPY_AND_ASSIGN(OnBCSystemCapabilityUpdatedNotificationFromHMI);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_BC_SYSTEM_CAPABILITY_UPDATED_NOTIFICATION_FROM_HMI_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_service_update_notification.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_service_update_notification.h
new file mode 100644
index 0000000000..bfa9b6e6ae
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/on_service_update_notification.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SERVICE_UPDATE_NOTIFICATION_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SERVICE_UPDATE_NOTIFICATION_H_
+
+#include "application_manager/commands/notification_to_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+namespace hmi {
+
+/**
+ * @brief OnServiceUpdateNotification command class
+ **/
+class OnServiceUpdateNotification
+    : public app_mngr::commands::NotificationToHMI {
+ public:
+  /**
+   * @brief OnServiceUpdateNotification class constructor
+   * @param application_manager ref to application manager
+   * @param rpc_service ref to rpc service
+   * @param hmi_capabilities ref to HMI capabilities
+   * @param policy_handle ref to policy handler
+   **/
+  OnServiceUpdateNotification(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler);
+
+  /**
+   * @brief OnServiceUpdateNotification class destructor
+   **/
+  virtual ~OnServiceUpdateNotification() OVERRIDE;
+
+  /**
+   * @brief Execute command
+   **/
+  void Run() OVERRIDE;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(OnServiceUpdateNotification);
+};
+
+}  // namespace hmi
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_ON_SERVICE_UPDATE_NOTIFICATION_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_request.h
index c3f7453583..043a4369c5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/get_urls.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_request.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Ford Motor Company
+ * Copyright (c) 2019, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,36 +30,38 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_POLICY_CONFIGURATION_DATA_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_POLICY_CONFIGURATION_DATA_REQUEST_H_
 
 #include "application_manager/commands/request_from_hmi.h"
-#include "policy/policy_types.h"
-#include "smart_objects/smart_object.h"
 
 namespace sdl_rpc_plugin {
 namespace app_mngr = application_manager;
+
 namespace commands {
+
 /**
- * @brief GetUrls command class
+ * @brief SDLGetPolicyConfigurationDataRequest command class
  **/
-class GetUrls : public app_mngr::commands::RequestFromHMI {
+class SDLGetPolicyConfigurationDataRequest
+    : public app_mngr::commands::RequestFromHMI {
  public:
   /**
-   * @brief GetUrls class constructor
+   * @brief SDLGetPolicyConfigurationDataRequest class constructor
    *
    * @param message Incoming SmartObject message
    **/
-  GetUrls(const app_mngr::commands::MessageSharedPtr& message,
-          app_mngr::ApplicationManager& application_manager,
-          app_mngr::rpc_service::RPCService& rpc_service,
-          app_mngr::HMICapabilities& hmi_capabilities,
-          policy::PolicyHandlerInterface& policy_handle);
+  SDLGetPolicyConfigurationDataRequest(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handle);
 
   /**
-   * @brief GetUrls class destructor
+   * @brief SDLGetPolicyConfigurationDataRequest class destructor
    **/
-  virtual ~GetUrls();
+  ~SDLGetPolicyConfigurationDataRequest() OVERRIDE;
 
   /**
    * @brief Execute command
@@ -67,30 +69,16 @@ class GetUrls : public app_mngr::commands::RequestFromHMI {
   void Run() OVERRIDE;
 
  private:
-#ifdef PROPRIETARY_MODE
-  /**
-   * @brief Processes URLs collecting for policy service
-   * @param endpoints Endpoints section of policy table
-   */
-  void ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints);
-#endif  // PROPRIETARY_MODE
+  hmi_apis::Common_Result::eType PrepareResponseParams(
+      smart_objects::SmartObject& response_out) const;
 
-  /**
-   * @brief Process URLs collecting for service
-   * @param endpoints Endpoints section of policy table
-   */
-  void ProcessServiceURLs(const policy::EndpointUrls& endpoints);
-
-  /**
-   * @brief Sends response to HMI
-   * @param result Result code
-   */
-  void SendResponseToHMI(hmi_apis::Common_Result::eType result);
+  smart_objects::SmartObject GetValueParam(
+      const Json::Value& policy_property) const;
 
-  DISALLOW_COPY_AND_ASSIGN(GetUrls);
+  DISALLOW_COPY_AND_ASSIGN(SDLGetPolicyConfigurationDataRequest);
 };
 
 }  // namespace commands
 }  // namespace sdl_rpc_plugin
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_GET_URLS_H_
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_POLICY_CONFIGURATION_DATA_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_response.h
new file mode 100644
index 0000000000..2c22f69281
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_response.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_POLICY_CONFIGURATION_DATA_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_POLICY_CONFIGURATION_DATA_RESPONSE_H_
+
+#include "application_manager/commands/response_to_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief SDLGetPolicyConfigurationDataResponse command class
+ **/
+class SDLGetPolicyConfigurationDataResponse
+    : public app_mngr::commands::ResponseToHMI {
+ public:
+  /**
+   * @brief SDLGetPolicyConfigurationDataResponse class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  SDLGetPolicyConfigurationDataResponse(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief SDLGetPolicyConfigurationDataResponse class destructor
+   **/
+  virtual ~SDLGetPolicyConfigurationDataResponse();
+
+  /**
+   * @brief Execute command
+   **/
+  virtual void Run();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SDLGetPolicyConfigurationDataResponse);
+};
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_SDL_GET_POLICY_CONFIGURATION_DATA_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_request.h
new file mode 100644
index 0000000000..a637f53df3
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_request.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CANCEL_INTERACTION_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CANCEL_INTERACTION_REQUEST_H_
+
+#include "application_manager/commands/request_to_hmi.h"
+#include "sdl_rpc_plugin/sdl_rpc_plugin.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief UICancelInteractionRequest command class
+ **/
+class UICancelInteractionRequest : public app_mngr::commands::RequestToHMI {
+ public:
+  /**
+   * @brief UICancelInteractionRequest class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  UICancelInteractionRequest(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief UICancelInteractionRequest class destructor
+   **/
+  virtual ~UICancelInteractionRequest();
+
+  /**
+   * @brief Execute command
+   **/
+  virtual void Run();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UICancelInteractionRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CANCEL_INTERACTION_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_response.h
new file mode 100644
index 0000000000..751a2ceef8
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_response.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CANCEL_INTERACTION_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CANCEL_INTERACTION_RESPONSE_H_
+
+#include "application_manager/commands/response_from_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief UICancelInteractionResponse command class
+ **/
+class UICancelInteractionResponse : public app_mngr::commands::ResponseFromHMI {
+ public:
+  /**
+   * @brief UICancelInteractionResponse class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  UICancelInteractionResponse(
+      const app_mngr::commands::MessageSharedPtr& message,
+      app_mngr::ApplicationManager& application_manager,
+      app_mngr::rpc_service::RPCService& rpc_service,
+      app_mngr::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief UICancelInteractionResponse class destructor
+   **/
+  virtual ~UICancelInteractionResponse();
+
+  /**
+   * @brief Execute command
+   **/
+  virtual void Run();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UICancelInteractionResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CANCEL_INTERACTION_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_create_window_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_create_window_request.h
new file mode 100644
index 0000000000..6fe8e182c4
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_create_window_request.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CREATE_WINDOW_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CREATE_WINDOW_REQUEST_H_
+
+#include "application_manager/commands/request_to_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief UI.CreateWindow request command class
+ **/
+class UICreateWindowRequest : public app_mngr::commands::RequestToHMI {
+ public:
+  UICreateWindowRequest(const app_mngr::commands::MessageSharedPtr& message,
+                        app_mngr::ApplicationManager& application_manager,
+                        app_mngr::rpc_service::RPCService& rpc_service,
+                        app_mngr::HMICapabilities& hmi_capabilities,
+                        policy::PolicyHandlerInterface& policy_handle);
+
+  ~UICreateWindowRequest() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UICreateWindowRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CREATE_WINDOW_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_create_window_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_create_window_response.h
new file mode 100644
index 0000000000..b9452fce1f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_create_window_response.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CREATE_WINDOW_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CREATE_WINDOW_RESPONSE_H_
+
+#include "application_manager/commands/response_from_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief UI.CreateWindow response command class
+ **/
+class UICreateWindowResponse : public app_mngr::commands::ResponseFromHMI {
+ public:
+  UICreateWindowResponse(const app_mngr::commands::MessageSharedPtr& message,
+                         app_mngr::ApplicationManager& application_manager,
+                         app_mngr::rpc_service::RPCService& rpc_service,
+                         app_mngr::HMICapabilities& hmi_capabilities,
+                         policy::PolicyHandlerInterface& policy_handle);
+
+  ~UICreateWindowResponse() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UICreateWindowResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_CREATE_WINDOW_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_window_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_window_request.h
new file mode 100644
index 0000000000..58b2c3989f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_window_request.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_WINDOW_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_WINDOW_REQUEST_H_
+
+#include "application_manager/commands/request_to_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief UI.DeleteWindow request command class
+ **/
+class UIDeleteWindowRequest : public app_mngr::commands::RequestToHMI {
+ public:
+  UIDeleteWindowRequest(const app_mngr::commands::MessageSharedPtr& message,
+                        app_mngr::ApplicationManager& application_manager,
+                        app_mngr::rpc_service::RPCService& rpc_service,
+                        app_mngr::HMICapabilities& hmi_capabilities,
+                        policy::PolicyHandlerInterface& policy_handle);
+
+  ~UIDeleteWindowRequest() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UIDeleteWindowRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_WINDOW_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_window_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_window_response.h
new file mode 100644
index 0000000000..1500a3f9b2
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/hmi/ui_delete_window_response.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_WINDOW_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_WINDOW_RESPONSE_H_
+
+#include "application_manager/commands/response_from_hmi.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief UI.DeleteWindow response command class
+ **/
+class UIDeleteWindowResponse : public app_mngr::commands::ResponseFromHMI {
+ public:
+  UIDeleteWindowResponse(const app_mngr::commands::MessageSharedPtr& message,
+                         app_mngr::ApplicationManager& application_manager,
+                         app_mngr::rpc_service::RPCService& rpc_service,
+                         app_mngr::HMICapabilities& hmi_capabilities,
+                         policy::PolicyHandlerInterface& policy_handle);
+
+  ~UIDeleteWindowResponse() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(UIDeleteWindowResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_UI_DELETE_WINDOW_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h
index 2da94ae67e..d99c5dab38 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/add_sub_menu_request.h
@@ -88,6 +88,8 @@ class AddSubMenuRequest : public app_mngr::commands::CommandRequestImpl {
    */
   bool CheckSubMenuName();
 
+  bool is_menu_layout_available_ = true;
+
   DISALLOW_COPY_AND_ASSIGN(AddSubMenuRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/cancel_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/cancel_interaction_request.h
new file mode 100644
index 0000000000..0063c07512
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/cancel_interaction_request.h
@@ -0,0 +1,85 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CANCEL_INTERACTION_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CANCEL_INTERACTION_REQUEST_H_
+
+#include "application_manager/commands/command_request_impl.h"
+#include "sdl_rpc_plugin/sdl_rpc_plugin.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief CancelInteractionRequest command class
+ **/
+class CancelInteractionRequest : public app_mngr::commands::CommandRequestImpl {
+ public:
+  /**
+   * @brief CancelInteractionRequest class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  CancelInteractionRequest(const app_mngr::commands::MessageSharedPtr& message,
+                           app_mngr::ApplicationManager& application_manager,
+                           app_mngr::rpc_service::RPCService& rpc_service,
+                           app_mngr::HMICapabilities& hmi_capabilities,
+                           policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief CancelInteractionRequest class destructor
+   **/
+  virtual ~CancelInteractionRequest();
+
+  /**
+   * @brief Execute command
+   **/
+  virtual void Run();
+
+  /**
+   * @brief Interface method that is called whenever new event received
+   *
+   * @param event The received event
+   */
+  void on_event(const app_mngr::event_engine::Event& event);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CancelInteractionRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CANCEL_INTERACTION_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/cancel_interaction_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/cancel_interaction_response.h
new file mode 100644
index 0000000000..3e8536e617
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/cancel_interaction_response.h
@@ -0,0 +1,79 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CANCEL_INTERACTION_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CANCEL_INTERACTION_RESPONSE_H_
+
+#include "application_manager/commands/command_response_impl.h"
+#include "sdl_rpc_plugin/sdl_rpc_plugin.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief CancelInteractionResponse command class
+ **/
+class CancelInteractionResponse
+    : public app_mngr::commands::CommandResponseImpl {
+ public:
+  /**
+   * @brief CancelInteractionResponse class constructor
+   *
+   * @param message Incoming SmartObject message
+   **/
+  CancelInteractionResponse(const app_mngr::commands::MessageSharedPtr& message,
+                            app_mngr::ApplicationManager& application_manager,
+                            app_mngr::rpc_service::RPCService& rpc_service,
+                            app_mngr::HMICapabilities& hmi_capabilities,
+                            policy::PolicyHandlerInterface& policy_handle);
+
+  /**
+   * @brief CancelInteractionResponse class destructor
+   **/
+  virtual ~CancelInteractionResponse();
+
+  /**
+   * @brief Execute command
+   **/
+  virtual void Run();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CancelInteractionResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CANCEL_INTERACTION_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
index 01f20a68e3..f9f780b84b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/change_registration_request.h
@@ -123,11 +123,12 @@ class ChangeRegistrationRequest
   /**
    * @brief Check parameters (name, vr) for
    * coincidence with already known parameters of registered applications
-   *
+   * @param device_id device identifier
    * @return SUCCESS if there is no coincidence of app.name/VR synonyms,
    * otherwise appropriate error code returns
    */
-  mobile_apis::Result::eType CheckCoincidence();
+  mobile_apis::Result::eType CheckCoincidence(
+      const connection_handler::DeviceHandle& device_id);
 
   /**
    * @brief Checks if requested name is allowed by policy
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_window_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_window_request.h
new file mode 100644
index 0000000000..cfbfc460b7
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_window_request.h
@@ -0,0 +1,117 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_WINDOW_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_WINDOW_REQUEST_H_
+
+#include "application_manager/commands/command_request_impl.h"
+#include "application_manager/hmi_state.h"
+#include "utils/macro.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief CreateWindow request command class
+ **/
+class CreateWindowRequest : public app_mngr::commands::CommandRequestImpl {
+ public:
+  CreateWindowRequest(const app_mngr::commands::MessageSharedPtr& message,
+                      app_mngr::ApplicationManager& application_manager,
+                      app_mngr::rpc_service::RPCService& rpc_service,
+                      app_mngr::HMICapabilities& hmi_capabilities,
+                      policy::PolicyHandlerInterface& policy_handler);
+
+  ~CreateWindowRequest() FINAL;
+
+  app_mngr::WindowID window_id() const FINAL;
+
+  void Run() FINAL;
+
+  void on_event(const app_mngr::event_engine::Event& event) FINAL;
+
+  /**
+   * @brief Init sets hash update mode for request
+   */
+  bool Init() FINAL;
+
+ private:
+  /**
+   * @brief CheckWindowName checks if provided window_name exists and allowed to
+   * be created
+   * @param app pointer to application owns affected window
+   * @param window_name window name to check
+   * @return true if window_name is valid, otherwise returns false
+   */
+  bool CheckWindowName(app_mngr::ApplicationSharedPtr app,
+                       const app_mngr::WindowID window_id,
+                       const std::string& window_name) const;
+
+  /**
+   * @brief ValidateWindowCreation checks whether window can be created
+   * @return true if window can be created, otherwise returns false
+   */
+  bool ValidateWindowCreation(app_mngr::ApplicationSharedPtr app,
+                              const app_mngr::WindowID window_id);
+
+  /**
+   * @brief IsWindowForAssociatedServiceCreated check whether a window with
+   * current associated type has already been created
+   * @return true if window has been created, otherwise returns false
+   */
+  bool IsWindowForAssociatedServiceCreated(
+      app_mngr::ApplicationSharedPtr app) const;
+
+  /**
+   * @brief DoesExceedMaxAllowedWindows check wheter max allowed amount of
+   * windows is exceeded
+   * @return true if amount us exceeded, otherwise returns false
+   */
+  bool DoesExceedMaxAllowedWindows(app_mngr::ApplicationSharedPtr app) const;
+
+  /**
+   * @brief ApplyWindowInitialState apply changes related to window HMI state
+   * initialization
+   * @param app pointer to application owns affected window
+   */
+  void ApplyWindowInitialState(app_mngr::ApplicationSharedPtr app) const;
+
+  DISALLOW_COPY_AND_ASSIGN(CreateWindowRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_WINDOW_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_window_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_window_response.h
new file mode 100644
index 0000000000..5163293a7c
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/create_window_response.h
@@ -0,0 +1,67 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_WINDOW_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_WINDOW_RESPONSE_H_
+
+#include "application_manager/commands/command_response_impl.h"
+#include "utils/macro.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief CreateWindow response command class
+ **/
+class CreateWindowResponse : public app_mngr::commands::CommandResponseImpl {
+ public:
+  CreateWindowResponse(const app_mngr::commands::MessageSharedPtr& message,
+                       app_mngr::ApplicationManager& application_manager,
+                       app_mngr::rpc_service::RPCService& rpc_service,
+                       app_mngr::HMICapabilities& hmi_capabilities,
+                       policy::PolicyHandlerInterface& policy_handler);
+
+  ~CreateWindowResponse() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CreateWindowResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_CREATE_WINDOW_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_window_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_window_request.h
new file mode 100644
index 0000000000..b837724d7b
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_window_request.h
@@ -0,0 +1,91 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_WINDOW_REQUEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_WINDOW_REQUEST_H_
+
+#include "application_manager/commands/command_request_impl.h"
+#include "application_manager/hmi_state.h"
+#include "utils/macro.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief CreateWindow request command class
+ **/
+class DeleteWindowRequest : public app_mngr::commands::CommandRequestImpl {
+ public:
+  DeleteWindowRequest(const app_mngr::commands::MessageSharedPtr& message,
+                      app_mngr::ApplicationManager& application_manager,
+                      app_mngr::rpc_service::RPCService& rpc_service,
+                      app_mngr::HMICapabilities& hmi_capabilities,
+                      policy::PolicyHandlerInterface& policy_handler);
+
+  ~DeleteWindowRequest() FINAL;
+
+  void Run() FINAL;
+
+  void on_event(const app_mngr::event_engine::Event& event) FINAL;
+
+  app_mngr::WindowID window_id() const FINAL;
+
+  /**
+   * @brief Init sets hash update mode for request
+   */
+  bool Init() FINAL;
+
+ private:
+  /**
+   * @brief CheckWindowId checks if provided window_id exists and allowed to be
+   * deleted
+   * @param app pointer to application owns affected window
+   * @return true if window_id is valid, otherwise returns false
+   */
+  bool CheckWindowId(app_mngr::ApplicationSharedPtr app) const;
+
+  /**
+   * @brief DeleteWindow deletes data related to a request window id
+   * @param app pointer to applications owns affected window
+   */
+  void DeleteWindow(app_mngr::ApplicationSharedPtr app) const;
+
+  DISALLOW_COPY_AND_ASSIGN(DeleteWindowRequest);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_WINDOW_REQUEST_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_window_response.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_window_response.h
new file mode 100644
index 0000000000..279541724a
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/delete_window_response.h
@@ -0,0 +1,67 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_WINDOW_RESPONSE_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_WINDOW_RESPONSE_H_
+
+#include "application_manager/commands/command_response_impl.h"
+#include "utils/macro.h"
+
+namespace sdl_rpc_plugin {
+namespace app_mngr = application_manager;
+
+namespace commands {
+
+/**
+ * @brief DeleteWindow response command class
+ **/
+class DeleteWindowResponse : public app_mngr::commands::CommandResponseImpl {
+ public:
+  DeleteWindowResponse(const app_mngr::commands::MessageSharedPtr& message,
+                       app_mngr::ApplicationManager& application_manager,
+                       app_mngr::rpc_service::RPCService& rpc_service,
+                       app_mngr::HMICapabilities& hmi_capabilities,
+                       policy::PolicyHandlerInterface& policy_handler);
+
+  ~DeleteWindowResponse() FINAL;
+
+  void Run() FINAL;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DeleteWindowResponse);
+};
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_MOBILE_DELETE_WINDOW_RESPONSE_H_
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h
index 0572679c85..52a0ad4dc1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/perform_interaction_request.h
@@ -93,6 +93,33 @@ class PerformInteractionRequest
    */
   virtual void onTimeOut();
 
+ protected:
+  /**
+   * @brief Prepare result code for sending to mobile application
+   * @param ui_response contains result_code from HMI response and
+   * interface that returns response
+   * @param vr_response contains result_code from HMI response and
+   * interface that returns response.
+   * @return resulting code for sending to mobile application.
+   */
+  mobile_apis::Result::eType PrepareResultCodeForResponse(
+      const app_mngr::commands::ResponseInfo& ui_response,
+      const app_mngr::commands::ResponseInfo& vr_response);
+
+  /**
+   * @brief Checks result code from HMI for splitted RPC
+   * and returns parameter for sending to mobile app.
+   * @param ui_response contains result_code from HMI response and
+   * interface that returns response
+   * @param vr_response contains result_code from HMI response and
+   * interface that returns response
+   * @return true if result code complies successful result code
+   * otherwise returns false
+   */
+  bool PrepareResultForMobileResponse(
+      app_mngr::commands::ResponseInfo& out_first,
+      app_mngr::commands::ResponseInfo& out_second) const;
+
  private:
   /**
    * @brief Function will be called when VR_OnCommand event
@@ -194,7 +221,7 @@ class PerformInteractionRequest
    * otherwise returns FALSE.
    */
   bool CheckChoiceIDFromResponse(app_mngr::ApplicationSharedPtr app,
-                                 int32_t choice_id);
+                                 const int32_t choice_id);
 
   /**
    * @brief Checks for a match of choice ID, in
@@ -232,7 +259,27 @@ class PerformInteractionRequest
    */
   void SendBothModeResponse(const smart_objects::SmartObject& msg_param);
 
+  /**
+   * @brief Sends UiClosePopUp request to HMI
+   */
+  void SendClosePopupRequestToHMI();
+
+  /**
+   * @brief Sets the choice according to the current interaction mode and first
+   * received choice id (UI or VR).
+   *
+   * @param msg_param Message parameters which will be included in the response
+   * to mobile device.
+   * @return Returns false, if choice_id received from UI and VR are valid and
+   * not equal. Otherwise returns true.
+   */
+  bool SetChoiceIdToResponseMsgParams(
+      smart_objects::SmartObject& msg_param) const;
+
   mobile_apis::InteractionMode::eType interaction_mode_;
+  std::int32_t ui_choice_id_received_;
+  std::int32_t vr_choice_id_received_;
+
   bool ui_response_received_;
   bool vr_response_received_;
   bool app_pi_was_active_before_;
@@ -241,6 +288,7 @@ class PerformInteractionRequest
   hmi_apis::Common_Result::eType ui_result_code_;
   std::string ui_info_;
   std::string vr_info_;
+  smart_objects::SmartObject response_msg_params;
 
   DISALLOW_COPY_AND_ASSIGN(PerformInteractionRequest);
 };
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
index 8a80db9cdf..d59964bbc7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/register_app_interface_request.h
@@ -126,7 +126,7 @@ class RegisterAppInterfaceRequest
    *
    * @param app application with changed HMI status
    * @param resumption If true, resumption-related parameters will be sent to
-   *the HMI
+   * the HMI
    * @param need_restore_vr If resumption is true, whether or not VR commands
    *should be resumed
    **/
@@ -134,30 +134,39 @@ class RegisterAppInterfaceRequest
       app_mngr::ApplicationConstSharedPtr app,
       bool resumption = false,
       bool need_restore_vr = false);
-  /*
+
+  /**
    * @brief Check new ID along with known mobile application ID
    *
    * return TRUE if ID is known already, otherwise - FALSE
    */
   bool IsApplicationWithSameAppIdRegistered();
 
-  /*
+  /**
    * @brief Check new application parameters (name, tts, vr) for
    * coincidence with already known parameters of registered applications
-   * @param out_duplicate_apps In the case other apps was found with duplicate
-   * names, this field will be filled with a list of said apps
    *
-   * return SUCCESS if there is no coincidence of app.name/TTS/VR synonyms,
+   * @return SUCCESS if there is no coincidence of app.name/TTS/VR synonyms,
    * otherwise appropriate error code returns
    */
-  mobile_apis::Result::eType CheckCoincidence(
+  mobile_apis::Result::eType CheckCoincidence();
+
+  /**
+   * @brief Search for any apps with the same appName as the one being
+   * registered
+   * @param out_duplicate_apps To be filled with a list of all of the apps which
+   * have duplicate appNames to the app being registered (registered or pending)
+   *
+   * @return TRUE if at least one duplicate app was found, otherwise FALSE
+   */
+  bool GetDuplicateNames(
       std::vector<app_mngr::ApplicationSharedPtr>& out_duplicate_apps);
 
-  /*
+  /**
    * @brief Predicate for using with CheckCoincidence method to compare with VR
    * synonym SO
    *
-   * return TRUE if there is coincidence of VR, otherwise FALSE
+   * @return TRUE if there is coincidence of VR, otherwise FALSE
    */
   struct CoincidencePredicateVR {
     CoincidencePredicateVR(const custom_str::CustomString& newItem)
@@ -207,17 +216,31 @@ class RegisterAppInterfaceRequest
   void SendSubscribeCustomButtonNotification();
 
   /**
-   * @brief IsApplicationSwitched checks whether application is switched from
-   * another transport. If application id is found, but not in reconnection
+   * @brief IsApplicationSwitched checks whether application is switched
+   * from another transport. If application id is found, but not in reconnection
    * list, returns 'already registered' code. Otherwise - proceed with
    * switching.
    * @return True if application is detected as switched, otherwise false.
    */
   bool IsApplicationSwitched();
 
+  /**
+   * @brief Information about given Connection Key.
+   * @param key Unique key used by other components as session identifier
+   * @param device_id device identifier.
+   * @param mac_address uniq address
+   * @return false in case of error or true in case of success
+   */
+  bool GetDataOnSessionKey(
+      const uint32_t key,
+      connection_handler::DeviceHandle* device_id = nullptr,
+      std::string* mac_address = nullptr) const;
+
  private:
   std::string response_info_;
   mobile_apis::Result::eType result_code_;
+  connection_handler::DeviceHandle device_handle_;
+  std::string device_id_;
 
   policy::PolicyHandlerInterface& GetPolicyHandler();
   DISALLOW_COPY_AND_ASSIGN(RegisterAppInterfaceRequest);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
index 86ca2fb126..520f27d8b9 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_app_icon_request.h
@@ -83,9 +83,11 @@ class SetAppIconRequest : public app_mngr::commands::CommandRequestImpl {
  private:
   /**
    * @brief Copies file to icon storage
+   * @param policy_app_id application policy app id
    * @param path_to_file Path to icon
    */
-  void CopyToIconStorage(const std::string& path_to_file) const;
+  void CopyToIconStorage(const std::string& policy_app_id,
+                         const std::string& path_to_file) const;
 
   /**
    * @brief Remove oldest icons
@@ -108,6 +110,11 @@ class SetAppIconRequest : public app_mngr::commands::CommandRequestImpl {
    * @brief Checks, if icons saving to configured folder is enabled
    */
   bool is_icons_saving_enabled_;
+
+  /**
+   * @brief Contains full file path to icon
+   */
+  std::string full_file_path_for_hmi_;
 };
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h
index e84bf6e5e6..3a32d1b671 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/set_global_properties_request.h
@@ -82,7 +82,76 @@ class SetGlobalPropertiesRequest
    */
   bool Init() FINAL;
 
+  /**
+   * @brief Prepares total result for mobile according to three results:
+   * ui_properties_result, tts_properties_result, rc_properties_result.
+   * @param first ResponseInfo as first argument
+   * @param second ResponseInfo as secondargument
+   * @param third ResponseInfo as third argument
+   * @return total result
+   */
+  bool PrepareResultForMobileResponse(
+      const app_mngr::commands::ResponseInfo& first,
+      const app_mngr::commands::ResponseInfo& second,
+      const app_mngr::commands::ResponseInfo& third) const;
+
+  /**
+   * @brief Prepare result code for sending to mobile application
+   * @param first contains result_code from HMI response and
+   * interface that returns response
+   * @param second contains result_code from HMI response and
+   * interface that returns response.
+   * * @param third contains result_code from HMI response and
+   * interface that returns response.
+   * @return resulting code for sending to mobile application.
+   */
+  mobile_apis::Result::eType PrepareResultCodeForResponse(
+      const app_mngr::commands::ResponseInfo& first,
+      const app_mngr::commands::ResponseInfo& second,
+      const app_mngr::commands::ResponseInfo& third);
+
+  /**
+   * @brief Resolves if the return code must be
+   * UNSUPPORTED_RESOURCE
+   * @param first contains result_code from HMI response and
+   * interface that returns response
+   * @param second contains result_code from HMI response and
+   * interface that returns response.
+   * * @param third contains result_code from HMI response and
+   * interface that returns response.
+   * @return True, if the communication return code must be
+   * UNSUPPORTED_RESOURCE, otherwise false.
+   */
+  bool IsResultCodeUnsupported(
+      const app_mngr::commands::ResponseInfo& first,
+      const app_mngr::commands::ResponseInfo& second,
+      const app_mngr::commands::ResponseInfo& third) const;
+
  private:
+  /**
+   * @brief MergeInfos merge 2 infos into one string with info
+   * @param first_info -contains result_code from HMI response and
+   * interface that returns response
+   * @param first_str - info string that should be first in result info
+   * @param second_info -contains result_code from HMI response and
+   * interface that returns response
+   * @param second_str - info string that should be second in result info
+   * @param third_info - contains result_code from HMI response and
+   * interface that returns response
+   * @param third_str - info string that should be third in result info
+   * @return if first_info is not available and second_str and third_info not
+   * empty return second if second_info is not available and first_str and
+   * third_info not empty return first if third_info is not available and
+   * first_str and second_str not empty return first other cases return result
+   * MergeInfos for 2 params
+   */
+  std::string MergeInfos(const app_mngr::commands::ResponseInfo& first_info,
+                         const std::string& first_str,
+                         const app_mngr::commands::ResponseInfo& second_info,
+                         const std::string& second_str,
+                         const app_mngr::commands::ResponseInfo& third_info,
+                         const std::string& third_str);
+
   // prepare UI sending data (VrHelps, Menus, Keyboard) to SmartObject
   static void PrepareUIRequestVRHelpData(
       const app_mngr::ApplicationSharedPtr app,
@@ -101,6 +170,9 @@ class SetGlobalPropertiesRequest
   // Send UI request to HMI
   void SendUIRequest(const smart_objects::SmartObject& params, bool use_events);
 
+  // Send SetGlobalProperties with userLocation parameter
+  void SendRCRequest(const smart_objects::SmartObject& params, bool use_events);
+
   // VRHelp shall contain sequential positions and start from 1
   static bool CheckVrHelpItemsOrder(const smart_objects::SmartObject& vr_help);
 
@@ -140,14 +212,20 @@ class SetGlobalPropertiesRequest
 
   bool is_ui_send_;
   bool is_tts_send_;
+  bool is_rc_send_;
 
   bool is_ui_received_;
   bool is_tts_received_;
+  bool is_rc_received_;
 
   hmi_apis::Common_Result::eType ui_result_;
   hmi_apis::Common_Result::eType tts_result_;
+  hmi_apis::Common_Result::eType rc_result_;
   std::string ui_response_info_;
   std::string tts_response_info_;
+  std::string rc_response_info_;
+
+  bool is_menu_layout_available_ = true;
 
   DISALLOW_COPY_AND_ASSIGN(SetGlobalPropertiesRequest);
 };
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h
index 586004b783..26612609a4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/commands/mobile/show_request.h
@@ -90,8 +90,33 @@ class ShowRequest : public app_mngr::commands::CommandRequestImpl {
                       int32_t field_index,
                       smart_objects::SmartObject& msg_params);
 
+  /**
+   * @brief Handle the template configuration information from the
+   * incoming mobile json message format for specified application
+   * @param app - application for which configuration should be checked
+   * @return True if template config can be successfully applied otherwise -
+   * false
+   */
+  bool CheckTemplateConfigurationForApp(application_manager::Application& app);
+
+  /**
+   * @brief Applies the template configuration which was set up beforehand
+   * @param result - result code on which template application is dependent
+   * @param app - application for which configuration should be applied
+   */
+  void ApplyTemplateConfigurationForApp(mobile_apis::Result::eType result,
+                                        application_manager::Application& app);
+
   mobile_apis::Result::eType core_result_code_;
   std::string core_response_info_;
+  app_mngr::WindowID current_window_id_;
+  smart_objects::SmartObject template_config_;
+  bool layout_change_required_;
+
+  // dcs - abbreviation of Day Color Scheme
+  bool dcs_change_required_;
+  // ncd - abbreviation of Night Color Scheme
+  bool ncs_change_required_;
 
   DISALLOW_COPY_AND_ASSIGN(ShowRequest);
 };
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
index 7d482709cb..9c770279ab 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/include/sdl_rpc_plugin/sdl_rpc_plugin.h
@@ -47,7 +47,15 @@ class SDLRPCPlugin : public plugins::RPCPlugin {
   bool Init(app_mngr::ApplicationManager& app_manager,
             app_mngr::rpc_service::RPCService& rpc_service,
             app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler) OVERRIDE;
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastStateWrapperPtr last_state) OVERRIDE;
+
+  DEPRECATED
+  bool Init(app_mngr::ApplicationManager& app_manager,
+            app_mngr::rpc_service::RPCService& rpc_service,
+            app_mngr::HMICapabilities& hmi_capabilities,
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastState& last_state) OVERRIDE;
 
   bool IsAbleToProcess(
       const int32_t function_id,
@@ -67,5 +75,5 @@ class SDLRPCPlugin : public plugins::RPCPlugin {
 }  // namespace sdl_rpc_plugin
 
 extern "C" application_manager::plugin_manager::RPCPlugin* Create();
-
+extern "C" void Delete(application_manager::plugin_manager::RPCPlugin* data);
 #endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_SDL_RPC_PLUGIN_H
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_request.cc
index fb87612e19..19c9fa91d8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/basic_communication_get_system_time_request.cc
@@ -51,7 +51,7 @@ BasicCommunicationGetSystemTimeRequest::BasicCommunicationGetSystemTimeRequest(
 
 void BasicCommunicationGetSystemTimeRequest::onTimeOut() {
   LOG4CXX_AUTO_TRACE(logger_);
-  application_manager_.protocol_handler().NotifyOnFailedHandshake();
+  application_manager_.protocol_handler().NotifyOnGetSystemTimeFailed();
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_app_properties_request.cc
new file mode 100644
index 0000000000..0dafa21e33
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_app_properties_request.cc
@@ -0,0 +1,144 @@
+/*
+ Copyright (c) 2020, Ford Motor Company, Livio
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/bc_get_app_properties_request.h"
+#include "application_manager/policies/policy_handler_interface.h"
+#include "application_manager/rpc_service.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+BCGetAppPropertiesRequest::BCGetAppPropertiesRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : RequestFromHMI(message,
+                     application_manager,
+                     rpc_service,
+                     hmi_capabilities,
+                     policy_handler) {}
+
+void BCGetAppPropertiesRequest::FillAppProperties(
+    const std::string& policy_app_id,
+    smart_objects::SmartObject& out_properties) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  policy::AppProperties app_properties;
+  const bool result =
+      policy_handler_.GetAppProperties(policy_app_id, app_properties);
+
+  if (!result) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "Failed to get app parameters for policy_app_id: " << policy_app_id);
+    return;
+  }
+
+  out_properties[strings::policy_app_id] = policy_app_id;
+  out_properties[strings::enabled] = app_properties.enabled;
+
+  policy::StringArray nicknames;
+  policy::StringArray app_hmi_types;
+
+  policy_handler_.GetInitialAppData(policy_app_id, &nicknames, &app_hmi_types);
+
+  smart_objects::SmartObject nicknames_array(smart_objects::SmartType_Array);
+  size_t i = 0;
+  for (const auto& nickname : nicknames) {
+    nicknames_array[i++] = nickname;
+  }
+  out_properties[strings::nicknames] = nicknames_array;
+
+  if (!app_properties.auth_token.empty()) {
+    out_properties[strings::auth_token] = app_properties.auth_token;
+  }
+  if (!app_properties.transport_type.empty()) {
+    out_properties[strings::transport_type] = app_properties.transport_type;
+  }
+  if (!app_properties.hybrid_app_preference.empty()) {
+    out_properties[strings::hybrid_app_preference] =
+        app_properties.hybrid_app_preference;
+  }
+  if (!app_properties.endpoint.empty()) {
+    out_properties[strings::endpoint] = app_properties.endpoint;
+  }
+}
+
+void BCGetAppPropertiesRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto& msg_params = (*message_)[strings::msg_params];
+  smart_objects::SmartObject response_params(smart_objects::SmartType_Map);
+
+  if (msg_params.keyExists(strings::policy_app_id)) {
+    const auto policy_app_id = msg_params[strings::policy_app_id].asString();
+    smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+    FillAppProperties(policy_app_id, properties);
+    if (!properties.empty()) {
+      response_params[strings::properties][0] = properties;
+    }
+  } else {
+    LOG4CXX_DEBUG(logger_,
+                  "policyAppID was absent in request, all apps properties "
+                  "will be returned.");
+    const auto app_ids = policy_handler_.GetApplicationPolicyIDs();
+    int i = 0;
+    for (auto& app_id : app_ids) {
+      smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+      FillAppProperties(app_id, properties);
+      response_params[strings::properties][i++] = properties;
+    }
+  }
+
+  if (response_params[strings::properties].empty()) {
+    SendErrorResponse(
+        (*message_)[strings::params][strings::correlation_id].asUInt(),
+        hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+        hmi_apis::Common_Result::DATA_NOT_AVAILABLE,
+        "Requested data not available",
+        application_manager::commands::Command::SOURCE_SDL_TO_HMI);
+    return;
+  }
+
+  SendResponse(true,
+               (*message_)[strings::params][strings::correlation_id].asUInt(),
+               hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+               hmi_apis::Common_Result::SUCCESS,
+               &response_params);
+}
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_app_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_app_properties_response.cc
new file mode 100644
index 0000000000..57949a949b
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_get_app_properties_response.cc
@@ -0,0 +1,60 @@
+/*
+ Copyright (c) 2020, Ford Motor Company, Livio
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/bc_get_app_properties_response.h"
+#include "application_manager/application_impl.h"
+#include "application_manager/event_engine/event.h"
+#include "application_manager/rpc_service.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+BCGetAppPropertiesResponse::BCGetAppPropertiesResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : ResponseToHMI(message,
+                    application_manager,
+                    rpc_service,
+                    hmi_capabilities,
+                    policy_handler) {}
+
+void BCGetAppPropertiesResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  rpc_service_.SendMessageToHMI(message_);
+}
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc
new file mode 100644
index 0000000000..a4c5d6b1b4
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_request.cc
@@ -0,0 +1,114 @@
+/*
+ Copyright (c) 2020, Ford Motor Company, Livio
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/bc_set_app_properties_request.h"
+#include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
+#include "application_manager/rpc_service.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+BCSetAppPropertiesRequest::BCSetAppPropertiesRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : RequestFromHMI(message,
+                     application_manager,
+                     rpc_service,
+                     hmi_capabilities,
+                     policy_handler) {}
+
+void BCSetAppPropertiesRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto& properties =
+      (*message_)[strings::msg_params][strings::properties];
+
+  const auto policy_app_id(properties[strings::policy_app_id].asString());
+
+  const auto properties_change_status =
+      policy_handler_.GetAppPropertiesStatus(properties, policy_app_id);
+
+  using AppPropertiesState = policy::PolicyHandlerInterface::AppPropertiesState;
+  const bool are_properties_changed =
+      AppPropertiesState::NO_CHANGES != properties_change_status;
+
+  const bool is_new_app = policy_handler_.IsNewApplication(policy_app_id);
+
+  policy_handler_.OnSetAppProperties(properties);
+  SendResponse(true,
+               (*message_)[strings::params][strings::correlation_id].asUInt(),
+               hmi_apis::FunctionID::BasicCommunication_SetAppProperties,
+               hmi_apis::Common_Result::SUCCESS);
+
+  if (are_properties_changed || is_new_app) {
+    const auto notification =
+        MessageHelper::CreateOnAppPropertiesChangeNotification(
+            policy_app_id, application_manager_);
+    application_manager_.GetRPCService().ManageHMICommand(notification);
+  }
+  if (is_new_app) {
+    LOG4CXX_ERROR(logger_,
+                  "Message contains unknow policyAppId: "
+                      << policy_app_id << ", PTU will be triggered");
+    policy_handler_.OnLocalAppAdded();
+  }
+
+  auto app_enabled = [this]() -> bool {
+    auto& properties = (*message_)[strings::msg_params][strings::properties];
+    if (properties.keyExists(strings::enabled)) {
+      return properties[strings::enabled].asBool();
+    }
+    return false;
+  };
+
+  const bool enable_flag_switch =
+      AppPropertiesState::ENABLED_FLAG_SWITCH == properties_change_status;
+
+  if (app_enabled() && (enable_flag_switch || is_new_app)) {
+    application_manager_.CreatePendingLocalApplication(policy_app_id);
+    application_manager_.SendUpdateAppList();
+    return;
+  }
+
+  if (enable_flag_switch) {
+    application_manager_.RemovePendingApplication(policy_app_id);
+    application_manager_.SendUpdateAppList();
+  }
+}
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_response.cc
new file mode 100644
index 0000000000..928a17d0f8
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/bc_set_app_properties_response.cc
@@ -0,0 +1,62 @@
+/*
+ Copyright (c) 2020, Ford Motor Company, Livio
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/bc_set_app_properties_response.h"
+#include "application_manager/application_impl.h"
+#include "application_manager/event_engine/event.h"
+#include "application_manager/policies/policy_handler_interface.h"
+#include "application_manager/rpc_service.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+BCSetAppPropertiesResponse::BCSetAppPropertiesResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : ResponseToHMI(message,
+                    application_manager,
+                    rpc_service,
+                    hmi_capabilities,
+                    policy_handler) {}
+
+void BCSetAppPropertiesResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  rpc_service_.SendMessageToHMI(message_);
+}
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc
index 3dbdf528a5..baff925a4e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_system_info_response.cc
@@ -31,6 +31,7 @@
  */
 #include "sdl_rpc_plugin/commands/hmi/get_system_info_response.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc
deleted file mode 100644
index 54a9633a37..0000000000
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls.cc
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2018, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "sdl_rpc_plugin/commands/hmi/get_urls.h"
-#include "application_manager/application_manager.h"
-#include "application_manager/message.h"
-#include "application_manager/policies/policy_handler.h"
-#include "application_manager/rpc_service.h"
-#include "utils/helpers.h"
-
-namespace sdl_rpc_plugin {
-using namespace application_manager;
-namespace commands {
-
-GetUrls::GetUrls(const application_manager::commands::MessageSharedPtr& message,
-                 ApplicationManager& application_manager,
-                 rpc_service::RPCService& rpc_service,
-                 HMICapabilities& hmi_capabilities,
-                 policy::PolicyHandlerInterface& policy_handle)
-    : RequestFromHMI(message,
-                     application_manager,
-                     rpc_service,
-                     hmi_capabilities,
-                     policy_handle) {}
-
-GetUrls::~GetUrls() {}
-
-void GetUrls::Run() {
-  LOG4CXX_AUTO_TRACE(logger_);
-  namespace Common_Result = hmi_apis::Common_Result;
-  using policy::EndpointUrls;
-
-  if (!policy_handler_.PolicyEnabled()) {
-    SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE);
-    return;
-  }
-
-  const uint32_t service_to_check =
-      (*message_)[strings::msg_params][hmi_request::service].asUInt();
-
-  EndpointUrls endpoints;
-  policy_handler_.GetUpdateUrls(service_to_check, endpoints);
-
-  if (endpoints.empty()) {
-    LOG4CXX_ERROR(logger_, "No URLs for service " << service_to_check);
-    SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE);
-    return;
-  }
-
-#ifdef PROPRIETARY_MODE
-  const uint32_t policy_service = 7u;
-
-  if (policy_service == service_to_check) {
-    ProcessPolicyServiceURLs(endpoints);
-    return;
-  }
-#endif  // PROPRIETARY_MODE
-
-  ProcessServiceURLs(endpoints);
-}
-
-void GetUrls::ProcessServiceURLs(const policy::EndpointUrls& endpoints) {
-  namespace Common_Result = hmi_apis::Common_Result;
-  using smart_objects::SmartObject;
-
-  (*message_)[strings::msg_params].erase(hmi_request::service);
-  SmartObject& urls = (*message_)[strings::msg_params][hmi_response::urls];
-
-  size_t index = 0;
-  for (size_t e = 0; e < endpoints.size(); ++e) {
-    ApplicationSharedPtr app =
-        application_manager_.application_by_policy_id(endpoints[e].app_id);
-
-#ifndef PROPRIETARY_MODE
-    bool registered_not_default = false;
-    if (policy::kDefaultId != endpoints[e].app_id) {
-      if (!app) {
-        LOG4CXX_ERROR(logger_,
-                      "Can't find application with policy id "
-                          << endpoints[e].app_id
-                          << " URLs adding for this application is skipped.");
-        continue;
-      }
-      registered_not_default = true;
-    }
-#endif  // EXTERNAL_PROPRIETARY_MODE || HTTP
-    for (size_t u = 0; u < endpoints[e].url.size(); ++u, ++index) {
-      const std::string& app_url = endpoints[e].url[u];
-      SmartObject& service_info = urls[index];
-
-      service_info[strings::url] = app_url;
-#ifndef PROPRIETARY_MODE
-      if (registered_not_default) {
-        service_info[strings::app_id] = app->hmi_app_id();
-      }
-#else  // EXTERNAL_PROPRIETARY_MODE || HTTP
-      service_info[hmi_response::policy_app_id] = endpoints[e].app_id;
-#endif
-    }
-  }
-  SendResponseToHMI(Common_Result::SUCCESS);
-}
-
-void GetUrls::SendResponseToHMI(hmi_apis::Common_Result::eType result) {
-  (*message_)[strings::params][strings::message_type] = MessageType::kResponse;
-  (*message_)[strings::params][hmi_response::code] = result;
-  rpc_service_.ManageHMICommand(message_);
-}
-
-#ifdef PROPRIETARY_MODE
-struct PolicyAppIdComparator {
-  PolicyAppIdComparator(const std::string& policy_app_id)
-      : policy_app_id_(policy_app_id) {}
-
-  bool operator()(const policy::EndpointData& data) {
-    return data.app_id == policy_app_id_;
-  }
-  std::string policy_app_id_;
-};
-
-void FillSODefaultUrls(smart_objects::SmartObject& urls,
-                       const policy::EndpointUrls& endpoints) {
-  using smart_objects::SmartObject;
-  PolicyAppIdComparator comparator(policy::kDefaultId);
-  policy::EndpointUrls::const_iterator it =
-      std::find_if(endpoints.begin(), endpoints.end(), comparator);
-  if (it == endpoints.end()) {
-    return;
-  }
-  SmartObject service_info = SmartObject(smart_objects::SmartType_Map);
-  for (size_t i = 0; i < (*it).url.size(); ++i) {
-    service_info[strings::url] = (*it).url[i];
-    urls[i] = service_info;
-  }
-}
-
-void GetUrls::ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  using namespace smart_objects;
-  using namespace application_manager;
-  using namespace strings;
-  using namespace hmi_apis;
-
-  const uint32_t app_id_to_send_to = policy_handler_.GetAppIdForSending();
-
-  if (!app_id_to_send_to) {
-    LOG4CXX_ERROR(logger_,
-                  "There are no available applications for processing.");
-    SmartObject urls(SmartType_Array);
-    FillSODefaultUrls(urls, endpoints);
-    if (!urls.empty()) {
-      (*message_)[msg_params][hmi_response::urls] = urls;
-    }
-    (*message_).erase(hmi_request::service);
-    SendResponseToHMI(Common_Result::SUCCESS);
-    return;
-  }
-
-  ApplicationSharedPtr app =
-      application_manager_.application(app_id_to_send_to);
-
-  if (app.use_count() == 0) {
-    LOG4CXX_WARN(logger_,
-                 "There is no registered application with "
-                 "connection key '"
-                     << app_id_to_send_to << "'");
-    SendResponseToHMI(Common_Result::DATA_NOT_AVAILABLE);
-    return;
-  }
-
-  SmartObject& object = *message_;
-  object[msg_params].erase(hmi_request::service);
-  object[msg_params][hmi_response::urls] = SmartObject(SmartType_Array);
-  SmartObject& urls = object[msg_params][hmi_response::urls];
-  const std::string mobile_app_id = app->policy_app_id();
-
-  size_t index = 0;
-  for (size_t i = 0; i < endpoints.size(); ++i) {
-    using namespace helpers;
-
-    const bool to_add = Compare<std::string, EQ, ONE>(
-        endpoints[i].app_id, mobile_app_id, policy::kDefaultId);
-    const bool is_default = policy::kDefaultId == endpoints[i].app_id;
-
-    if (to_add) {
-      for (size_t k = 0; k < endpoints[i].url.size(); ++k) {
-        if (!is_default) {
-          urls[index][strings::app_id] = app_id_to_send_to;
-        }
-        urls[index][strings::url] = endpoints[i].url[k];
-        ++index;
-      }
-    }
-  }
-  SendResponseToHMI(Common_Result::SUCCESS);
-  return;
-}
-#endif  // PROPRIETARY_MODE
-
-}  // namespace commands
-}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc
index 371f47a759..47f2f2505e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_audio_start_stream_request.cc
@@ -113,7 +113,7 @@ void AudioStartStreamRequest::on_event(const event_engine::Event& event) {
 
       if (hmi_apis::Common_Result::SUCCESS == code) {
         LOG4CXX_INFO(logger_, "StartAudioStream response SUCCESS");
-        if (application_manager_.HMILevelAllowsStreaming(app->app_id(),
+        if (application_manager_.HMIStateAllowsStreaming(app->app_id(),
                                                          ServiceType::kAudio)) {
           app->set_audio_streaming_approved(true);
         } else {
@@ -171,11 +171,11 @@ void AudioStartStreamRequest::RetryStartSession() {
   }
 
   uint32_t curr_retry_number = app->audio_stream_retry_number();
-  LOG4CXX_DEBUG(
-      logger_, "Retry number " << curr_retry_number << " of " << retry_number_);
 
-  if (curr_retry_number < retry_number_) {
-    LOG4CXX_DEBUG(logger_, "Send AudioStartStream retry");
+  if (curr_retry_number <= retry_number_) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "Retry number " << curr_retry_number << " of " << retry_number_);
     MessageHelper::SendAudioStartStream(app->app_id(), application_manager_);
     app->set_audio_stream_retry_number(++curr_retry_number);
   } else {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc
index 7f643d6130..00974085c3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/navi_start_stream_request.cc
@@ -64,8 +64,9 @@ NaviStartStreamRequest::NaviStartStreamRequest(
 }
 
 NaviStartStreamRequest::~NaviStartStreamRequest() {
-  // unsubscribe_from_all_events() in EventObserver's destructor isn't enough;
-  // we must unsubscribe before this NaviStartStreamRequest instance is removed
+  // unsubscribe_from_all_hmi_events() in EventObserver's destructor isn't
+  // enough; we must unsubscribe before this NaviStartStreamRequest instance is
+  // removed
   unsubscribe_from_event(hmi_apis::FunctionID::Navigation_StartStream);
 }
 
@@ -114,7 +115,7 @@ void NaviStartStreamRequest::on_event(const event_engine::Event& event) {
 
       if (hmi_apis::Common_Result::SUCCESS == code) {
         LOG4CXX_INFO(logger_, "NaviStartStreamResponse SUCCESS");
-        if (application_manager_.HMILevelAllowsStreaming(
+        if (application_manager_.HMIStateAllowsStreaming(
                 app->app_id(), ServiceType::kMobileNav)) {
           app->set_video_streaming_approved(true);
         } else {
@@ -172,11 +173,11 @@ void NaviStartStreamRequest::RetryStartSession() {
   }
 
   uint32_t curr_retry_number = app->video_stream_retry_number();
-  LOG4CXX_DEBUG(
-      logger_, "Retry number " << curr_retry_number << " of " << retry_number_);
 
-  if (curr_retry_number < retry_number_) {
-    LOG4CXX_DEBUG(logger_, "Send NaviStartStream retry");
+  if (curr_retry_number <= retry_number_) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "Retry number " << curr_retry_number << " of " << retry_number_);
     MessageHelper::SendNaviStartStream(app->app_id(), application_manager_);
     app->set_video_stream_retry_number(++curr_retry_number);
   } else {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_properties_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_properties_change_notification.cc
new file mode 100644
index 0000000000..f1fa703bbb
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_app_properties_change_notification.cc
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/on_app_properties_change_notification.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+OnAppPropertiesChangeNotification::OnAppPropertiesChangeNotification(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : NotificationToHMI(message,
+                        application_manager,
+                        rpc_service,
+                        hmi_capabilities,
+                        policy_handle) {}
+
+void OnAppPropertiesChangeNotification::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  SendNotification();
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc
index 37dca47793..1a104c0fa1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification.cc
@@ -161,6 +161,15 @@ void OnBCSystemCapabilityUpdatedNotification::Run() {
                 [strings::app_services_capabilities] = app_service_caps;
       break;
     }
+    case mobile_apis::SystemCapabilityType::DISPLAYS: {
+      if (!hmi_capabilities_.system_display_capabilities()) {
+        LOG4CXX_INFO(logger_, "system_display_capabilities are not available");
+        return;
+      }
+      msg_params[strings::system_capability][strings::display_capabilities] =
+          *hmi_capabilities_.system_display_capabilities();
+      break;
+    }
     default:
       return;
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc
new file mode 100644
index 0000000000..f32aef1102
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.cc
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.h"
+
+#include "application_manager/display_capabilities_builder.h"
+#include "application_manager/message_helper.h"
+#include "interfaces/HMI_API.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+OnBCSystemCapabilityUpdatedNotificationFromHMI::
+    OnBCSystemCapabilityUpdatedNotificationFromHMI(
+        const application_manager::commands::MessageSharedPtr& message,
+        ApplicationManager& application_manager,
+        rpc_service::RPCService& rpc_service,
+        HMICapabilities& hmi_capabilities,
+        policy::PolicyHandlerInterface& policy_handle)
+    : NotificationFromHMI(message,
+                          application_manager,
+                          rpc_service,
+                          hmi_capabilities,
+                          policy_handle) {}
+
+OnBCSystemCapabilityUpdatedNotificationFromHMI::
+    ~OnBCSystemCapabilityUpdatedNotificationFromHMI() {}
+
+OnBCSystemCapabilityUpdatedNotificationFromHMI::
+    ProcessSystemDisplayCapabilitiesResult
+    OnBCSystemCapabilityUpdatedNotificationFromHMI::
+        ProcessSystemDisplayCapabilities(
+            const smart_objects::SmartObject& display_capabilities) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!(*message_)[strings::msg_params].keyExists(strings::app_id)) {
+    LOG4CXX_DEBUG(logger_, "Updating general display capabilities");
+    hmi_capabilities_.set_system_display_capabilities(display_capabilities);
+    return ProcessSystemDisplayCapabilitiesResult::SUCCESS;
+  }
+
+  const auto app_id =
+      (*message_)[strings::msg_params][strings::app_id].asUInt();
+  auto app = application_manager_.application(app_id);
+  if (!app) {
+    LOG4CXX_ERROR(logger_,
+                  "Application with app_id " << app_id << " is not registered");
+    return ProcessSystemDisplayCapabilitiesResult::FAIL;
+  }
+
+  LOG4CXX_DEBUG(logger_, "Updating display capabilities for app " << app_id);
+  app->set_display_capabilities(display_capabilities);
+
+  // Remove app_id from notification to mobile
+  (*message_)[strings::params][strings::connection_key] =
+      (*message_)[strings::msg_params][strings::app_id];
+  (*message_)[strings::msg_params].erase(strings::app_id);
+  if (app->is_resuming() && app->is_app_data_resumption_allowed()) {
+    LOG4CXX_DEBUG(logger_, "Application is resuming");
+    app->display_capabilities_builder().UpdateDisplayCapabilities(
+        display_capabilities);
+    return ProcessSystemDisplayCapabilitiesResult::CAPABILITIES_CACHED;
+  }
+
+  return ProcessSystemDisplayCapabilitiesResult::SUCCESS;
+}
+
+void OnBCSystemCapabilityUpdatedNotificationFromHMI::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  // Prepare SmartObject for mobile factory
+  (*message_)[strings::params][strings::function_id] = static_cast<int32_t>(
+      mobile_apis::FunctionID::OnSystemCapabilityUpdatedID);
+
+  const auto& system_capability =
+      (*message_)[strings::msg_params][strings::system_capability];
+
+  switch (system_capability[strings::system_capability_type].asInt()) {
+    case mobile_apis::SystemCapabilityType::DISPLAYS: {
+      if (system_capability.keyExists(strings::display_capabilities)) {
+        const auto result = ProcessSystemDisplayCapabilities(
+            system_capability[strings::display_capabilities]);
+        if (ProcessSystemDisplayCapabilitiesResult::FAIL == result) {
+          LOG4CXX_ERROR(
+              logger_,
+              "Failed to process display capabilities. Notification will "
+              "be ignored");
+          return;
+        } else if (ProcessSystemDisplayCapabilitiesResult::
+                       CAPABILITIES_CACHED == result) {
+          LOG4CXX_TRACE(logger_,
+                        "Capabilities are being cached for resuming app");
+          return;
+        }
+      }
+      break;
+    }
+    case mobile_apis::SystemCapabilityType::REMOTE_CONTROL: {
+      if (system_capability.keyExists(strings::rc_capability)) {
+        LOG4CXX_DEBUG(logger_, "Updating RC Capabilities");
+        hmi_capabilities_.set_rc_capability(
+            system_capability[strings::rc_capability]);
+      }
+      break;
+    }
+  }
+
+  SendNotificationToMobile(message_);
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc
index 9ddd822b1c..129ba8c9ba 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_device_state_changed_notification.cc
@@ -34,6 +34,7 @@
 #include <algorithm>
 #include "application_manager/application_manager.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "encryption/hashing.h"
 #include "interfaces/HMI_API.h"
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc
index 4229369acc..a743c58672 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_driver_distraction_notification.cc
@@ -35,6 +35,7 @@
 
 #include "application_manager/application_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
 
@@ -65,7 +66,11 @@ struct OnDriverDistractionProcessor {
       const RPCParams params;
       policy::CheckPermissionResult result;
       application_manager_.GetPolicyHandler().CheckPermissions(
-          application, stringified_function_id_, params, result);
+          application,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+          stringified_function_id_,
+          params,
+          result);
       auto& msg_params = message[strings::msg_params];
       const bool is_lock_screen_dismissal_exists = msg_params.keyExists(
           mobile_notification::lock_screen_dismissal_enabled);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc
index 11647e2140..3eec6c5d1a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_exit_application_notification.cc
@@ -119,12 +119,7 @@ void OnExitApplicationNotification::Run() {
     }
   }
 
-  application_manager_.state_controller().SetRegularState(
-      app_impl,
-      HMILevel::HMI_NONE,
-      AudioStreamingState::NOT_AUDIBLE,
-      VideoStreamingState::NOT_STREAMABLE,
-      false);
+  application_manager_.state_controller().ExitDefaultWindow(app_impl);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc
index 9c2c68989f..1e8da19c0a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_ignition_cycle_over_notification.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/on_ignition_cycle_over_notification.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc
index 67352fbc4a..a0e75371b5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_policy_update.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/on_policy_update.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc
index 4a8c8df0ee..b2c9151b40 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_received_policy_update.cc
@@ -33,6 +33,7 @@
 #include "sdl_rpc_plugin/commands/hmi/on_received_policy_update.h"
 #include <string>
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "utils/file_system.h"
 
 namespace sdl_rpc_plugin {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_service_update_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_service_update_notification.cc
new file mode 100644
index 0000000000..de03b75214
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_service_update_notification.cc
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/on_service_update_notification.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+namespace hmi {
+
+OnServiceUpdateNotification::OnServiceUpdateNotification(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : NotificationToHMI(message,
+                        application_manager,
+                        rpc_service,
+                        hmi_capabilities,
+                        policy_handler) {}
+
+OnServiceUpdateNotification::~OnServiceUpdateNotification() {}
+
+void OnServiceUpdateNotification::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  SendNotification();
+}
+
+}  // namespace hmi
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc
index 38b87f23d3..bf52492ae1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_context_notification.cc
@@ -62,13 +62,27 @@ void OnSystemContextNotification::Run() {
           (*message_)[strings::msg_params][hmi_notification::system_context]
               .asInt());
 
+  WindowID window_id = mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+  if ((*message_)[strings::msg_params].keyExists(strings::window_id)) {
+    window_id = (*message_)[strings::msg_params][strings::window_id].asInt();
+  }
+
   ApplicationSharedPtr app;
-  if ((mobile_api::SystemContext::SYSCTXT_VRSESSION == system_context) ||
-      (mobile_api::SystemContext::SYSCTXT_MENU == system_context) ||
-      (mobile_api::SystemContext::SYSCTXT_HMI_OBSCURED == system_context)) {
+  if (helpers::
+          Compare<mobile_api::SystemContext::eType, helpers::EQ, helpers::ONE>(
+              system_context,
+              mobile_api::SystemContext::SYSCTXT_VRSESSION,
+              mobile_api::SystemContext::SYSCTXT_MENU,
+              mobile_api::SystemContext::SYSCTXT_HMI_OBSCURED)) {
     app = application_manager_.active_application();
-  } else if ((mobile_api::SystemContext::SYSCTXT_ALERT == system_context) ||
-             (mobile_api::SystemContext::SYSCTXT_MAIN == system_context)) {
+  }
+
+  if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW != window_id ||
+      helpers::Compare<mobile_api::SystemContext::eType,
+                       helpers::EQ,
+                       helpers::ONE>(system_context,
+                                     mobile_api::SystemContext::SYSCTXT_ALERT,
+                                     mobile_api::SystemContext::SYSCTXT_MAIN)) {
     if ((*message_)[strings::msg_params].keyExists(strings::app_id)) {
       app = application_manager_.application(
           (*message_)[strings::msg_params][strings::app_id].asUInt());
@@ -76,8 +90,8 @@ void OnSystemContextNotification::Run() {
   }
 
   if (app && mobile_api::SystemContext::INVALID_ENUM != system_context) {
-    application_manager_.state_controller().SetRegularState(app,
-                                                            system_context);
+    application_manager_.state_controller().SetRegularState(
+        app, window_id, system_context);
   } else {
     LOG4CXX_ERROR(logger_, "Application does not exist");
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc
index 6a5ee4fce4..9b8523e882 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_error_notification.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/on_system_error_notification.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "interfaces/HMI_API.h"
 
 namespace sdl_rpc_plugin {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc
index b7ba6951fb..171c144055 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_info_changed_notification.cc
@@ -33,6 +33,7 @@
 #include "sdl_rpc_plugin/commands/hmi/on_system_info_changed_notification.h"
 #include "application_manager/application_manager.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc
index a9670681b2..4f83e3e653 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_system_request_notification.cc
@@ -37,6 +37,10 @@
 #include "sdl_rpc_plugin/commands/hmi/on_system_request_notification.h"
 #include "utils/macro.h"
 
+#ifdef EXTERNAL_PROPRIETARY_MODE
+#include "policy/ptu_retry_handler.h"
+#endif  // EXTERNAL_PROPRIETARY_MODE
+
 using policy::PolicyHandlerInterface;
 
 namespace sdl_rpc_plugin {
@@ -67,6 +71,39 @@ void OnSystemRequestNotification::Run() {
   params[strings::function_id] =
       static_cast<int32_t>(mobile_apis::FunctionID::eType::OnSystemRequestID);
 
+  using namespace rpc::policy_table_interface_base;
+  const auto request_type =
+      static_cast<rpc::policy_table_interface_base::RequestType>(
+          (*message_)[strings::msg_params][strings::request_type].asUInt());
+
+#ifdef PROPRIETARY_MODE
+  if (RequestType::RT_PROPRIETARY == request_type) {
+    if (msg_params.keyExists(strings::url)) {
+      // For backward-compatibility, the URL is cached for retries if provided
+      // by HMI
+      policy_handler_.CacheRetryInfo(msg_params.keyExists(strings::app_id)
+                                         ? msg_params[strings::app_id].asUInt()
+                                         : 0,
+                                     msg_params[strings::url].asString(),
+                                     msg_params[strings::file_name].asString());
+    } else {
+      // Clear cached retry info
+      policy_handler_.CacheRetryInfo(
+          0, std::string(), msg_params[strings::file_name].asString());
+
+      // URL and app are chosen by Core for PROPRIETARY mode normally
+      uint32_t app_id = 0;
+      msg_params[strings::url] = policy_handler_.GetNextUpdateUrl(
+          policy::PTUIterationType::DefaultIteration, app_id);
+      if (0 == app_id) {
+        LOG4CXX_WARN(logger_,
+                     "Can't select application to forward OnSystemRequest.");
+        return;
+      }
+      msg_params[strings::app_id] = app_id;
+    }
+  }
+#endif
   // According to HMI API, this should be HMI unique id, but during processing
   // messages from HMI this param is replaced by connection key, so below it
   // will be treated as connection key
@@ -81,8 +118,7 @@ void OnSystemRequestNotification::Run() {
                   "Received OnSystemRequest without appID."
                   " One of registered apps will be used.");
     LOG4CXX_DEBUG(logger_, "Searching registered app to send OnSystemRequest.");
-    const PolicyHandlerInterface& policy_handler = policy_handler_;
-    const uint32_t selected_app_id = policy_handler.GetAppIdForSending();
+    const uint32_t selected_app_id = policy_handler_.GetAppIdForSending();
     if (0 == selected_app_id) {
       LOG4CXX_WARN(logger_,
                    "Can't select application to forward OnSystemRequest.");
@@ -116,6 +152,11 @@ void OnSystemRequestNotification::Run() {
                 "Sending request with application id " << app->policy_app_id());
 
   params[strings::connection_key] = app->app_id();
+
+  if (helpers::Compare<RequestType, helpers::EQ, helpers::ONE>(
+          request_type, RequestType::RT_PROPRIETARY, RequestType::RT_HTTP)) {
+    policy_handler_.OnSystemRequestReceived();
+  }
   SendNotificationToMobile(message_);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc
index 7680b74426..c4678f69e0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_command_notification.cc
@@ -65,14 +65,17 @@ void OnVRCommandNotification::Run() {
       (*message_)[strings::msg_params][strings::cmd_id].asUInt();
   uint32_t max_cmd_id = application_manager_.get_settings().max_cmd_id();
 
-  // Check if this is one of standart VR commands (i.e. "Help")
+  // Check if this is one of standard VR commands (i.e. "Help")
   if (cmd_id > max_cmd_id + 1) {
     LOG4CXX_INFO(logger_, "Switched App");
     const uint32_t app_id = cmd_id - max_cmd_id;
     ApplicationSharedPtr app = application_manager_.application(app_id);
     if (app) {
       application_manager_.state_controller().SetRegularState(
-          app, mobile_apis::HMILevel::HMI_FULL, true);
+          app,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+          mobile_apis::HMILevel::HMI_FULL,
+          true);
     } else {
       LOG4CXX_ERROR(logger_, "Unable to find appication " << app_id);
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
index 55c6eb8881..c308af9b92 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/on_vr_language_change_notification.cc
@@ -83,7 +83,10 @@ void OnVRLanguageChangeNotification::Run() {
     if (static_cast<int32_t>(app->language()) !=
         (*message_)[strings::msg_params][strings::language].asInt()) {
       application_manager_.state_controller().SetRegularState(
-          app, mobile_api::HMILevel::HMI_NONE, false);
+          app,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+          mobile_apis::HMILevel::HMI_NONE,
+          false);
 
       rpc_service_.ManageMobileCommand(
           MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc
index f4651ee0cb..128b111c5e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/rc_get_capabilities_response.cc
@@ -54,14 +54,24 @@ void RCGetCapabilitiesResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   HMICapabilities& hmi_capabilities = hmi_capabilities_;
-  bool capability_exists =
+  bool rc_capability_exists =
       (*message_)[strings::msg_params].keyExists(strings::rc_capability);
 
-  if (capability_exists) {
+  if (rc_capability_exists) {
     hmi_capabilities.set_rc_capability(
         (*message_)[strings::msg_params][strings::rc_capability]);
   }
-  hmi_capabilities.set_rc_supported(capability_exists);
+
+  bool seat_location_capability_exists =
+      (*message_)[strings::msg_params].keyExists(
+          strings::seat_location_capability);
+
+  if (seat_location_capability_exists) {
+    hmi_capabilities.set_seat_location_capability(
+        (*message_)[strings::msg_params][strings::seat_location_capability]);
+  }
+
+  hmi_capabilities.set_rc_supported(rc_capability_exists);
 }
 
 }  // namespace commands
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
index 30184be7a1..0a6632fca8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_activate_app_request.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_request.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/state_controller.h"
 
 namespace sdl_rpc_plugin {
@@ -153,10 +154,6 @@ void SDLActivateAppRequest::Run() {
       application_manager_.application(application_id);
 
   if (!app_to_activate) {
-    LOG4CXX_WARN(
-        logger_,
-        "Can't find application within regular apps: " << application_id);
-
     // Here is the hack - in fact SDL gets hmi_app_id in appID field and
     // replaces it with connection_key only for normally registered apps, but
     // for apps_to_be_registered (waiting) it keeps original value (hmi_app_id)
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc
index 095ffbd9c7..c8266e0f39 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_list_of_permissions_request.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_policy_configuration_data_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_policy_configuration_data_request.cc
new file mode 100644
index 0000000000..52b7f83e9b
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_policy_configuration_data_request.cc
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_request.h"
+#include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+SDLGetPolicyConfigurationDataRequest::SDLGetPolicyConfigurationDataRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : RequestFromHMI(message,
+                     application_manager,
+                     rpc_service,
+                     hmi_capabilities,
+                     policy_handle) {}
+
+SDLGetPolicyConfigurationDataRequest::~SDLGetPolicyConfigurationDataRequest() {}
+
+void SDLGetPolicyConfigurationDataRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  smart_objects::SmartObject response_value(
+      smart_objects::SmartType::SmartType_Array);
+
+  hmi_apis::Common_Result::eType result_code =
+      PrepareResponseParams(response_value);
+
+  if (hmi_apis::Common_Result::SUCCESS != result_code) {
+    LOG4CXX_ERROR(logger_, "Unable to PrepareResponseParams");
+    SendErrorResponse(
+        correlation_id(),
+        hmi_apis::FunctionID::SDL_GetPolicyConfigurationData,
+        result_code,
+        "",
+        application_manager::commands::Command::SOURCE_SDL_TO_HMI);
+    return;
+  }
+
+  smart_objects::SmartObject response_msg_params(
+      smart_objects::SmartType::SmartType_Map);
+  response_msg_params[strings::value] = response_value;
+  SendResponse(true,
+               correlation_id(),
+               hmi_apis::FunctionID::SDL_GetPolicyConfigurationData,
+               result_code,
+               &response_msg_params,
+               application_manager::commands::Command::SOURCE_SDL_TO_HMI);
+}
+
+hmi_apis::Common_Result::eType
+SDLGetPolicyConfigurationDataRequest::PrepareResponseParams(
+    smart_objects::SmartObject& response_out) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto policy_type =
+      (*message_)[strings::msg_params][strings::policy_type].asString();
+
+  const auto property =
+      (*message_)[strings::msg_params][strings::property].asString();
+
+  auto policy_table_data = policy_handler_.GetPolicyTableData();
+  if (!policy_table_data.isMember(policy_type)) {
+    LOG4CXX_ERROR(
+        logger_,
+        "policy_type " << policy_type << " doesn't exist in policy table.");
+    return hmi_apis::Common_Result::DATA_NOT_AVAILABLE;
+  }
+
+  auto& policy_section_table_data = policy_table_data[policy_type];
+  if (!policy_section_table_data.isMember(property)) {
+    LOG4CXX_ERROR(
+        logger_,
+        "property " << property << " doesn't exist in " << policy_type);
+    return hmi_apis::Common_Result::DATA_NOT_AVAILABLE;
+  }
+
+  auto& property_table_data = policy_section_table_data[property];
+  response_out = GetValueParam(property_table_data);
+
+  return hmi_apis::Common_Result::SUCCESS;
+}
+
+void clear_new_line_symbol(std::string& str_to_clear) {
+  str_to_clear.erase(
+      std::remove_if(str_to_clear.begin(),
+                     str_to_clear.end(),
+                     [](char character) { return '\n' == character; }),
+      str_to_clear.end());
+}
+
+smart_objects::SmartObject SDLGetPolicyConfigurationDataRequest::GetValueParam(
+    const Json::Value& policy_property) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  smart_objects::SmartObject value(smart_objects::SmartType_Array);
+
+  auto put_element_in_value_array = [&value](const Json::Value& element,
+                                             const int32_t index) {
+    Json::StreamWriterBuilder writer_builder;
+    writer_builder["indentation"] = "";
+    std::string str;
+    if (element.type() == Json::objectValue) {
+      str = Json::writeString(writer_builder, element);
+      clear_new_line_symbol(str);
+    } else {
+      str = element.asString();
+    }
+    value[index] = str;
+  };
+
+  if (policy_property.type() == Json::arrayValue) {
+    for (Json::ArrayIndex i = 0; i < policy_property.size(); i++) {
+      put_element_in_value_array(policy_property[i], i);
+    }
+    return value;
+  }
+  put_element_in_value_array(policy_property, 0);
+  return value;
+}
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_policy_configuration_data_response.cc
index 77d90ec8bb..21b7dea41c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/get_urls_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_policy_configuration_data_response.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Ford Motor Company
+ * Copyright (c) 2019, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,14 +30,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "sdl_rpc_plugin/commands/hmi/get_urls_response.h"
+#include "sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_response.h"
 #include "application_manager/rpc_service.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
+
 namespace commands {
 
-GetUrlsResponse::GetUrlsResponse(
+SDLGetPolicyConfigurationDataResponse::SDLGetPolicyConfigurationDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
     ApplicationManager& application_manager,
     rpc_service::RPCService& rpc_service,
@@ -49,13 +50,13 @@ GetUrlsResponse::GetUrlsResponse(
                     hmi_capabilities,
                     policy_handle) {}
 
-GetUrlsResponse::~GetUrlsResponse() {}
+SDLGetPolicyConfigurationDataResponse::
+    ~SDLGetPolicyConfigurationDataResponse() {}
 
-void GetUrlsResponse::Run() {
+void SDLGetPolicyConfigurationDataResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
   (*message_)[strings::params][strings::protocol_type] = hmi_protocol_type_;
   (*message_)[strings::params][strings::protocol_version] = protocol_version_;
-
   rpc_service_.SendMessageToHMI(message_);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc
index 7200f6918c..b494be56e8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_status_update_request.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc
index 28167df047..f853cf814c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_get_user_friendly_message_request.cc
@@ -32,6 +32,7 @@
 
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
@@ -68,7 +69,16 @@ void SDLGetUserFriendlyMessageRequest::Run() {
   smart_objects::SmartArray::const_iterator it = msg->begin();
   smart_objects::SmartArray::const_iterator it_end = msg->end();
   for (; it != it_end; ++it) {
-    msg_codes.push_back((*it).asString());
+    std::string str = (*it).asString();
+    if (!CheckSyntax(str)) {
+      LOG4CXX_WARN(logger_, "Invalid data");
+      SendErrorResponse(correlation_id(),
+                        static_cast<hmi_apis::FunctionID::eType>(function_id()),
+                        hmi_apis::Common_Result::INVALID_DATA,
+                        "invalid messageCode syntax");
+      return;
+    }
+    msg_codes.push_back(str);
   }
 
   std::string required_language;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc
index 12cdfb4ad9..bfbf73270e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/sdl_policy_update_response.cc
@@ -31,6 +31,7 @@
  */
 
 #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
@@ -52,7 +53,20 @@ SDLPolicyUpdateResponse::~SDLPolicyUpdateResponse() {}
 
 void SDLPolicyUpdateResponse::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
-  // TODO(PV): add some logic here
+  const hmi_apis::Common_Result::eType code =
+      static_cast<hmi_apis::Common_Result::eType>(
+          (*message_)[strings::params][hmi_response::code].asInt());
+
+  if (helpers::Compare<hmi_apis::Common_Result::eType,
+                       helpers::NEQ,
+                       helpers::ALL>(code,
+                                     hmi_apis::Common_Result::SUCCESS,
+                                     hmi_apis::Common_Result::WARNINGS)) {
+    LOG4CXX_ERROR(logger_, "Error is returned. PTU won't be started.");
+    return;
+  }
+
+  application_manager_.GetPolicyHandler().OnUpdateRequestSentToMobile();
 }
 }  // namespace commands
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc
index bf449db808..793e70d9e1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_alert_request.cc
@@ -47,7 +47,11 @@ UIAlertRequest::UIAlertRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle) {}
+                   policy_handle) {
+  const auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t request_timeout = msg_params[strings::duration].asUInt();
+  default_timeout_ += request_timeout;
+}
 
 UIAlertRequest::~UIAlertRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_cancel_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_cancel_interaction_request.cc
new file mode 100644
index 0000000000..c186077b1e
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_cancel_interaction_request.cc
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_request.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+UICancelInteractionRequest::UICancelInteractionRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : RequestToHMI(message,
+                   application_manager,
+                   rpc_service,
+                   hmi_capabilities,
+                   policy_handle) {}
+
+UICancelInteractionRequest::~UICancelInteractionRequest() {}
+
+void UICancelInteractionRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  SendRequest();
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_cancel_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_cancel_interaction_response.cc
new file mode 100644
index 0000000000..2d5db4eecb
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_cancel_interaction_response.cc
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_response.h"
+#include "application_manager/event_engine/event.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+UICancelInteractionResponse::UICancelInteractionResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : ResponseFromHMI(message,
+                      application_manager,
+                      rpc_service,
+                      hmi_capabilities,
+                      policy_handle) {}
+
+UICancelInteractionResponse::~UICancelInteractionResponse() {}
+
+void UICancelInteractionResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  event_engine::Event event(hmi_apis::FunctionID::UI_CancelInteraction);
+  event.set_smart_object(*message_);
+  event.raise(application_manager_.event_dispatcher());
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_create_window_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_create_window_request.cc
new file mode 100644
index 0000000000..b354009e3f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_create_window_request.cc
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/ui_create_window_request.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+UICreateWindowRequest::UICreateWindowRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : RequestToHMI(message,
+                   application_manager,
+                   rpc_service,
+                   hmi_capabilities,
+                   policy_handle) {}
+
+UICreateWindowRequest::~UICreateWindowRequest() {}
+
+void UICreateWindowRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  SendRequest();
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_create_window_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_create_window_response.cc
new file mode 100644
index 0000000000..c3a323818d
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_create_window_response.cc
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "sdl_rpc_plugin/commands/hmi/ui_create_window_response.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+UICreateWindowResponse::UICreateWindowResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : ResponseFromHMI(message,
+                      application_manager,
+                      rpc_service,
+                      hmi_capabilities,
+                      policy_handle) {}
+
+UICreateWindowResponse::~UICreateWindowResponse() {}
+
+void UICreateWindowResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  event_engine::Event event(hmi_apis::FunctionID::UI_CreateWindow);
+  event.set_smart_object(*message_);
+  event.raise(application_manager_.event_dispatcher());
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_window_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_window_request.cc
new file mode 100644
index 0000000000..7933574d92
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_window_request.cc
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/hmi/ui_delete_window_request.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+UIDeleteWindowRequest::UIDeleteWindowRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : RequestToHMI(message,
+                   application_manager,
+                   rpc_service,
+                   hmi_capabilities,
+                   policy_handle) {}
+
+UIDeleteWindowRequest::~UIDeleteWindowRequest() {}
+
+void UIDeleteWindowRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  SendRequest();
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_window_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_window_response.cc
new file mode 100644
index 0000000000..ba703e18ae
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_delete_window_response.cc
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "sdl_rpc_plugin/commands/hmi/ui_delete_window_response.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+UIDeleteWindowResponse::UIDeleteWindowResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handle)
+    : ResponseFromHMI(message,
+                      application_manager,
+                      rpc_service,
+                      hmi_capabilities,
+                      policy_handle) {}
+
+UIDeleteWindowResponse::~UIDeleteWindowResponse() {}
+
+void UIDeleteWindowResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  event_engine::Event event(hmi_apis::FunctionID::UI_DeleteWindow);
+  event.set_smart_object(*message_);
+  event.raise(application_manager_.event_dispatcher());
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
index b18e3e5d89..5405b48027 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc
@@ -73,9 +73,17 @@ void UIGetCapabilitiesResponse::Run() {
         msg_params[hmi_response::soft_button_capabilities]);
   }
 
-  if (msg_params.keyExists(strings::audio_pass_thru_capabilities)) {
+  // use newer parameter "audioPassThruCapabilitiesList" when available
+  if (msg_params.keyExists(strings::audio_pass_thru_capabilities_list)) {
     hmi_capabilities.set_audio_pass_thru_capabilities(
-        msg_params[strings::audio_pass_thru_capabilities]);
+        msg_params[strings::audio_pass_thru_capabilities_list]);
+  } else if (msg_params.keyExists(strings::audio_pass_thru_capabilities)) {
+    smart_objects::SmartObject audio_pass_thru_capabilities_list(
+        smart_objects::SmartType_Array);
+    audio_pass_thru_capabilities_list[0] =
+        msg_params[strings::audio_pass_thru_capabilities];
+    hmi_capabilities.set_audio_pass_thru_capabilities(
+        audio_pass_thru_capabilities_list);
   }
 
   if (msg_params.keyExists(strings::hmi_capabilities)) {
@@ -114,6 +122,7 @@ void UIGetCapabilitiesResponse::Run() {
                     [strings::video_streaming_capability]);
     }
     if (msg_params[strings::system_capabilities].keyExists(
+<<<<<<< HEAD
             strings::driver_distraction_capability)) {
       if (!msg_params[strings::system_capabilities]
                      [strings::driver_distraction_capability]
@@ -123,6 +132,12 @@ void UIGetCapabilitiesResponse::Run() {
                       [strings::driver_distraction_capability]);
         hmi_capabilities.set_driver_distraction_supported(true);
       }
+=======
+            strings::display_capabilities)) {
+      hmi_capabilities.set_system_display_capabilities(
+          msg_params[strings::system_capabilities]
+                    [strings::display_capabilities]);
+>>>>>>> origin/develop
     }
   }
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc
index aa5878590b..a07c72cbf4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_perform_interaction_request.cc
@@ -47,7 +47,11 @@ UIPerformInteractionRequest::UIPerformInteractionRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle) {}
+                   policy_handle) {
+  const auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t request_timeout = msg_params[strings::timeout].asUInt();
+  default_timeout_ += request_timeout;
+}
 
 UIPerformInteractionRequest::~UIPerformInteractionRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc
index de639420fb..cad68e23aa 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_scrollable_message_request.cc
@@ -47,7 +47,11 @@ UIScrollableMessageRequest::UIScrollableMessageRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle) {}
+                   policy_handle) {
+  const auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t request_timeout = msg_params[strings::timeout].asUInt();
+  default_timeout_ += request_timeout;
+}
 
 UIScrollableMessageRequest::~UIScrollableMessageRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc
index 56fca3d062..eae8cc523c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_slider_request.cc
@@ -47,7 +47,11 @@ UISliderRequest::UISliderRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle) {}
+                   policy_handle) {
+  const auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t request_timeout = msg_params[strings::timeout].asUInt();
+  default_timeout_ += request_timeout;
+}
 
 UISliderRequest::~UISliderRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc
index 96d454d4ee..a52f03b998 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/update_sdl_request.cc
@@ -32,6 +32,7 @@
  */
 
 #include "sdl_rpc_plugin/commands/hmi/update_sdl_request.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc
index ae94019b25..4257158f6a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/vr_perform_interaction_request.cc
@@ -47,7 +47,11 @@ VRPerformInteractionRequest::VRPerformInteractionRequest(
                    application_manager,
                    rpc_service,
                    hmi_capabilities,
-                   policy_handle) {}
+                   policy_handle) {
+  const auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t request_timeout = msg_params[strings::timeout].asUInt();
+  default_timeout_ += request_timeout;
+}
 
 VRPerformInteractionRequest::~VRPerformInteractionRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc
index a57d222765..1dbfc97458 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_command_request.cc
@@ -160,7 +160,9 @@ void AddCommandRequest::Run() {
     return;
   }
 
-  app->AddCommand((*message_)[strings::msg_params][strings::cmd_id].asUInt(),
+  const uint32_t internal_consecutive_number = application_manager::commands::
+      CommandImpl::CalcCommandInternalConsecutiveNumber(app);
+  app->AddCommand(internal_consecutive_number,
                   (*message_)[strings::msg_params]);
 
   smart_objects::SmartObject ui_msg_params =
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc
index 6ef83b4af1..f2d670f0cf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/add_sub_menu_request.cc
@@ -111,6 +111,17 @@ void AddSubMenuRequest::Run() {
   smart_objects::SmartObject msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
+  if (received_msg_params.keyExists(strings::menu_layout)) {
+    auto menu_layout = static_cast<mobile_apis::MenuLayout::eType>(
+        received_msg_params[strings::menu_layout].asUInt());
+    if (app->menu_layout_supported(menu_layout)) {
+      msg_params[strings::menu_layout] =
+          received_msg_params[strings::menu_layout];
+    } else {
+      is_menu_layout_available_ = false;
+    }
+  }
+
   msg_params[strings::menu_id] = received_msg_params[strings::menu_id];
   if (received_msg_params.keyExists(strings::position)) {
     msg_params[strings::menu_params][strings::position] =
@@ -157,11 +168,22 @@ void AddSubMenuRequest::on_event(const event_engine::Event& event) {
         application->AddSubMenu(
             (*message_)[strings::msg_params][strings::menu_id].asInt(),
             (*message_)[strings::msg_params]);
+        response_info =
+            "The MenuLayout specified is unsupported, the "
+            "default MenuLayout will be used." +
+            response_info;
+        SendResponse(result,
+                     is_menu_layout_available_
+                         ? MessageHelper::HMIToMobileResult(result_code)
+                         : mobile_apis::Result::WARNINGS,
+                     is_menu_layout_available_ ? NULL : response_info.c_str(),
+                     &(message[strings::msg_params]));
+      } else {
+        SendResponse(result,
+                     MessageHelper::HMIToMobileResult(result_code),
+                     response_info.empty() ? NULL : response_info.c_str(),
+                     &(message[strings::msg_params]));
       }
-      SendResponse(result,
-                   MessageHelper::HMIToMobileResult(result_code),
-                   response_info.empty() ? NULL : response_info.c_str(),
-                   &(message[strings::msg_params]));
       break;
     }
     default: {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
index 908f31cd51..57912e7087 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/alert_request.cc
@@ -73,18 +73,15 @@ AlertRequest::~AlertRequest() {}
 
 bool AlertRequest::Init() {
   /* Timeout in milliseconds.
-     If omitted a standard value of 10000 milliseconds is used.*/
-  if ((*message_)[strings::msg_params].keyExists(strings::duration)) {
-    default_timeout_ =
-        (*message_)[strings::msg_params][strings::duration].asUInt();
-  } else {
-    const int32_t def_value = 5000;
-    default_timeout_ = def_value;
-  }
+    If omitted a standard value of 10000 milliseconds is used.*/
+  auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t duration_timeout = msg_params[strings::duration].asUInt();
+
+  default_timeout_ += duration_timeout;
 
   // If soft buttons are present, SDL will not use initiate timeout tracking for
   // response.
-  if ((*message_)[strings::msg_params].keyExists(strings::soft_buttons)) {
+  if (msg_params.keyExists(strings::soft_buttons)) {
     LOG4CXX_INFO(logger_,
                  "Request contains soft buttons - request timeout "
                  "will be set to 0.");
@@ -251,7 +248,8 @@ bool AlertRequest::Validate(uint32_t app_id) {
     return false;
   }
 
-  if (mobile_apis::HMILevel::HMI_BACKGROUND == app->hmi_level() &&
+  if (mobile_apis::HMILevel::HMI_BACKGROUND ==
+          app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW) &&
       app->AreCommandLimitsExceeded(
           static_cast<mobile_apis::FunctionID::eType>(function_id()),
           application_manager::TLimitSource::POLICY_TABLE)) {
@@ -321,6 +319,11 @@ void AlertRequest::SendAlertRequest(int32_t app_id) {
   msg_params[hmi_request::alert_strings] =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
 
+  if ((*message_)[strings::msg_params].keyExists(strings::cancel_id)) {
+    msg_params[strings::cancel_id] =
+        (*message_)[strings::msg_params][strings::cancel_id].asInt();
+  }
+
   int32_t index = 0;
   if ((*message_)[strings::msg_params].keyExists(strings::alert_text1)) {
     msg_params[hmi_request::alert_strings][index][hmi_request::field_name] =
@@ -349,6 +352,10 @@ void AlertRequest::SendAlertRequest(int32_t app_id) {
         (*message_)[strings::msg_params][strings::soft_buttons];
     MessageHelper::SubscribeApplicationToSoftButton(
         (*message_)[strings::msg_params], app, function_id());
+    msg_params[strings::duration] = 0;
+  } else {
+    msg_params[strings::duration] =
+        (*message_)[strings::msg_params][strings::duration].asUInt();
   }
 
   if ((*message_)[strings::msg_params].keyExists(strings::alert_icon)) {
@@ -369,7 +376,6 @@ void AlertRequest::SendAlertRequest(int32_t app_id) {
 
   // app_id
   msg_params[strings::app_id] = app_id;
-  msg_params[strings::duration] = default_timeout_;
 
   // NAVI platform progressIndicator
   if ((*message_)[strings::msg_params].keyExists(strings::progress_indicator)) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/cancel_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/cancel_interaction_request.cc
new file mode 100644
index 0000000000..82e0703da1
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/cancel_interaction_request.cc
@@ -0,0 +1,117 @@
+
+/*
+Copyright (c) 2019, Ford Motor Company, Livio
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following
+disclaimer in the documentation and/or other materials provided with the
+distribution.
+
+Neither the name of the the copyright holders nor the names of their
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "sdl_rpc_plugin/commands/mobile/cancel_interaction_request.h"
+#include "application_manager/application_impl.h"
+#include "application_manager/message_helper.h"
+#include "interfaces/MOBILE_API.h"
+#include "utils/helpers.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+CancelInteractionRequest::CancelInteractionRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : CommandRequestImpl(message,
+                         application_manager,
+                         rpc_service,
+                         hmi_capabilities,
+                         policy_handler) {}
+
+CancelInteractionRequest::~CancelInteractionRequest() {}
+
+void CancelInteractionRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto function_id = static_cast<mobile_apis::FunctionID::eType>(
+      (*message_)[strings::msg_params][strings::func_id].asInt());
+
+  if (helpers::
+          Compare<mobile_apis::FunctionID::eType, helpers::NEQ, helpers::ALL>(
+              function_id,
+              mobile_apis::FunctionID::PerformInteractionID,
+              mobile_apis::FunctionID::AlertID,
+              mobile_apis::FunctionID::ScrollableMessageID,
+              mobile_apis::FunctionID::SliderID)) {
+    LOG4CXX_ERROR(logger_, "Bad function ID" << function_id);
+    SendResponse(false, mobile_apis::Result::INVALID_ID);
+    return;
+  }
+
+  smart_objects::SmartObject msg_params;
+  msg_params[strings::app_id] = connection_key();
+  msg_params[strings::func_id] = function_id;
+
+  if ((*message_)[strings::msg_params].keyExists(strings::cancel_id)) {
+    msg_params[strings::cancel_id] =
+        (*message_)[strings::msg_params][strings::cancel_id].asInt();
+  }
+
+  SendHMIRequest(hmi_apis::FunctionID::UI_CancelInteraction, &msg_params, true);
+}
+
+void CancelInteractionRequest::on_event(const event_engine::Event& event) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (event.id() != hmi_apis::FunctionID::UI_CancelInteraction) {
+    LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
+    return;
+  }
+
+  auto message = event.smart_object();
+
+  hmi_apis::Common_Result::eType hmi_result =
+      static_cast<hmi_apis::Common_Result::eType>(
+          message[strings::params][hmi_response::code].asInt());
+
+  mobile_apis::Result::eType result =
+      MessageHelper::HMIToMobileResult(hmi_result);
+  bool success = PrepareResultForMobileResponse(
+      hmi_result, HmiInterfaces::HMI_INTERFACE_UI);
+
+  auto msg_params = message[strings::msg_params];
+
+  const char* info = msg_params.keyExists(strings::info)
+                         ? msg_params[strings::info].asCharArray()
+                         : NULL;
+
+  SendResponse(success, result, info, &msg_params);
+}
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/cancel_interaction_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/cancel_interaction_response.cc
new file mode 100644
index 0000000000..af73e72a6f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/cancel_interaction_response.cc
@@ -0,0 +1,60 @@
+/*
+ Copyright (c) 2019, Ford Motor Company, Livio
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the the copyright holders nor the names of their
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/mobile/cancel_interaction_response.h"
+#include "application_manager/application_impl.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+namespace commands {
+
+CancelInteractionResponse::CancelInteractionResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    app_mngr::rpc_service::RPCService& rpc_service,
+    app_mngr::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : CommandResponseImpl(message,
+                          application_manager,
+                          rpc_service,
+                          hmi_capabilities,
+                          policy_handler) {}
+
+CancelInteractionResponse::~CancelInteractionResponse() {}
+
+void CancelInteractionResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  rpc_service_.SendMessageToMobile(message_);
+}
+
+}  // namespace commands
+}  // namespace sdl_rpc_plugin
\ No newline at end of file
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
index ef81babdd6..50217a9c8a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/change_registration_request.cc
@@ -37,6 +37,7 @@
 #include "application_manager/application_impl.h"
 #include "application_manager/application_manager.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
 
@@ -49,7 +50,7 @@ struct IsSameNickname {
   }
 
  private:
-  const custom_str::CustomString& app_id_;
+  const custom_str::CustomString app_id_;
 };
 }  // namespace
 
@@ -160,7 +161,7 @@ void ChangeRegistrationRequest::Run() {
     return;
   }
 
-  if (mobile_apis::Result::SUCCESS != CheckCoincidence()) {
+  if (mobile_apis::Result::SUCCESS != CheckCoincidence(app->device())) {
     SendResponse(false, mobile_apis::Result::DUPLICATE_NAME);
     return;
   }
@@ -578,36 +579,46 @@ bool ChangeRegistrationRequest::IsWhiteSpaceExist() {
   return false;
 }
 
-mobile_apis::Result::eType ChangeRegistrationRequest::CheckCoincidence() {
+mobile_apis::Result::eType ChangeRegistrationRequest::CheckCoincidence(
+    const connection_handler::DeviceHandle& device_id) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
 
-  ApplicationSet accessor = application_manager_.applications().GetData();
+  auto compare_tts_name = [](const smart_objects::SmartObject& obj_1,
+                             const smart_objects::SmartObject& obj_2) {
+    return obj_1[application_manager::strings::text]
+        .asCustomString()
+        .CompareIgnoreCase(
+            obj_2[application_manager::strings::text].asCustomString());
+  };
+
+  const auto& accessor = application_manager_.applications().GetData();
   custom_str::CustomString app_name;
-  uint32_t app_id = connection_key();
+  const uint32_t app_id = connection_key();
   if (msg_params.keyExists(strings::app_name)) {
     app_name = msg_params[strings::app_name].asCustomString();
   }
 
-  ApplicationSetConstIt it = accessor.begin();
-  for (; accessor.end() != it; ++it) {
-    if (app_id == (*it)->app_id()) {
+  for (const auto& app : accessor) {
+    if (app->device() != device_id) {
+      continue;
+    }
+
+    if (app->app_id() == app_id) {
       continue;
     }
 
-    const custom_str::CustomString& cur_name = (*it)->name();
+    const auto& cur_name = app->name();
     if (msg_params.keyExists(strings::app_name)) {
       if (app_name.CompareIgnoreCase(cur_name)) {
         LOG4CXX_ERROR(logger_, "Application name is known already.");
         return mobile_apis::Result::DUPLICATE_NAME;
       }
-
-      const smart_objects::SmartObject* vr = (*it)->vr_synonyms();
-      const std::vector<smart_objects::SmartObject>* curr_vr = NULL;
-      if (NULL != vr) {
-        curr_vr = vr->asArray();
+      const auto vr = app->vr_synonyms();
+      if (vr) {
+        const auto curr_vr = vr->asArray();
         CoincidencePredicateVR v(app_name);
 
         if (0 != std::count_if(curr_vr->begin(), curr_vr->end(), v)) {
@@ -617,18 +628,37 @@ mobile_apis::Result::eType ChangeRegistrationRequest::CheckCoincidence() {
       }
     }
 
-    // vr check
+    // VR check
     if (msg_params.keyExists(strings::vr_synonyms)) {
-      const std::vector<smart_objects::SmartObject>* new_vr =
-          msg_params[strings::vr_synonyms].asArray();
+      const auto new_vr = msg_params[strings::vr_synonyms].asArray();
 
       CoincidencePredicateVR v(cur_name);
       if (0 != std::count_if(new_vr->begin(), new_vr->end(), v)) {
         LOG4CXX_ERROR(logger_, "vr_synonyms duplicated with app_name .");
         return mobile_apis::Result::DUPLICATE_NAME;
       }
-    }  // end vr check
-  }    // application for end
+    }  // End vr check
+
+    // TTS check
+    if (msg_params.keyExists(strings::tts_name) && app->tts_name()) {
+      const auto tts_array = msg_params[strings::tts_name].asArray();
+      const auto tts_curr = app->tts_name()->asArray();
+      const auto& it_tts = std::find_first_of(tts_array->begin(),
+                                              tts_array->end(),
+                                              tts_curr->begin(),
+                                              tts_curr->end(),
+                                              compare_tts_name);
+      if (it_tts != tts_array->end()) {
+        LOG4CXX_ERROR(
+            logger_,
+            "TTS name: "
+                << (*it_tts)[strings::text].asCustomString().AsMBString()
+                << " is known already");
+        return mobile_apis::Result::DUPLICATE_NAME;
+      }
+    }  // End tts check
+
+  }  // Application for end
   return mobile_apis::Result::SUCCESS;
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/close_application_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/close_application_request.cc
index 736f0355dc..275f1d82a6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/close_application_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/close_application_request.cc
@@ -101,6 +101,7 @@ void CloseApplicationRequest::on_event(const event_engine::Event& event) {
     application_manager_.GetPluginManager().ForEachPlugin(on_app_exit);
     application_manager_.state_controller().SetRegularState(
         app,
+        mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
         mobile_apis::HMILevel::HMI_NONE,
         mobile_apis::AudioStreamingState::NOT_AUDIBLE,
         mobile_apis::VideoStreamingState::NOT_STREAMABLE,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc
new file mode 100644
index 0000000000..b69b0ee801
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_request.cc
@@ -0,0 +1,376 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/mobile/create_window_request.h"
+
+#include <algorithm>
+
+#include "application_manager/application_impl.h"
+#include "application_manager/application_state.h"
+#include "application_manager/message_helper.h"
+#include "utils/helpers.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+using app_mngr::ApplicationSharedPtr;
+
+namespace commands {
+
+CreateWindowRequest::CreateWindowRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : CommandRequestImpl(message,
+                         application_manager,
+                         rpc_service,
+                         hmi_capabilities,
+                         policy_handler) {}
+
+CreateWindowRequest::~CreateWindowRequest() {}
+
+bool CreateWindowRequest::CheckWindowName(
+    app_mngr::ApplicationSharedPtr app,
+    const app_mngr::WindowID window_id,
+    const std::string& window_name) const {
+  if (mobile_apis::PredefinedWindows::PRIMARY_WIDGET == window_id) {
+    LOG4CXX_DEBUG(logger_,
+                  "Window name check is ignored for the primary widgets");
+    return true;
+  }
+
+  const bool names_are_equal = window_name == app->name().c_str();
+  if (names_are_equal &&
+      mobile_apis::PredefinedWindows::DEFAULT_WINDOW != window_id) {
+    LOG4CXX_ERROR(logger_,
+                  "Regular widget can't have the same name as application: "
+                      << window_name);
+    return false;
+  }
+
+  const WindowNames window_names = app->GetWindowNames();
+  return !helpers::in_range(window_names, window_name);
+}
+
+void CreateWindowRequest::ApplyWindowInitialState(
+    ApplicationSharedPtr app) const {
+  const mobile_apis::WindowType::eType window_type =
+      static_cast<mobile_apis::WindowType::eType>(
+          (*message_)[strings::msg_params][strings::window_type].asInt());
+
+  // State should be initialized with INVALID_ENUM value to let state controller
+  // trigger OnHmiStatus notifiation sending
+  HmiStatePtr initial_state = application_manager_.CreateRegularState(
+      app,
+      window_type,
+      mobile_apis::HMILevel::INVALID_ENUM,
+      mobile_apis::AudioStreamingState::INVALID_ENUM,
+      mobile_apis::VideoStreamingState::INVALID_ENUM,
+      mobile_api::SystemContext::INVALID_ENUM);
+
+  const WindowID window_id =
+      (*message_)[strings::msg_params][strings::window_id].asInt();
+  const std::string window_name =
+      (*message_)[strings::msg_params][strings::window_name].asString();
+
+  smart_objects::SmartObject window_info(smart_objects::SmartType_Map);
+  if ((*message_)[strings::msg_params].keyExists(
+          strings::associated_service_type)) {
+    window_info[strings::associated_service_type] =
+        (*message_)[strings::msg_params][strings::associated_service_type];
+  }
+  if ((*message_)[strings::msg_params].keyExists(
+          strings::duplicate_updates_from_window_id)) {
+    window_info[strings::duplicate_updates_from_window_id] =
+        (*message_)[strings::msg_params]
+                   [strings::duplicate_updates_from_window_id];
+  }
+
+  window_info[strings::window_name] = window_name;
+
+  app->SetWindowInfo(window_id, window_info);
+
+  app->SetInitialState(window_id, window_name, initial_state);
+
+  // Default HMI level for all windows except the main one is always NONE
+  application_manager_.state_controller().OnAppWindowAdded(
+      app, window_id, window_type, mobile_apis::HMILevel::HMI_NONE);
+}
+
+app_mngr::WindowID CreateWindowRequest::window_id() const {
+  return mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
+void CreateWindowRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto application = application_manager_.application(connection_key());
+
+  if (!application) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
+
+  const auto window_id =
+      (*message_)[strings::msg_params][strings::window_id].asInt();
+  if (application->WindowIdExists(window_id)) {
+    LOG4CXX_ERROR(logger_,
+                  "Window with id #" << window_id << " does already exist");
+    SendResponse(false, mobile_apis::Result::INVALID_ID);
+    return;
+  }
+
+  const auto window_type =
+      (*message_)[strings::msg_params][strings::window_type].asInt();
+
+  if (mobile_apis::WindowType::eType::MAIN == window_type) {
+    LOG4CXX_ERROR(logger_, "MAIN application window already exists");
+    SendResponse(false, mobile_apis::Result::INVALID_DATA);
+    return;
+  }
+
+  if ((*message_)[strings::msg_params].keyExists(
+          strings::duplicate_updates_from_window_id)) {
+    const auto duplicate_updates_from_window_id =
+        (*message_)[strings::msg_params]
+                   [strings::duplicate_updates_from_window_id]
+                       .asInt();
+    if (!application->WindowIdExists(duplicate_updates_from_window_id)) {
+      LOG4CXX_ERROR(logger_,
+                    "Window with id #" << duplicate_updates_from_window_id
+                                       << " does not exist");
+      SendResponse(false, mobile_apis::Result::INVALID_DATA);
+      return;
+    }
+  }
+
+  const std::string window_name =
+      (*message_)[strings::msg_params][strings::window_name].asString();
+  if (!CheckWindowName(application, window_id, window_name)) {
+    LOG4CXX_ERROR(logger_,
+                  "Window name \"" << window_name
+                                   << "\" is disallowed for window #"
+                                   << window_id);
+    SendResponse(false, mobile_apis::Result::DUPLICATE_NAME);
+    return;
+  }
+
+  if (!ValidateWindowCreation(application, window_id)) {
+    return;
+  }
+
+  smart_objects::SmartObject msg_params = (*message_)[strings::msg_params];
+  msg_params[strings::app_id] = application->hmi_app_id();
+
+  StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
+  SendHMIRequest(hmi_apis::FunctionID::UI_CreateWindow, &msg_params, true);
+}
+
+void CreateWindowRequest::on_event(const event_engine::Event& event) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (hmi_apis::FunctionID::UI_CreateWindow != event.id()) {
+    LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
+    return;
+  }
+
+  auto application = application_manager_.application(connection_key());
+
+  if (!application) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
+
+  LOG4CXX_INFO(logger_, "Received CreateWindow event");
+  EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
+
+  const smart_objects::SmartObject& response_message = event.smart_object();
+  const auto result_code = CommandRequestImpl::GetMobileResultCode(
+      static_cast<hmi_apis::Common_Result::eType>(
+          response_message[strings::params][hmi_response::code].asInt()));
+
+  const bool is_success = IsMobileResultSuccess(result_code);
+  std::string response_info;
+  GetInfo(response_message, response_info);
+
+  if (!is_success) {
+    LOG4CXX_ERROR(logger_, "CreateWindow request has failed on HMI side");
+    SendResponse(is_success,
+                 result_code,
+                 response_info.empty() ? nullptr : response_info.c_str());
+    return;
+  }
+
+  ApplyWindowInitialState(application);
+
+  SendResponse(is_success,
+               result_code,
+               response_info.empty() ? nullptr : response_info.c_str());
+}
+
+bool CreateWindowRequest::Init() {
+  hash_update_mode_ = HashUpdateMode::kDoHashUpdate;
+  return true;
+}
+
+bool CreateWindowRequest::IsWindowForAssociatedServiceCreated(
+    app_mngr::ApplicationSharedPtr app) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto window_optional_params_map =
+      app->window_optional_params_map().GetData();
+
+  if (!(*message_)[strings::msg_params].keyExists(
+          strings::associated_service_type)) {
+    return false;
+  }
+
+  const auto associated_service_type =
+      (*message_)[strings::msg_params][strings::associated_service_type]
+          .asString();
+
+  const auto find_res = std::find_if(
+      window_optional_params_map.begin(),
+      window_optional_params_map.end(),
+      [&associated_service_type](
+          const std::pair<WindowID, smart_objects::SmartObjectSPtr>& element) {
+        LOG4CXX_DEBUG(logger_,
+                      "Searching for " << associated_service_type
+                                       << " in window info for id "
+                                       << element.first);
+        if (element.second->keyExists(strings::associated_service_type) &&
+            associated_service_type ==
+                (*element.second)[strings::associated_service_type]
+                    .asString()) {
+          return true;
+        }
+
+        return false;
+      });
+
+  return find_res != window_optional_params_map.end();
+}
+
+bool CreateWindowRequest::DoesExceedMaxAllowedWindows(
+    app_mngr::ApplicationSharedPtr app) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto get_current_number_of_windows =
+      [&app](const mobile_apis::WindowType::eType window_type) -> size_t {
+    switch (window_type) {
+      case mobile_apis::WindowType::MAIN: {
+        return 1u;
+      }
+      case mobile_apis::WindowType::WIDGET: {
+        return app->window_optional_params_map().GetData().size();
+      }
+
+      default: {
+        LOG4CXX_WARN(logger_, "Unknown window type");
+        return 0u;
+      }
+    }
+  };
+
+  const auto window_type = static_cast<mobile_apis::WindowType::eType>(
+      (*message_)[strings::msg_params][strings::window_type].asInt());
+
+  auto display_capabilities = hmi_capabilities_.system_display_capabilities();
+  if (app->display_capabilities()) {
+    display_capabilities = app->display_capabilities();
+  }
+
+  if (!display_capabilities) {
+    LOG4CXX_WARN(logger_, "Application has no capabilities");
+    return false;
+  }
+
+  MessageHelper::PrintSmartObject(*display_capabilities);
+
+  const auto windowTypeSupported =
+      (*display_capabilities)[0][strings::window_type_supported].asArray();
+
+  DCHECK(windowTypeSupported);
+
+  const auto find_res = std::find_if(
+      windowTypeSupported->begin(),
+      windowTypeSupported->end(),
+      [&window_type](const smart_objects::SmartObject& element) {
+        if (window_type == static_cast<mobile_apis::WindowType::eType>(
+                               element[strings::window_type].asInt())) {
+          return true;
+        }
+
+        return false;
+      });
+
+  if (find_res == windowTypeSupported->end()) {
+    LOG4CXX_WARN(logger_, "Requested Window Type is not supported by the HMI");
+    return true;
+  }
+
+  if (get_current_number_of_windows(window_type) + 1 >
+      (*find_res)[strings::maximum_number_of_windows].asUInt()) {
+    return true;
+  }
+
+  return false;
+}
+
+bool CreateWindowRequest::ValidateWindowCreation(
+    app_mngr::ApplicationSharedPtr app, const WindowID window_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (DoesExceedMaxAllowedWindows(app)) {
+    std::string info("Maximum allowed amount of windows is exceeded");
+    LOG4CXX_WARN(logger_, info);
+    SendResponse(false, mobile_apis::Result::REJECTED, info.c_str());
+    return false;
+  }
+
+  if (IsWindowForAssociatedServiceCreated(app)) {
+    std::string info(
+        "Window for this associated service type is already created");
+    LOG4CXX_WARN(logger_, info);
+    SendResponse(false, mobile_apis::Result::REJECTED, info.c_str());
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_response.cc
new file mode 100644
index 0000000000..0d9bbc2815
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/create_window_response.cc
@@ -0,0 +1,64 @@
+/*
+
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/mobile/create_window_response.h"
+#include "application_manager/rpc_service.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+CreateWindowResponse::CreateWindowResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : CommandResponseImpl(message,
+                          application_manager,
+                          rpc_service,
+                          hmi_capabilities,
+                          policy_handler) {}
+
+CreateWindowResponse::~CreateWindowResponse() {}
+
+void CreateWindowResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  rpc_service_.SendMessageToMobile(message_);
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc
index b2c9a3377f..46af8353b7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_file_request.cc
@@ -68,7 +68,9 @@ void DeleteFileRequest::Run() {
     return;
   }
 
-  if ((mobile_api::HMILevel::HMI_NONE == application->hmi_level()) &&
+  if ((mobile_api::HMILevel::HMI_NONE ==
+       application->hmi_level(
+           mobile_apis::PredefinedWindows::DEFAULT_WINDOW)) &&
       (application_manager_.get_settings().delete_file_in_none() <=
        application->delete_file_in_none_count())) {
     // If application is in the HMI_NONE level the quantity of allowed
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_window_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_window_request.cc
new file mode 100644
index 0000000000..7f253e25fd
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_window_request.cc
@@ -0,0 +1,162 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/mobile/delete_window_request.h"
+
+#include <algorithm>
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+DeleteWindowRequest::DeleteWindowRequest(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : CommandRequestImpl(message,
+                         application_manager,
+                         rpc_service,
+                         hmi_capabilities,
+                         policy_handler) {}
+
+DeleteWindowRequest::~DeleteWindowRequest() {}
+
+bool DeleteWindowRequest::CheckWindowId(
+    app_mngr::ApplicationSharedPtr app) const {
+  const WindowID window_id =
+      (*message_)[strings::msg_params][strings::window_id].asInt();
+  if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW == window_id) {
+    LOG4CXX_ERROR(logger_, "Main application window can't be deleted");
+    return false;
+  }
+
+  if (!app->WindowIdExists(window_id)) {
+    LOG4CXX_ERROR(logger_,
+                  "Window with id #" << window_id << " does not exist");
+    return false;
+  }
+
+  return true;
+}
+
+app_mngr::WindowID DeleteWindowRequest::window_id() const {
+  return mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
+void DeleteWindowRequest::DeleteWindow(
+    app_mngr::ApplicationSharedPtr app) const {
+  const WindowID window_id =
+      (*message_)[strings::msg_params][strings::window_id].asInt();
+  app->RemoveWindowInfo(window_id);
+  app->RemoveHMIState(window_id, HmiState::StateID::STATE_ID_REGULAR);
+  app->remove_window_capability(window_id);
+}
+
+void DeleteWindowRequest::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  ApplicationSharedPtr application =
+      application_manager_.application(connection_key());
+
+  if (!application) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
+
+  if (!CheckWindowId(application)) {
+    SendResponse(false, mobile_apis::Result::INVALID_ID);
+    return;
+  }
+
+  smart_objects::SmartObject msg_params = (*message_)[strings::msg_params];
+  msg_params[strings::app_id] = application->hmi_app_id();
+
+  StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
+  SendHMIRequest(hmi_apis::FunctionID::UI_DeleteWindow, &msg_params, true);
+}
+
+void DeleteWindowRequest::on_event(const event_engine::Event& event) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (hmi_apis::FunctionID::UI_DeleteWindow != event.id()) {
+    LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
+    return;
+  }
+
+  ApplicationSharedPtr application =
+      application_manager_.application(connection_key());
+
+  if (!application) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
+
+  LOG4CXX_INFO(logger_, "Received DeleteWindow event");
+  EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
+
+  const smart_objects::SmartObject& response_message = event.smart_object();
+  const auto result_code = CommandRequestImpl::GetMobileResultCode(
+      static_cast<hmi_apis::Common_Result::eType>(
+          response_message[strings::params][hmi_response::code].asInt()));
+
+  const bool is_success = IsMobileResultSuccess(result_code);
+  std::string response_info;
+  GetInfo(response_message, response_info);
+
+  if (!is_success) {
+    LOG4CXX_ERROR(logger_, "DeleteWindow request has failed on HMI side");
+    SendResponse(is_success,
+                 result_code,
+                 response_info.empty() ? nullptr : response_info.c_str());
+    return;
+  }
+
+  DeleteWindow(application);
+
+  SendResponse(is_success,
+               result_code,
+               response_info.empty() ? nullptr : response_info.c_str());
+}
+
+bool DeleteWindowRequest::Init() {
+  hash_update_mode_ = HashUpdateMode::kDoHashUpdate;
+  return true;
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_window_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_window_response.cc
new file mode 100644
index 0000000000..f9ac9a46d6
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/delete_window_response.cc
@@ -0,0 +1,64 @@
+/*
+
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "sdl_rpc_plugin/commands/mobile/delete_window_response.h"
+#include "application_manager/rpc_service.h"
+
+namespace sdl_rpc_plugin {
+using namespace application_manager;
+
+namespace commands {
+
+DeleteWindowResponse::DeleteWindowResponse(
+    const application_manager::commands::MessageSharedPtr& message,
+    ApplicationManager& application_manager,
+    rpc_service::RPCService& rpc_service,
+    HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler)
+    : CommandResponseImpl(message,
+                          application_manager,
+                          rpc_service,
+                          hmi_capabilities,
+                          policy_handler) {}
+
+DeleteWindowResponse::~DeleteWindowResponse() {}
+
+void DeleteWindowResponse::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  rpc_service_.SendMessageToMobile(message_);
+}
+
+}  // namespace commands
+
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc
index 34ed30c243..c5e94da378 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_cloud_app_properties_request.cc
@@ -1,4 +1,5 @@
 #include "sdl_rpc_plugin/commands/mobile/get_cloud_app_properties_request.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
@@ -32,20 +33,10 @@ void GetCloudAppPropertiesRequest::Run() {
   std::string policy_app_id =
       (*message_)[strings::msg_params][strings::app_id].asString();
 
-  bool enabled = true;
-  std::string endpoint;
-  std::string auth_token;
-  std::string certificate;
-  std::string cloud_transport_type;
-  std::string hybrid_app_preference;
-
-  bool result = policy_handler_.GetCloudAppParameters(policy_app_id,
-                                                      enabled,
-                                                      endpoint,
-                                                      certificate,
-                                                      auth_token,
-                                                      cloud_transport_type,
-                                                      hybrid_app_preference);
+  policy::AppProperties app_properties;
+
+  const bool result =
+      policy_handler_.GetAppProperties(policy_app_id, app_properties);
 
   if (!result) {
     SendResponse(false,
@@ -69,19 +60,20 @@ void GetCloudAppPropertiesRequest::Run() {
   }
   properties[strings::nicknames] = nicknames_array;
   properties[strings::app_id] = policy_app_id;
-  properties[strings::enabled] = enabled;
+  properties[strings::enabled] = app_properties.enabled;
 
-  if (!auth_token.empty()) {
-    properties[strings::auth_token] = auth_token;
+  if (!app_properties.auth_token.empty()) {
+    properties[strings::auth_token] = app_properties.auth_token;
   }
-  if (!cloud_transport_type.empty()) {
-    properties[strings::cloud_transport_type] = cloud_transport_type;
+  if (!app_properties.transport_type.empty()) {
+    properties[strings::cloud_transport_type] = app_properties.transport_type;
   }
-  if (!hybrid_app_preference.empty()) {
-    properties[strings::hybrid_app_preference] = hybrid_app_preference;
+  if (!app_properties.hybrid_app_preference.empty()) {
+    properties[strings::hybrid_app_preference] =
+        app_properties.hybrid_app_preference;
   }
-  if (!endpoint.empty()) {
-    properties[strings::endpoint] = endpoint;
+  if (!app_properties.endpoint.empty()) {
+    properties[strings::endpoint] = app_properties.endpoint;
   }
 
   response_params[strings::properties] = properties;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
index 5fa5ba52f8..c659badf87 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
@@ -133,6 +133,17 @@ void GetSystemCapabilityRequest::Run() {
       }
       break;
     }
+    case mobile_apis::SystemCapabilityType::SEAT_LOCATION: {
+      if (hmi_capabilities.seat_location_capability()) {
+        response_params[strings::system_capability]
+                       [strings::seat_location_capability] =
+                           *hmi_capabilities.seat_location_capability();
+      } else {
+        SendResponse(false, mobile_apis::Result::DATA_NOT_AVAILABLE);
+        return;
+      }
+      break;
+    }
     case mobile_apis::SystemCapabilityType::VIDEO_STREAMING:
       if (hmi_capabilities.video_streaming_capability()) {
         response_params[strings::system_capability]
@@ -152,6 +163,7 @@ void GetSystemCapabilityRequest::Run() {
                              all_services);
       break;
     }
+<<<<<<< HEAD
     case mobile_apis::SystemCapabilityType::DRIVER_DISTRACTION:
       if (hmi_capabilities.driver_distraction_capability() &&
           hmi_capabilities.driver_distraction_supported()) {
@@ -163,27 +175,56 @@ void GetSystemCapabilityRequest::Run() {
         return;
       }
       break;
+=======
+    case mobile_apis::SystemCapabilityType::DISPLAYS: {
+      auto capabilities = hmi_capabilities.system_display_capabilities();
+      if (app->display_capabilities()) {
+        capabilities = app->display_capabilities();
+      }
+
+      if (!capabilities) {
+        SendResponse(false, mobile_apis::Result::DATA_NOT_AVAILABLE);
+        LOG4CXX_INFO(logger_, "system_display_capabilities are not available");
+        return;
+      }
+
+      response_params[strings::system_capability]
+                     [strings::display_capabilities] = *capabilities;
+      break;
+    }
+>>>>>>> origin/develop
     default:  // Return unsupported resource
       SendResponse(false, mobile_apis::Result::UNSUPPORTED_RESOURCE);
       return;
   }
 
-  if ((*message_)[app_mngr::strings::msg_params].keyExists(
-          strings::subscribe)) {
-    auto& ext = SystemCapabilityAppExtension::ExtractExtension(*app);
-    if ((*message_)[app_mngr::strings::msg_params][strings::subscribe]
-            .asBool() == true) {
-      LOG4CXX_DEBUG(logger_,
-                    "Subscribe to system capability: " << response_type);
-      ext.SubscribeTo(response_type);
-    } else {
-      LOG4CXX_DEBUG(logger_,
-                    "Unsubscribe from system capability: " << response_type);
-      ext.UnsubscribeFrom(response_type);
+  const char* info = nullptr;
+  // Ignore subscription/unsubscription for DISPLAYS type
+  if (mobile_apis::SystemCapabilityType::DISPLAYS != response_type) {
+    if ((*message_)[app_mngr::strings::msg_params].keyExists(
+            strings::subscribe)) {
+      auto& ext = SystemCapabilityAppExtension::ExtractExtension(*app);
+      if ((*message_)[app_mngr::strings::msg_params][strings::subscribe]
+              .asBool() == true) {
+        LOG4CXX_DEBUG(logger_,
+                      "Subscribe to system capability: " << response_type);
+        ext.SubscribeTo(response_type);
+      } else {
+        LOG4CXX_DEBUG(logger_,
+                      "Unsubscribe from system capability: " << response_type);
+        ext.UnsubscribeFrom(response_type);
+      }
+    }
+  } else {
+    if ((*message_)[app_mngr::strings::msg_params].keyExists(
+            strings::subscribe)) {
+      info =
+          "Subscribe parameter is ignored. Auto Subscription/Unsubscription is "
+          "used for DISPLAY capability type.";
     }
   }
 
-  SendResponse(true, mobile_apis::Result::SUCCESS, NULL, &response_params);
+  SendResponse(true, mobile_apis::Result::SUCCESS, info, &response_params);
 }
 
 void GetSystemCapabilityRequest::on_event(const event_engine::Event& event) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc
index 46a39513d5..b8714b4784 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/list_files_request.cc
@@ -70,7 +70,9 @@ void ListFilesRequest::Run() {
     return;
   }
 
-  if ((mobile_api::HMILevel::HMI_NONE == application->hmi_level()) &&
+  if ((mobile_api::HMILevel::HMI_NONE ==
+       application->hmi_level(
+           mobile_apis::PredefinedWindows::DEFAULT_WINDOW)) &&
       (application_manager_.get_settings().list_files_in_none() <=
        application->list_files_in_none_count())) {
     // If application is in the HMI_NONE level the quantity of allowed
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc
index f0368a742d..bca3b20fe0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_event_notification.cc
@@ -102,11 +102,13 @@ void OnButtonEventNotification::Run() {
       return;
     }
 
-    if ((mobile_api::HMILevel::HMI_FULL != app->hmi_level()) &&
-        (mobile_api::HMILevel::HMI_LIMITED != app->hmi_level())) {
+    const auto window_id = app->GetSoftButtonWindowID(custom_btn_id);
+    (*message_)[strings::msg_params][strings::window_id] = window_id;
+    const auto window_hmi_level = app->hmi_level(window_id);
+    if ((mobile_api::HMILevel::HMI_NONE == window_hmi_level)) {
       LOG4CXX_WARN(logger_,
-                   "CUSTOM_BUTTON OnButtonEvent notification is allowed only "
-                       << "in FULL or LIMITED hmi level");
+                   "CUSTOM_BUTTON OnButtonEvent notification is not allowed in "
+                   "NONE hmi level");
       return;
     }
 
@@ -127,8 +129,11 @@ void OnButtonEventNotification::Run() {
     }
 
     // Send ButtonEvent notification only in HMI_FULL or HMI_LIMITED mode
-    if ((mobile_api::HMILevel::HMI_FULL != subscribed_app->hmi_level()) &&
-        (mobile_api::HMILevel::HMI_LIMITED != subscribed_app->hmi_level())) {
+    const mobile_apis::HMILevel::eType app_hmi_level =
+        subscribed_app->hmi_level(
+            mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
+    if ((mobile_api::HMILevel::HMI_FULL != app_hmi_level) &&
+        (mobile_api::HMILevel::HMI_LIMITED != app_hmi_level)) {
       LOG4CXX_WARN(logger_,
                    "OnButtonEvent notification is allowed only"
                        << "in FULL or LIMITED hmi level");
@@ -179,6 +184,11 @@ void OnButtonEventNotification::SendButtonEvent(ApplicationConstSharedPtr app) {
         (*message_)[strings::msg_params][strings::custom_button_id];
   }
 
+  if ((*message_)[strings::msg_params].keyExists(strings::window_id)) {
+    (*on_btn_event)[strings::msg_params][strings::window_id] =
+        (*message_)[strings::msg_params][strings::window_id];
+  }
+
   message_ = on_btn_event;
   SendNotification();
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc
index 7c77e29298..a205660e23 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_button_press_notification.cc
@@ -67,6 +67,10 @@ void OnButtonPressNotification::Run() {
   const bool is_app_id_exists =
       (*message_)[strings::msg_params].keyExists(strings::app_id);
   ApplicationSharedPtr app;
+  if (is_app_id_exists) {
+    app = application_manager_.application(
+        (*message_)[strings::msg_params][strings::app_id].asUInt());
+  }
 
   // CUSTOM_BUTTON notification
   if (static_cast<uint32_t>(mobile_apis::ButtonName::CUSTOM_BUTTON) == btn_id) {
@@ -76,9 +80,6 @@ void OnButtonPressNotification::Run() {
       return;
     }
 
-    app = application_manager_.application(
-        (*message_)[strings::msg_params][strings::app_id].asUInt());
-
     // custom_button_id is mandatory for CUSTOM_BUTTON notification
     if (false == (*message_)[strings::msg_params].keyExists(
                      hmi_response::custom_button_id)) {
@@ -104,11 +105,14 @@ void OnButtonPressNotification::Run() {
     }
 
     // Send ButtonPress notification only in HMI_FULL or HMI_LIMITED mode
-    if ((mobile_api::HMILevel::HMI_FULL != app->hmi_level()) &&
-        (mobile_api::HMILevel::HMI_LIMITED != app->hmi_level())) {
+    const auto window_id = app->GetSoftButtonWindowID(custom_btn_id);
+    app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
+    (*message_)[strings::msg_params][strings::window_id] = window_id;
+    const auto window_hmi_level = app->hmi_level(window_id);
+    if ((mobile_api::HMILevel::HMI_NONE == window_hmi_level)) {
       LOG4CXX_WARN(logger_,
-                   "CUSTOM_BUTTON OnButtonPress notification is allowed only "
-                       << "in FULL or LIMITED hmi level");
+                   "CUSTOM_BUTTON OnButtonPress notification is not allowed in "
+                   "NONE hmi level");
       return;
     }
 
@@ -129,8 +133,11 @@ void OnButtonPressNotification::Run() {
     }
 
     // Send ButtonPress notification only in HMI_FULL or HMI_LIMITED mode
-    if ((mobile_api::HMILevel::HMI_FULL != subscribed_app->hmi_level()) &&
-        (mobile_api::HMILevel::HMI_LIMITED != subscribed_app->hmi_level())) {
+    const mobile_apis::HMILevel::eType app_hmi_level =
+        subscribed_app->hmi_level(
+            mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
+    if ((mobile_api::HMILevel::HMI_FULL != app_hmi_level) &&
+        (mobile_api::HMILevel::HMI_LIMITED != app_hmi_level)) {
       LOG4CXX_WARN(logger_,
                    "OnButtonPress notification is allowed only"
                        << "in FULL or LIMITED hmi level");
@@ -187,6 +194,11 @@ void OnButtonPressNotification::SendButtonPress(ApplicationConstSharedPtr app) {
         (*message_)[strings::msg_params][strings::custom_button_id];
   }
 
+  if ((*message_)[strings::msg_params].keyExists(strings::window_id)) {
+    (*on_btn_press)[strings::msg_params][strings::window_id] =
+        (*message_)[strings::msg_params][strings::window_id];
+  }
+
   message_ = on_btn_press;
   SendNotification();
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc
index 8ec8a86554..1c0609e17d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_keyboard_input_notification.cc
@@ -76,7 +76,8 @@ void OnKeyBoardInputNotification::Run() {
       break;
     }
 
-    if (mobile_apis::HMILevel::eType::HMI_FULL == app->hmi_level()) {
+    if (mobile_apis::HMILevel::eType::HMI_FULL ==
+        app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW)) {
       LOG4CXX_INFO(logger_, "There is application in HMI_FULL level");
       app_to_notify = app;
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc
index 515279c5f9..cc6ab7b65b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_capability_updated_notification.cc
@@ -2,6 +2,7 @@
 
 #include "application_manager/app_service_manager.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/display_capabilities_builder.h"
 #include "application_manager/helpers/application_helper.h"
 #include "application_manager/message_helper.h"
 #include "sdl_rpc_plugin/extensions/system_capability_app_extension.h"
@@ -31,7 +32,7 @@ void OnSystemCapabilityUpdatedNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
   smart_objects::SmartObject& msg_params = (*message_)[strings::msg_params];
-  mobile_apis::SystemCapabilityType::eType system_capability_type =
+  const auto system_capability_type =
       static_cast<mobile_apis::SystemCapabilityType::eType>(
           msg_params[strings::system_capability]
                     [strings::system_capability_type]
@@ -127,8 +128,21 @@ void OnSystemCapabilityUpdatedNotification::Run() {
                 [strings::app_services_capabilities] = app_service_caps;
       break;
     }
-    default:
+
+    case mobile_apis::SystemCapabilityType::DISPLAYS: {
+      // Display capabilities content will be populated in the code after the
+      // switch so just breaking here
+      break;
+    }
+
+    default: {
+      LOG4CXX_ERROR(logger_,
+                    "Unknown system capability type: "
+                        << msg_params[strings::system_capability]
+                                     [strings::system_capability_type]
+                                         .asInt());
       return;
+    }
   }
 
   const char* capability_type_string;
@@ -136,11 +150,34 @@ void OnSystemCapabilityUpdatedNotification::Run() {
       mobile_apis::SystemCapabilityType::eType>::
       EnumToCString(system_capability_type, &capability_type_string);
 
+  const auto initial_connection_key =
+      (*message_)[strings::params][strings::connection_key].asUInt();
+
   auto subscribed_to_capability_predicate =
-      [&system_capability_type](const ApplicationSharedPtr app) {
+      [&system_capability_type,
+       &initial_connection_key](const ApplicationSharedPtr app) {
         DCHECK_OR_RETURN(app, false);
         auto& ext = SystemCapabilityAppExtension::ExtractExtension(*app);
-        return ext.IsSubscribedTo(system_capability_type);
+        if (!ext.IsSubscribedTo(system_capability_type)) {
+          LOG4CXX_DEBUG(logger_,
+                        "App " << app->app_id()
+                               << " is not subscribed to this capability type");
+          return false;
+        }
+
+        if (mobile_apis::SystemCapabilityType::DISPLAYS ==
+                system_capability_type &&
+            initial_connection_key > 0) {
+          LOG4CXX_DEBUG(logger_,
+                        "Display capabilities notification for app "
+                            << initial_connection_key << " only");
+          return app->app_id() == initial_connection_key;
+        }
+
+        LOG4CXX_DEBUG(logger_,
+                      "App " << app->app_id()
+                             << " is subscribed to specified capability type");
+        return true;
       };
 
   const std::vector<ApplicationSharedPtr>& applications = FindAllApps(
@@ -167,6 +204,40 @@ void OnSystemCapabilityUpdatedNotification::Run() {
       ext.UnsubscribeFrom(system_capability_type);
       continue;
     }
+
+    if (mobile_apis::SystemCapabilityType::DISPLAYS == system_capability_type) {
+      LOG4CXX_DEBUG(logger_, "Using common display capabilities");
+      auto capabilities = hmi_capabilities_.system_display_capabilities();
+      if (app->is_resuming() && app->is_app_data_resumption_allowed()) {
+        LOG4CXX_DEBUG(logger_,
+                      "Application "
+                          << app->app_id()
+                          << " is resuming. Providing cached capabilities");
+        auto display_caps =
+            app->display_capabilities_builder().display_capabilities();
+        capabilities = display_caps;
+      } else if (app->display_capabilities()) {
+        LOG4CXX_DEBUG(logger_,
+                      "Application " << app->app_id()
+                                     << " has specific display capabilities");
+        const WindowID window_id =
+            msg_params[strings::system_capability]
+                      [strings::display_capabilities][0]
+                      [strings::window_capabilities][0][strings::window_id]
+                          .asInt();
+        capabilities = app->display_capabilities(window_id);
+      }
+
+      if (!capabilities) {
+        LOG4CXX_WARN(logger_,
+                     "No available display capabilities for sending. Skipping");
+        continue;
+      }
+
+      msg_params[strings::system_capability][strings::display_capabilities] =
+          *capabilities;
+    }
+
     LOG4CXX_INFO(logger_,
                  "Sending OnSystemCapabilityUpdated " << capability_type_string
                                                       << " application id "
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc
index a85dec10bb..9c868172f5 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_system_request_notification.cc
@@ -86,8 +86,8 @@ void OnSystemRequestNotification::Run() {
           static_cast<rpc::policy_table_interface_base::RequestType>(
               request_type));
 
-  if (!policy_handler.IsRequestTypeAllowed(app->policy_app_id(),
-                                           request_type)) {
+  if (!policy_handler.IsRequestTypeAllowed(
+          app->device(), app->policy_app_id(), request_type)) {
     LOG4CXX_WARN(logger_,
                  "Request type " << stringified_request_type
                                  << " is not allowed by policies");
@@ -118,22 +118,23 @@ void OnSystemRequestNotification::Run() {
           mobile_apis::RequestType::OEM_SPECIFIC);
 
   BinaryMessage binary_data;
-  if (binary_data_is_required) {
+  if (binary_data_is_required &&
+      (*message_)[strings::msg_params].keyExists(strings::file_name)) {
     const std::string filename =
         (*message_)[strings::msg_params][strings::file_name].asString();
     file_system::ReadBinaryFile(filename, binary_data);
+  } else if ((*message_)[strings::params].keyExists(strings::binary_data)) {
+    // Binary data may already be attached to the message
+    binary_data = (*message_)[strings::params][strings::binary_data].asBinary();
   }
 
   if (mobile_apis::RequestType::OEM_SPECIFIC == request_type) {
     (*message_)[strings::params][strings::binary_data] = binary_data;
-  }
-
-  if (mobile_apis::RequestType::PROPRIETARY == request_type) {
+  } else if (mobile_apis::RequestType::PROPRIETARY == request_type) {
     /* According to requirements:
        "If the requestType = PROPRIETARY, add to mobile API fileType = JSON
         If the requestType = HTTP, add to mobile API fileType = BINARY"
-       Also in Genivi SDL we don't save the PT to file - we put it directly in
-       binary_data */
+       Also we don't save the PT to file - we put it directly in binary_data */
 
 #if defined(PROPRIETARY_MODE)
     AddHeader(binary_data);
@@ -144,14 +145,19 @@ void OnSystemRequestNotification::Run() {
 #endif  // PROPRIETARY_MODE
 
     (*message_)[strings::msg_params][strings::file_type] = FileType::JSON;
-  }
-
-  if (mobile_apis::RequestType::HTTP == request_type) {
+  } else if (mobile_apis::RequestType::HTTP == request_type) {
     (*message_)[strings::msg_params][strings::file_type] = FileType::BINARY;
     if ((*message_)[strings::msg_params].keyExists(strings::url)) {
       (*message_)[strings::msg_params][strings::timeout] =
           policy_handler.TimeoutExchangeSec();
     }
+  } else if (mobile_apis::RequestType::LOCK_SCREEN_ICON_URL == request_type) {
+    if (!(*message_)[strings::msg_params].keyExists(strings::url) ||
+        (*message_)[strings::msg_params][strings::url].empty()) {
+      LOG4CXX_ERROR(logger_,
+                    "discarding LOCK_SCREEN_ICON_URL request without URL");
+      return;
+    }
   }
 
   SendNotification();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc
index ccbdab15c9..0a8420b6a3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_tbt_client_state_notification.cc
@@ -67,7 +67,8 @@ void OnTBTClientStateNotification::Run() {
   std::vector<ApplicationSharedPtr>::const_iterator it = applications.begin();
   for (; applications.end() != it; ++it) {
     ApplicationSharedPtr app = *it;
-    if (mobile_apis::HMILevel::eType::HMI_NONE != app->hmi_level()) {
+    if (mobile_apis::HMILevel::eType::HMI_NONE !=
+        app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW)) {
       (*message_)[strings::params][strings::connection_key] = app->app_id();
       SendNotification();
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc
index e89ede53b9..39e0735013 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/on_way_point_change_notification.cc
@@ -65,6 +65,7 @@ void OnWayPointChangeNotification::Run() {
     (*message_)[strings::params][strings::connection_key] = *app_id;
     SendNotification();
   }
+  application_manager_.SaveWayPointsMessage(message_);
 }
 }  // namespace commands
 }  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc
index 8f8e4dbf6f..2f3d38f0b0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_audio_pass_thru_request.cc
@@ -87,7 +87,8 @@ void PerformAudioPassThruRequest::Run() {
     return;
   }
 
-  if (mobile_api::HMILevel::HMI_NONE == app->hmi_level()) {
+  if (mobile_api::HMILevel::HMI_NONE ==
+      app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW)) {
     LOG4CXX_ERROR(logger_, "application isn't activated");
     SendResponse(false, mobile_apis::Result::REJECTED);
     return;
@@ -286,20 +287,22 @@ void PerformAudioPassThruRequest::SendPerformAudioPassThruRequest() {
   msg_params[hmi_request::audio_pass_display_texts] =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
 
+  int32_t index = 0;
   if ((*message_)[str::msg_params].keyExists(str::audio_pass_display_text1)) {
-    msg_params[hmi_request::audio_pass_display_texts][0]
+    msg_params[hmi_request::audio_pass_display_texts][index]
               [hmi_request::field_name] = static_cast<int32_t>(
                   hmi_apis::Common_TextFieldName::audioPassThruDisplayText1);
-    msg_params[hmi_request::audio_pass_display_texts][0]
+    msg_params[hmi_request::audio_pass_display_texts][index]
               [hmi_request::field_text] =
                   (*message_)[str::msg_params][str::audio_pass_display_text1];
+    ++index;
   }
 
   if ((*message_)[str::msg_params].keyExists(str::audio_pass_display_text2)) {
-    msg_params[hmi_request::audio_pass_display_texts][1]
+    msg_params[hmi_request::audio_pass_display_texts][index]
               [hmi_request::field_name] = static_cast<int32_t>(
                   hmi_apis::Common_TextFieldName::audioPassThruDisplayText2);
-    msg_params[hmi_request::audio_pass_display_texts][1]
+    msg_params[hmi_request::audio_pass_display_texts][index]
               [hmi_request::field_text] =
                   (*message_)[str::msg_params][str::audio_pass_display_text2];
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
index 6b2f3cbcc5..881c838c1a 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/perform_interaction_request.cc
@@ -32,6 +32,7 @@
  */
 
 #include "sdl_rpc_plugin/commands/mobile/perform_interaction_request.h"
+
 #include <string.h>
 #include <numeric>
 #include <string>
@@ -46,6 +47,10 @@
 #include "utils/gen_hash.h"
 #include "utils/helpers.h"
 
+namespace {
+const std::int32_t INVALID_CHOICE_ID = -1;
+}
+
 namespace sdl_rpc_plugin {
 using namespace application_manager;
 
@@ -67,11 +72,15 @@ PerformInteractionRequest::PerformInteractionRequest(
                          hmi_capabilities,
                          policy_handler)
     , interaction_mode_(mobile_apis::InteractionMode::INVALID_ENUM)
+    , ui_choice_id_received_(INVALID_CHOICE_ID)
+    , vr_choice_id_received_(INVALID_CHOICE_ID)
     , ui_response_received_(false)
     , vr_response_received_(false)
     , app_pi_was_active_before_(false)
     , vr_result_code_(hmi_apis::Common_Result::INVALID_ENUM)
     , ui_result_code_(hmi_apis::Common_Result::INVALID_ENUM) {
+  response_msg_params =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
   subscribe_on_event(hmi_apis::FunctionID::UI_OnResetTimeout);
   subscribe_on_event(hmi_apis::FunctionID::VR_OnCommand);
   subscribe_on_event(hmi_apis::FunctionID::Buttons_OnButtonPress);
@@ -82,17 +91,18 @@ PerformInteractionRequest::~PerformInteractionRequest() {}
 bool PerformInteractionRequest::Init() {
   /* Timeout in milliseconds.
      If omitted a standard value of 10000 milliseconds is used.*/
-  if ((*message_)[strings::msg_params].keyExists(strings::timeout)) {
-    default_timeout_ =
-        (*message_)[strings::msg_params][strings::timeout].asUInt();
-  }
+  const auto& msg_params = (*message_)[strings::msg_params];
+  uint32_t request_timeout = msg_params[strings::timeout].asUInt();
 
   interaction_mode_ = static_cast<mobile_apis::InteractionMode::eType>(
-      (*message_)[strings::msg_params][strings::interaction_mode].asInt());
+      msg_params[strings::interaction_mode].asInt());
 
   if (mobile_apis::InteractionMode::BOTH == interaction_mode_ ||
       mobile_apis::InteractionMode::MANUAL_ONLY == interaction_mode_) {
-    default_timeout_ *= 2;
+    const uint32_t increase_value = 2;
+    default_timeout_ += request_timeout * increase_value;
+  } else {
+    default_timeout_ += request_timeout;
   }
   return true;
 }
@@ -226,8 +236,6 @@ void PerformInteractionRequest::Run() {
 void PerformInteractionRequest::on_event(const event_engine::Event& event) {
   LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
-  smart_objects::SmartObject msg_param =
-      smart_objects::SmartObject(smart_objects::SmartType_Map);
 
   switch (event.id()) {
     case hmi_apis::FunctionID::UI_OnResetTimeout: {
@@ -240,22 +248,24 @@ void PerformInteractionRequest::on_event(const event_engine::Event& event) {
       LOG4CXX_DEBUG(logger_, "Received UI_PerformInteraction event");
       EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
       ui_response_received_ = true;
+
       unsubscribe_from_event(hmi_apis::FunctionID::UI_PerformInteraction);
       ui_result_code_ = static_cast<hmi_apis::Common_Result::eType>(
           message[strings::params][hmi_response::code].asUInt());
       GetInfo(message, ui_info_);
-      ProcessUIResponse(event.smart_object(), msg_param);
+      ProcessUIResponse(event.smart_object(), response_msg_params);
       break;
     }
     case hmi_apis::FunctionID::VR_PerformInteraction: {
       LOG4CXX_DEBUG(logger_, "Received VR_PerformInteraction");
       EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_VR);
       vr_response_received_ = true;
+
       unsubscribe_from_event(hmi_apis::FunctionID::VR_PerformInteraction);
       vr_result_code_ = static_cast<hmi_apis::Common_Result::eType>(
           message[strings::params][hmi_response::code].asUInt());
       GetInfo(message, vr_info_);
-      if (ProcessVRResponse(event.smart_object(), msg_param)) {
+      if (ProcessVRResponse(event.smart_object(), response_msg_params)) {
         return;
       }
       break;
@@ -267,8 +277,17 @@ void PerformInteractionRequest::on_event(const event_engine::Event& event) {
   }
 
   if (!HasHMIResponsesToWait()) {
-    LOG4CXX_DEBUG(logger_, "Send response in BOTH iteraction mode");
-    SendBothModeResponse(msg_param);
+    LOG4CXX_DEBUG(logger_,
+                  "Send response in interaction mode "
+                      << static_cast<int32_t>(interaction_mode_));
+    if (SetChoiceIdToResponseMsgParams(response_msg_params)) {
+      SendBothModeResponse(response_msg_params);
+    } else {
+      DisablePerformInteraction();
+      SendResponse(false,
+                   mobile_apis::Result::GENERIC_ERROR,
+                   "Received two different choice IDs");
+    }
   }
 }
 
@@ -284,7 +303,7 @@ void PerformInteractionRequest::onTimeOut() {
         CommandRequestImpl::onTimeOut();
       } else {
         application_manager_.updateRequestTimeout(
-            connection_key(), correlation_id(), default_timeout());
+            connection_key(), correlation_id(), default_timeout_);
       }
       break;
     }
@@ -341,10 +360,15 @@ bool PerformInteractionRequest::ProcessVRResponse(
     }
     LOG4CXX_DEBUG(logger_, "Update timeout for UI");
     application_manager_.updateRequestTimeout(
-        connection_key(), correlation_id(), default_timeout());
+        connection_key(), correlation_id(), default_timeout_);
     return false;
   }
 
+  if (!ui_response_received_ &&
+      InteractionMode::MANUAL_ONLY != interaction_mode_) {
+    SendClosePopupRequestToHMI();
+  }
+
   const SmartObject& hmi_msg_params = message[strings::msg_params];
   if (hmi_msg_params.keyExists(strings::choice_id)) {
     const int choice_id = hmi_msg_params[strings::choice_id].asInt();
@@ -355,7 +379,14 @@ bool PerformInteractionRequest::ProcessVRResponse(
           false, Result::GENERIC_ERROR, "Wrong choiceID was received from HMI");
       return true;
     }
-    msg_params[strings::choice_id] = choice_id;
+    vr_choice_id_received_ = choice_id;
+  }
+
+  if (mobile_apis::InteractionMode::BOTH == interaction_mode_ ||
+      mobile_apis::InteractionMode::MANUAL_ONLY == interaction_mode_) {
+    LOG4CXX_DEBUG(logger_, "Update timeout for UI");
+    application_manager_.updateRequestTimeout(
+        connection_key(), correlation_id(), default_timeout_);
   }
 
   const bool is_vr_result_success = Compare<Common_Result::eType, EQ, ONE>(
@@ -389,8 +420,8 @@ void PerformInteractionRequest::ProcessUIResponse(
   HmiInterfaces::InterfaceState ui_interface_state =
       application_manager_.hmi_interfaces().GetInterfaceState(
           HmiInterfaces::HMI_INTERFACE_UI);
-  bool result = false;
-  result = Compare<hmi_apis::Common_Result::eType, EQ, ONE>(
+
+  bool result = Compare<hmi_apis::Common_Result::eType, EQ, ONE>(
       ui_result_code_,
       hmi_apis::Common_Result::SUCCESS,
       hmi_apis::Common_Result::WARNINGS);
@@ -422,11 +453,14 @@ void PerformInteractionRequest::ProcessUIResponse(
 
     // result code must be GENERIC_ERROR in case wrong choice_id
     if (msg_params.keyExists(strings::choice_id)) {
-      if (!CheckChoiceIDFromResponse(app,
-                                     msg_params[strings::choice_id].asInt())) {
+      const std::int32_t ui_choice_id =
+          static_cast<std::int32_t>(msg_params[strings::choice_id].asInt());
+
+      if (!CheckChoiceIDFromResponse(app, ui_choice_id)) {
         ui_result_code_ = hmi_apis::Common_Result::GENERIC_ERROR;
         ui_info_ = "Wrong choiceID was received from HMI";
       } else {
+        ui_choice_id_received_ = ui_choice_id;
         msg_params[strings::trigger_source] =
             mobile_apis::TriggerSource::TS_MENU;
       }
@@ -449,6 +483,11 @@ void PerformInteractionRequest::SendUIPerformInteractionRequest(
   smart_objects::SmartObject msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
+  if ((*message_)[strings::msg_params].keyExists(strings::cancel_id)) {
+    msg_params[strings::cancel_id] =
+        (*message_)[strings::msg_params][strings::cancel_id].asInt();
+  }
+
   mobile_apis::InteractionMode::eType mode =
       static_cast<mobile_apis::InteractionMode::eType>(
           (*message_)[strings::msg_params][strings::interaction_mode].asInt());
@@ -471,12 +510,8 @@ void PerformInteractionRequest::SendUIPerformInteractionRequest(
     }
   }
 
-  if (mobile_apis::InteractionMode::BOTH == mode ||
-      mobile_apis::InteractionMode::MANUAL_ONLY == mode) {
-    msg_params[strings::timeout] = default_timeout_ / 2;
-  } else {
-    msg_params[strings::timeout] = default_timeout_;
-  }
+  msg_params[strings::timeout] =
+      (*message_)[strings::msg_params][strings::timeout].asUInt();
   msg_params[strings::app_id] = app->app_id();
   if (mobile_apis::InteractionMode::VR_ONLY != mode) {
     msg_params[strings::choice_set] =
@@ -532,6 +567,11 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest(
   smart_objects::SmartObject msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
+  if ((*message_)[strings::msg_params].keyExists(strings::cancel_id)) {
+    msg_params[strings::cancel_id] =
+        (*message_)[strings::msg_params][strings::cancel_id].asInt();
+  }
+
   smart_objects::SmartObject& choice_list =
       (*message_)[strings::msg_params][strings::interaction_choice_set_id_list];
 
@@ -652,16 +692,9 @@ void PerformInteractionRequest::SendVRPerformInteractionRequest(
     return;
   }
 
-  mobile_apis::InteractionMode::eType mode =
-      static_cast<mobile_apis::InteractionMode::eType>(
-          (*message_)[strings::msg_params][strings::interaction_mode].asInt());
-
-  if (mobile_apis::InteractionMode::BOTH == mode ||
-      mobile_apis::InteractionMode::MANUAL_ONLY == mode) {
-    msg_params[strings::timeout] = default_timeout_ / 2;
-  } else {
-    msg_params[strings::timeout] = default_timeout_;
-  }
+  msg_params[strings::timeout] =
+      (*message_)[strings::msg_params][strings::timeout].asUInt();
+  ;
   msg_params[strings::app_id] = app->app_id();
   StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_VR);
   SendHMIRequest(
@@ -924,15 +957,19 @@ bool PerformInteractionRequest::IsWhiteSpaceExist() {
 void PerformInteractionRequest::TerminatePerformInteraction() {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  SendClosePopupRequestToHMI();
+  DisablePerformInteraction();
+}
+
+void PerformInteractionRequest::SendClosePopupRequestToHMI() {
   smart_objects::SmartObject msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
   msg_params[hmi_request::method_name] = "UI.PerformInteraction";
   SendHMIRequest(hmi_apis::FunctionID::UI_ClosePopUp, &msg_params);
-  DisablePerformInteraction();
 }
 
 bool PerformInteractionRequest::CheckChoiceIDFromResponse(
-    ApplicationSharedPtr app, int32_t choice_id) {
+    ApplicationSharedPtr app, const int32_t choice_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   const DataAccessor<PerformChoiceSetMap> accessor =
       app->performinteraction_choice_set_map();
@@ -944,12 +981,14 @@ bool PerformInteractionRequest::CheckChoiceIDFromResponse(
     const PerformChoice& choice = choice_set_map_it->second;
     PerformChoice::const_iterator it = choice.begin();
     for (; choice.end() != it; ++it) {
-      const smart_objects::SmartObject& choice_set =
-          (*it->second).getElement(strings::choice_set);
-      for (size_t j = 0; j < choice_set.length(); ++j) {
-        if (choice_id ==
-            choice_set.getElement(j).getElement(strings::choice_id).asInt()) {
-          return true;
+      if ((*it->second).keyExists(strings::choice_set)) {
+        const smart_objects::SmartObject& choice_set =
+            (*it->second).getElement(strings::choice_set);
+        for (size_t j = 0; j < choice_set.length(); ++j) {
+          if (choice_id ==
+              choice_set.getElement(j).getElement(strings::choice_id).asInt()) {
+            return true;
+          }
         }
       }
     }
@@ -1056,13 +1095,94 @@ void PerformInteractionRequest::SendBothModeResponse(
       msg_param.empty() ? NULL : &msg_param;
   std::string info = app_mngr::commands::MergeInfos(
       ui_perform_info, ui_info_, vr_perform_info, vr_info_);
+
   DisablePerformInteraction();
+
   SendResponse(result,
                perform_interaction_result_code,
                info.empty() ? NULL : info.c_str(),
                response_params);
 }
 
-}  // namespace commands
+mobile_apis::Result::eType
+PerformInteractionRequest::PrepareResultCodeForResponse(
+    const app_mngr::commands::ResponseInfo& ui_response,
+    const app_mngr::commands::ResponseInfo& vr_response) {
+  LOG4CXX_DEBUG(
+      logger_, "InteractionMode = " << static_cast<int32_t>(interaction_mode_));
+
+  auto mobile_vr_result_code =
+      MessageHelper::HMIToMobileResult(vr_result_code_);
+  auto mobile_ui_result_code =
+      MessageHelper::HMIToMobileResult(ui_result_code_);
+
+  if (mobile_apis::Result::eType::WARNINGS == mobile_vr_result_code) {
+    if (mobile_apis::Result::eType::SUCCESS == mobile_ui_result_code) {
+      return mobile_apis::Result::eType::WARNINGS;
+    }
+  } else if (mobile_apis::Result::eType::WARNINGS == mobile_ui_result_code) {
+    if (mobile_apis::Result::eType::SUCCESS == mobile_vr_result_code) {
+      return mobile_apis::Result::eType::WARNINGS;
+    }
+  }
 
+  if (mobile_apis::InteractionMode::VR_ONLY == interaction_mode_) {
+    return mobile_vr_result_code;
+  }
+  if (mobile_apis::InteractionMode::MANUAL_ONLY == interaction_mode_) {
+    return mobile_ui_result_code;
+  }
+
+  if (INVALID_CHOICE_ID != vr_choice_id_received_) {
+    return mobile_vr_result_code;
+  }
+  if (INVALID_CHOICE_ID != ui_choice_id_received_) {
+    return mobile_ui_result_code;
+  }
+
+  return CommandRequestImpl::PrepareResultCodeForResponse(ui_response,
+                                                          vr_response);
+}
+
+bool PerformInteractionRequest::PrepareResultForMobileResponse(
+    app_mngr::commands::ResponseInfo& ui_response,
+    app_mngr::commands::ResponseInfo& vr_response) const {
+  if (mobile_apis::InteractionMode::VR_ONLY == interaction_mode_) {
+    return vr_response.is_ok;
+  }
+  if (mobile_apis::InteractionMode::MANUAL_ONLY == interaction_mode_) {
+    return ui_response.is_ok;
+  }
+
+  return (vr_response.is_ok || ui_response.is_ok);
+}
+
+bool PerformInteractionRequest::SetChoiceIdToResponseMsgParams(
+    ns_smart_device_link::ns_smart_objects::SmartObject& msg_param) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const bool ui_choice_id_valid = INVALID_CHOICE_ID != ui_choice_id_received_;
+  const bool vr_choice_id_valid = INVALID_CHOICE_ID != vr_choice_id_received_;
+
+  if (ui_choice_id_valid && vr_choice_id_valid &&
+      ui_choice_id_received_ != vr_choice_id_received_) {
+    return false;
+  }
+
+  if (mobile_apis::InteractionMode::eType::MANUAL_ONLY == interaction_mode_) {
+    msg_param[strings::choice_id] = ui_choice_id_received_;
+    return true;
+  }
+
+  if (mobile_apis::InteractionMode::eType::VR_ONLY == interaction_mode_) {
+    msg_param[strings::choice_id] = vr_choice_id_received_;
+    return true;
+  }
+
+  msg_param[strings::choice_id] =
+      ui_choice_id_valid ? ui_choice_id_received_ : vr_choice_id_received_;
+  return true;
+}
+
+}  // namespace commands
 }  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc
index f68596ce27..e25215fb48 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/put_file_request.cc
@@ -94,7 +94,9 @@ void PutFileRequest::Run() {
     return;
   }
 
-  if (mobile_api::HMILevel::HMI_NONE == application->hmi_level() &&
+  if (mobile_api::HMILevel::HMI_NONE ==
+          application->hmi_level(
+              mobile_apis::PredefinedWindows::DEFAULT_WINDOW) &&
       application_manager_.get_settings().put_file_in_none() <=
           application->put_file_in_none_count()) {
     // If application is in the HMI_NONE level the quantity of allowed
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
index 597df26d0a..5fb66c25ac 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/register_app_interface_request.cc
@@ -43,6 +43,7 @@
 #include "application_manager/application_manager.h"
 #include "application_manager/helpers/application_helper.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/plugin_manager/plugin_keys.h"
 #include "application_manager/policies/policy_handler.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/resumption/resume_ctrl.h"
@@ -158,13 +159,14 @@ class SmartArrayValueExtractor {
 };
 
 struct IsSameNickname {
-  IsSameNickname(const custom_str::CustomString& app_id) : app_id_(app_id) {}
+  IsSameNickname(const custom_str::CustomString app_name)
+      : app_name_(app_name) {}
   bool operator()(const policy::StringArray::value_type& nickname) const {
-    return app_id_.CompareIgnoreCase(nickname.c_str());
+    return app_name_.CompareIgnoreCase(nickname.c_str());
   }
 
  private:
-  const custom_str::CustomString& app_id_;
+  const custom_str::CustomString app_name_;
 };
 }  // namespace
 
@@ -184,7 +186,8 @@ RegisterAppInterfaceRequest::RegisterAppInterfaceRequest(
                          rpc_service,
                          hmi_capabilities,
                          policy_handler)
-    , result_code_(mobile_apis::Result::INVALID_ENUM) {}
+    , result_code_(mobile_apis::Result::INVALID_ENUM)
+    , device_handle_(0) {}
 
 RegisterAppInterfaceRequest::~RegisterAppInterfaceRequest() {}
 
@@ -224,20 +227,38 @@ void RegisterAppInterfaceRequest::Run() {
     return;
   }
 
+  // Cache the original app ID (for legacy behavior)
+  const auto policy_app_id =
+      application_manager_.GetCorrectMobileIDFromMessage(message_);
+
+  if (application_manager_.IsApplicationForbidden(connection_key(),
+                                                  policy_app_id)) {
+    SendResponse(false, mobile_apis::Result::TOO_MANY_PENDING_REQUESTS);
+    return;
+  }
+
+  if (!GetDataOnSessionKey(connection_key(), &device_handle_, &device_id_)) {
+    SendResponse(false,
+                 mobile_apis::Result::GENERIC_ERROR,
+                 "Could not find a session for your connection key!");
+    return;
+  }
+
+  LOG4CXX_DEBUG(
+      logger_,
+      "device_handle: " << device_handle_ << " device_id: " << device_id_);
+
   if (IsApplicationSwitched()) {
     return;
   }
 
   ApplicationSharedPtr application =
-      application_manager_.application(connection_key());
+      application_manager_.application(device_id_, policy_app_id);
 
   if (application) {
     SendResponse(false, mobile_apis::Result::APPLICATION_REGISTERED_ALREADY);
     return;
   }
-  // cache the original app ID (for legacy behavior)
-  const std::string policy_app_id =
-      application_manager_.GetCorrectMobileIDFromMessage(message_);
 
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
@@ -260,11 +281,6 @@ void RegisterAppInterfaceRequest::Run() {
                    ::tolower);
     (*message_)[strings::msg_params][strings::full_app_id] = new_app_id_full;
   }
-  if (application_manager_.IsApplicationForbidden(connection_key(),
-                                                  policy_app_id)) {
-    SendResponse(false, mobile_apis::Result::TOO_MANY_PENDING_REQUESTS);
-    return;
-  }
 
   if (IsApplicationWithSameAppIdRegistered()) {
     SendResponse(false, mobile_apis::Result::DISALLOWED);
@@ -281,50 +297,77 @@ void RegisterAppInterfaceRequest::Run() {
     return;
   }
 
+  mobile_apis::Result::eType coincidence_result = CheckCoincidence();
+
   std::vector<ApplicationSharedPtr> duplicate_apps;
-  mobile_apis::Result::eType coincidence_result =
-      CheckCoincidence(duplicate_apps);
-
-  if (mobile_apis::Result::DUPLICATE_NAME == coincidence_result &&
-      duplicate_apps.size() == 1) {
-    ApplicationSharedPtr duplicate_app = duplicate_apps.front();
-    bool error_response = true;
-    if (duplicate_app->is_cloud_app()) {
-      if (duplicate_app->hybrid_app_preference() ==
-          mobile_apis::HybridAppPreference::MOBILE) {
-        // Unregister cloud application and allow mobile application to register
-        // in it's place
-        application_manager_.UnregisterApplication(
-            duplicate_app->app_id(), mobile_apis::Result::USER_DISALLOWED);
-        error_response = false;
-      }
+  if (GetDuplicateNames(duplicate_apps)) {
+    LOG4CXX_ERROR(logger_,
+                  "Found duplicate app names, checking for hybrid apps.");
+    // Default preference to BOTH
+    mobile_apis::HybridAppPreference::eType preference =
+        mobile_apis::HybridAppPreference::BOTH;
+    ApplicationSharedPtr app =
+        application_manager_.pending_application_by_policy_id(policy_app_id);
+    bool is_cloud_app = app.use_count() != 0 && app->is_cloud_app();
+    if (is_cloud_app) {
+      // Retrieve hybrid app preference from registering app
+      preference = app->hybrid_app_preference();
     } else {
-      ApplicationSharedPtr cloud_app =
-          application_manager_.pending_application_by_policy_id(policy_app_id);
-      // If the duplicate name was not because of a mobile/cloud app pair, go
-      // through the normal process for handling duplicate names
-      if (cloud_app.use_count() == 0 || !cloud_app->is_cloud_app()) {
+      if (mobile_apis::Result::DUPLICATE_NAME == coincidence_result) {
         usage_statistics::AppCounter count_of_rejections_duplicate_name(
             GetPolicyHandler().GetStatisticManager(),
             policy_app_id,
             usage_statistics::REJECTIONS_DUPLICATE_NAME);
         ++count_of_rejections_duplicate_name;
-      } else if (cloud_app->hybrid_app_preference() ==
-                 mobile_apis::HybridAppPreference::CLOUD) {
-        // Unregister mobile application and allow cloud application to
-        // register in it's place
-        application_manager_.UnregisterApplication(
-            duplicate_app->app_id(), mobile_apis::Result::USER_DISALLOWED);
-        error_response = false;
+      }
+      // Search for the hybrid app preference in the duplicate app list
+      for (auto duplicate_app : duplicate_apps) {
+        if (duplicate_app->is_cloud_app()) {
+          preference = duplicate_app->hybrid_app_preference();
+          break;
+        }
       }
     }
 
-    if (error_response) {
-      LOG4CXX_ERROR(logger_, "Coincidence check failed.");
-      SendResponse(false, coincidence_result);
-      return;
+    if (preference == mobile_apis::HybridAppPreference::MOBILE ||
+        preference == mobile_apis::HybridAppPreference::CLOUD) {
+      bool cloud_app_exists = is_cloud_app;
+      bool mobile_app_exists = !is_cloud_app;
+      for (auto duplicate_app : duplicate_apps) {
+        cloud_app_exists = cloud_app_exists || (duplicate_app->IsRegistered() &&
+                                                duplicate_app->is_cloud_app());
+        mobile_app_exists = mobile_app_exists || !duplicate_app->is_cloud_app();
+        if (is_cloud_app && !duplicate_app->is_cloud_app() &&
+            preference == mobile_apis::HybridAppPreference::CLOUD) {
+          // Unregister mobile application and allow cloud application to
+          // register in it's place
+          LOG4CXX_ERROR(
+              logger_,
+              "Unregistering app because a preferred version is registered.");
+          application_manager_.UnregisterApplication(
+              duplicate_app->app_id(),
+              mobile_apis::Result::USER_DISALLOWED,
+              "App is disabled by user preferences");
+        }
+      }
+
+      bool mobile_app_matches =
+          !is_cloud_app &&
+          preference == mobile_apis::HybridAppPreference::MOBILE;
+      bool cloud_app_matches =
+          is_cloud_app && preference == mobile_apis::HybridAppPreference::CLOUD;
+
+      bool is_preferred_application = mobile_app_matches || cloud_app_matches;
+      if (mobile_app_exists && cloud_app_exists && !is_preferred_application) {
+        SendResponse(false,
+                     mobile_apis::Result::USER_DISALLOWED,
+                     "App is disabled by user preferences");
+        return;
+      }
     }
-  } else if (mobile_apis::Result::SUCCESS != coincidence_result) {
+  }
+
+  if (mobile_apis::Result::SUCCESS != coincidence_result) {
     LOG4CXX_ERROR(logger_, "Coincidence check failed.");
     SendResponse(false, coincidence_result);
     return;
@@ -443,6 +486,12 @@ void RegisterAppInterfaceRequest::Run() {
     }
   }
 
+  auto on_app_registered = [application](plugin_manager::RPCPlugin& plugin) {
+    plugin.OnApplicationEvent(plugin_manager::kApplicationRegistered,
+                              application);
+  };
+  application_manager_.ApplyFunctorForEachPlugin(on_app_registered);
+
   if (msg_params.keyExists(strings::day_color_scheme)) {
     application->set_day_color_scheme(msg_params[strings::day_color_scheme]);
   }
@@ -502,126 +551,116 @@ RegisterAppInterfaceRequest::GetLockScreenIconUrlNotification(
   (*message)[strings::msg_params][strings::request_type] =
       mobile_apis::RequestType::LOCK_SCREEN_ICON_URL;
   (*message)[strings::msg_params][strings::url] =
-      GetPolicyHandler().GetLockScreenIconUrl();
+      GetPolicyHandler().GetLockScreenIconUrl(app->policy_app_id());
   return message;
 }
 
 void FillVRRelatedFields(smart_objects::SmartObject& response_params,
                          const HMICapabilities& hmi_capabilities) {
-  response_params[strings::language] = hmi_capabilities.active_vr_language();
-  if (hmi_capabilities.vr_capabilities()) {
-    response_params[strings::vr_capabilities] =
-        *hmi_capabilities.vr_capabilities();
+  auto active_vr_lang = hmi_capabilities.active_vr_language();
+  if (hmi_apis::Common_Language::INVALID_ENUM != active_vr_lang) {
+    response_params[strings::language] = active_vr_lang;
+  }
+  auto vr_capabilities = hmi_capabilities.vr_capabilities();
+  if (vr_capabilities) {
+    response_params[strings::vr_capabilities] = *vr_capabilities;
   }
 }
 
 void FillVIRelatedFields(smart_objects::SmartObject& response_params,
                          const HMICapabilities& hmi_capabilities) {
-  if (hmi_capabilities.vehicle_type()) {
-    response_params[hmi_response::vehicle_type] =
-        *hmi_capabilities.vehicle_type();
+  auto vehicle_type = hmi_capabilities.vehicle_type();
+  if (vehicle_type) {
+    response_params[hmi_response::vehicle_type] = *vehicle_type;
   }
 }
 
 void FillTTSRelatedFields(smart_objects::SmartObject& response_params,
                           const HMICapabilities& hmi_capabilities) {
-  response_params[strings::language] = hmi_capabilities.active_tts_language();
-  if (hmi_capabilities.speech_capabilities()) {
-    response_params[strings::speech_capabilities] =
-        *hmi_capabilities.speech_capabilities();
+  auto active_tts_lang = hmi_capabilities.active_tts_language();
+  if (hmi_apis::Common_Language::INVALID_ENUM != active_tts_lang) {
+    response_params[strings::language] = active_tts_lang;
+  }
+  auto speech_capabilities = hmi_capabilities.speech_capabilities();
+  if (speech_capabilities) {
+    response_params[strings::speech_capabilities] = *speech_capabilities;
   }
-  if (hmi_capabilities.prerecorded_speech()) {
-    response_params[strings::prerecorded_speech] =
-        *(hmi_capabilities.prerecorded_speech());
+  auto prerecorded_speech = hmi_capabilities.prerecorded_speech();
+  if (prerecorded_speech) {
+    response_params[strings::prerecorded_speech] = *prerecorded_speech;
   }
 }
 
 void FillUIRelatedFields(smart_objects::SmartObject& response_params,
                          const HMICapabilities& hmi_capabilities) {
-  response_params[strings::hmi_display_language] =
-      hmi_capabilities.active_ui_language();
-  if (hmi_capabilities.display_capabilities()) {
+  auto active_ui_lang = hmi_capabilities.active_ui_language();
+  if (hmi_apis::Common_Language::INVALID_ENUM != active_ui_lang) {
+    response_params[strings::hmi_display_language] = active_ui_lang;
+  }
+
+  auto display_capabilities = hmi_capabilities.display_capabilities();
+  if (display_capabilities) {
     response_params[hmi_response::display_capabilities] =
         smart_objects::SmartObject(smart_objects::SmartType_Map);
 
     smart_objects::SmartObject& display_caps =
         response_params[hmi_response::display_capabilities];
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::display_type)) {
+    if (display_capabilities->keyExists(hmi_response::display_type)) {
       display_caps[hmi_response::display_type] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::display_type);
+          display_capabilities->getElement(hmi_response::display_type);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::display_name)) {
+    if (display_capabilities->keyExists(hmi_response::display_name)) {
       display_caps[hmi_response::display_name] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::display_name);
+          display_capabilities->getElement(hmi_response::display_name);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::text_fields)) {
+    if (display_capabilities->keyExists(hmi_response::text_fields)) {
       display_caps[hmi_response::text_fields] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::text_fields);
+          display_capabilities->getElement(hmi_response::text_fields);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::image_fields)) {
+    if (display_capabilities->keyExists(hmi_response::image_fields)) {
       display_caps[hmi_response::image_fields] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::image_fields);
+          display_capabilities->getElement(hmi_response::image_fields);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::media_clock_formats)) {
+    if (display_capabilities->keyExists(hmi_response::media_clock_formats)) {
       display_caps[hmi_response::media_clock_formats] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::media_clock_formats);
+          display_capabilities->getElement(hmi_response::media_clock_formats);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::templates_available)) {
+    if (display_capabilities->keyExists(hmi_response::templates_available)) {
       display_caps[hmi_response::templates_available] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::templates_available);
+          display_capabilities->getElement(hmi_response::templates_available);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::screen_params)) {
+    if (display_capabilities->keyExists(hmi_response::screen_params)) {
       display_caps[hmi_response::screen_params] =
-          hmi_capabilities.display_capabilities()->getElement(
-              hmi_response::screen_params);
+          display_capabilities->getElement(hmi_response::screen_params);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
+    if (display_capabilities->keyExists(
             hmi_response::num_custom_presets_available)) {
       display_caps[hmi_response::num_custom_presets_available] =
-          hmi_capabilities.display_capabilities()->getElement(
+          display_capabilities->getElement(
               hmi_response::num_custom_presets_available);
     }
 
-    if (hmi_capabilities.display_capabilities()->keyExists(
-            hmi_response::image_capabilities)) {
+    if (display_capabilities->keyExists(hmi_response::image_capabilities)) {
       display_caps[hmi_response::graphic_supported] =
-          (hmi_capabilities.display_capabilities()
-               ->getElement(hmi_response::image_capabilities)
+          (display_capabilities->getElement(hmi_response::image_capabilities)
                .length() > 0);
     }
   }
 
-  if (hmi_capabilities.audio_pass_thru_capabilities()) {
-    if (smart_objects::SmartType_Array ==
-        hmi_capabilities.audio_pass_thru_capabilities()->getType()) {
-      // hmi_capabilities json contains array and HMI response object
-      response_params[strings::audio_pass_thru_capabilities] =
-          *hmi_capabilities.audio_pass_thru_capabilities();
-    } else {
-      response_params[strings::audio_pass_thru_capabilities][0] =
-          *hmi_capabilities.audio_pass_thru_capabilities();
-    }
+  auto audio_pass_thru_capabilities =
+      hmi_capabilities.audio_pass_thru_capabilities();
+  if (audio_pass_thru_capabilities) {
+    // hmi_capabilities json contains array and HMI response object
+    response_params[strings::audio_pass_thru_capabilities] =
+        *audio_pass_thru_capabilities;
   }
   response_params[strings::hmi_capabilities] =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
@@ -633,6 +672,11 @@ void FillUIRelatedFields(smart_objects::SmartObject& response_params,
       hmi_capabilities.video_streaming_supported();
   response_params[strings::hmi_capabilities][strings::remote_control] =
       hmi_capabilities.rc_supported();
+  response_params[strings::hmi_capabilities][strings::app_services] = true;
+  // Apps are automatically subscribed to the SystemCapability: DISPLAYS
+  response_params[strings::hmi_capabilities][strings::displays] = true;
+  response_params[strings::hmi_capabilities][strings::seat_location] =
+      hmi_capabilities.seat_location_capability() ? true : false;
 }
 
 void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
@@ -714,36 +758,39 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
     FillVIRelatedFields(response_params, hmi_capabilities);
   }
 
-  if (hmi_capabilities.button_capabilities()) {
-    response_params[hmi_response::button_capabilities] =
-        *hmi_capabilities.button_capabilities();
+  auto button_capabilities = hmi_capabilities.button_capabilities();
+  if (button_capabilities) {
+    response_params[hmi_response::button_capabilities] = *button_capabilities;
   }
 
-  if (hmi_capabilities.soft_button_capabilities()) {
+  auto soft_button_capabilities = hmi_capabilities.soft_button_capabilities();
+  if (soft_button_capabilities) {
     response_params[hmi_response::soft_button_capabilities] =
-        *hmi_capabilities.soft_button_capabilities();
+        *soft_button_capabilities;
   }
 
-  if (hmi_capabilities.preset_bank_capabilities()) {
+  auto preset_bank_capabilities = hmi_capabilities.preset_bank_capabilities();
+  if (preset_bank_capabilities) {
     response_params[hmi_response::preset_bank_capabilities] =
-        *hmi_capabilities.preset_bank_capabilities();
+        *preset_bank_capabilities;
   }
 
-  if (hmi_capabilities.hmi_zone_capabilities()) {
-    if (smart_objects::SmartType_Array ==
-        hmi_capabilities.hmi_zone_capabilities()->getType()) {
+  auto hmi_zone_capabilities = hmi_capabilities.hmi_zone_capabilities();
+  if (hmi_zone_capabilities) {
+    if (smart_objects::SmartType_Array == hmi_zone_capabilities->getType()) {
       // hmi_capabilities json contains array and HMI response object
       response_params[hmi_response::hmi_zone_capabilities] =
-          *hmi_capabilities.hmi_zone_capabilities();
+          *hmi_zone_capabilities;
     } else {
       response_params[hmi_response::hmi_zone_capabilities][0] =
-          *hmi_capabilities.hmi_zone_capabilities();
+          *hmi_zone_capabilities;
     }
   }
 
-  if (hmi_capabilities.pcm_stream_capabilities()) {
+  auto pcm_stream_capabilities = hmi_capabilities.pcm_stream_capabilities();
+  if (pcm_stream_capabilities) {
     response_params[strings::pcm_stream_capabilities] =
-        *hmi_capabilities.pcm_stream_capabilities();
+        *pcm_stream_capabilities;
   }
 
   const std::vector<uint32_t>& diag_modes =
@@ -785,15 +832,16 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
     return;
   }
 
-  bool resumption =
+  const bool hash_id_present =
       (*message_)[strings::msg_params].keyExists(strings::hash_id);
+  const std::string hash_id =
+      (*message_)[strings::msg_params][strings::hash_id].asString();
 
+  const bool resumption = hash_id_present && !hash_id.empty();
   bool need_restore_vr = resumption;
 
-  std::string hash_id;
   std::string add_info;
   if (resumption) {
-    hash_id = (*message_)[strings::msg_params][strings::hash_id].asString();
     if (!resumer.CheckApplicationHash(application, hash_id)) {
       LOG4CXX_WARN(logger_,
                    "Hash from RAI does not match to saved resume data.");
@@ -807,6 +855,8 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
       need_restore_vr = false;
     } else {
       add_info = "Resume succeeded.";
+      application->set_app_data_resumption_allowance(true);
+      application->set_is_resuming(true);
     }
   }
   if ((mobile_apis::Result::SUCCESS == result_code) &&
@@ -815,10 +865,18 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
     result_code = result_code_;
   }
 
-  // in case application exist in resumption we need to send resumeVrgrammars
-  if (false == resumption) {
-    resumption = resumer.IsApplicationSaved(application->policy_app_id(),
-                                            application->mac_address());
+  // In case application exist in resumption we need to send resumeVrgrammars
+  const bool is_app_saved_in_resumption = resumer.IsApplicationSaved(
+      application->policy_app_id(), application->mac_address());
+
+  // If app is in resuming state
+  // DisplayCapabilitiesBuilder has to collect all the information
+  // from incoming HMI notifications and send only one notification
+  // to mobile app, even if hash does not match, which means that app data
+  // will not be resumed, notification should be sent for default window as
+  // it will be resumed in any case
+  if (resumption || is_app_saved_in_resumption) {
+    resumer.StartWaitingForDisplayCapabilitiesUpdate(application);
   }
 
   AppHmiTypes hmi_types;
@@ -835,20 +893,27 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
     }
   }
   policy::StatusNotifier notify_upd_manager = GetPolicyHandler().AddApplication(
-      application->policy_app_id(), hmi_types);
+      application->mac_address(), application->policy_app_id(), hmi_types);
 
   response_params[strings::icon_resumed] =
       file_system::FileExists(application->app_icon_path());
 
   SendResponse(true, result_code, add_info.c_str(), &response_params);
   if (msg_params.keyExists(strings::app_hmi_type)) {
-    GetPolicyHandler().SetDefaultHmiTypes(application->policy_app_id(),
+    GetPolicyHandler().SetDefaultHmiTypes(application->device(),
+                                          application->policy_app_id(),
                                           &(msg_params[strings::app_hmi_type]));
   }
 
   // Default HMI level should be set before any permissions validation, since it
   // relies on HMI level.
   application_manager_.OnApplicationRegistered(application);
+
+  auto send_rc_status = [application](plugin_manager::RPCPlugin& plugin) {
+    plugin.OnApplicationEvent(plugin_manager::kRCStatusChanged, application);
+  };
+  application_manager_.ApplyFunctorForEachPlugin(send_rc_status);
+
   SendOnAppRegisteredNotificationToHMI(
       application, resumption, need_restore_vr);
   (*notify_upd_manager)();
@@ -856,11 +921,13 @@ void RegisterAppInterfaceRequest::SendRegisterAppInterfaceResponseToMobile(
   // Start PTU after successfull registration
   // Sends OnPermissionChange notification to mobile right after RAI response
   // and HMI level set-up
-  GetPolicyHandler().OnAppRegisteredOnMobile(application->policy_app_id());
+  GetPolicyHandler().OnAppRegisteredOnMobile(application->mac_address(),
+                                             application->policy_app_id());
 
-  if (result_code != mobile_apis::Result::RESUME_FAILED) {
+  if (result_code != mobile_apis::Result::RESUME_FAILED &&
+      application->is_app_data_resumption_allowed()) {
     resumer.StartResumption(application, hash_id);
-  } else {
+  } else if (is_app_saved_in_resumption) {
     resumer.StartResumptionOnlyHMILevel(application);
   }
 
@@ -955,61 +1022,113 @@ void RegisterAppInterfaceRequest::SendOnAppRegisteredNotificationToHMI(
   DCHECK(rpc_service_.ManageHMICommand(notification));
 }
 
-mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckCoincidence(
-    std::vector<ApplicationSharedPtr>& out_duplicate_apps) {
+mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckCoincidence() {
   LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
 
-  ApplicationSet accessor = application_manager_.applications().GetData();
+  auto compare_tts_name = [](const smart_objects::SmartObject& obj_1,
+                             const smart_objects::SmartObject& obj_2) {
+    return obj_1[application_manager::strings::text]
+        .asCustomString()
+        .CompareIgnoreCase(
+            obj_2[application_manager::strings::text].asCustomString());
+  };
 
-  ApplicationSetConstIt it = accessor.begin();
-  const custom_str::CustomString& app_name =
-      msg_params[strings::app_name].asCustomString();
+  const auto& accessor = application_manager_.applications().GetData();
+  const auto& app_name = msg_params[strings::app_name].asCustomString();
 
-  for (; accessor.end() != it; ++it) {
-    // name check
-    const custom_str::CustomString& cur_name = (*it)->name();
+  for (const auto& app : accessor) {
+    if (app->device() != device_handle_) {
+      continue;
+    }
+    // Name check
+    const auto& cur_name = app->name();
     if (app_name.CompareIgnoreCase(cur_name)) {
       LOG4CXX_ERROR(logger_, "Application name is known already.");
-      out_duplicate_apps.push_back(*it);
-      continue;
+      return mobile_apis::Result::DUPLICATE_NAME;
     }
-
-    const smart_objects::SmartObject* vr = (*it)->vr_synonyms();
-    const std::vector<smart_objects::SmartObject>* curr_vr = NULL;
-    if (NULL != vr) {
-      curr_vr = vr->asArray();
+    const auto vr = app->vr_synonyms();
+    if (vr) {
+      const auto curr_vr = vr->asArray();
       CoincidencePredicateVR v(app_name);
 
       if (0 != std::count_if(curr_vr->begin(), curr_vr->end(), v)) {
         LOG4CXX_ERROR(logger_, "Application name is known already.");
-        out_duplicate_apps.push_back(*it);
-        continue;
+        return mobile_apis::Result::DUPLICATE_NAME;
       }
     }
 
-    // vr check
+    // VR check
     if (msg_params.keyExists(strings::vr_synonyms)) {
-      const std::vector<smart_objects::SmartObject>* new_vr =
-          msg_params[strings::vr_synonyms].asArray();
+      const auto new_vr = msg_params[strings::vr_synonyms].asArray();
 
       CoincidencePredicateVR v(cur_name);
       if (0 != std::count_if(new_vr->begin(), new_vr->end(), v)) {
         LOG4CXX_ERROR(logger_, "vr_synonyms duplicated with app_name .");
-        out_duplicate_apps.push_back(*it);
-        continue;
+        return mobile_apis::Result::DUPLICATE_NAME;
       }
-    }  // end vr check
+    }  // End vr check
+
+    // TTS check
+    if (msg_params.keyExists(strings::tts_name) && app->tts_name()) {
+      const auto tts_array = msg_params[strings::tts_name].asArray();
+      const auto tts_curr = app->tts_name()->asArray();
+      const auto& it_tts = std::find_first_of(tts_array->begin(),
+                                              tts_array->end(),
+                                              tts_curr->begin(),
+                                              tts_curr->end(),
+                                              compare_tts_name);
+      if (it_tts != tts_array->end()) {
+        LOG4CXX_ERROR(
+            logger_,
+            "TTS name: "
+                << (*it_tts)[strings::text].asCustomString().AsMBString()
+                << " is known already");
+        return mobile_apis::Result::DUPLICATE_NAME;
+      }
+    }  // End tts check
 
-  }  // application for end
+  }  // Application for end
 
-  if (!out_duplicate_apps.empty()) {
-    return mobile_apis::Result::DUPLICATE_NAME;
-  }
   return mobile_apis::Result::SUCCESS;
 }  // method end
 
+bool RegisterAppInterfaceRequest::GetDuplicateNames(
+    std::vector<ApplicationSharedPtr>& out_duplicate_apps) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const smart_objects::SmartObject& msg_params =
+      (*message_)[strings::msg_params];
+
+  const auto& app_name = msg_params[strings::app_name].asCustomString();
+  {
+    const auto& accessor = application_manager_.applications().GetData();
+
+    for (const auto& app : accessor) {
+      const auto& cur_name = app->name();
+      if (app_name.CompareIgnoreCase(cur_name)) {
+        out_duplicate_apps.push_back(app);
+      }
+    }
+  }
+
+  const std::string policy_app_id =
+      application_manager_.GetCorrectMobileIDFromMessage(message_);
+  {
+    const auto& accessor =
+        application_manager_.pending_applications().GetData();
+
+    for (const auto& app : accessor) {
+      const auto& cur_name = app->name();
+      if (app_name.CompareIgnoreCase(cur_name) &&
+          policy_app_id != app->policy_app_id()) {
+        out_duplicate_apps.push_back(app);
+      }
+    }
+  }
+  return !out_duplicate_apps.empty();
+}
+
 mobile_apis::Result::eType RegisterAppInterfaceRequest::CheckWithPolicyData() {
   LOG4CXX_AUTO_TRACE(logger_);
   // TODO(AOleynik): Check is necessary to allow register application in case
@@ -1131,14 +1250,19 @@ bool RegisterAppInterfaceRequest::IsApplicationWithSameAppIdRegistered() {
   const custom_string::CustomString mobile_app_id(
       application_manager_.GetCorrectMobileIDFromMessage(message_));
 
-  const ApplicationSet& applications =
-      application_manager_.applications().GetData();
-
-  ApplicationSetConstIt it = applications.begin();
-  ApplicationSetConstIt it_end = applications.end();
-
-  for (; it != it_end; ++it) {
-    if (mobile_app_id.CompareIgnoreCase((*it)->policy_app_id().c_str())) {
+  const auto& applications = application_manager_.applications().GetData();
+
+  for (const auto& app : applications) {
+    if (mobile_app_id.CompareIgnoreCase(app->policy_app_id().c_str())) {
+      if (app->device() != device_handle_) {
+        LOG4CXX_DEBUG(logger_,
+                      "These policy_app_id equal, but applications have "
+                      "different device id"
+                          << " mobile_app_id: " << mobile_app_id.c_str()
+                          << " device_handle: " << device_handle_
+                          << " device_handle: " << app->device());
+        continue;
+      }
       return true;
     }
   }
@@ -1308,13 +1432,12 @@ void RegisterAppInterfaceRequest::CheckResponseVehicleTypeParam(
 
 void RegisterAppInterfaceRequest::SendSubscribeCustomButtonNotification() {
   using namespace smart_objects;
-  using namespace hmi_apis;
-
   SmartObject msg_params = SmartObject(SmartType_Map);
   msg_params[strings::app_id] = connection_key();
-  msg_params[strings::name] = Common_ButtonName::CUSTOM_BUTTON;
+  msg_params[strings::name] = hmi_apis::Common_ButtonName::CUSTOM_BUTTON;
   msg_params[strings::is_suscribed] = true;
-  CreateHMINotification(FunctionID::Buttons_OnButtonSubscription, msg_params);
+  CreateHMINotification(hmi_apis::FunctionID::Buttons_OnButtonSubscription,
+                        msg_params);
 }
 
 bool RegisterAppInterfaceRequest::IsApplicationSwitched() {
@@ -1322,8 +1445,8 @@ bool RegisterAppInterfaceRequest::IsApplicationSwitched() {
       application_manager_.GetCorrectMobileIDFromMessage(message_);
 
   LOG4CXX_DEBUG(logger_, "Looking for application id " << policy_app_id);
-
-  auto app = application_manager_.application_by_policy_id(policy_app_id);
+  auto app =
+      application_manager_.reregister_application_by_policy_id(policy_app_id);
 
   if (!app) {
     LOG4CXX_DEBUG(
@@ -1334,12 +1457,14 @@ bool RegisterAppInterfaceRequest::IsApplicationSwitched() {
 
   LOG4CXX_DEBUG(logger_,
                 "Application with policy id " << policy_app_id << " is found.");
-  if (!application_manager_.IsAppInReconnectMode(policy_app_id)) {
-    LOG4CXX_DEBUG(
-        logger_,
-        "Policy id " << policy_app_id << " is not found in reconnection list.");
+
+  const auto app_device_handle = app->device();
+  if (app_device_handle == device_handle_) {
+    LOG4CXX_DEBUG(logger_,
+                  "Application " << policy_app_id
+                                 << " is already registered from this device.");
     SendResponse(false, mobile_apis::Result::APPLICATION_REGISTERED_ALREADY);
-    return false;
+    return true;
   }
 
   LOG4CXX_DEBUG(logger_, "Application is found in reconnection list.");
@@ -1358,13 +1483,61 @@ bool RegisterAppInterfaceRequest::IsApplicationSwitched() {
   application_manager_.ProcessReconnection(app, connection_key());
   SendRegisterAppInterfaceResponseToMobile(app_type);
 
-  application_manager_.SendHMIStatusNotification(app);
+  MessageHelper::SendHMIStatusNotification(
+      app,
+      mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+      application_manager_);
 
   application_manager_.OnApplicationSwitched(app);
 
   return true;
 }
 
+bool RegisterAppInterfaceRequest::GetDataOnSessionKey(
+    const uint32_t key,
+    connection_handler::DeviceHandle* device_id,
+    std::string* mac_address) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if ((nullptr == mac_address) && (nullptr == device_id)) {
+    LOG4CXX_ERROR(logger_,
+                  "Can't get data on session key because device id and mac "
+                  "address are empty.");
+    return false;
+  }
+
+  connection_handler::DeviceHandle device_handle = 0;
+  auto& connect_handler = application_manager_.connection_handler();
+
+  auto result = connect_handler.GetDataOnSessionKey(
+      connection_key(), nullptr, nullptr, &device_handle);
+
+  if (result) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "Failed to get device info for connection key: " << connection_key());
+    return false;
+  }
+
+  if (mac_address) {
+    result = connect_handler.get_session_observer().GetDataOnDeviceID(
+        device_handle, nullptr, nullptr, mac_address, nullptr);
+  }
+
+  if (result) {
+    LOG4CXX_DEBUG(logger_,
+                  "Failed get unique address info for connection key: "
+                      << connection_key());
+    return false;
+  }
+
+  if (device_id) {
+    *device_id = device_handle;
+  }
+
+  return true;
+}
+
 policy::PolicyHandlerInterface&
 RegisterAppInterfaceRequest::GetPolicyHandler() {
   return policy_handler_;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
index ffd8a7dc81..a0e178d0e2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
@@ -198,8 +198,21 @@ bool ResetGlobalPropertiesRequest::ResetHelpPromt(
     SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
     return false;
   }
+  const std::vector<std::string>& help_prompt =
+      application_manager_.get_settings().help_prompt();
+
   smart_objects::SmartObject so_help_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
+
+  for (size_t i = 0; i < help_prompt.size(); ++i) {
+    smart_objects::SmartObject help_prompt_item =
+        smart_objects::SmartObject(smart_objects::SmartType_Map);
+    help_prompt_item[strings::text] = help_prompt[i];
+    help_prompt_item[strings::type] =
+        hmi_apis::Common_SpeechCapabilities::SC_TEXT;
+    so_help_prompt[i] = help_prompt_item;
+  }
+
   app->set_help_prompt(so_help_prompt);
   return true;
 }
@@ -218,7 +231,7 @@ bool ResetGlobalPropertiesRequest::ResetTimeoutPromt(
   smart_objects::SmartObject so_time_out_promt =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
 
-  for (uint32_t i = 0; i < time_out_promt.size(); ++i) {
+  for (size_t i = 0; i < time_out_promt.size(); ++i) {
     smart_objects::SmartObject timeoutPrompt =
         smart_objects::SmartObject(smart_objects::SmartType_Map);
     timeoutPrompt[strings::text] = time_out_promt[i];
@@ -238,8 +251,16 @@ bool ResetGlobalPropertiesRequest::ResetVrHelpTitleItems(
     SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
     return false;
   }
+
+  const std::string& vr_help_title =
+      application_manager_.get_settings().vr_help_title();
+  smart_objects::SmartObject so_vr_help_title =
+      smart_objects::SmartObject(smart_objects::SmartType_String);
+  so_vr_help_title = vr_help_title;
+
   app->reset_vr_help_title();
   app->reset_vr_help();
+  app->set_vr_help_title(so_vr_help_title);
 
   return true;
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc
index c1d02c96d3..90dbb91b5f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/scrollable_message_request.cc
@@ -65,13 +65,9 @@ ScrollableMessageRequest::~ScrollableMessageRequest() {}
 bool ScrollableMessageRequest::Init() {
   /* Timeout in milliseconds.
      If omitted a standard value of 10000 milliseconds is used.*/
-  if ((*message_)[strings::msg_params].keyExists(strings::timeout)) {
-    default_timeout_ =
-        (*message_)[strings::msg_params][strings::timeout].asUInt();
-  } else {
-    const int32_t def_value = 30000;
-    default_timeout_ = def_value;
-  }
+  uint32_t request_timeout =
+      (*message_)[strings::msg_params][strings::timeout].asUInt();
+  default_timeout_ += request_timeout;
 
   return true;
 }
@@ -110,7 +106,13 @@ void ScrollableMessageRequest::Run() {
   msg_params[hmi_request::message_text][hmi_request::field_text] =
       (*message_)[strings::msg_params][strings::scroll_message_body];
   msg_params[strings::app_id] = app->app_id();
-  msg_params[strings::timeout] = default_timeout_;
+  msg_params[strings::timeout] =
+      (*message_)[strings::msg_params][strings::timeout].asUInt();
+
+  if ((*message_)[strings::msg_params].keyExists(strings::cancel_id)) {
+    msg_params[strings::cancel_id] =
+        (*message_)[strings::msg_params][strings::cancel_id].asInt();
+  }
 
   if ((*message_)[strings::msg_params].keyExists(strings::soft_buttons)) {
     msg_params[strings::soft_buttons] =
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc
index 1df4d788d2..805c0f0e41 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/send_location_request.cc
@@ -254,10 +254,10 @@ bool SendLocationRequest::CheckHMICapabilities(
     return false;
   }
 
-  if (hmi_capabilities.display_capabilities()) {
-    const SmartObject disp_cap = (*hmi_capabilities.display_capabilities());
+  auto display_capabilities = hmi_capabilities.display_capabilities();
+  if (display_capabilities) {
     const SmartObject& text_fields =
-        disp_cap.getElement(hmi_response::text_fields);
+        display_capabilities->getElement(hmi_response::text_fields);
     const size_t len = text_fields.length();
     for (size_t i = 0; i < len; ++i) {
       const SmartObject& text_field = text_fields[i];
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc
index b2363e870f..ed77d8a550 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_app_icon_request.cc
@@ -60,6 +60,14 @@ SetAppIconRequest::SetAppIconRequest(
     , is_icons_saving_enabled_(false) {
   const std::string path =
       application_manager_.get_settings().app_icons_folder();
+
+  if (!file_system::DirectoryExists(path)) {
+    LOG4CXX_WARN(logger_, "App icons folder doesn't exist.");
+    if (!file_system::CreateDirectoryRecursively(path)) {
+      LOG4CXX_ERROR(logger_, "Unable to create app icons directory: " << path);
+    }
+  }
+
   is_icons_saving_enabled_ = file_system::IsWritingAllowed(path) &&
                              file_system::IsReadingAllowed(path);
 }
@@ -106,25 +114,22 @@ void SetAppIconRequest::Run() {
   msg_params[strings::sync_file_name] =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
-  // Panasonic requres unchanged path value without encoded special characters
-  const std::string full_file_path_for_hmi =
-      file_system::ConvertPathForURL(full_file_path);
+  // For further use in on_event function
+  full_file_path_for_hmi_ = file_system::ConvertPathForURL(full_file_path);
 
-  msg_params[strings::sync_file_name][strings::value] = full_file_path_for_hmi;
+  msg_params[strings::sync_file_name][strings::value] = full_file_path_for_hmi_;
 
   // TODO(VS): research why is image_type hardcoded
   msg_params[strings::sync_file_name][strings::image_type] =
       static_cast<int32_t>(SetAppIconRequest::ImageType::DYNAMIC);
 
-  // for further use in on_event function
-  (*message_)[strings::msg_params][strings::sync_file_name] =
-      msg_params[strings::sync_file_name];
   StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
   SendHMIRequest(hmi_apis::FunctionID::UI_SetAppIcon, &msg_params, true);
 }
 
 void SetAppIconRequest::CopyToIconStorage(
-    const std::string& path_to_file) const {
+    const std::string& policy_app_id, const std::string& path_to_file) const {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!(application_manager_.protocol_handler()
             .get_settings()
             .max_supported_protocol_version() >=
@@ -146,6 +151,11 @@ void SetAppIconRequest::CopyToIconStorage(
       application_manager_.get_settings().app_icons_folder_max_size());
   const uint64_t file_size = file_system::FileSize(path_to_file);
 
+  if (0 == file_size) {
+    LOG4CXX_ERROR(logger_, "Can't get the icon file size: " << path_to_file);
+    return;
+  }
+
   if (storage_max_size < file_size) {
     LOG4CXX_ERROR(logger_,
                   "Icon size (" << file_size
@@ -159,6 +169,7 @@ void SetAppIconRequest::CopyToIconStorage(
 
   const uint64_t storage_size =
       static_cast<uint64_t>(file_system::DirectorySize(icon_storage));
+
   if (storage_max_size < (file_size + storage_size)) {
     const uint32_t icons_amount =
         application_manager_.get_settings().app_icons_amount_to_remove();
@@ -174,23 +185,15 @@ void SetAppIconRequest::CopyToIconStorage(
       RemoveOldestIcons(icon_storage, icons_amount);
     }
   }
-  ApplicationConstSharedPtr app =
-      application_manager_.application(connection_key());
 
-  if (!app) {
-    LOG4CXX_ERROR(
-        logger_,
-        "Can't get application for connection key: " << connection_key());
-    return;
-  }
+  const std::string icon_path = icon_storage + "/" + policy_app_id;
 
-  const std::string icon_path = icon_storage + "/" + app->policy_app_id();
   if (!file_system::CreateFile(icon_path)) {
     LOG4CXX_ERROR(logger_, "Can't create icon: " << icon_path);
     return;
   }
 
-  if (!file_system::Write(icon_path, file_content)) {
+  if (!file_system::WriteBinaryFile(icon_path, file_content)) {
     LOG4CXX_ERROR(logger_, "Can't write icon: " << icon_path);
     return;
   }
@@ -266,21 +269,19 @@ void SetAppIconRequest::on_event(const event_engine::Event& event) {
         ApplicationSharedPtr app =
             application_manager_.application(connection_key());
 
-        if ((message_.use_count() == 0) || (app.use_count() == 0)) {
-          LOG4CXX_ERROR(logger_, "NULL pointer.");
+        if (!app) {
+          LOG4CXX_ERROR(
+              logger_,
+              "Can't get application for connection key: " << connection_key());
           return;
         }
 
-        const std::string& path =
-            (*message_)[strings::msg_params][strings::sync_file_name]
-                       [strings::value]
-                           .asString();
-
-        if (is_icons_saving_enabled_) {
-          CopyToIconStorage(path);
+        if (is_icons_saving_enabled_ && !full_file_path_for_hmi_.empty()) {
+          const auto policy_app_id = app->policy_app_id();
+          CopyToIconStorage(policy_app_id, full_file_path_for_hmi_);
         }
 
-        app->set_app_icon_path(path);
+        app->set_app_icon_path(full_file_path_for_hmi_);
 
         LOG4CXX_INFO(logger_,
                      "Icon path was set to '" << app->app_icon_path() << "'");
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc
index 5173be56d6..680429d3b6 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_cloud_app_properties_request.cc
@@ -1,4 +1,6 @@
 #include "sdl_rpc_plugin/commands/mobile/set_cloud_app_properties_request.h"
+#include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
@@ -29,9 +31,29 @@ void SetCloudAppPropertiesRequest::Run() {
     return;
   }
 
-  policy_handler_.OnSetCloudAppProperties(*message_);
+  const auto& properties =
+      (*message_)[strings::msg_params][strings::properties];
+
+  const auto app_id(properties[strings::app_id].asString());
+
+  const auto properties_change_status =
+      policy_handler_.GetAppPropertiesStatus(properties, app_id);
+
+  using AppPropertiesState = policy::PolicyHandlerInterface::AppPropertiesState;
+  const bool is_properties_changed =
+      AppPropertiesState::NO_CHANGES != properties_change_status;
 
+  const bool is_new_app = policy_handler_.IsNewApplication(app_id);
+
+  policy_handler_.OnSetCloudAppProperties(*message_);
   SendResponse(true, mobile_apis::Result::SUCCESS);
+
+  if (is_properties_changed || is_new_app) {
+    const auto notification =
+        MessageHelper::CreateOnAppPropertiesChangeNotification(
+            app_id, application_manager_);
+    application_manager_.GetRPCService().ManageHMICommand(notification);
+  }
 }
 
 void SetCloudAppPropertiesRequest::on_event(
@@ -40,4 +62,4 @@ void SetCloudAppPropertiesRequest::on_event(
 }
 
 }  // namespace commands
-}  // namespace sdl_rpc_plugin
\ No newline at end of file
+}  // namespace sdl_rpc_plugin
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc
index 2a09a72af2..0cd9f6635c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_display_layout_request.cc
@@ -75,8 +75,8 @@ void SetDisplayLayoutRequest::Run() {
     new_layout = msg_params[strings::display_layout].asString();
   }
 
-  if (new_layout != old_layout &&
-      !new_layout.empty()) {  // Template switched, allow any color change
+  if (new_layout != old_layout && !new_layout.empty()) {
+    // Template switched, hence allow any color change
     LOG4CXX_DEBUG(logger_,
                   "SetDisplayLayoutRequest New Layout: " << new_layout);
     app->set_display_layout(new_layout);
@@ -85,22 +85,20 @@ void SetDisplayLayoutRequest::Run() {
     // Template layout is the same as previous layout
     // Reject message if colors are set
     if (msg_params.keyExists(strings::day_color_scheme) &&
-        app->day_color_scheme() != NULL &&
-        !(msg_params[strings::day_color_scheme] ==
-          *(app->day_color_scheme()))) {
-      // Color scheme param exists and has been previously set, do not allow
-      // color change
+        app->day_color_scheme().getType() != smart_objects::SmartType_Null &&
+        msg_params[strings::day_color_scheme] != app->day_color_scheme()) {
+      // Color scheme param exists and has been previously set,
+      // hence do not allow color change
       LOG4CXX_DEBUG(logger_, "Reject Day Color Scheme Change");
       SendResponse(false, mobile_apis::Result::REJECTED);
       return;
     }
 
     if (msg_params.keyExists(strings::night_color_scheme) &&
-        app->night_color_scheme() != NULL &&
-        !(msg_params[strings::night_color_scheme] ==
-          *(app->night_color_scheme()))) {
-      // Color scheme param exists and has been previously set, do not allow
-      // color change
+        app->night_color_scheme().getType() != smart_objects::SmartType_Null &&
+        msg_params[strings::night_color_scheme] != app->night_color_scheme()) {
+      // Color scheme param exists and has been previously set,
+      // hence do not allow color change
       LOG4CXX_DEBUG(logger_, "Reject Night Color Scheme Change");
       SendResponse(false, mobile_apis::Result::REJECTED);
       return;
@@ -127,6 +125,14 @@ void SetDisplayLayoutRequest::Run() {
 void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  ApplicationSharedPtr app = application_manager_.application(connection_key());
+
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
+
   const smart_objects::SmartObject& message = event.smart_object();
   switch (event.id()) {
     case hmi_apis::FunctionID::UI_SetDisplayLayout: {
@@ -143,21 +149,35 @@ void SetDisplayLayoutRequest::on_event(const event_engine::Event& event) {
       if (response_success) {
         HMICapabilities& hmi_capabilities = hmi_capabilities_;
 
-        // in case templates_available is empty copy from hmi capabilities
+        // In case templates_available is empty copy from hmi capabilities
         if (msg_params.keyExists(hmi_response::display_capabilities)) {
           if (0 == msg_params[hmi_response::display_capabilities]
                              [hmi_response::templates_available]
                                  .length()) {
-            msg_params[hmi_response::display_capabilities]
-                      [hmi_response::templates_available] =
-                          hmi_capabilities.display_capabilities()->getElement(
-                              hmi_response::templates_available);
+            auto display_capabilities = hmi_capabilities.display_capabilities();
+            if (display_capabilities) {
+              msg_params[hmi_response::display_capabilities]
+                        [hmi_response::templates_available] =
+                            display_capabilities->getElement(
+                                hmi_response::templates_available);
+            }
           }
         }
+        const Version& app_version = app->version();
+        if (app_version.max_supported_api_version >= APIVersion::kAPIV6) {
+          // In case of successful response warn user that this RPC is
+          // deprecated from 6.0 and higher API versions
+          result_code = hmi_apis::Common_Result::WARNINGS;
+          info =
+              "The RPC is deprecated and will be removed in a future version. "
+              "The requested display layout is set to the main window. Please "
+              "use `Show.templateConfiguration` instead.";
+        }
       }
+
       SendResponse(response_success,
                    MessageHelper::HMIToMobileResult(result_code),
-                   info.empty() ? NULL : info.c_str(),
+                   info.empty() ? nullptr : info.c_str(),
                    &msg_params);
       break;
     }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
index 3b13b00968..a567d1b32f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/set_global_properties_request.cc
@@ -38,6 +38,7 @@
 #include "application_manager/message_helper.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
+
 #include "utils/helpers.h"
 
 namespace sdl_rpc_plugin {
@@ -45,6 +46,24 @@ using namespace application_manager;
 
 namespace commands {
 
+namespace {
+bool IsResultCodeWarning(const app_mngr::commands::ResponseInfo& first,
+                         const app_mngr::commands::ResponseInfo& second,
+                         const app_mngr::commands::ResponseInfo& third) {
+  const bool first_is_ok_second_is_warn =
+      (first.is_ok || first.is_not_used) &&
+      (hmi_apis::Common_Result::WARNINGS == second.result_code) &&
+      (hmi_apis::Common_Result::WARNINGS == third.result_code);
+
+  const bool final_warnings =
+      hmi_apis::Common_Result::WARNINGS == first.result_code &&
+      ((hmi_apis::Common_Result::WARNINGS == second.result_code) &&
+       (hmi_apis::Common_Result::WARNINGS == third.result_code));
+
+  return first_is_ok_second_is_warn || final_warnings;
+}
+}  // namespace
+
 SetGlobalPropertiesRequest::SetGlobalPropertiesRequest(
     const application_manager::commands::MessageSharedPtr& message,
     ApplicationManager& application_manager,
@@ -58,10 +77,13 @@ SetGlobalPropertiesRequest::SetGlobalPropertiesRequest(
                          policy_handler)
     , is_ui_send_(false)
     , is_tts_send_(false)
+    , is_rc_send_(false)
     , is_ui_received_(false)
     , is_tts_received_(false)
+    , is_rc_received_(false)
     , ui_result_(hmi_apis::Common_Result::INVALID_ENUM)
-    , tts_result_(hmi_apis::Common_Result::INVALID_ENUM) {}
+    , tts_result_(hmi_apis::Common_Result::INVALID_ENUM)
+    , rc_result_(hmi_apis::Common_Result::INVALID_ENUM) {}
 
 SetGlobalPropertiesRequest::~SetGlobalPropertiesRequest() {}
 
@@ -146,6 +168,19 @@ void SetGlobalPropertiesRequest::Run() {
     return;
   }
 
+  smart_objects::SmartObject params =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  if (msg_params.keyExists(strings::menu_layout)) {
+    auto menu_layout = static_cast<mobile_apis::MenuLayout::eType>(
+        msg_params[strings::menu_layout].asUInt());
+    if (app->menu_layout_supported(menu_layout)) {
+      params[strings::menu_layout] = msg_params[strings::menu_layout];
+    } else {
+      is_menu_layout_available_ = false;
+    }
+  }
+
   /* Need to set flags before sending request to HMI
    * for correct processing this flags in method on_event */
   if (is_help_prompt_present || is_timeout_prompt_present) {
@@ -162,9 +197,6 @@ void SetGlobalPropertiesRequest::Run() {
       return;
     }
 
-    smart_objects::SmartObject params =
-        smart_objects::SmartObject(smart_objects::SmartType_Map);
-
     PrepareUIRequestVRHelpData(app, msg_params, params);
     PrepareUIRequestMenuAndKeyboardData(app, msg_params, params);
 
@@ -177,9 +209,6 @@ void SetGlobalPropertiesRequest::Run() {
     LOG4CXX_DEBUG(logger_, "VRHelp params does not present");
     DCHECK_OR_RETURN_VOID(!is_vr_help_title_present && !is_vr_help_present);
 
-    smart_objects::SmartObject params =
-        smart_objects::SmartObject(smart_objects::SmartType_Map);
-
     PrepareUIRequestMenuAndKeyboardData(app, msg_params, params);
 
     // Preparing data
@@ -191,17 +220,44 @@ void SetGlobalPropertiesRequest::Run() {
     }
   }
 
+  // Check RC params
+  const bool is_user_location_present =
+      msg_params.keyExists(strings::user_location);
+  if (is_user_location_present) {
+    if (msg_params[strings::user_location].empty()) {
+      SendResponse(
+          false, mobile_apis::Result::INVALID_DATA, "UserLocation is empty");
+      return;
+    }
+    LOG4CXX_DEBUG(logger_, "Userlocation params presents");
+    const auto& user_location = msg_params[strings::user_location];
+    app->set_user_location(user_location);
+
+    auto on_global_properties_updated = [app](
+                                            plugin_manager::RPCPlugin& plugin) {
+      plugin.OnApplicationEvent(plugin_manager::kGlobalPropertiesUpdated, app);
+    };
+
+    application_manager_.GetPluginManager().ForEachPlugin(
+        on_global_properties_updated);
+
+    smart_objects::SmartObject params =
+        smart_objects::SmartObject(smart_objects::SmartType_Map);
+    params[strings::app_id] = app->app_id();
+    params[strings::user_location] = user_location;
+    SendRCRequest(params, true);
+  }
+
   // check TTS params
   if (is_help_prompt_present || is_timeout_prompt_present) {
     LOG4CXX_DEBUG(logger_, "TTS params presents");
-    smart_objects::SmartObject params =
-        smart_objects::SmartObject(smart_objects::SmartType_Map);
+    auto tts_params = smart_objects::SmartObject(smart_objects::SmartType_Map);
 
     std::vector<std::string> invalid_params;
     if (is_help_prompt_present) {
       smart_objects::SmartObject& help_prompt =
           (*message_)[strings::msg_params][strings::help_prompt];
-      mobile_apis::Result::eType verification_result =
+      verification_result =
           MessageHelper::VerifyTtsFiles(help_prompt, app, application_manager_);
 
       if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) {
@@ -211,16 +267,15 @@ void SetGlobalPropertiesRequest::Run() {
         invalid_params.push_back("help_prompt");
       } else {
         app->set_help_prompt(help_prompt);
-        params[strings::help_prompt] = (*app->help_prompt());
+        tts_params[strings::help_prompt] = (*app->help_prompt());
       }
     }
 
     if (is_timeout_prompt_present) {
       smart_objects::SmartObject& timeout_prompt =
           (*message_)[strings::msg_params][strings::timeout_prompt];
-      mobile_apis::Result::eType verification_result =
-          MessageHelper::VerifyTtsFiles(
-              timeout_prompt, app, application_manager_);
+      verification_result = MessageHelper::VerifyTtsFiles(
+          timeout_prompt, app, application_manager_);
 
       if (mobile_apis::Result::FILE_NOT_FOUND == verification_result) {
         LOG4CXX_ERROR(
@@ -229,7 +284,7 @@ void SetGlobalPropertiesRequest::Run() {
         invalid_params.push_back("timeout_prompt");
       } else {
         app->set_timeout_prompt(timeout_prompt);
-        params[strings::timeout_prompt] = (*app->timeout_prompt());
+        tts_params[strings::timeout_prompt] = (*app->timeout_prompt());
       }
     }
 
@@ -247,11 +302,18 @@ void SetGlobalPropertiesRequest::Run() {
       return;
     }
 
-    params[strings::app_id] = app->app_id();
-    SendTTSRequest(params, true);
+    tts_params[strings::app_id] = app->app_id();
+    SendTTSRequest(tts_params, true);
 
     auto& help_prompt_manager = app->help_prompt_manager();
-    help_prompt_manager.OnSetGlobalPropertiesReceived(params, false);
+    help_prompt_manager.OnSetGlobalPropertiesReceived(tts_params, false);
+  } else if (!is_ui_send_ && !is_rc_send_) {
+    std::string response_info = "There are no parameters present in request.";
+    if (!is_menu_layout_available_) {
+      response_info += " The MenuLayout specified is unsupported.";
+    }
+    SendResponse(
+        false, mobile_apis::Result::INVALID_DATA, response_info.c_str());
   }
 }
 
@@ -286,7 +348,7 @@ void SetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
 
   switch (event.id()) {
     case hmi_apis::FunctionID::UI_SetGlobalProperties: {
-      LOG4CXX_INFO(logger_, "Received UI_SetGlobalProperties event");
+      LOG4CXX_DEBUG(logger_, "Received UI_SetGlobalProperties event");
       EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
       is_ui_received_ = true;
       ui_result_ = static_cast<hmi_apis::Common_Result::eType>(
@@ -299,7 +361,7 @@ void SetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
       break;
     }
     case hmi_apis::FunctionID::TTS_SetGlobalProperties: {
-      LOG4CXX_INFO(logger_, "Received TTS_SetGlobalProperties event");
+      LOG4CXX_DEBUG(logger_, "Received TTS_SetGlobalProperties event");
       EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_TTS);
       is_tts_received_ = true;
       tts_result_ = static_cast<hmi_apis::Common_Result::eType>(
@@ -311,6 +373,15 @@ void SetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
       }
       break;
     }
+    case hmi_apis::FunctionID::RC_SetGlobalProperties: {
+      LOG4CXX_DEBUG(logger_, "Received RC_SetGlobalProperties event");
+      EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_RC);
+      is_rc_received_ = true;
+      rc_result_ = static_cast<hmi_apis::Common_Result::eType>(
+          message[strings::params][hmi_response::code].asInt());
+      GetInfo(message, rc_response_info_);
+      break;
+    }
     default: {
       LOG4CXX_ERROR(logger_, "Received unknown event" << event.id());
       return;
@@ -325,10 +396,21 @@ void SetGlobalPropertiesRequest::on_event(const event_engine::Event& event) {
   std::string response_info;
   const bool result = PrepareResponseParameters(result_code, response_info);
 
-  SendResponse(result,
-               result_code,
-               response_info.empty() ? NULL : response_info.c_str(),
-               &(message[strings::msg_params]));
+  if (result && !is_menu_layout_available_) {
+    response_info =
+        "The MenuLayout specified is unsupported, the "
+        "default MenuLayout will be used." +
+        response_info;
+    SendResponse(result,
+                 mobile_apis::Result::WARNINGS,
+                 response_info.c_str(),
+                 &(message[strings::msg_params]));
+  } else {
+    SendResponse(result,
+                 result_code,
+                 response_info.empty() ? NULL : response_info.c_str(),
+                 &(message[strings::msg_params]));
+  }
 }
 
 bool SetGlobalPropertiesRequest::Init() {
@@ -346,28 +428,173 @@ bool SetGlobalPropertiesRequest::PrepareResponseParameters(
 
   app_mngr::commands::ResponseInfo tts_properties_info(
       tts_result_, HmiInterfaces::HMI_INTERFACE_TTS, application_manager_);
-  const bool result =
-      PrepareResultForMobileResponse(ui_properties_info, tts_properties_info);
+
+  app_mngr::commands::ResponseInfo rc_properties_info(
+      rc_result_, HmiInterfaces::HMI_INTERFACE_RC, application_manager_);
+
+  bool result = false;
+
+  if (!is_rc_send_) {
+    result = CommandRequestImpl::PrepareResultForMobileResponse(
+        ui_properties_info, tts_properties_info);
+  } else {
+    result = PrepareResultForMobileResponse(
+        ui_properties_info, tts_properties_info, rc_properties_info);
+  }
   if (result &&
       (HmiInterfaces::STATE_AVAILABLE == tts_properties_info.interface_state) &&
       (tts_properties_info.is_unsupported_resource)) {
     result_code = mobile_apis::Result::WARNINGS;
     tts_response_info_ = "Unsupported phoneme type sent in a prompt";
-    info = app_mngr::commands::MergeInfos(tts_properties_info,
-                                          tts_response_info_,
-                                          ui_properties_info,
-                                          ui_response_info_);
+    info = MergeInfos(tts_properties_info,
+                      tts_response_info_,
+                      ui_properties_info,
+                      ui_response_info_,
+                      rc_properties_info,
+                      rc_response_info_);
     return result;
   }
-  result_code =
-      PrepareResultCodeForResponse(ui_properties_info, tts_properties_info);
-  info = app_mngr::commands::MergeInfos(tts_properties_info,
-                                        tts_response_info_,
-                                        ui_properties_info,
-                                        ui_response_info_);
+
+  if (!is_rc_send_) {
+    result_code = CommandRequestImpl::PrepareResultCodeForResponse(
+        ui_properties_info, tts_properties_info);
+  } else {
+    result_code = PrepareResultCodeForResponse(
+        ui_properties_info, tts_properties_info, rc_properties_info);
+  }
+  info = MergeInfos(tts_properties_info,
+                    tts_response_info_,
+                    ui_properties_info,
+                    ui_response_info_,
+                    rc_properties_info,
+                    rc_response_info_);
   return result;
 }
 
+bool SetGlobalPropertiesRequest::PrepareResultForMobileResponse(
+    const app_mngr::commands::ResponseInfo& first,
+    const app_mngr::commands::ResponseInfo& second,
+    const app_mngr::commands::ResponseInfo& third) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  app_mngr::commands::ResponseInfo both_info;
+  std::vector<hmi_apis::Common_Result::eType> success_result_codes{
+      hmi_apis::Common_Result::SUCCESS,
+      hmi_apis::Common_Result::WARNINGS,
+      hmi_apis::Common_Result::WRONG_LANGUAGE,
+      hmi_apis::Common_Result::RETRY,
+      hmi_apis::Common_Result::SAVED};
+
+  both_info.is_ok =
+      helpers::in_range(success_result_codes, first.result_code) &&
+      helpers::in_range(success_result_codes, second.result_code);
+
+  both_info.is_not_used =
+      (hmi_apis::Common_Result::INVALID_ENUM == first.result_code) ||
+      (hmi_apis::Common_Result::INVALID_ENUM == second.result_code);
+
+  both_info.is_unsupported_resource =
+      (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == first.result_code) ||
+      (hmi_apis::Common_Result::UNSUPPORTED_RESOURCE == second.result_code);
+
+  const bool final_result = CommandRequestImpl::CheckResult(both_info, third) ||
+                            CommandRequestImpl::CheckResult(third, both_info);
+
+  return final_result;
+}
+
+mobile_apis::Result::eType
+SetGlobalPropertiesRequest::PrepareResultCodeForResponse(
+    const app_mngr::commands::ResponseInfo& first,
+    const app_mngr::commands::ResponseInfo& second,
+    const app_mngr::commands::ResponseInfo& third) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  mobile_apis::Result::eType result_code = mobile_apis::Result::INVALID_ENUM;
+  if (IsResultCodeUnsupported(first, second, third) ||
+      IsResultCodeUnsupported(second, third, first) ||
+      IsResultCodeUnsupported(third, first, second)) {
+    return mobile_apis::Result::UNSUPPORTED_RESOURCE;
+  }
+  if (IsResultCodeWarning(first, second, third) ||
+      IsResultCodeWarning(second, third, first) ||
+      IsResultCodeWarning(third, first, second)) {
+    return mobile_apis::Result::WARNINGS;
+  }
+  // If response contains erroneous result code SDL need return erroneous
+  // result code.
+  auto first_result = hmi_apis::Common_Result::INVALID_ENUM;
+  auto second_result = hmi_apis::Common_Result::INVALID_ENUM;
+  auto third_result = hmi_apis::Common_Result::INVALID_ENUM;
+
+  if (!first.is_unsupported_resource) {
+    first_result = first.result_code;
+  }
+  if (!second.is_unsupported_resource) {
+    second_result = second.result_code;
+  }
+  if (!third.is_unsupported_resource) {
+    third_result = third.result_code;
+  }
+
+  hmi_apis::Common_Result::eType intermediate_result =
+      std::max(first_result, second_result);
+  result_code = MessageHelper::HMIToMobileResult(
+      std::max(intermediate_result, third_result));
+
+  return result_code;
+}
+
+bool SetGlobalPropertiesRequest::IsResultCodeUnsupported(
+    const application_manager::commands::ResponseInfo& first,
+    const application_manager::commands::ResponseInfo& second,
+    const application_manager::commands::ResponseInfo& third) const {
+  const bool first_ok_second_or_third_unsupported =
+      (first.is_ok || first.is_not_used) &&
+      (second.is_unsupported_resource || third.is_unsupported_resource);
+  const bool final_unsupported = first.is_unsupported_resource &&
+                                 second.is_unsupported_resource &&
+                                 third.is_unsupported_resource;
+
+  return first_ok_second_or_third_unsupported || final_unsupported;
+}
+
+std::string SetGlobalPropertiesRequest::MergeInfos(
+    const app_mngr::commands::ResponseInfo& first_info,
+    const std::string& first_str,
+    const app_mngr::commands::ResponseInfo& second_info,
+    const std::string& second_str,
+    const app_mngr::commands::ResponseInfo& third_info,
+    const std::string& third_str) {
+  if ((first_info.interface_state == HmiInterfaces::STATE_NOT_AVAILABLE) &&
+
+      ((second_info.interface_state != HmiInterfaces::STATE_NOT_AVAILABLE) &&
+       !second_str.empty()) &&
+      ((third_info.interface_state != HmiInterfaces::STATE_NOT_AVAILABLE) &&
+       !third_str.empty())) {
+    return second_str;
+  }
+
+  if ((second_info.interface_state == HmiInterfaces::STATE_NOT_AVAILABLE) &&
+      ((first_info.interface_state != HmiInterfaces::STATE_NOT_AVAILABLE) &&
+       !first_str.empty()) &&
+      ((third_info.interface_state != HmiInterfaces::STATE_NOT_AVAILABLE) &&
+       !third_str.empty())) {
+    return first_str;
+  }
+
+  if ((third_info.interface_state == HmiInterfaces::STATE_NOT_AVAILABLE) &&
+      ((first_info.interface_state != HmiInterfaces::STATE_NOT_AVAILABLE) &&
+       !first_str.empty()) &&
+      ((second_info.interface_state != HmiInterfaces::STATE_NOT_AVAILABLE) &&
+       !second_str.empty())) {
+    return third_str;
+  }
+
+  std::string intermediate_result =
+      app_mngr::commands::MergeInfos(first_str, second_str);
+  return app_mngr::commands::MergeInfos(intermediate_result, third_str);
+}
+
 void SetGlobalPropertiesRequest::PrepareUIRequestVRHelpData(
     const ApplicationSharedPtr app,
     const smart_objects::SmartObject& msg_params,
@@ -430,8 +657,19 @@ void SetGlobalPropertiesRequest::SendUIRequest(
       hmi_apis::FunctionID::UI_SetGlobalProperties, &params, use_events);
 }
 
+void SetGlobalPropertiesRequest::SendRCRequest(
+    const ns_smart_device_link::ns_smart_objects::SmartObject& params,
+    bool use_events) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  is_rc_send_ = true;
+  StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_RC);
+  SendHMIRequest(
+      hmi_apis::FunctionID::RC_SetGlobalProperties, &params, use_events);
+}
+
 bool SetGlobalPropertiesRequest::IsPendingResponseExist() {
-  return is_ui_send_ != is_ui_received_ || is_tts_send_ != is_tts_received_;
+  return is_ui_send_ != is_ui_received_ || is_tts_send_ != is_tts_received_ ||
+         is_rc_send_ != is_rc_received_;
 }
 
 bool SetGlobalPropertiesRequest::ValidateConditionalMandatoryParameters(
@@ -443,7 +681,9 @@ bool SetGlobalPropertiesRequest::ValidateConditionalMandatoryParameters(
          params.keyExists(strings::vr_help) ||
          params.keyExists(strings::menu_title) ||
          params.keyExists(strings::menu_icon) ||
-         params.keyExists(strings::keyboard_properties);
+         params.keyExists(strings::keyboard_properties) ||
+         params.keyExists(strings::menu_layout) ||
+         params.keyExists(strings::user_location);
 }
 
 bool SetGlobalPropertiesRequest::IsWhiteSpaceExist() {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_app_menu_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_app_menu_request.cc
index 2a8dc6cb70..36278168dc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_app_menu_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_app_menu_request.cc
@@ -68,11 +68,12 @@ void ShowAppMenuRequest::Run() {
     return;
   }
 
-  if (mobile_apis::HMILevel::HMI_FULL != app->hmi_level() ||
+  if (mobile_apis::HMILevel::HMI_FULL !=
+          app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW) ||
       helpers::Compare<mobile_apis::SystemContext::eType,
                        helpers::NEQ,
                        helpers::ALL>(
-          app->system_context(),
+          app->system_context(mobile_apis::PredefinedWindows::DEFAULT_WINDOW),
           mobile_apis::SystemContext::SYSCTXT_MAIN,
           mobile_apis::SystemContext::SYSCTXT_MENU)) {
     LOG4CXX_ERROR(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc
index bf26cc62af..84d11f8e09 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/show_request.cc
@@ -55,7 +55,12 @@ ShowRequest::ShowRequest(
                          rpc_service,
                          hmi_capabilities,
                          policy_handler)
-    , core_result_code_(mobile_apis::Result::INVALID_ENUM) {}
+    , core_result_code_(mobile_apis::Result::INVALID_ENUM)
+    , current_window_id_(mobile_apis::PredefinedWindows::DEFAULT_WINDOW)
+    , template_config_(smart_objects::SmartType::SmartType_Null)
+    , layout_change_required_(false)
+    , dcs_change_required_(false)
+    , ncs_change_required_(false) {}
 
 ShowRequest::~ShowRequest() {}
 
@@ -94,6 +99,137 @@ void ShowRequest::HandleMetadata(const char* field_id,
   }
 }
 
+bool ShowRequest::CheckTemplateConfigurationForApp(
+    application_manager::Application& app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if ((*message_)[strings::msg_params].keyExists(strings::window_id)) {
+    current_window_id_ =
+        (*message_)[strings::msg_params][strings::window_id].asInt();
+  }
+
+  const auto set_window_layout = [&app, this]() -> bool {
+    const auto new_template_layout =
+        template_config_[strings::template_layout].asString();
+    const auto old_template_layout = app.window_layout(current_window_id_);
+    LOG4CXX_DEBUG(logger_, "New layout: " << new_template_layout);
+    LOG4CXX_DEBUG(logger_, "Old layout: " << old_template_layout);
+
+    const bool layouts_equal = (new_template_layout == old_template_layout);
+
+    if (!new_template_layout.empty() && !layouts_equal) {
+      // Template switched, hence allow any color change
+      LOG4CXX_DEBUG(logger_,
+                    "Show Request: Setting new Layout: " << new_template_layout
+                                                         << " for window ID: "
+                                                         << current_window_id_);
+      layout_change_required_ = true;
+      return true;
+    }
+    LOG4CXX_DEBUG(logger_, "Show Request: No Layout Change");
+    return false;
+  };
+
+  const auto set_day_color_scheme = [&app, this]() -> bool {
+    if (!template_config_.keyExists(strings::day_color_scheme)) {
+      return false;
+    }
+    if (app.day_color_scheme(current_window_id_).getType() !=
+            smart_objects::SmartType_Null &&
+        template_config_[strings::day_color_scheme] !=
+            app.day_color_scheme(current_window_id_)) {
+      // Color scheme param exists and has been previously set,
+      // hence do not allow color change
+      LOG4CXX_DEBUG(logger_, "Day Color Scheme change is rejected");
+      return false;
+    }
+    LOG4CXX_DEBUG(logger_, "Day Color Scheme change is allowed");
+    dcs_change_required_ = true;
+
+    return true;
+  };
+
+  const auto set_night_color_scheme = [&app, this]() -> bool {
+    if (!template_config_.keyExists(strings::night_color_scheme)) {
+      return false;
+    }
+    if (app.night_color_scheme(current_window_id_).getType() !=
+            smart_objects::SmartType_Null &&
+        template_config_[strings::night_color_scheme] !=
+            app.night_color_scheme(current_window_id_)) {
+      // Color scheme param exists and has been previously set,
+      // hence do not allow color change
+      LOG4CXX_DEBUG(logger_, "Night Color Scheme change is rejected");
+      return false;
+    }
+    LOG4CXX_DEBUG(logger_, "Night Color Scheme Change is allowed");
+    ncs_change_required_ = true;
+
+    return true;
+  };
+
+  const bool set_layout_result = set_window_layout();
+
+  if (set_layout_result) {
+    set_day_color_scheme();
+    set_night_color_scheme();
+    return true;
+  }
+
+  if (!template_config_.keyExists(strings::night_color_scheme) &&
+      !template_config_.keyExists(strings::day_color_scheme)) {
+    // In case current layout was not changed and day and night color
+    // schemes are absent in mobile message SDL has to forward message
+    // to HMI with the only layout even it was not changed
+    return true;
+  }
+
+  const bool set_schemes_result =
+      (set_day_color_scheme() && set_night_color_scheme());
+
+  return set_schemes_result;
+}
+
+void ShowRequest::ApplyTemplateConfigurationForApp(
+    mobile_apis::Result::eType result, application_manager::Application& app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (helpers::Compare<mobile_apis::Result::eType, helpers::EQ, helpers::ONE>(
+          result,
+          mobile_apis::Result::SUCCESS,
+          mobile_apis::Result::WARNINGS)) {
+    if (layout_change_required_) {
+      const std::string new_layout =
+          template_config_[strings::template_layout].asString();
+      LOG4CXX_DEBUG(logger_, "New layout : " << new_layout << " is applied");
+      app.set_window_layout(current_window_id_, new_layout);
+
+      if (template_config_.keyExists(strings::day_color_scheme)) {
+        app.set_day_color_scheme(current_window_id_,
+                                 template_config_[strings::day_color_scheme]);
+      }
+
+      if (template_config_.keyExists(strings::night_color_scheme)) {
+        app.set_night_color_scheme(
+            current_window_id_, template_config_[strings::night_color_scheme]);
+      }
+
+      return;
+    }
+
+    if (dcs_change_required_) {
+      LOG4CXX_DEBUG(logger_, "New day color scheme is applied");
+      app.set_day_color_scheme(current_window_id_,
+                               template_config_[strings::day_color_scheme]);
+    }
+
+    if (ncs_change_required_) {
+      LOG4CXX_DEBUG(logger_, "New night color scheme is applied");
+      app.set_night_color_scheme(current_window_id_,
+                                 template_config_[strings::night_color_scheme]);
+    }
+  }
+}
+
 void ShowRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -272,7 +408,7 @@ void ShowRequest::Run() {
       app->UnsubscribeFromSoftButtons(function_id());
     } else {
       MessageHelper::SubscribeApplicationToSoftButton(
-          (*message_)[strings::msg_params], app, function_id());
+          (*message_)[strings::msg_params], app, function_id(), window_id());
     }
   }
 
@@ -281,6 +417,33 @@ void ShowRequest::Run() {
         (*message_)[strings::msg_params][strings::custom_presets];
   }
 
+  if ((*message_)[strings::msg_params].keyExists(strings::window_id)) {
+    const auto window_id =
+        (*message_)[strings::msg_params][strings::window_id].asInt();
+    if (!app->WindowIdExists(window_id)) {
+      LOG4CXX_ERROR(logger_,
+                    "Window with id #" << window_id << " does not exist");
+      SendResponse(false, mobile_apis::Result::INVALID_ID);
+      return;
+    }
+    msg_params[strings::window_id] = window_id;
+  }
+
+  if ((*message_)[strings::msg_params].keyExists(
+          strings::template_configuration)) {
+    template_config_ =
+        (*message_)[strings::msg_params][strings::template_configuration];
+    const bool result = CheckTemplateConfigurationForApp(*app);
+    if (!result) {
+      const char* info(
+          "Color schemes can not be changed without a new template set");
+      SendResponse(false, mobile_apis::Result::REJECTED, info);
+      return;
+    }
+    msg_params[strings::template_configuration] =
+        (*message_)[strings::msg_params][strings::template_configuration];
+  }
+
   StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
   SendHMIRequest(hmi_apis::FunctionID::UI_Show, &msg_params, true);
 
@@ -294,6 +457,13 @@ void ShowRequest::on_event(const event_engine::Event& event) {
   using namespace helpers;
 
   const smart_objects::SmartObject& message = event.smart_object();
+  ApplicationSharedPtr app = application_manager_.application(connection_key());
+
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "Application is not registered");
+    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
+    return;
+  }
 
   switch (event.id()) {
     case hmi_apis::FunctionID::UI_Show: {
@@ -313,6 +483,9 @@ void ShowRequest::on_event(const event_engine::Event& event) {
       }
       mobile_apis::Result::eType converted_result_code =
           MessageHelper::HMIToMobileResult(result_code);
+
+      ApplyTemplateConfigurationForApp(converted_result_code, *app);
+
       if (mobile_apis::Result::SUCCESS == converted_result_code &&
           mobile_apis::Result::INVALID_ENUM != core_result_code_) {
         converted_result_code = core_result_code_;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
index d80e73ccbf..dd7b426b40 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/slider_request.cc
@@ -116,6 +116,11 @@ void SliderRequest::Run() {
     msg_params[strings::timeout] = default_timeout_;
   }
 
+  if ((*message_)[strings::msg_params].keyExists(strings::cancel_id)) {
+    msg_params[strings::cancel_id] =
+        (*message_)[strings::msg_params][strings::cancel_id].asInt();
+  }
+
   StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_UI);
   SendHMIRequest(hmi_apis::FunctionID::UI_Slider, &msg_params, true);
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc
index 1acb2a7438..3797913f5b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/subscribe_button_request.cc
@@ -107,8 +107,8 @@ void SubscribeButtonRequest::Run() {
   app->SubscribeToButton(static_cast<mobile_apis::ButtonName::eType>(btn_id));
   SendSubscribeButtonNotification();
 
-  const bool is_succedeed = true;
-  SendResponse(is_succedeed, mobile_apis::Result::SUCCESS);
+  const bool is_succeeded = true;
+  SendResponse(is_succeeded, mobile_apis::Result::SUCCESS);
 }
 
 bool SubscribeButtonRequest::Init() {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
index e70433f29b..033e70a29c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/system_request.cc
@@ -46,6 +46,7 @@ Copyright (c) 2018, Ford Motor Company
 #include "utils/custom_string.h"
 #include "utils/file_system.h"
 #include "utils/helpers.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
@@ -470,8 +471,8 @@ void SystemRequest::Run() {
           static_cast<rpc::policy_table_interface_base::RequestType>(
               request_type));
 
-  if (!policy_handler.IsRequestTypeAllowed(application->policy_app_id(),
-                                           request_type)) {
+  if (!policy_handler.IsRequestTypeAllowed(
+          application->device(), application->policy_app_id(), request_type)) {
     LOG4CXX_ERROR(logger_,
                   "RequestType " << stringified_request_type
                                  << " is DISALLOWED by policies");
@@ -612,17 +613,21 @@ void SystemRequest::Run() {
     return;
   } else if (mobile_apis::RequestType::QUERY_APPS == request_type) {
     using namespace ns_smart_device_link::ns_json_handler::formatters;
+    application_manager_.OnQueryAppsRequest(application->device());
 
-    smart_objects::SmartObject sm_object;
-    Json::Reader reader;
+    utils::JsonReader reader;
     std::string json(binary_data.begin(), binary_data.end());
     Json::Value root;
-    if (!reader.parse(json.c_str(), root)) {
-      LOG4CXX_DEBUG(logger_, "Unable to parse query_app json file.");
+
+    if (!reader.parse(json, &root)) {
+      LOG4CXX_DEBUG(logger_, "Unable to parse query_app json file. ");
       return;
     }
 
+    smart_objects::SmartObject sm_object;
+
     CFormatterJsonBase::jsonValueToObj(root, sm_object);
+
     if (!ValidateQueryAppData(sm_object)) {
       SendResponse(false, mobile_apis::Result::GENERIC_ERROR);
       return;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
index ebd463d4fa..ec8de68c9e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/unsubscribe_button_request.cc
@@ -94,7 +94,7 @@ void UnsubscribeButtonRequest::Run() {
 
   if (!app->UnsubscribeFromButton(
           static_cast<mobile_apis::ButtonName::eType>(btn_id))) {
-    LOG4CXX_ERROR(logger_, "App doesn't subscibe to button " << btn_id);
+    LOG4CXX_ERROR(logger_, "App doesn't subscribe to button " << btn_id);
     SendResponse(false, mobile_apis::Result::IGNORED);
     return;
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
index fa41e51980..b89a8dbd68 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
@@ -71,6 +71,8 @@
 #include "sdl_rpc_plugin/commands/hmi/sdl_activate_app_response.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_request.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_list_of_permissions_response.h"
+#include "sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_request.h"
+#include "sdl_rpc_plugin/commands/hmi/sdl_get_policy_configuration_data_response.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_request.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_status_update_response.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_get_user_friendly_message_request.h"
@@ -99,10 +101,14 @@
 #include "sdl_rpc_plugin/commands/hmi/ui_alert_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_change_registration_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_change_registration_response.h"
+#include "sdl_rpc_plugin/commands/hmi/ui_create_window_request.h"
+#include "sdl_rpc_plugin/commands/hmi/ui_create_window_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_delete_command_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_delete_command_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_delete_submenu_response.h"
+#include "sdl_rpc_plugin/commands/hmi/ui_delete_window_request.h"
+#include "sdl_rpc_plugin/commands/hmi/ui_delete_window_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_end_audio_pass_thru_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_get_capabilities_request.h"
@@ -167,8 +173,6 @@
 #include "sdl_rpc_plugin/commands/hmi/basic_communication_system_response.h"
 #include "sdl_rpc_plugin/commands/hmi/dial_number_request.h"
 #include "sdl_rpc_plugin/commands/hmi/dial_number_response.h"
-#include "sdl_rpc_plugin/commands/hmi/get_urls.h"
-#include "sdl_rpc_plugin/commands/hmi/get_urls_response.h"
 #include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_request.h"
 #include "sdl_rpc_plugin/commands/hmi/navi_alert_maneuver_response.h"
 #include "sdl_rpc_plugin/commands/hmi/navi_audio_start_stream_request.h"
@@ -232,6 +236,8 @@
 #include "sdl_rpc_plugin/commands/hmi/on_vr_stopped_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update.h"
 #include "sdl_rpc_plugin/commands/hmi/sdl_policy_update_response.h"
+#include "sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_request.h"
+#include "sdl_rpc_plugin/commands/hmi/ui_cancel_interaction_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_request.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_send_haptic_data_response.h"
 #include "sdl_rpc_plugin/commands/hmi/ui_set_display_layout_request.h"
@@ -241,12 +247,20 @@
 
 #include "sdl_rpc_plugin/commands/hmi/bc_get_file_path_request.h"
 #include "sdl_rpc_plugin/commands/hmi/bc_get_file_path_response.h"
+#include "sdl_rpc_plugin/commands/hmi/on_service_update_notification.h"
 #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_request.h"
 #include "sdl_rpc_plugin/commands/hmi/rc_get_capabilities_response.h"
 #include "sdl_rpc_plugin/commands/hmi/rc_is_ready_request.h"
 #include "sdl_rpc_plugin/commands/hmi/rc_is_ready_response.h"
 
 #include "sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification.h"
+#include "sdl_rpc_plugin/commands/hmi/on_bc_system_capability_updated_notification_from_hmi.h"
+
+#include "sdl_rpc_plugin/commands/hmi/bc_get_app_properties_request.h"
+#include "sdl_rpc_plugin/commands/hmi/bc_get_app_properties_response.h"
+#include "sdl_rpc_plugin/commands/hmi/bc_set_app_properties_request.h"
+#include "sdl_rpc_plugin/commands/hmi/bc_set_app_properties_response.h"
+#include "sdl_rpc_plugin/commands/hmi/on_app_properties_change_notification.h"
 
 namespace sdl_rpc_plugin {
 using namespace application_manager;
@@ -350,11 +364,6 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::SDLPolicyUpdate>()
                  : factory.GetCreator<commands::SDLPolicyUpdateResponse>();
     }
-    case hmi_apis::FunctionID::SDL_GetURLS: {
-      return hmi_apis::messageType::request == message_type
-                 ? factory.GetCreator<commands::GetUrls>()
-                 : factory.GetCreator<commands::GetUrlsResponse>();
-    }
     case hmi_apis::FunctionID::SDL_OnAppPermissionChanged: {
       return factory.GetCreator<commands::OnAppPermissionChangedNotification>();
     }
@@ -377,6 +386,13 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::SDLGetStatusUpdateRequest>()
                  : factory.GetCreator<commands::SDLGetStatusUpdateResponse>();
     }
+    case hmi_apis::FunctionID::SDL_GetPolicyConfigurationData: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<
+                       commands::SDLGetPolicyConfigurationDataRequest>()
+                 : factory.GetCreator<
+                       commands::SDLGetPolicyConfigurationDataResponse>();
+    }
     case hmi_apis::FunctionID::SDL_OnStatusUpdate: {
       return factory.GetCreator<commands::OnStatusUpdateNotification>();
     }
@@ -396,6 +412,11 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::UIAddCommandRequest>()
                  : factory.GetCreator<commands::UIAddCommandResponse>();
     }
+    case hmi_apis::FunctionID::UI_CancelInteraction: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::UICancelInteractionRequest>()
+                 : factory.GetCreator<commands::UICancelInteractionResponse>();
+    }
     case hmi_apis::FunctionID::UI_DeleteCommand: {
       return hmi_apis::messageType::request == message_type
                  ? factory.GetCreator<commands::UIDeleteCommandRequest>()
@@ -416,6 +437,11 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::UIShowAppMenuRequest>()
                  : factory.GetCreator<commands::UIShowAppMenuResponse>();
     }
+    case hmi_apis::FunctionID::UI_DeleteWindow: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::UIDeleteWindowRequest>()
+                 : factory.GetCreator<commands::UIDeleteWindowResponse>();
+    }
     case hmi_apis::FunctionID::UI_SetMediaClockTimer: {
       return hmi_apis::messageType::request == message_type
                  ? factory.GetCreator<commands::UISetMediaClockTimerRequest>()
@@ -464,6 +490,11 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::UIChangeRegistrationRequest>()
                  : factory.GetCreator<commands::UIChangeRegistratioResponse>();
     }
+    case hmi_apis::FunctionID::UI_CreateWindow: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::UICreateWindowRequest>()
+                 : factory.GetCreator<commands::UICreateWindowResponse>();
+    }
     case hmi_apis::FunctionID::UI_PerformAudioPassThru: {
       return hmi_apis::messageType::request == message_type
                  ? factory.GetCreator<commands::UIPerformAudioPassThruRequest>()
@@ -844,6 +875,9 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  ? factory.GetCreator<commands::hmi::DialNumberRequest>()
                  : factory.GetCreator<commands::hmi::DialNumberResponse>();
     }
+    case hmi_apis::FunctionID::BasicCommunication_OnServiceUpdate: {
+      return factory.GetCreator<commands::hmi::OnServiceUpdateNotification>();
+    }
     case hmi_apis::FunctionID::Navigation_OnWayPointChange: {
       return factory.GetCreator<commands::OnNaviWayPointChangeNotification>();
     }
@@ -868,8 +902,26 @@ CommandCreator& HMICommandFactory::get_creator_factory(
                  : factory.GetCreator<commands::BCGetFilePathResponse>();
     }
     case hmi_apis::FunctionID::BasicCommunication_OnSystemCapabilityUpdated: {
-      return factory
-          .GetCreator<commands::OnBCSystemCapabilityUpdatedNotification>();
+      return (application_manager::commands::Command::CommandSource::
+                  SOURCE_HMI == source)
+                 ? factory.GetCreator<
+                       commands::
+                           OnBCSystemCapabilityUpdatedNotificationFromHMI>()
+                 : factory.GetCreator<
+                       commands::OnBCSystemCapabilityUpdatedNotification>();
+    }
+    case hmi_apis::FunctionID::BasicCommunication_GetAppProperties: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::BCGetAppPropertiesRequest>()
+                 : factory.GetCreator<commands::BCGetAppPropertiesResponse>();
+    }
+    case hmi_apis::FunctionID::BasicCommunication_SetAppProperties: {
+      return hmi_apis::messageType::request == message_type
+                 ? factory.GetCreator<commands::BCSetAppPropertiesRequest>()
+                 : factory.GetCreator<commands::BCSetAppPropertiesResponse>();
+    }
+    case hmi_apis::FunctionID::BasicCommunication_OnAppPropertiesChange: {
+      return factory.GetCreator<commands::OnAppPropertiesChangeNotification>();
     }
     default: { return factory.GetCreator<InvalidCommand>(); }
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
index 0b91febe1b..c6f4b64636 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
@@ -40,12 +40,16 @@
 #include "sdl_rpc_plugin/commands/mobile/alert_maneuver_response.h"
 #include "sdl_rpc_plugin/commands/mobile/alert_request.h"
 #include "sdl_rpc_plugin/commands/mobile/alert_response.h"
+#include "sdl_rpc_plugin/commands/mobile/cancel_interaction_request.h"
+#include "sdl_rpc_plugin/commands/mobile/cancel_interaction_response.h"
 #include "sdl_rpc_plugin/commands/mobile/change_registration_request.h"
 #include "sdl_rpc_plugin/commands/mobile/change_registration_response.h"
 #include "sdl_rpc_plugin/commands/mobile/close_application_request.h"
 #include "sdl_rpc_plugin/commands/mobile/close_application_response.h"
 #include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_request.h"
 #include "sdl_rpc_plugin/commands/mobile/create_interaction_choice_set_response.h"
+#include "sdl_rpc_plugin/commands/mobile/create_window_request.h"
+#include "sdl_rpc_plugin/commands/mobile/create_window_response.h"
 #include "sdl_rpc_plugin/commands/mobile/delete_command_request.h"
 #include "sdl_rpc_plugin/commands/mobile/delete_command_response.h"
 #include "sdl_rpc_plugin/commands/mobile/delete_file_request.h"
@@ -54,6 +58,8 @@
 #include "sdl_rpc_plugin/commands/mobile/delete_interaction_choice_set_response.h"
 #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_request.h"
 #include "sdl_rpc_plugin/commands/mobile/delete_sub_menu_response.h"
+#include "sdl_rpc_plugin/commands/mobile/delete_window_request.h"
+#include "sdl_rpc_plugin/commands/mobile/delete_window_response.h"
 #include "sdl_rpc_plugin/commands/mobile/dial_number_request.h"
 #include "sdl_rpc_plugin/commands/mobile/dial_number_response.h"
 #include "sdl_rpc_plugin/commands/mobile/end_audio_pass_thru_request.h"
@@ -174,6 +180,11 @@ CommandCreator& MobileCommandFactory::get_command_creator(
                  ? factory.GetCreator<commands::AddCommandRequest>()
                  : factory.GetCreator<commands::AddCommandResponse>();
     }
+    case mobile_apis::FunctionID::CreateWindowID: {
+      return mobile_api::messageType::request == message_type
+                 ? factory.GetCreator<commands::CreateWindowRequest>()
+                 : factory.GetCreator<commands::CreateWindowResponse>();
+    }
     case mobile_apis::FunctionID::DeleteCommandID: {
       return mobile_api::messageType::request == message_type
                  ? factory.GetCreator<commands::DeleteCommandRequest>()
@@ -194,6 +205,11 @@ CommandCreator& MobileCommandFactory::get_command_creator(
                  ? factory.GetCreator<commands::ShowAppMenuRequest>()
                  : factory.GetCreator<commands::ShowAppMenuResponse>();
     }
+    case mobile_apis::FunctionID::DeleteWindowID: {
+      return mobile_api::messageType::request == message_type
+                 ? factory.GetCreator<commands::DeleteWindowRequest>()
+                 : factory.GetCreator<commands::DeleteWindowResponse>();
+    }
     case mobile_apis::FunctionID::DeleteInteractionChoiceSetID: {
       return mobile_api::messageType::request == message_type
                  ? factory.GetCreator<
@@ -221,6 +237,11 @@ CommandCreator& MobileCommandFactory::get_command_creator(
                  ? factory.GetCreator<commands::PerformAudioPassThruRequest>()
                  : factory.GetCreator<commands::PerformAudioPassThruResponse>();
     }
+    case mobile_apis::FunctionID::CancelInteractionID: {
+      return mobile_api::messageType::request == message_type
+                 ? factory.GetCreator<commands::CancelInteractionRequest>()
+                 : factory.GetCreator<commands::CancelInteractionResponse>();
+    }
     case mobile_apis::FunctionID::CreateInteractionChoiceSetID: {
       return mobile_api::messageType::request == message_type
                  ? factory.GetCreator<
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
index b261b20c24..2a1261f643 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/sdl_rpc_plugin.cc
@@ -44,7 +44,21 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "SdlRPCPlugin")
 bool SDLRPCPlugin::Init(app_mngr::ApplicationManager& app_manager,
                         app_mngr::rpc_service::RPCService& rpc_service,
                         app_mngr::HMICapabilities& hmi_capabilities,
-                        policy::PolicyHandlerInterface& policy_handler) {
+                        policy::PolicyHandlerInterface& policy_handler,
+                        resumption::LastStateWrapperPtr last_state) {
+  UNUSED(last_state);
+  command_factory_.reset(new sdl_rpc_plugin::SDLCommandFactory(
+      app_manager, rpc_service, hmi_capabilities, policy_handler));
+  return true;
+}
+
+bool SDLRPCPlugin::Init(
+    application_manager::ApplicationManager& app_manager,
+    application_manager::rpc_service::RPCService& rpc_service,
+    application_manager::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastState& last_state) {
+  UNUSED(last_state);
   command_factory_.reset(new sdl_rpc_plugin::SDLCommandFactory(
       app_manager, rpc_service, hmi_capabilities, policy_handler));
   return true;
@@ -70,8 +84,14 @@ void SDLRPCPlugin::OnApplicationEvent(
     plugins::ApplicationEvent event,
     app_mngr::ApplicationSharedPtr application) {
   if (plugins::ApplicationEvent::kApplicationRegistered == event) {
-    application->AddExtension(
-        std::make_shared<SystemCapabilityAppExtension>(*this, *application));
+    auto sys_cap_ext_ptr =
+        std::make_shared<SystemCapabilityAppExtension>(*this, *application);
+    application->AddExtension(sys_cap_ext_ptr);
+    // Processing automatic subscription to SystemCapabilities for DISPLAY type
+    const auto capability_type =
+        mobile_apis::SystemCapabilityType::eType::DISPLAYS;
+    LOG4CXX_DEBUG(logger_, "Subscription to DISPLAYS capability is enabled");
+    sys_cap_ext_ptr->SubscribeTo(capability_type);
   } else if (plugins::ApplicationEvent::kDeleteApplicationData == event) {
     ClearSubscriptions(application);
   }
@@ -84,6 +104,14 @@ void SDLRPCPlugin::ClearSubscriptions(app_mngr::ApplicationSharedPtr app) {
 
 }  // namespace sdl_rpc_plugin
 
-extern "C" application_manager::plugin_manager::RPCPlugin* Create() {
+extern "C" __attribute__((visibility("default")))
+application_manager::plugin_manager::RPCPlugin*
+Create() {
   return new sdl_rpc_plugin::SDLRPCPlugin();
 }
+
+extern "C" __attribute__((visibility("default"))) void Delete(
+    application_manager::plugin_manager::RPCPlugin* data) {
+  delete data;
+  DELETE_THREAD_LOGGER(sdl_rpc_plugin::logger_);
+}
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/CMakeLists.txt b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/CMakeLists.txt
index 1a206c2cce..b21ab9dca8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/CMakeLists.txt
@@ -23,15 +23,8 @@ file(GLOB SOURCES
 )
 
 set(LIBRARIES
+  sdl_rpc_plugin_static
   gmock
-  Utils
-  SmartObjects
-  HMI_API
-  MOBILE_API
-  connectionHandler
-  sdl_rpc_plugin
-  jsoncpp
-  Policy
 )
 
 create_cotired_test("sdl_commands_test" "${SOURCES}" "${LIBRARIES}" )
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc
index 0251c4873d..9cd87b053d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/basic_communication_get_system_time_request_test.cc
@@ -60,7 +60,7 @@ TEST_F(BasicCommunicationGetSystemTimeRequestTest, OnTimeout) {
 
   ON_CALL(app_mngr_, protocol_handler())
       .WillByDefault(ReturnRef(mock_protocol_handler));
-  EXPECT_CALL(mock_protocol_handler, NotifyOnFailedHandshake());
+  EXPECT_CALL(mock_protocol_handler, NotifyOnGetSystemTimeFailed());
 
   command->onTimeOut();
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_get_app_properties_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_get_app_properties_request_test.cc
new file mode 100644
index 0000000000..0d70226645
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_get_app_properties_request_test.cc
@@ -0,0 +1,367 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gtest/gtest.h"
+
+#include "application_manager/commands/command_impl.h"
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/mock_application.h"
+#include "hmi/bc_get_app_properties_request.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace bc_get_app_properties_request_test {
+
+namespace am = ::application_manager;
+namespace strings = ::application_manager::strings;
+
+using am::commands::CommandImpl;
+using am::commands::MessageSharedPtr;
+using sdl_rpc_plugin::commands::BCGetAppPropertiesRequest;
+
+using testing::DoAll;
+using testing::Return;
+using testing::ReturnRef;
+using testing::SaveArg;
+
+namespace {
+const std::string kPolicyAppId = "00001";
+const uint32_t kCorrelationId = 1u;
+const auto kSource = am::commands::Command::SOURCE_HMI;
+
+const std::string kAuthToken = "auth_token";
+const std::string kCertificate = "certificate";
+const std::string kTransportType = "WS";
+const std::string kHybridAppPreference = "local_app";
+const bool kEnabled = true;
+
+const std::string kNickname1 = "nickname1";
+const std::string kNickname2 = "nickname2";
+}  // namespace
+
+bool CompareAppProperties(const smart_objects::SmartObject& app_propersties_so,
+                          const policy::AppProperties& app_properties) {
+  return (app_propersties_so[strings::auth_token].asString() ==
+          app_properties.auth_token) &&
+         (app_propersties_so[strings::transport_type].asString() ==
+          app_properties.transport_type) &&
+         (app_propersties_so[strings::hybrid_app_preference].asString() ==
+          app_properties.hybrid_app_preference);
+}
+
+bool CompareNicknames(const smart_objects::SmartObject& nicknames_so,
+                      const policy::StringArray& nicknames) {
+  if (nicknames_so.length() != nicknames.size()) {
+    return false;
+  }
+
+  for (size_t i = 0; i < nicknames_so.length(); ++i) {
+    if (nicknames_so[i].asString() != nicknames[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+ACTION_P(SetTestAppProperties, app_properties) {
+  arg1 = app_properties;
+}
+
+ACTION_P(SetTestNickNames, nicknames) {
+  *arg1 = nicknames;
+}
+
+class BCGetAppPropertiesRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ public:
+  BCGetAppPropertiesRequestTest() : mock_app_(CreateMockApp()) {
+    ON_CALL(app_mngr_, GetRPCService())
+        .WillByDefault(ReturnRef(mock_rpc_service_));
+  }
+
+  MockAppPtr mock_app_;
+};
+
+TEST_F(BCGetAppPropertiesRequestTest, Run_PolicyAppId_Exist_SUCCESS) {
+  auto msg = CreateMessage();
+
+  (*msg)[strings::params][strings::correlation_id] = kCorrelationId;
+  (*msg)[strings::msg_params][strings::policy_app_id] = kPolicyAppId;
+  auto command = CreateCommand<BCGetAppPropertiesRequest>(msg);
+
+  // Fills app properties with default test values
+  EXPECT_CALL(mock_policy_handler_, GetAppProperties(kPolicyAppId, _))
+      .WillOnce(DoAll(
+          SetTestAppProperties(policy::AppProperties("",
+                                                     kCertificate,
+                                                     kEnabled,
+                                                     kAuthToken,
+                                                     kTransportType,
+                                                     kHybridAppPreference)),
+          Return(true)));
+
+  // Fills app nicknames with default test values
+  EXPECT_CALL(mock_policy_handler_, GetInitialAppData(kPolicyAppId, _, _))
+      .WillOnce(
+          DoAll(SetTestNickNames(policy::StringArray{kNickname1, kNickname2}),
+                Return(true)));
+
+  auto message_to_hmi = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIMessageParametersAre(
+                      kCorrelationId,
+                      hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+                      hmi_apis::Common_Result::SUCCESS),
+                  kSource))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  const smart_objects::SmartObject& sent_app_properties =
+      (*message_to_hmi)[strings::msg_params][strings::properties][0];
+
+  EXPECT_FALSE(sent_app_properties.empty());
+
+  const std::string auth_token =
+      sent_app_properties[strings::auth_token].asString();
+  const std::string transport_type =
+      sent_app_properties[strings::transport_type].asString();
+  const std::string hybrid_app_preference =
+      sent_app_properties[strings::hybrid_app_preference].asString();
+  // ENDPOINT should be omitted for local application properties.
+  EXPECT_FALSE(sent_app_properties.keyExists(strings::endpoint));
+
+  EXPECT_EQ(kAuthToken, auth_token);
+  EXPECT_EQ(kTransportType, transport_type);
+  EXPECT_EQ(kHybridAppPreference, hybrid_app_preference);
+
+  EXPECT_TRUE(sent_app_properties.keyExists(strings::nicknames));
+
+  const auto nick_names = sent_app_properties[strings::nicknames];
+  EXPECT_EQ(kNickname1, nick_names[0].asString());
+  EXPECT_EQ(kNickname2, nick_names[1].asString());
+}
+
+TEST_F(BCGetAppPropertiesRequestTest,
+       PolicyAppIdExistsInMessage_GetAppPropertiesFailed_UNSUCCESS) {
+  auto msg = CreateMessage();
+
+  (*msg)[strings::params][strings::correlation_id] = kCorrelationId;
+  (*msg)[strings::msg_params][strings::policy_app_id] = kPolicyAppId;
+  auto command = CreateCommand<BCGetAppPropertiesRequest>(msg);
+
+  EXPECT_CALL(mock_policy_handler_, GetAppProperties(kPolicyAppId, _))
+      .WillOnce(Return(false));
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIMessageParametersAre(
+                      kCorrelationId,
+                      hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+                      hmi_apis::Common_Result::DATA_NOT_AVAILABLE),
+                  application_manager::commands::Command::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(
+    BCGetAppPropertiesRequestTest,
+    Run_PolicyAppIdIsAbsentInMessage_AppParametersAreAbsent_NickNamesAreAbsent_UNSUCCESS) {
+  auto msg = CreateMessage();
+
+  (*msg)[strings::params][strings::correlation_id] = kCorrelationId;
+  auto command = CreateCommand<BCGetAppPropertiesRequest>(msg);
+
+  EXPECT_CALL(mock_policy_handler_, GetApplicationPolicyIDs())
+      .WillOnce(Return(policy::StringArray()));
+
+  EXPECT_CALL(mock_policy_handler_, GetAppProperties(_, _)).Times(0);
+  EXPECT_CALL(mock_policy_handler_, GetInitialAppData(_, _, _)).Times(0);
+
+  auto message_to_hmi = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIMessageParametersAre(
+                      kCorrelationId,
+                      hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+                      hmi_apis::Common_Result::DATA_NOT_AVAILABLE),
+                  Command::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  EXPECT_FALSE(
+      (*message_to_hmi)[strings::msg_params].keyExists(strings::properties));
+}
+
+TEST_F(BCGetAppPropertiesRequestTest,
+       Run_PolicyAppIdIsAbsentInMessage_ReturnsAllAppProperties_SUCCESS) {
+  auto msg = CreateMessage();
+
+  (*msg)[strings::params][strings::correlation_id] = kCorrelationId;
+  auto command = CreateCommand<BCGetAppPropertiesRequest>(msg);
+
+  const std::string test_policy_app_id1 = "test_policy_app_id1";
+  const policy::AppProperties test_app1_properties("",
+                                                   "cert1",
+                                                   true,
+                                                   "auth_token1",
+                                                   "transport_type1",
+                                                   "hybrid_app_preference1");
+  const policy::StringArray test_nicknames1{"nickname1", "nickname2"};
+
+  const std::string test_policy_app_id2 = "test_policy_app_id2";
+  const policy::AppProperties test_app2_properties("",
+                                                   "cert2",
+                                                   false,
+                                                   "auth_token2",
+                                                   "transport_type2",
+                                                   "hybrid_app_preference2");
+  const policy::StringArray test_nicknames2{"nickname3", "nickname4"};
+
+  EXPECT_CALL(mock_policy_handler_, GetApplicationPolicyIDs())
+      .WillOnce(Return(
+          policy::StringArray{test_policy_app_id1, test_policy_app_id2}));
+
+  EXPECT_CALL(mock_policy_handler_, GetAppProperties(test_policy_app_id1, _))
+      .WillOnce(
+          DoAll(SetTestAppProperties(test_app1_properties), Return(true)));
+  EXPECT_CALL(mock_policy_handler_,
+              GetInitialAppData(test_policy_app_id1, _, _))
+      .WillOnce(DoAll(SetTestNickNames(test_nicknames1), Return(true)));
+
+  EXPECT_CALL(mock_policy_handler_, GetAppProperties(test_policy_app_id2, _))
+      .WillOnce(
+          DoAll(SetTestAppProperties(test_app2_properties), Return(true)));
+  EXPECT_CALL(mock_policy_handler_,
+              GetInitialAppData(test_policy_app_id2, _, _))
+      .WillOnce(DoAll(SetTestNickNames(test_nicknames2), Return(true)));
+
+  auto message_to_hmi = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIMessageParametersAre(
+                      kCorrelationId,
+                      hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+                      hmi_apis::Common_Result::SUCCESS),
+                  kSource))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  const auto& sent_app_properties =
+      (*message_to_hmi)[strings::msg_params][strings::properties];
+
+  EXPECT_EQ(2u, sent_app_properties.length());
+
+  // Compare test_app1 app_properties with sent app properties
+  const auto& sent_test_app1_properties = sent_app_properties[0];
+  EXPECT_FALSE(sent_test_app1_properties.keyExists(strings::endpoint));
+  EXPECT_TRUE(
+      CompareAppProperties(sent_test_app1_properties, test_app1_properties));
+
+  const auto& sent_test_app1_nicknames =
+      sent_app_properties[0][strings::nicknames];
+  EXPECT_TRUE(CompareNicknames(sent_test_app1_nicknames, test_nicknames1));
+
+  // Compare test_app2 app_properties with sent app properties
+  const auto& sent_test_app2_properties = sent_app_properties[1];
+  EXPECT_FALSE(sent_test_app2_properties.keyExists(strings::endpoint));
+  EXPECT_TRUE(
+      CompareAppProperties(sent_test_app2_properties, test_app2_properties));
+
+  const auto& sent_test_app2_nicknames =
+      sent_app_properties[1][strings::nicknames];
+  EXPECT_TRUE(CompareNicknames(sent_test_app2_nicknames, test_nicknames2));
+}
+
+TEST_F(BCGetAppPropertiesRequestTest,
+       Run_PolicyAppIdExist_NickNamesAreAbsent_SendEmptyArray_SUCCESS) {
+  auto msg = CreateMessage();
+
+  (*msg)[strings::params][strings::correlation_id] = kCorrelationId;
+  (*msg)[strings::msg_params][strings::policy_app_id] = kPolicyAppId;
+  auto command = CreateCommand<BCGetAppPropertiesRequest>(msg);
+
+  // Fills app properties with default test values
+  EXPECT_CALL(mock_policy_handler_, GetAppProperties(kPolicyAppId, _))
+      .WillOnce(DoAll(
+          SetTestAppProperties(policy::AppProperties("",
+                                                     kCertificate,
+                                                     kEnabled,
+                                                     kAuthToken,
+                                                     kTransportType,
+                                                     kHybridAppPreference)),
+          Return(true)));
+
+  // In the case when nicknames array is empty, SDL should forward the empty
+  // array to HMI in the app properties
+  EXPECT_CALL(mock_policy_handler_, GetInitialAppData(kPolicyAppId, _, _))
+      .WillOnce(DoAll(SetTestNickNames(policy::StringArray{}), Return(true)));
+
+  auto message_to_hmi = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIMessageParametersAre(
+                      kCorrelationId,
+                      hmi_apis::FunctionID::BasicCommunication_GetAppProperties,
+                      hmi_apis::Common_Result::SUCCESS),
+                  kSource))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  const auto& sent_app_properties =
+      (*message_to_hmi)[strings::msg_params][strings::properties];
+
+  EXPECT_TRUE(sent_app_properties[0].keyExists(strings::nicknames));
+  EXPECT_TRUE(sent_app_properties[0][strings::nicknames].empty());
+}
+
+}  // namespace bc_get_app_properties_request_test
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_get_app_properties_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_get_app_properties_response_test.cc
new file mode 100644
index 0000000000..f9df8db1e3
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_get_app_properties_response_test.cc
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2020 Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the names of the copyright holders nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/bc_get_app_properties_response.h"
+#include "application_manager/commands/command_impl.h"
+#include "application_manager/commands/commands_test.h"
+#include "gtest/gtest.h"
+#include "smart_objects/smart_object.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace bc_get_app_properties_response {
+
+using sdl_rpc_plugin::commands::BCGetAppPropertiesResponse;
+
+class BCGetAppPropertiesResponseTest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {};
+
+TEST_F(BCGetAppPropertiesResponseTest, RUN_SUCCESS) {
+  MessageSharedPtr msg = CreateMessage();
+
+  std::shared_ptr<BCGetAppPropertiesResponse> command(
+      CreateCommand<BCGetAppPropertiesResponse>(msg));
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(msg));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+}  // namespace bc_get_app_properties_response
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc
new file mode 100644
index 0000000000..5804476649
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_request_test.cc
@@ -0,0 +1,304 @@
+/*
+ * Copyright (c) 2020 Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the names of the copyright holders nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gtest/gtest.h"
+
+#include "application_manager/policies/policy_handler.h"
+#include "hmi/bc_set_app_properties_request.h"
+
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/policies/policy_handler.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace bc_set_app_properties_request {
+
+namespace am = ::application_manager;
+namespace strings = am::strings;
+
+using sdl_rpc_plugin::commands::BCSetAppPropertiesRequest;
+using ::testing::_;
+using ::testing::ReturnRef;
+
+namespace {
+const uint32_t kAppId = 1u;
+const std::string kPolicyAppId = "00001";
+const std::string kToken = "TOKEN";
+const uint32_t kHmiAppId = 13u;
+const uint32_t kCorrelationId = 1u;
+const auto kSource = am::commands::Command::SOURCE_HMI;
+}  // namespace
+
+typedef std::shared_ptr<BCSetAppPropertiesRequest> BCSetAppPropertiesRequestPtr;
+
+class BCSetAppPropertiesRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ public:
+  BCSetAppPropertiesRequestTest() : mock_app_(CreateMockApp()) {
+    ON_CALL((*mock_app_), app_id()).WillByDefault(Return(kAppId));
+    ON_CALL(app_mngr_, event_dispatcher())
+        .WillByDefault(ReturnRef(event_dispatcher_));
+    ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app_));
+    ON_CALL(app_mngr_, application_by_hmi_app(_))
+        .WillByDefault(Return(mock_app_));
+    ON_CALL(app_mngr_, GetRPCService())
+        .WillByDefault(ReturnRef(mock_rpc_service_));
+    ON_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+        .WillByDefault(Return(true));
+  }
+
+  MessageSharedPtr CreateMessageWithCustomProperties(
+      const smart_objects::SmartObject& properties) {
+    MessageSharedPtr msg = CreateMessage();
+    (*msg)[strings::params][strings::correlation_id] = kCorrelationId;
+    (*msg)[strings::msg_params][strings::app_id] = kAppId;
+    (*msg)[strings::msg_params][strings::properties] = properties;
+    return msg;
+  }
+
+  MockAppPtr mock_app_;
+};
+
+TEST_F(BCSetAppPropertiesRequestTest,
+       Run_NoAppPropertyChanges_AppIsSame_FailToUpdateAppList) {
+  smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+  properties[strings::policy_app_id] = kPolicyAppId;
+
+  MessageSharedPtr msg = CreateMessageWithCustomProperties(properties);
+  auto command = CreateCommand<BCSetAppPropertiesRequest>(msg);
+
+  const auto change_status =
+      policy::PolicyHandler::AppPropertiesState::NO_CHANGES;
+  ON_CALL(mock_policy_handler_,
+          GetAppPropertiesStatus(properties, kPolicyAppId))
+      .WillByDefault(Return(change_status));
+  ON_CALL(mock_policy_handler_, IsNewApplication(kPolicyAppId))
+      .WillByDefault(Return(false));
+
+  MessageSharedPtr notification = CreateMessage();
+  ON_CALL(mock_message_helper_,
+          CreateOnAppPropertiesChangeNotification(kPolicyAppId, _))
+      .WillByDefault(Return(notification));
+
+  EXPECT_CALL(mock_message_helper_,
+              CreateOnAppPropertiesChangeNotification(_, _))
+      .Times(0);
+  EXPECT_CALL(mock_policy_handler_,
+              GetAppPropertiesStatus(properties, kPolicyAppId));
+  EXPECT_CALL(mock_policy_handler_, OnSetAppProperties(properties));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(
+              hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
+          kSource));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource))
+      .Times(0);
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId)).Times(0);
+  EXPECT_CALL(app_mngr_, SendUpdateAppList()).Times(0);
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(BCSetAppPropertiesRequestTest,
+       Run_AppAuthTokenChanged_AppIsSame_NoUpdateAppList) {
+  smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+  properties[strings::auth_token] = kToken;
+  properties[strings::policy_app_id] = kPolicyAppId;
+
+  MessageSharedPtr msg = CreateMessageWithCustomProperties(properties);
+  auto command = CreateCommand<BCSetAppPropertiesRequest>(msg);
+
+  const auto change_status =
+      policy::PolicyHandler::AppPropertiesState::AUTH_TOKEN_CHANGED;
+  ON_CALL(mock_policy_handler_,
+          GetAppPropertiesStatus(properties, kPolicyAppId))
+      .WillByDefault(Return(change_status));
+  ON_CALL(mock_policy_handler_, IsNewApplication(kPolicyAppId))
+      .WillByDefault(Return(false));
+
+  MessageSharedPtr notification = CreateMessage();
+  ON_CALL(mock_message_helper_,
+          CreateOnAppPropertiesChangeNotification(kPolicyAppId, _))
+      .WillByDefault(Return(notification));
+
+  EXPECT_CALL(mock_message_helper_,
+              CreateOnAppPropertiesChangeNotification(kPolicyAppId, _));
+  EXPECT_CALL(mock_policy_handler_,
+              GetAppPropertiesStatus(properties, kPolicyAppId));
+  EXPECT_CALL(mock_policy_handler_, OnSetAppProperties(properties));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(
+              hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
+          kSource));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId)).Times(0);
+  EXPECT_CALL(app_mngr_, SendUpdateAppList()).Times(0);
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(BCSetAppPropertiesRequestTest,
+       Run_NoAppPropetiesChanged_AppIsNewAndEnabled_AppListUpdated) {
+  smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+  properties[strings::policy_app_id] = kPolicyAppId;
+  properties[strings::enabled] = true;
+
+  MessageSharedPtr msg = CreateMessageWithCustomProperties(properties);
+  auto command = CreateCommand<BCSetAppPropertiesRequest>(msg);
+
+  const auto change_status =
+      policy::PolicyHandler::AppPropertiesState::NO_CHANGES;
+  ON_CALL(mock_policy_handler_,
+          GetAppPropertiesStatus(properties, kPolicyAppId))
+      .WillByDefault(Return(change_status));
+  ON_CALL(mock_policy_handler_, IsNewApplication(kPolicyAppId))
+      .WillByDefault(Return(true));
+
+  MessageSharedPtr notification = CreateMessage();
+  ON_CALL(mock_message_helper_,
+          CreateOnAppPropertiesChangeNotification(kPolicyAppId, _))
+      .WillByDefault(Return(notification));
+
+  EXPECT_CALL(mock_message_helper_,
+              CreateOnAppPropertiesChangeNotification(kPolicyAppId, _));
+  EXPECT_CALL(mock_policy_handler_,
+              GetAppPropertiesStatus(properties, kPolicyAppId));
+  EXPECT_CALL(mock_policy_handler_, OnSetAppProperties(properties));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(
+              hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
+          kSource));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId));
+  EXPECT_CALL(app_mngr_, SendUpdateAppList());
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(BCSetAppPropertiesRequestTest,
+       Run_AppEnabledFlagChanged_AppListUpdated) {
+  smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+  properties[strings::policy_app_id] = kPolicyAppId;
+  properties[strings::enabled] = true;
+
+  MessageSharedPtr msg = CreateMessageWithCustomProperties(properties);
+  auto command = CreateCommand<BCSetAppPropertiesRequest>(msg);
+
+  const auto change_status =
+      policy::PolicyHandler::AppPropertiesState::ENABLED_FLAG_SWITCH;
+  ON_CALL(mock_policy_handler_,
+          GetAppPropertiesStatus(properties, kPolicyAppId))
+      .WillByDefault(Return(change_status));
+  ON_CALL(mock_policy_handler_, IsNewApplication(kPolicyAppId))
+      .WillByDefault(Return(false));
+
+  MessageSharedPtr notification = CreateMessage();
+  ON_CALL(mock_message_helper_,
+          CreateOnAppPropertiesChangeNotification(kPolicyAppId, _))
+      .WillByDefault(Return(notification));
+
+  EXPECT_CALL(mock_message_helper_,
+              CreateOnAppPropertiesChangeNotification(kPolicyAppId, _));
+  EXPECT_CALL(mock_policy_handler_,
+              GetAppPropertiesStatus(properties, kPolicyAppId));
+  EXPECT_CALL(mock_policy_handler_, OnSetAppProperties(properties));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(
+              hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
+          kSource));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId));
+  EXPECT_CALL(app_mngr_, SendUpdateAppList());
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(BCSetAppPropertiesRequestTest,
+       Run_AppEnabledFlagChangedToFalse_AppRemoveFromList_AppListUpdated) {
+  smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+  properties[strings::policy_app_id] = kPolicyAppId;
+  properties[strings::enabled] = false;
+
+  MessageSharedPtr msg = CreateMessageWithCustomProperties(properties);
+  auto command = CreateCommand<BCSetAppPropertiesRequest>(msg);
+
+  const auto change_status =
+      policy::PolicyHandler::AppPropertiesState::ENABLED_FLAG_SWITCH;
+  ON_CALL(mock_policy_handler_,
+          GetAppPropertiesStatus(properties, kPolicyAppId))
+      .WillByDefault(Return(change_status));
+  ON_CALL(mock_policy_handler_, IsNewApplication(kPolicyAppId))
+      .WillByDefault(Return(false));
+
+  MessageSharedPtr notification = CreateMessage();
+  ON_CALL(mock_message_helper_,
+          CreateOnAppPropertiesChangeNotification(kPolicyAppId, _))
+      .WillByDefault(Return(notification));
+
+  EXPECT_CALL(mock_message_helper_,
+              CreateOnAppPropertiesChangeNotification(kPolicyAppId, _));
+  EXPECT_CALL(mock_policy_handler_,
+              GetAppPropertiesStatus(properties, kPolicyAppId));
+  EXPECT_CALL(mock_policy_handler_, OnSetAppProperties(properties));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(
+              hmi_apis::FunctionID::BasicCommunication_SetAppProperties),
+          kSource));
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(notification, kSource));
+  EXPECT_CALL(app_mngr_, CreatePendingLocalApplication(kPolicyAppId)).Times(0);
+  EXPECT_CALL(app_mngr_, RemovePendingApplication(kPolicyAppId));
+  EXPECT_CALL(app_mngr_, SendUpdateAppList());
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+}  // namespace bc_set_app_properties_request
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_response_test.cc
new file mode 100644
index 0000000000..d4b7447d0d
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/bc_set_app_properties_response_test.cc
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2020 Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the names of the copyright holders nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gtest/gtest.h"
+
+#include "hmi/bc_set_app_properties_response.h"
+
+#include "application_manager/commands/commands_test.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace bc_set_app_properties_response {
+
+using sdl_rpc_plugin::commands::BCSetAppPropertiesResponse;
+
+class BCSetAppPropertiesResponseTest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {};
+
+TEST_F(BCSetAppPropertiesResponseTest, RUN_SUCCESS) {
+  MessageSharedPtr msg = CreateMessage();
+
+  std::shared_ptr<BCSetAppPropertiesResponse> command(
+      CreateCommand<BCSetAppPropertiesResponse>(msg));
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(msg));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+}  // namespace bc_set_app_properties_response
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
index f5593bf241..c66cb81141 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/dummy_hmi_commands_test.cc
@@ -56,8 +56,6 @@
 #include "hmi/dial_number_response.h"
 #include "hmi/get_system_info_request.h"
 #include "hmi/get_system_info_response.h"
-#include "hmi/get_urls.h"
-#include "hmi/get_urls_response.h"
 #include "hmi/mixing_audio_supported_request.h"
 #include "hmi/mixing_audio_supported_response.h"
 #include "hmi/navi_alert_maneuver_request.h"
@@ -320,8 +318,6 @@ typedef Types<commands::OnStartDeviceDiscovery,
               commands::SDLActivateAppRequest,
               commands::SDLPolicyUpdateResponse,
               commands::SDLPolicyUpdate,
-              commands::GetUrlsResponse,
-              commands::GetUrls,
               commands::OnAppPermissionChangedNotification,
               commands::SDLGetListOfPermissionsResponse,
               commands::SDLGetListOfPermissionsRequest,
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc
deleted file mode 100644
index b19207cc14..0000000000
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_test.cc
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright (c) 2018, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdint.h>
-#include <string>
-
-#include "application_manager/commands/command.h"
-#include "application_manager/commands/command_request_test.h"
-#include "application_manager/commands/commands_test.h"
-#include "application_manager/commands/request_from_hmi.h"
-#include "application_manager/event_engine/event_dispatcher.h"
-#include "application_manager/message.h"
-#include "application_manager/mock_application.h"
-#include "application_manager/mock_application_manager.h"
-#include "application_manager/policies/mock_policy_handler_interface.h"
-#include "application_manager/policies/policy_handler.h"
-#include "application_manager/smart_object_keys.h"
-#include "gtest/gtest.h"
-#include "hmi/get_urls.h"
-#include "policy/mock_policy_manager.h"
-#include "smart_objects/smart_object.h"
-
-namespace test {
-namespace components {
-namespace commands_test {
-namespace hmi_commands_test {
-namespace get_urls {
-
-using namespace hmi_apis;
-using namespace policy;
-using ::test::components::application_manager_test::MockApplication;
-using ::testing::_;
-using ::testing::NiceMock;
-using ::testing::SetArgReferee;
-namespace am = ::application_manager;
-namespace strings = ::application_manager::strings;
-using am::commands::CommandImpl;
-using am::commands::RequestFromHMI;
-using policy::PolicyHandler;
-using policy_test::MockPolicyHandlerInterface;
-using sdl_rpc_plugin::commands::GetUrls;
-
-typedef std::shared_ptr<RequestFromHMI> RequestFromHMIPtr;
-
-namespace {
-const uint32_t kInvalidAppId_ = 0u;
-const uint32_t kAppIdForSending = 1u;
-const uint32_t kConnectionKey = 2u;
-const uint32_t kServiceType = 0u;
-const std::string kInitialService = "0x0";
-const std::string kPolicyService = "7";
-const std::string kDefaultUrl = "URL is not found";
-const std::string kDefaultId = "default";
-const std::string kPolicyAppId = "policy_app_id";
-}  // namespace
-
-class GetUrlsTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
- public:
-  MessageSharedPtr command_msg_;
-  RequestFromHMIPtr request_command_;
-
-  GetUrlsTest() {
-    command_msg_ =
-        CreateMessage(ns_smart_device_link::ns_smart_objects::SmartType_Map);
-    (*command_msg_)[am::strings::params][am::strings::connection_key] =
-        kConnectionKey;
-    (*command_msg_)[am::strings::msg_params][am::hmi_request::service] =
-        kInitialService;
-
-    request_command_ = CreateCommand<GetUrls>(command_msg_);
-  }
-};
-
-TEST_F(GetUrlsTest, RUN_SUCCESS) {
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-  //  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(_, _));
-
-  request_command_->Run();
-}
-
-TEST_F(GetUrlsTest, RUN_PolicyNotEnabled_UNSUCCESS) {
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(false));
-
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(command_msg_, _))
-      .WillOnce(Return(true));
-
-  request_command_->Run();
-
-  EXPECT_EQ(am::MessageType::kResponse,
-            (*command_msg_)[strings::params][strings::message_type].asInt());
-  EXPECT_EQ(Common_Result::DATA_NOT_AVAILABLE,
-            (*command_msg_)[strings::params][am::hmi_response::code].asInt());
-}
-
-TEST_F(GetUrlsTest, RUN_EmptyEndpoints_UNSUCCESS) {
-  EndpointUrls endpoints_;
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kServiceType, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(command_msg_, _))
-      .WillOnce(Return(true));
-
-  request_command_->Run();
-
-  EXPECT_EQ(am::MessageType::kResponse,
-            (*command_msg_)[strings::params][strings::message_type].asInt());
-  EXPECT_EQ(Common_Result::DATA_NOT_AVAILABLE,
-            (*command_msg_)[strings::params][am::hmi_response::code].asInt());
-}
-
-#ifdef EXTENDED_POLICY
-TEST_F(GetUrlsTest, ProcessPolicyServiceURLs_SUCCESS) {
-  (*command_msg_)[am::strings::msg_params][am::hmi_request::service] =
-      kPolicyService;
-
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-
-  EndpointUrls endpoints_;
-  EndpointData data(kDefaultUrl);
-  endpoints_.push_back(data);
-
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kPolicyService, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-
-  MockAppPtr mock_app = CreateMockApp();
-
-  EXPECT_CALL(mock_policy_handler_, GetAppIdForSending())
-      .WillOnce(Return(kAppIdForSending));
-
-  EXPECT_CALL(app_mngr_, application(kAppIdForSending))
-      .WillOnce(Return(mock_app));
-  EXPECT_CALL(*mock_app, app_id()).WillOnce(Return(kAppIdForSending));
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(command_msg_, _))
-      .WillOnce(Return(true));
-
-  request_command_->Run();
-
-  EXPECT_FALSE((*command_msg_)[am::strings::msg_params].keyExists(
-      am::hmi_request::service));
-
-  EXPECT_EQ(am::MessageType::kResponse,
-            (*command_msg_)[strings::params][strings::message_type].asInt());
-  EXPECT_EQ(Common_Result::SUCCESS,
-            (*command_msg_)[strings::params][am::hmi_response::code].asInt());
-
-  EXPECT_EQ(kAppIdForSending,
-            (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-                           [strings::app_id]
-                               .asInt());
-  EXPECT_EQ(kDefaultUrl,
-            (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-                           [strings::url]
-                               .asString());
-}
-
-TEST_F(GetUrlsTest, ProcessPolicyServiceURLs_IncorrectIdForSending_UNSUCCESS) {
-  (*command_msg_)[am::strings::msg_params][am::hmi_request::service] =
-      kPolicyService;
-
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-
-  EndpointUrls endpoints_;
-  EndpointData data(kDefaultUrl);
-  endpoints_.push_back(data);
-
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kPolicyService, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-
-  EXPECT_CALL(mock_policy_handler_, GetAppIdForSending())
-      .WillOnce(Return(kInvalidAppId_));
-
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(command_msg_, _))
-      .WillOnce(Return(true));
-
-  EXPECT_CALL(app_mngr_, application(kInvalidAppId_)).Times(0);
-
-  request_command_->Run();
-}
-
-TEST_F(GetUrlsTest, ProcessPolicyServiceURLs_ApplicationIsNotValid_UNSUCCESS) {
-  (*command_msg_)[am::strings::msg_params][am::hmi_request::service] =
-      kPolicyService;
-
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-
-  EndpointUrls endpoints_;
-  EndpointData data(kDefaultUrl);
-  endpoints_.push_back(data);
-
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kPolicyService, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-
-  MockAppPtr invalid_mock_app;
-
-  EXPECT_CALL(mock_policy_handler_, GetAppIdForSending())
-      .WillOnce(Return(kAppIdForSending));
-
-  EXPECT_CALL(app_mngr_, application(kAppIdForSending))
-      .WillOnce(Return(invalid_mock_app));
-
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(command_msg_, _))
-      .WillOnce(Return(true));
-
-  request_command_->Run();
-
-  EXPECT_EQ(am::MessageType::kResponse,
-            (*command_msg_)[strings::params][strings::message_type].asInt());
-  EXPECT_EQ(Common_Result::DATA_NOT_AVAILABLE,
-            (*command_msg_)[strings::params][am::hmi_response::code].asInt());
-}
-
-TEST_F(GetUrlsTest, ProcessPolicyServiceURLs_FoundURLForApplication_SUCCESS) {
-  (*command_msg_)[am::strings::msg_params][am::hmi_request::service] =
-      kPolicyService;
-
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-
-  EndpointUrls endpoints_;
-  EndpointData data(kDefaultUrl);
-  data.app_id = kPolicyAppId;
-  endpoints_.push_back(data);
-
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kPolicyService, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-
-  MockAppPtr mock_app = CreateMockApp();
-
-  EXPECT_CALL(mock_policy_handler_, GetAppIdForSending())
-      .WillOnce(Return(kAppIdForSending));
-
-  EXPECT_CALL(app_mngr_, application(kAppIdForSending))
-      .WillOnce(Return(mock_app));
-
-  EXPECT_CALL(*mock_app, policy_app_id()).WillOnce(Return(kPolicyAppId));
-
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(command_msg_, _))
-      .WillOnce(Return(true));
-
-  request_command_->Run();
-
-  EXPECT_FALSE((*command_msg_)[am::strings::msg_params].keyExists(
-      am::hmi_request::service));
-
-  EXPECT_EQ(am::MessageType::kResponse,
-            (*command_msg_)[strings::params][strings::message_type].asInt());
-  EXPECT_EQ(Common_Result::SUCCESS,
-            (*command_msg_)[strings::params][am::hmi_response::code].asInt());
-}
-#endif
-
-TEST_F(GetUrlsTest, DISABLED_ProcessServiceURLs_SUCCESS) {
-  (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0] =
-      kDefaultUrl;
-  (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-                 [am::hmi_response::policy_app_id] = "1";
-
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-
-  EndpointUrls endpoints_;
-  EndpointData data(kDefaultUrl);
-  data.app_id = "1";
-  endpoints_.push_back(data);
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kServiceType, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-
-  request_command_->Run();
-
-  EXPECT_FALSE((*command_msg_)[am::strings::msg_params].keyExists(
-      am::hmi_request::service));
-  EXPECT_EQ(kDefaultUrl,
-            (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-                           [am::strings::url]
-                               .asString());
-  EXPECT_EQ(endpoints_[0].app_id,
-            (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-                           [am::hmi_response::policy_app_id]
-                               .asString());
-}
-
-TEST_F(GetUrlsTest, ProcessServiceURLs_PolicyDefaultId_SUCCESS) {
-  (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0] =
-      kDefaultUrl;
-  (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-                 [am::hmi_response::policy_app_id] = kDefaultId;
-
-  EXPECT_CALL(mock_policy_handler_, PolicyEnabled()).WillOnce(Return(true));
-  EndpointUrls endpoints_;
-  EndpointData data(kDefaultUrl);
-  endpoints_.push_back(data);
-  EXPECT_CALL(mock_policy_handler_, GetUpdateUrls(kServiceType, _))
-      .WillOnce(SetArgReferee<1>(endpoints_));
-  MockAppPtr mock_app = CreateMockApp();
-  EXPECT_CALL(app_mngr_, application_by_policy_id(_))
-      .WillOnce(Return(mock_app));
-  request_command_->Run();
-
-  EXPECT_FALSE((*command_msg_)[am::strings::msg_params].keyExists(
-      am::hmi_request::service));
-  EXPECT_TRUE(
-      (*command_msg_)[am::strings::msg_params][am::hmi_response::urls][0]
-          .keyExists(am::hmi_response::policy_app_id));
-}
-
-}  // namespace get_urls
-}  // namespace hmi_commands_test
-}  // namespace commands_test
-}  // namespace components
-}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc
index 2f8f5c2849..26f7a63872 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/hmi_notifications_test.cc
@@ -148,6 +148,11 @@ typedef NiceMock<
 #define NAVI true
 #define NOT_NAVI false
 
+namespace {
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
 ACTION_P(GetEventId, event_id) {
   *event_id = arg0.id();
 }
@@ -155,8 +160,8 @@ ACTION_P(GetArg, arg) {
   *arg = arg0;
 }
 
-ACTION_P(GetArg3, result) {
-  arg3 = *result;
+ACTION_P(GetArg4, result) {
+  arg4 = *result;
 }
 
 ACTION_P2(GetConnectIdPermissionConsent, connect_id, consent) {
@@ -1103,6 +1108,7 @@ TEST_F(HMICommandsNotificationsTest,
       .WillOnce(ReturnRef(mock_state_controller_));
   EXPECT_CALL(mock_state_controller_,
               SetRegularState(app_,
+                              kDefaultWindowId,
                               mobile_apis::HMILevel::HMI_NONE,
                               mobile_apis::AudioStreamingState::NOT_AUDIBLE,
                               mobile_apis::VideoStreamingState::NOT_STREAMABLE,
@@ -1127,12 +1133,7 @@ TEST_F(HMICommandsNotificationsTest,
   EXPECT_CALL(app_mngr_, UnregisterApplication(_, _, _, _)).Times(0);
   EXPECT_CALL(app_mngr_, state_controller())
       .WillOnce(ReturnRef(mock_state_controller_));
-  EXPECT_CALL(mock_state_controller_,
-              SetRegularState(app_,
-                              mobile_apis::HMILevel::HMI_NONE,
-                              mobile_apis::AudioStreamingState::NOT_AUDIBLE,
-                              mobile_apis::VideoStreamingState::NOT_STREAMABLE,
-                              false));
+  EXPECT_CALL(mock_state_controller_, ExitDefaultWindow(app_));
   command->Run();
 }
 
@@ -1150,7 +1151,8 @@ TEST_F(HMICommandsNotificationsTest,
   EXPECT_CALL(app_mngr_, state_controller())
       .WillOnce(ReturnRef(mock_state_controller_));
   EXPECT_CALL(mock_state_controller_,
-              SetRegularState(_, mobile_apis::HMILevel::HMI_FULL, true));
+              SetRegularState(
+                  _, kDefaultWindowId, mobile_apis::HMILevel::HMI_FULL, true));
 
   EXPECT_CALL(app_mngr_, get_settings())
       .WillOnce(ReturnRef(app_mngr_settings_));
@@ -1351,8 +1353,10 @@ TEST_F(HMICommandsNotificationsTest,
   EXPECT_CALL(*app_ptr_, language()).WillRepeatedly(ReturnRef(kLang));
   EXPECT_CALL(app_mngr_, state_controller())
       .WillOnce(ReturnRef(mock_state_controller_));
-  EXPECT_CALL(mock_state_controller_,
-              SetRegularState(app_, mobile_apis::HMILevel::HMI_NONE, false));
+  EXPECT_CALL(
+      mock_state_controller_,
+      SetRegularState(
+          app_, kDefaultWindowId, mobile_apis::HMILevel::HMI_NONE, false));
   EXPECT_CALL(mock_message_helper_,
               GetOnAppInterfaceUnregisteredNotificationToMobile(
                   kAppId_,
@@ -1429,7 +1433,8 @@ TEST_F(HMICommandsNotificationsTest,
     EXPECT_CALL(app_mngr_, active_application()).WillOnce(Return(app_));
     EXPECT_CALL(app_mngr_, state_controller())
         .WillOnce(ReturnRef(mock_state_controller_));
-    EXPECT_CALL(mock_state_controller_, SetRegularState(app_, *it));
+    EXPECT_CALL(mock_state_controller_,
+                SetRegularState(app_, kDefaultWindowId, *it));
     command->Run();
   }
 }
@@ -1478,7 +1483,8 @@ TEST_F(HMICommandsNotificationsTest,
     EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(app_));
     EXPECT_CALL(app_mngr_, state_controller())
         .WillOnce(ReturnRef(mock_state_controller_));
-    EXPECT_CALL(mock_state_controller_, SetRegularState(app_, *it));
+    EXPECT_CALL(mock_state_controller_,
+                SetRegularState(app_, kDefaultWindowId, *it));
     command->Run();
   }
 }
@@ -1885,8 +1891,8 @@ TEST_F(HMICommandsNotificationsTest, OnDriverDistractionNotificationValidApp) {
 
   policy::CheckPermissionResult result;
   result.hmi_level_permitted = policy::kRpcAllowed;
-  EXPECT_CALL(mock_policy_handler_, CheckPermissions(_, _, _, _))
-      .WillOnce(GetArg3(&result));
+  EXPECT_CALL(mock_policy_handler_, CheckPermissions(_, _, _, _, _))
+      .WillOnce(GetArg4(&result));
 
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(_, Command::CommandSource::SOURCE_SDL))
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_app_properties_change_notification_test.cc
index f030701710..0ab0bc5a35 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/get_urls_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_app_properties_change_notification_test.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Ford Motor Company
+ * Copyright (c) 2020, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,59 +29,63 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-
 #include <stdint.h>
-#include <string>
 
-#include "application_manager/application.h"
-#include "application_manager/commands/command.h"
 #include "application_manager/commands/commands_test.h"
-#include "application_manager/commands/response_to_hmi.h"
+#include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
 #include "application_manager/smart_object_keys.h"
 #include "gtest/gtest.h"
-#include "hmi/get_urls_response.h"
+#include "hmi/on_app_properties_change_notification.h"
 #include "smart_objects/smart_object.h"
 
 namespace test {
 namespace components {
 namespace commands_test {
 namespace hmi_commands_test {
-namespace get_urls_response {
+namespace on_app_properties_change_notification {
 
-using ::testing::_;
-using ::testing::Return;
-namespace am = ::application_manager;
-namespace strings = ::application_manager::strings;
-using am::commands::CommandImpl;
-using am::commands::ResponseToHMI;
-using sdl_rpc_plugin::commands::GetUrlsResponse;
+using namespace application_manager;
+using sdl_rpc_plugin::commands::OnAppPropertiesChangeNotification;
 
-typedef std::shared_ptr<ResponseToHMI> ResponseToHMIPtr;
+typedef std::shared_ptr<OnAppPropertiesChangeNotification> NotificationPtr;
+typedef hmi_apis::Common_ServiceType::eType ServiceType;
+typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
 
 namespace {
-const uint32_t kConnectionKey = 2u;
+const uint32_t kConnectionKey = 1232u;
+const uint32_t kHmiAppId = 321u;
 }  // namespace
 
-class GetUrlResponseTest : public CommandsTest<CommandsTestMocks::kIsNice> {};
+class OnAppPropertiesChangeNotificationTest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {
+ public:
+  OnAppPropertiesChangeNotificationTest()
+      : message_(CreateMessage(smart_objects::SmartType_Map)) {}
+
+ protected:
+  MessageSharedPtr message_;
+  NotificationPtr command_;
+};
+
+TEST_F(OnAppPropertiesChangeNotificationTest, SendNotificationToHMI) {
+  (*message_)[strings::msg_params][strings::app_id] = kConnectionKey;
+  command_ = CreateCommand<OnAppPropertiesChangeNotification>(message_);
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(message_)).Times(1);
 
-TEST_F(GetUrlResponseTest, RUN_SendRequest_SUCCESS) {
-  MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
-  (*command_msg)[strings::msg_params][strings::number] = "123";
-  (*command_msg)[strings::params][strings::connection_key] = kConnectionKey;
+  auto mock_app = std::make_shared<NiceMock<MockApplication> >();
 
-  ResponseToHMIPtr command(CreateCommand<GetUrlsResponse>(command_msg));
-  EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(command_msg));
+  ON_CALL(app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app));
 
-  command->Run();
+  ON_CALL(*mock_app, hmi_app_id()).WillByDefault(Return(kHmiAppId));
 
-  EXPECT_EQ((*command_msg)[strings::params][strings::protocol_type].asInt(),
-            CommandImpl::hmi_protocol_type_);
-  EXPECT_EQ((*command_msg)[strings::params][strings::protocol_version].asInt(),
-            CommandImpl::protocol_version_);
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
 }
 
-}  // namespace get_urls_response
+}  // namespace on_app_properties_change_notification
 }  // namespace hmi_commands_test
 }  // namespace commands_test
 }  // namespace components
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc
new file mode 100644
index 0000000000..f3ed480180
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_from_hmi_test.cc
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/on_bc_system_capability_updated_notification_from_hmi.h"
+
+#include "application_manager/commands/commands_test.h"
+#include "gtest/gtest.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace on_bc_system_capability_updated_notification_from_hmi {
+
+using sdl_rpc_plugin::commands::OnBCSystemCapabilityUpdatedNotificationFromHMI;
+using ::testing::_;
+using ::testing::Return;
+
+typedef std::shared_ptr<OnBCSystemCapabilityUpdatedNotificationFromHMI>
+    OnBCSystemCapabilityUpdatedNotificationFromHMIPtr;
+
+namespace strings = application_manager::strings;
+namespace {
+const uint32_t kAppId = 1u;
+}  // namespace
+
+MATCHER(CheckMessageToMobile, "") {
+  const auto function_id = mobile_apis::FunctionID::OnSystemCapabilityUpdatedID;
+
+  const bool is_function_id_matched =
+      function_id == static_cast<am::mobile_api::FunctionID::eType>(
+                         (*arg)[strings::params][strings::function_id].asInt());
+  const bool app_id_exist =
+      (*arg)[strings::msg_params].keyExists(strings::app_id);
+  bool is_connection_key_correct = true;
+  if ((*arg)[strings::msg_params].keyExists(strings::connection_key)) {
+    is_connection_key_correct =
+        (*arg)[strings::params][strings::connection_key] == kAppId;
+  }
+  return is_function_id_matched && !app_id_exist && is_connection_key_correct;
+}
+
+MATCHER_P(CheckDisplayCapabilitiesNotChanged, display_capability, "") {
+  return display_capability == arg;
+}
+
+class OnBCSystemCapabilityUpdatedNotificationFromHMITest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {
+ protected:
+  OnBCSystemCapabilityUpdatedNotificationFromHMITest()
+      : message_(CreateMessage())
+      , display_capability_(
+            (*message_)[am::strings::msg_params][strings::system_capability]
+                       [strings::display_capabilities]) {
+    command_ =
+        CreateCommand<OnBCSystemCapabilityUpdatedNotificationFromHMI>(message_);
+    mock_app_ = CreateMockApp();
+  }
+
+  OnBCSystemCapabilityUpdatedNotificationFromHMIPtr command_;
+  MockAppPtr mock_app_;
+  MessageSharedPtr message_;
+  const SmartObject display_capability_;
+};
+
+TEST_F(
+    OnBCSystemCapabilityUpdatedNotificationFromHMITest,
+    Run_AppIdNotPresentedInMessage_SetSystemDisplayCapabilitiesToHMICapabilities_SendMessageToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  EXPECT_CALL(mock_hmi_capabilities_,
+              set_system_display_capabilities(
+                  CheckDisplayCapabilitiesNotChanged(display_capability_)));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(
+          CheckMessageToMobile(),
+          ::application_manager::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(OnBCSystemCapabilityUpdatedNotificationFromHMITest,
+       Run_AppNotRegisteredWithPresentedAppIdInMessage_MessageNotSendToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+  (*message_)[strings::msg_params][strings::app_id] = kAppId;
+  ApplicationSharedPtr app;  // Empty application shared pointer
+
+  ON_CALL(app_mngr_, application(kAppId)).WillByDefault(Return(app));
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(
+    OnBCSystemCapabilityUpdatedNotificationFromHMITest,
+    Run_AppRegisteredWithPresentedAppIdInMessage_SetDisplayCapabilitiesToApp_SendMessageToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+  (*message_)[strings::msg_params][strings::app_id] = kAppId;
+
+  ON_CALL(app_mngr_, application(kAppId)).WillByDefault(Return(mock_app_));
+
+  EXPECT_CALL(*mock_app_,
+              set_display_capabilities(
+                  CheckDisplayCapabilitiesNotChanged(display_capability_)));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(
+          CheckMessageToMobile(),
+          ::application_manager::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+}  // namespace on_bc_system_capability_updated_notification_from_hmi
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc
new file mode 100644
index 0000000000..cb8894749f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_bc_system_capability_updated_notification_test.cc
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/on_bc_system_capability_updated_notification.h"
+
+#include "application_manager/commands/commands_test.h"
+#include "gtest/gtest.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace on_bc_system_capability_updated_notification {
+
+using sdl_rpc_plugin::commands::OnBCSystemCapabilityUpdatedNotification;
+using ::testing::_;
+using ::testing::Return;
+
+typedef std::shared_ptr<OnBCSystemCapabilityUpdatedNotification>
+    OnBCSystemCapabilityUpdatedNotificationPtr;
+
+namespace strings = application_manager::strings;
+namespace {
+const uint32_t kConnectionKey = 1u;
+}
+
+MATCHER_P(CheckDisplayCapabilities, display_capabilities, "") {
+  return display_capabilities ==
+         (*arg)[strings::msg_params][strings::system_capability]
+               [strings::display_capabilities];
+}
+
+class OnBCSystemCapabilityUpdatedNotificationTest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {
+ protected:
+  void SetUp() OVERRIDE {
+    message_ = CreateMessage();
+    (*message_)[strings::params][strings::connection_key] = kConnectionKey;
+
+    command_ = CreateCommand<OnBCSystemCapabilityUpdatedNotification>(message_);
+    mock_app_ = CreateMockApp();
+  }
+
+  OnBCSystemCapabilityUpdatedNotificationPtr command_;
+  MockAppPtr mock_app_;
+  MessageSharedPtr message_;
+};
+
+TEST_F(OnBCSystemCapabilityUpdatedNotificationTest,
+       SystemDisplayCapabilities_SUCCESS) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  smart_objects::SmartObjectSPtr system_display_capabilities =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Null);
+
+  EXPECT_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .Times(2)
+      .WillRepeatedly(Return(system_display_capabilities));
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      SendMessageToHMI(CheckDisplayCapabilities(*system_display_capabilities)));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(OnBCSystemCapabilityUpdatedNotificationTest,
+       SystemDisplayCapabilities_DATA_NOT_AVAILABLE) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+  EXPECT_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .WillOnce(Return(nullptr));
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(_)).Times(0);
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+}  // namespace on_bc_system_capability_updated_notification
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc
index 5e0083d395..fe6ba7c4e3 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_driver_distraction_notification_test.cc
@@ -126,8 +126,8 @@ MATCHER_P2(CheckNotificationParams, function_id, state, "") {
   return is_function_id_matched && is_state_matched;
 }
 
-ACTION_P(GetArg3, result) {
-  arg3 = *result;
+ACTION_P(GetArg4, result) {
+  arg4 = *result;
 }
 
 ACTION_P(SetMessage, lockScreenDismissalWarning) {
@@ -159,8 +159,8 @@ TEST_F(HMIOnDriverDistractionNotificationTest,
 
   policy::CheckPermissionResult result;
   result.hmi_level_permitted = policy::kRpcAllowed;
-  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _))
-      .WillOnce(GetArg3(&result));
+  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _, _))
+      .WillOnce(GetArg4(&result));
 
   MessageSharedPtr message_to_mobile(
       CreateMessage(smart_objects::SmartType_Map));
@@ -202,8 +202,9 @@ TEST_F(HMIOnDriverDistractionNotificationTest,
 
   policy::CheckPermissionResult result;
   result.hmi_level_permitted = policy::kRpcDisallowed;
-  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _))
-      .WillOnce(GetArg3(&result));
+  EXPECT_CALL(app_mngr_, GetPolicyHandler()).Times(3);
+  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _, _))
+      .WillOnce(GetArg4(&result));
 
   MessageSharedPtr pushed_message(CreateMessage(smart_objects::SmartType_Map));
   EXPECT_CALL(*mock_app_,
@@ -240,8 +241,8 @@ TEST_F(HMIOnDriverDistractionNotificationTest,
 
   policy::CheckPermissionResult result;
   result.hmi_level_permitted = policy::kRpcAllowed;
-  ON_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _))
-      .WillByDefault(GetArg3(&result));
+  ON_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _, _))
+      .WillByDefault(GetArg4(&result));
 
   MessageSharedPtr command_result;
   EXPECT_CALL(mock_rpc_service_,
@@ -284,11 +285,11 @@ TEST_F(HMIOnDriverDistractionNotificationTest,
 
   policy::CheckPermissionResult result;
   result.hmi_level_permitted = policy::kRpcAllowed;
-  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _))
-      .WillOnce(GetArg3(&result));
-
   MessageSharedPtr message_to_mobile(
       CreateMessage(smart_objects::SmartType_Map));
+  EXPECT_CALL(app_mngr_, GetPolicyHandler()).Times(2);
+  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _, _))
+      .WillOnce(GetArg4(&result));
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(
                   CheckNotificationParams(
@@ -331,8 +332,8 @@ TEST_F(HMIOnDriverDistractionNotificationTest,
 
   policy::CheckPermissionResult result;
   result.hmi_level_permitted = policy::kRpcAllowed;
-  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _))
-      .WillOnce(GetArg3(&result));
+  EXPECT_CALL(mock_policy_handler_interface_, CheckPermissions(_, _, _, _, _))
+      .WillOnce(GetArg4(&result));
 
   MessageSharedPtr message_to_mobile(
       CreateMessage(smart_objects::SmartType_Map));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_service_status_update_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_service_status_update_notification_test.cc
new file mode 100644
index 0000000000..a9bc97f842
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/on_service_status_update_notification_test.cc
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <stdint.h>
+
+#include "application_manager/commands/commands_test.h"
+#include "application_manager/mock_application.h"
+#include "application_manager/mock_application_manager.h"
+#include "application_manager/smart_object_keys.h"
+#include "gtest/gtest.h"
+#include "hmi/on_service_update_notification.h"
+#include "smart_objects/smart_object.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace on_service_update_notification {
+
+using namespace application_manager;
+using sdl_rpc_plugin::commands::hmi::OnServiceUpdateNotification;
+
+typedef std::shared_ptr<OnServiceUpdateNotification> NotificationPtr;
+typedef hmi_apis::Common_ServiceType::eType ServiceType;
+typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
+
+namespace {
+const uint32_t kConnectionKey = 1232u;
+const uint32_t kHmi_app_id = 321u;
+}  // namespace
+
+class OnServiceUpdateNotificationTest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {
+ public:
+  OnServiceUpdateNotificationTest()
+      : message_(CreateMessage(smart_objects::SmartType_Map)) {}
+
+ public:
+  MessageSharedPtr message_;
+  NotificationPtr command_;
+};
+
+TEST_F(OnServiceUpdateNotificationTest, SendNotificationToHMI) {
+  (*message_)[strings::msg_params][hmi_notification::service_type] =
+      ServiceType::AUDIO;
+  (*message_)[strings::msg_params][hmi_notification::service_event] =
+      ServiceEvent::REQUEST_ACCEPTED;
+  (*message_)[strings::msg_params][strings::app_id] = kConnectionKey;
+  command_ = CreateCommand<OnServiceUpdateNotification>(message_);
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToHMI(message_)).Times(1);
+
+  auto mock_app = std::make_shared<NiceMock<MockApplication> >();
+
+  ON_CALL(app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app));
+
+  ON_CALL(*mock_app, hmi_app_id()).WillByDefault(Return(kHmi_app_id));
+
+  command_->Init();
+  command_->Run();
+}
+
+}  // namespace on_service_update_notification
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_policy_configuration_data_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_policy_configuration_data_request_test.cc
new file mode 100644
index 0000000000..b5263ece7d
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_policy_configuration_data_request_test.cc
@@ -0,0 +1,180 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/sdl_get_policy_configuration_data_request.h"
+#include "application_manager/commands/command_request_test.h"
+#include "gtest/gtest.h"
+#include "smart_objects/smart_object.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace sdl_get_policy_configuration_data_request {
+
+using testing::Return;
+
+using sdl_rpc_plugin::commands::SDLGetPolicyConfigurationDataRequest;
+using test::components::policy_test::MockPolicyHandlerInterface;
+
+namespace strings = ::app_mngr::strings;
+namespace hmi_response = ::app_mngr::hmi_response;
+
+class SDLGetPolicyConfigurationDataRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {};
+
+MATCHER_P(GetPolicyConfigurationDataFirstElementMatches,
+          string_first_element_value,
+          "") {
+  auto message = static_cast<smart_objects::SmartObject>(*arg);
+  if (!message.keyExists(strings::msg_params) ||
+      !message[strings::msg_params].keyExists(strings::value)) {
+    return false;
+  }
+
+  if (message[strings::msg_params][strings::value].getType() !=
+          smart_objects::SmartType::SmartType_Array ||
+      message[strings::msg_params][strings::value].empty()) {
+    return false;
+  }
+
+  Json::Value msg_json_value(Json::ValueType::arrayValue);
+
+  auto msg_value_first = message[strings::msg_params][strings::value][0];
+  return msg_value_first.asString() == string_first_element_value;
+}
+
+MATCHER_P(HMIResultCodeIs, result_code, "") {
+  return result_code ==
+         static_cast<hmi_apis::Common_Result::eType>(
+             (*arg)[strings::params][hmi_response::code].asInt());
+}
+
+TEST_F(SDLGetPolicyConfigurationDataRequestTest, Run_Fail_DataNotAvailable) {
+  std::string kInvalidKey = "invalid_key";
+
+  PolicyTable pt;
+  ON_CALL(mock_policy_handler_, GetPolicyTableData())
+      .WillByDefault(Return(pt.ToJsonValue()));
+
+  MessageSharedPtr msg = CreateMessage();
+  (*msg)[strings::msg_params][strings::policy_type] = kInvalidKey;
+  (*msg)[strings::msg_params][strings::property] = kInvalidKey;
+
+  std::shared_ptr<SDLGetPolicyConfigurationDataRequest> command(
+      CreateCommand<SDLGetPolicyConfigurationDataRequest>(msg));
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIResultCodeIs(hmi_apis::Common_Result::DATA_NOT_AVAILABLE),
+                  Command::SOURCE_SDL_TO_HMI));
+
+  command->Run();
+}
+
+void clear_new_line_symbol(std::string& str_to_clear) {
+  str_to_clear.erase(
+      std::remove_if(str_to_clear.begin(),
+                     str_to_clear.end(),
+                     [](char character) { return '\n' == character; }),
+      str_to_clear.end());
+}
+
+TEST_F(SDLGetPolicyConfigurationDataRequestTest, Run_Success) {
+  MessageSharedPtr msg = CreateMessage();
+  (*msg)[strings::msg_params][strings::policy_type] = "module_config";
+  (*msg)[strings::msg_params][strings::property] = "endpoints";
+
+  std::shared_ptr<SDLGetPolicyConfigurationDataRequest> command(
+      CreateCommand<SDLGetPolicyConfigurationDataRequest>(msg));
+
+  policy_table::ModuleConfig module_config_with_endpoints;
+  policy_table::URLList endpoint_url_list;
+  policy_table::URL urls;
+  urls.push_back("https://url1.com");
+  urls.push_back("https://url2.com");
+  endpoint_url_list["default"] = urls;
+  module_config_with_endpoints.endpoints["0x9"] = endpoint_url_list;
+
+  PolicyTable pt;
+  pt.mark_initialized();
+  pt.module_config.mark_initialized();
+  pt.module_config = module_config_with_endpoints;
+
+  ON_CALL(mock_policy_handler_, GetPolicyTableData())
+      .WillByDefault(Return(pt.ToJsonValue()));
+
+  auto json_val = module_config_with_endpoints.endpoints.ToJsonValue();
+  Json::StreamWriterBuilder writer_builder;
+  writer_builder.settings_["indentation"] = "";
+  std::string expected_string = Json::writeString(writer_builder, json_val);
+  clear_new_line_symbol(expected_string);
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(GetPolicyConfigurationDataFirstElementMatches(
+                                   expected_string),
+                               Command::SOURCE_SDL_TO_HMI));
+  command->Run();
+}
+
+TEST_F(SDLGetPolicyConfigurationDataRequestTest,
+       Run_RetriveStringValueFromPolicy) {
+  MessageSharedPtr msg = CreateMessage();
+  (*msg)[strings::msg_params][strings::policy_type] =
+      "consumer_friendly_messages";
+  (*msg)[strings::msg_params][strings::property] = "version";
+
+  auto command = CreateCommand<SDLGetPolicyConfigurationDataRequest>(msg);
+
+  const std::string version_test_value("version string");
+  PolicyTable pt;
+  pt.mark_initialized();
+  pt.consumer_friendly_messages->mark_initialized();
+  pt.consumer_friendly_messages->version =
+      rpc::String<1, 100>(version_test_value);
+
+  ON_CALL(mock_policy_handler_, GetPolicyTableData())
+      .WillByDefault(Return(pt.ToJsonValue()));
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(GetPolicyConfigurationDataFirstElementMatches(
+                                   version_test_value),
+                               Command::SOURCE_SDL_TO_HMI));
+
+  command->Run();
+}
+
+}  // namespace sdl_get_policy_configuration_data_request
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc
index 5cac1c823f..0e87acef1f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/sdl_get_user_friendly_message_request_test.cc
@@ -110,6 +110,7 @@ TEST_F(SDLGetUserFriendlyMessageRequestTest, Run_LanguageSet_SUCCESS) {
   EXPECT_CALL(mock_policy_handler_,
               OnGetUserFriendlyMessage(msg_codes, kLanguageEn, kCorrelationID));
 
+  command->Init();
   command->Run();
 }
 
@@ -136,6 +137,7 @@ TEST_F(SDLGetUserFriendlyMessageRequestTest, Run_LanguageNotSet_SUCCESS) {
   EXPECT_CALL(mock_policy_handler_,
               OnGetUserFriendlyMessage(msg_codes, kLanguageEn, kCorrelationID));
 
+  command->Init();
   command->Run();
 }
 
@@ -150,6 +152,39 @@ TEST_F(SDLGetUserFriendlyMessageRequestTest, Run_NoMsgCodes_Canceled) {
   EXPECT_CALL(mock_message_helper_, CommonLanguageToString(_)).Times(0);
   EXPECT_CALL(mock_policy_handler_, OnGetUserFriendlyMessage(_, _, _)).Times(0);
 
+  command->Init();
+  command->Run();
+}
+
+MATCHER_P(HMIRequestResultCodeIs, result_code, "") {
+  return result_code ==
+         static_cast<hmi_apis::Common_Result::eType>(
+             (*arg)[strings::params][am::hmi_response::code].asInt());
+}
+
+TEST_F(
+    SDLGetUserFriendlyMessageRequestTest,
+    RUN_InvalidRequestInvalidSymbolsStringMandatoryParam_SendInvalidDataErrorResponse) {
+  const std::string kInvalidSyntaxString = "\n\t ";
+  MessageSharedPtr msg = CreateMessage();
+  (*msg)[strings::params][strings::correlation_id] = kCorrelationID;
+  (*msg)[strings::msg_params][strings::app_id] = kAppID;
+
+  (*msg)[strings::msg_params][kMessageCodes] =
+      SmartObject(smart_objects::SmartType_Array);
+  (*msg)[strings::msg_params][kMessageCodes][0] =
+      SmartObject(kInvalidSyntaxString);
+  (*msg)[strings::msg_params][kMessageCodes][1] = SmartObject(kLanguageEn);
+
+  (*msg)[strings::msg_params][strings::language] = kLanguage;
+
+  std::shared_ptr<SDLGetUserFriendlyMessageRequest> command(
+      CreateCommand<SDLGetUserFriendlyMessageRequest>(msg));
+
+  EXPECT_CALL(mock_message_helper_, CommonLanguageToString(_)).Times(0);
+  EXPECT_CALL(mock_policy_handler_, OnGetUserFriendlyMessage(_, _, _)).Times(0);
+
+  command->Init();
   command->Run();
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc
index 3fd3a39dca..4683fc62c7 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/ui_get_capabilities_response_test.cc
@@ -145,7 +145,7 @@ TEST_F(UIGetCapabilitiesResponseTest, SetHmiZone_SUCCESS) {
 TEST_F(UIGetCapabilitiesResponseTest, SetAudioPassThru_SUCCESS) {
   MessageSharedPtr command_msg = CreateCommandMsg();
   (*command_msg)[strings::msg_params][strings::audio_pass_thru_capabilities] =
-      smart_objects::SmartObject(smart_objects::SmartType_Array);
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
 
   ResponseFromHMIPtr command(
       CreateCommand<UIGetCapabilitiesResponse>(command_msg));
@@ -153,9 +153,40 @@ TEST_F(UIGetCapabilitiesResponseTest, SetAudioPassThru_SUCCESS) {
   smart_objects::SmartObject audio_pass_thru_capabilities_so =
       (*command_msg)[strings::msg_params]
                     [strings::audio_pass_thru_capabilities];
+
+  // hmi_capabilities will receive a list of capabilities, the first element
+  // being audio_pass_thru_capabilities_so
+  smart_objects::SmartObject audio_pass_thru_capabilities_list_so =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  audio_pass_thru_capabilities_list_so[0] = audio_pass_thru_capabilities_so;
   EXPECT_CALL(
       mock_hmi_capabilities_,
-      set_audio_pass_thru_capabilities(audio_pass_thru_capabilities_so));
+      set_audio_pass_thru_capabilities(audio_pass_thru_capabilities_list_so));
+
+  command->Run();
+}
+
+TEST_F(UIGetCapabilitiesResponseTest, SetAudioPassThruList_SUCCESS) {
+  MessageSharedPtr command_msg = CreateCommandMsg();
+
+  // if both audioPassThruCapabilities and audioPassThruCapabilitiesList are
+  // supplied, audioPassThruCapabilitiesList should be used
+  smart_objects::SmartObject audio_pass_thru_capabilities_so =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+  smart_objects::SmartObject audio_pass_thru_capabilities_list_so =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  (*command_msg)[strings::msg_params][strings::audio_pass_thru_capabilities] =
+      audio_pass_thru_capabilities_so;
+  (*command_msg)[strings::msg_params]
+                [strings::audio_pass_thru_capabilities_list] =
+                    audio_pass_thru_capabilities_list_so;
+
+  ResponseFromHMIPtr command(
+      CreateCommand<UIGetCapabilitiesResponse>(command_msg));
+
+  EXPECT_CALL(
+      mock_hmi_capabilities_,
+      set_audio_pass_thru_capabilities(audio_pass_thru_capabilities_list_so));
 
   command->Run();
 }
@@ -279,7 +310,7 @@ TEST_F(UIGetCapabilitiesResponseTest, SetVideoStreamingCapability_SUCCESS) {
   video_streaming_capability[strings::preferred_resolution]
                             [strings::resolution_width] = 800;
   video_streaming_capability[strings::preferred_resolution]
-                            [strings::resolution_height] = 350;
+                            [strings::resolution_height] = 354;
 
   video_streaming_capability[strings::max_bitrate] = 10000;
 
@@ -297,6 +328,12 @@ TEST_F(UIGetCapabilitiesResponseTest, SetVideoStreamingCapability_SUCCESS) {
 
   video_streaming_capability[strings::haptic_spatial_data_supported] = true;
 
+  video_streaming_capability[strings::diagonal_screen_size] = 7.47;
+
+  video_streaming_capability[strings::pixel_per_inch] = 117.f;
+
+  video_streaming_capability[strings::scale] = 1.f;
+
   ResponseFromHMIPtr command(
       CreateCommand<UIGetCapabilitiesResponse>(command_msg));
 
@@ -306,6 +343,25 @@ TEST_F(UIGetCapabilitiesResponseTest, SetVideoStreamingCapability_SUCCESS) {
   command->Run();
 }
 
+TEST_F(UIGetCapabilitiesResponseTest, SetSystemDisplayCapabilities_SUCCESS) {
+  MessageSharedPtr command_msg = CreateCommandMsg();
+  (*command_msg)[strings::msg_params][strings::system_capabilities] =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  ResponseFromHMIPtr command(
+      CreateCommand<UIGetCapabilitiesResponse>(command_msg));
+
+  const auto& display_capability_so =
+      (*command_msg)[strings::msg_params][strings::system_capabilities]
+                    [strings::display_capabilities];
+
+  EXPECT_CALL(mock_hmi_capabilities_,
+              set_system_display_capabilities(display_capability_so));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
 }  // namespace ui_get_capabilities_response
 }  // namespace hmi_commands_test
 }  // namespace commands_test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
index 113c6d32a0..dc7731bfc8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/alert_request_test.cc
@@ -73,6 +73,8 @@ const uint32_t kDefaultTimeout = 1000u;
 const uint32_t kCorrelationId = 2u;
 const mobile_apis::FunctionID::eType kFunctionId =
     mobile_apis::FunctionID::AlertID;
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 class AlertRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
@@ -138,9 +140,9 @@ class AlertRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
         *mock_app_,
         AreCommandLimitsExceeded(kFunctionId, am::TLimitSource::POLICY_TABLE))
         .WillByDefault(Return(false));
-    ON_CALL(*mock_app_, hmi_level())
+    ON_CALL(*mock_app_, hmi_level(kDefaultWindowId))
         .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
-    ON_CALL(*mock_app_, hmi_level())
+    ON_CALL(*mock_app_, hmi_level(kDefaultWindowId))
         .WillByDefault(Return(mobile_apis::HMILevel::HMI_BACKGROUND));
   }
 
@@ -155,7 +157,8 @@ class AlertRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
   }
 
   void ExpectCallHmiLevel(const mobile_apis::HMILevel::eType level) {
-    EXPECT_CALL(*mock_app_, hmi_level()).WillRepeatedly(Return(level));
+    EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
+        .WillRepeatedly(Return(level));
   }
 
   void ExpectManageMobileCommandWithResultCode(
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc
new file mode 100644
index 0000000000..905c6ceb72
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_window_request_test.cc
@@ -0,0 +1,460 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdint.h>
+#include <memory>
+#include <set>
+#include <string>
+
+#include "mobile/create_window_request.h"
+
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/event_engine/event.h"
+#include "application_manager/hmi_state.h"
+#include "application_manager/mock_application.h"
+#include "application_manager/mock_application_manager.h"
+#include "application_manager/mock_hmi_interface.h"
+#include "application_manager/mock_message_helper.h"
+#include "application_manager/mock_state_controller.h"
+#include "gtest/gtest.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace mobile_commands_test {
+namespace create_window_request {
+
+namespace am = application_manager;
+using am::MockMessageHelper;
+using am::commands::CommandImpl;
+using am::commands::MessageSharedPtr;
+using sdl_rpc_plugin::commands::CreateWindowRequest;
+using namespace mobile_apis::PredefinedWindows;
+using am::commands::Command;
+using application_manager::WindowID;
+using test::components::application_manager_test::MockStateController;
+using test::components::policy_test::MockPolicyHandlerInterface;
+using ::testing::_;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace {
+const uint32_t kAppId = 1u;
+const uint32_t kConnectionKey = 2u;
+const int32_t kFunctionID = mobile_apis::FunctionID::CreateWindowID;
+const WindowID kTestWindowId = 12;
+const WindowID kDuplicateWindowID = 13;
+const char* const kWindowName = "WindowName";
+const utils::custom_string::CustomString kAppName("TestApp");
+}  // namespace
+
+MATCHER_P2(CheckMessageToMobile, result_code, success, "") {
+  const bool is_success =
+      (*arg)[am::strings::msg_params][am::strings::success].asBool() == success;
+
+  const bool is_result_code_correct =
+      (*arg)[am::strings::msg_params][am::strings::result_code].asInt() ==
+      static_cast<int32_t>(result_code);
+  return is_success && is_result_code_correct;
+}
+
+class CreateWindowRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ public:
+  CreateWindowRequestTest() {
+    mock_app_ = CreateMockApp();
+    ON_CALL(app_mngr_, application(kConnectionKey))
+        .WillByDefault(Return(mock_app_));
+  }
+
+ protected:
+  MessageSharedPtr CreateMsgParams() {
+    auto msg = CreateMessage();
+    (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+    (*msg)[am::strings::params][am::strings::function_id] = kFunctionID;
+    return msg;
+  }
+
+  void SetupHelperApplyWindowInitialState(const MockAppPtr& app,
+                                          const MessageSharedPtr& msg) {
+    am::HmiStatePtr state(new am::HmiState(app, app_mngr_));
+    const auto window_type = static_cast<mobile_apis::WindowType::eType>(
+        (*msg)[am::strings::msg_params][am::strings::window_type].asInt());
+    const auto window_id = static_cast<mobile_apis::WindowType::eType>(
+        (*msg)[am::strings::msg_params][am::strings::window_id].asInt());
+    const auto window_name =
+        (*msg)[am::strings::msg_params][am::strings::window_name].asString();
+
+    state->set_window_type(window_type);
+    state->set_hmi_level(mobile_apis::HMILevel::INVALID_ENUM);
+    state->set_audio_streaming_state(
+        mobile_apis::AudioStreamingState::INVALID_ENUM);
+    state->set_video_streaming_state(
+        mobile_apis::VideoStreamingState::INVALID_ENUM);
+    state->set_system_context(mobile_apis::SystemContext::INVALID_ENUM);
+    ApplicationSharedPtr AppPtr = app;
+    ON_CALL(app_mngr_,
+            CreateRegularState(AppPtr,
+                               window_type,
+                               mobile_apis::HMILevel::INVALID_ENUM,
+                               mobile_apis::AudioStreamingState::INVALID_ENUM,
+                               mobile_apis::VideoStreamingState::INVALID_ENUM,
+                               mobile_apis::SystemContext::INVALID_ENUM))
+        .WillByDefault(Return(state));
+    ON_CALL(*mock_app_, SetInitialState(kTestWindowId, window_name, state))
+        .WillByDefault(Return());
+    ON_CALL(app_mngr_, state_controller())
+        .WillByDefault(ReturnRef(mock_state_controller));
+    ON_CALL(
+        mock_state_controller,
+        OnAppWindowAdded(
+            AppPtr, window_id, window_type, mobile_apis::HMILevel::HMI_NONE))
+        .WillByDefault(Return());
+  }
+
+  void SetUp() OVERRIDE {
+    using namespace application_manager;
+    display_capabilities_ = std::make_shared<smart_objects::SmartObject>(
+        smart_objects::SmartType_Array);
+
+    smart_objects::SmartObject window_type_supported(
+        smart_objects::SmartType_Array);
+
+    const uint32_t maximum_widgets_amount = 4;
+    smart_objects::SmartObject maximum_widgets(smart_objects::SmartType_Map);
+    maximum_widgets[strings::window_type] = mobile_apis::WindowType::WIDGET;
+    maximum_widgets[strings::maximum_number_of_windows] =
+        maximum_widgets_amount;
+
+    window_type_supported[window_type_supported.length()] = maximum_widgets;
+
+    (*display_capabilities_)[0][strings::window_type_supported] =
+        window_type_supported;
+
+    ON_CALL(*mock_app_, display_capabilities())
+        .WillByDefault(Return(display_capabilities_));
+
+    ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+        .WillByDefault(Return(display_capabilities_));
+
+    window_params_map_lock_ptr_ = std::make_shared<sync_primitives::Lock>();
+
+    DataAccessor<am::WindowParamsMap> window_params_map(
+        test_window_params_map_, window_params_map_lock_ptr_);
+    ON_CALL(*mock_app_, window_optional_params_map())
+        .WillByDefault(Return(window_params_map));
+  }
+
+  MockAppPtr mock_app_;
+  NiceMock<MockStateController> mock_state_controller;
+  std::shared_ptr<sync_primitives::Lock> window_params_map_lock_ptr_;
+  application_manager::WindowParamsMap test_window_params_map_;
+  smart_objects::SmartObjectSPtr display_capabilities_;
+};
+
+TEST_F(CreateWindowRequestTest, WindowID_ExpectDefaultWindowID) {
+  auto msg = CreateMsgParams();
+  const auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_EQ(mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            command->window_id());
+}
+
+TEST_F(CreateWindowRequestTest,
+       Run_AppDoesNotExist_ExpectAppNotRegisteredResponseToMobile) {
+  const auto result_code = mobile_apis::Result::APPLICATION_NOT_REGISTERED;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(nullptr));
+
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(CreateWindowRequestTest,
+       Run_WindowIDAlreadyExist_ExpectInvalidIDResponseToMobile) {
+  const auto result_code = mobile_apis::Result::INVALID_ID;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(true));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(CreateWindowRequestTest,
+       Run_CreateWindowForMAINWindowType_ExpectInvalidDataResponseToMobile) {
+  const auto result_code = mobile_apis::Result::INVALID_DATA;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(false));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params][am::strings::window_type] =
+      mobile_apis::WindowType::eType::MAIN;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(
+    CreateWindowRequestTest,
+    Run_DuplicateUpdatesFromNotExistingWindowId_ExpectInvalidDataResponseToMobile) {
+  const auto result_code = mobile_apis::Result::INVALID_DATA;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(false));
+  ON_CALL(*mock_app_, WindowIdExists(kDuplicateWindowID))
+      .WillByDefault(Return(false));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params]
+        [am::strings::duplicate_updates_from_window_id] = kDuplicateWindowID;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(
+    CreateWindowRequestTest,
+    Run_DuplicateUpdatesFromExistingWindowId_ExpectUICreateWindowIsSentToHMI) {
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_CreateWindow),
+                       Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(false));
+  ON_CALL(*mock_app_, WindowIdExists(kDuplicateWindowID))
+      .WillByDefault(Return(true));
+  ON_CALL(*mock_app_, name()).WillByDefault(ReturnRef(kAppName));
+  ON_CALL(*mock_app_, GetWindowNames())
+      .WillByDefault(Return(std::vector<std::string>()));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params]
+        [am::strings::duplicate_updates_from_window_id] = kDuplicateWindowID;
+  (*msg)[am::strings::msg_params][am::strings::window_type] =
+      mobile_apis::WindowType::WIDGET;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(CreateWindowRequestTest,
+       Run_WindowNameAppNameAreEqual_ExpectDuplicateNameResponseToMobile) {
+  const auto result_code = mobile_apis::Result::DUPLICATE_NAME;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(false));
+  ON_CALL(*mock_app_, name()).WillByDefault(ReturnRef(kAppName));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params][am::strings::window_name] = kAppName;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(CreateWindowRequestTest,
+       Run_AllParametersCorrect_ExpectUICreateWindowIsSentToHMI) {
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_CreateWindow),
+                       Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(false));
+  ON_CALL(*mock_app_, WindowIdExists(kDuplicateWindowID))
+      .WillByDefault(Return(true));
+  ON_CALL(*mock_app_, name()).WillByDefault(ReturnRef(kAppName));
+
+  const std::vector<std::string> windowNames = {
+      "WindowName_1", "WindowName_2", "WindowName_3"};
+  ON_CALL(*mock_app_, GetWindowNames()).WillByDefault(Return(windowNames));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params][am::strings::window_name] = kWindowName;
+  (*msg)[am::strings::msg_params]
+        [am::strings::duplicate_updates_from_window_id] = kDuplicateWindowID;
+  (*msg)[am::strings::msg_params][am::strings::associated_service_type] =
+      "MEDIA";
+  (*msg)[am::strings::msg_params][am::strings::window_type] =
+      mobile_apis::WindowType::WIDGET;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(
+    CreateWindowRequestTest,
+    CheckWindowName_AllParametersCorrectCreateWindowForPrimaryWidget_SendMessageToHMI) {
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_CreateWindow),
+                       Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, WindowIdExists(kTestWindowId))
+      .WillByDefault(Return(false));
+  ON_CALL(*mock_app_, WindowIdExists(kDuplicateWindowID))
+      .WillByDefault(Return(true));
+  ON_CALL(*mock_app_, name()).WillByDefault(ReturnRef(kAppName));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] =
+      mobile_apis::PredefinedWindows::PRIMARY_WIDGET;
+  (*msg)[am::strings::msg_params][am::strings::window_name] = kWindowName;
+  (*msg)[am::strings::msg_params]
+        [am::strings::duplicate_updates_from_window_id] = kDuplicateWindowID;
+  (*msg)[am::strings::msg_params][am::strings::associated_service_type] =
+      "MEDIA";
+  (*msg)[am::strings::msg_params][am::strings::window_type] =
+      mobile_apis::WindowType::WIDGET;
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(CreateWindowRequestTest,
+       OnEvent_InvalidFunctionId_MessageNotSendToMobile) {
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  Event event(hmi_apis::FunctionID::INVALID_ENUM);
+  command->on_event(event);
+}
+
+TEST_F(CreateWindowRequestTest,
+       OnEvent_AppDoesNotExist_ExpectAppNotRegisteredResponseToMobile) {
+  const auto result_code = mobile_apis::Result::APPLICATION_NOT_REGISTERED;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(nullptr));
+
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  Event event(hmi_apis::FunctionID::UI_CreateWindow);
+  command->on_event(event);
+}
+
+TEST_F(CreateWindowRequestTest,
+       OnEvent_RequestFailedOnHMISide_SendGenericErrorResponseToMobile) {
+  const auto result_code = mobile_apis::Result::GENERIC_ERROR;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::GENERIC_ERROR;
+  (*msg)[am::strings::msg_params][am::strings::window_name] = kWindowName;
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params][am::strings::window_type] =
+      mobile_apis::WindowType::eType::WIDGET;
+
+  SetupHelperApplyWindowInitialState(mock_app_, msg);
+
+  Event event(hmi_apis::FunctionID::UI_CreateWindow);
+  event.set_smart_object(*msg);
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->on_event(event);
+}
+
+TEST_F(CreateWindowRequestTest,
+       OnEvent_AllParametersCorrect_SendSuccessResponseToMobile) {
+  const auto result_code = mobile_apis::Result::SUCCESS;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, true),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_app_, UpdateHash()).Times(1);
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::SUCCESS;
+  (*msg)[am::strings::msg_params][am::strings::window_name] = kWindowName;
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+  (*msg)[am::strings::msg_params][am::strings::window_type] =
+      mobile_apis::WindowType::eType::WIDGET;
+
+  SetupHelperApplyWindowInitialState(mock_app_, msg);
+
+  Event event(hmi_apis::FunctionID::UI_CreateWindow);
+  event.set_smart_object(*msg);
+
+  auto command = CreateCommand<CreateWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->on_event(event);
+}
+
+}  // namespace create_window_request
+}  // namespace mobile_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc
index 4081583099..cce53bb480 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_file_test.cc
@@ -98,6 +98,8 @@ namespace {
 const uint32_t kConnectionKey = 1u;
 const uint32_t kCorrelationId = 10u;
 const int32_t kMenuId = 5;
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 class DeleteFileRequestTest
@@ -134,7 +136,7 @@ TEST_F(DeleteFileRequestTest, Run_HMILevelNone_UNSUCCESS) {
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_NONE));
 
   EXPECT_CALL(app_mngr_, get_settings())
@@ -161,7 +163,7 @@ TEST_F(DeleteFileRequestTest, Run_ValidFileName_SUCCESS) {
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillRepeatedly(Return(mock_app_));
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   EXPECT_CALL(app_mngr_, get_settings())
@@ -191,7 +193,7 @@ TEST_F(DeleteFileRequestTest, Run_InvalidFile_UNSUCCESS) {
   (*message_)[am::strings::msg_params][am::strings::sync_file_name] = file_name;
 
   EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(mock_app_));
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   EXPECT_CALL(app_mngr_, get_settings())
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_window_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_window_request_test.cc
new file mode 100644
index 0000000000..f951d5c2a7
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/delete_window_request_test.cc
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdint.h>
+#include <memory>
+#include <set>
+#include <string>
+
+#include "mobile/delete_window_request.h"
+
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/event_engine/event.h"
+#include "application_manager/hmi_state.h"
+#include "application_manager/mock_application.h"
+#include "application_manager/mock_application_manager.h"
+#include "application_manager/mock_hmi_interface.h"
+#include "application_manager/mock_message_helper.h"
+#include "application_manager/mock_state_controller.h"
+#include "gtest/gtest.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace mobile_commands_test {
+namespace delete_window_request {
+
+namespace am = application_manager;
+using am::MockMessageHelper;
+using am::commands::CommandImpl;
+using am::commands::MessageSharedPtr;
+using sdl_rpc_plugin::commands::DeleteWindowRequest;
+using namespace mobile_apis::PredefinedWindows;
+using am::commands::Command;
+using application_manager::WindowID;
+using test::components::application_manager_test::MockStateController;
+using test::components::policy_test::MockPolicyHandlerInterface;
+using ::testing::_;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace {
+const uint32_t kConnectionKey = 2u;
+const int32_t kFunctionID = mobile_apis::FunctionID::DeleteWindowID;
+const WindowID kTestWindowId = 12;
+}  // namespace
+
+MATCHER_P2(CheckMessageToMobile, result_code, success, "") {
+  const bool is_success =
+      (*arg)[am::strings::msg_params][am::strings::success].asBool() == success;
+
+  const bool is_result_code_correct =
+      (*arg)[am::strings::msg_params][am::strings::result_code].asInt() ==
+      static_cast<int32_t>(result_code);
+  return is_success && is_result_code_correct;
+}
+
+class DeleteWindowRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ public:
+  DeleteWindowRequestTest() {
+    mock_app_ = CreateMockApp();
+    ON_CALL(app_mngr_, application(kConnectionKey))
+        .WillByDefault(Return(mock_app_));
+  }
+
+ protected:
+  MessageSharedPtr CreateMsgParams() {
+    auto msg = CreateMessage();
+    (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+    (*msg)[am::strings::params][am::strings::function_id] = kFunctionID;
+    return msg;
+  }
+
+  MockAppPtr mock_app_;
+  NiceMock<MockStateController> mock_state_controller;
+};
+
+TEST_F(DeleteWindowRequestTest, WindowID_ExpectDefaultWindowID) {
+  auto msg = CreateMsgParams();
+  const auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_EQ(mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            command->window_id());
+}
+
+TEST_F(DeleteWindowRequestTest,
+       Run_AppDoesNotExist_ExpectAppNotRegisteredResponseToMobile) {
+  const auto result_code = mobile_apis::Result::APPLICATION_NOT_REGISTERED;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(nullptr));
+
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(DeleteWindowRequestTest,
+       Run_WindowIDForMainApplicationWindow_ExpectInvalidIDResponseToMobile) {
+  const auto result_code = mobile_apis::Result::INVALID_ID;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] =
+      mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(DeleteWindowRequestTest,
+       Run_WindowIDNotExist_ExpectInvalidIDResponseToMobile) {
+  const auto result_code = mobile_apis::Result::INVALID_ID;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  ON_CALL(*mock_app_, GetWindowIds()).WillByDefault(Return(am::WindowIds()));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(DeleteWindowRequestTest,
+       Run_AllParametersCorrect_ExpectUIDeleteWindowIsSentToHMI) {
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_DeleteWindow),
+                       Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+
+  ON_CALL(*mock_app_, GetWindowIds())
+      .WillByDefault(Return(am::WindowIds(1, kTestWindowId)));
+  EXPECT_CALL(*mock_app_, WindowIdExists(kTestWindowId)).WillOnce(Return(true));
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(DeleteWindowRequestTest,
+       Run_AllParametersCorrectDeleteWindowForPrimaryWidget_SendMessageToHMI) {
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_DeleteWindow),
+                       Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+  const auto primary_widget_window_id =
+      mobile_apis::PredefinedWindows::PRIMARY_WIDGET;
+  ON_CALL(*mock_app_, GetWindowIds())
+      .WillByDefault(Return(am::WindowIds(1, primary_widget_window_id)));
+  EXPECT_CALL(*mock_app_, WindowIdExists(primary_widget_window_id))
+      .WillOnce(Return(true));
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] =
+      primary_widget_window_id;
+
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(DeleteWindowRequestTest,
+       OnEvent_InvalidFunctionId_MessageNotSendToMobile) {
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  Event event(hmi_apis::FunctionID::INVALID_ENUM);
+  command->on_event(event);
+}
+
+TEST_F(DeleteWindowRequestTest,
+       OnEvent_AppDoesNotExist_ExpectAppNotRegisteredResponseToMobile) {
+  const auto result_code = mobile_apis::Result::APPLICATION_NOT_REGISTERED;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(nullptr));
+
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  Event event(hmi_apis::FunctionID::UI_DeleteWindow);
+  command->on_event(event);
+}
+
+TEST_F(DeleteWindowRequestTest,
+       OnEvent_RequestFailedOnHMISide_SendGenericErrorResponseToMobile) {
+  const auto result_code = mobile_apis::Result::GENERIC_ERROR;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::GENERIC_ERROR;
+
+  Event event(hmi_apis::FunctionID::UI_DeleteWindow);
+  event.set_smart_object(*msg);
+
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->on_event(event);
+}
+
+TEST_F(DeleteWindowRequestTest,
+       OnEvent_AllParametersCorrect_SendSuccessResponseToMobile) {
+  const auto result_code = mobile_apis::Result::SUCCESS;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, true),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_app_, UpdateHash()).Times(1);
+  EXPECT_CALL(*mock_app_, RemoveHMIState(kTestWindowId, _)).Times(1);
+
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::SUCCESS;
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kTestWindowId;
+
+  Event event(hmi_apis::FunctionID::UI_DeleteWindow);
+  event.set_smart_object(*msg);
+
+  auto command = CreateCommand<DeleteWindowRequest>(msg);
+  EXPECT_TRUE(command->Init());
+  command->on_event(event);
+}
+
+}  // namespace delete_window_request
+}  // namespace mobile_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc
new file mode 100644
index 0000000000..74c61410e8
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/get_system_capability_request_test.cc
@@ -0,0 +1,124 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "mobile/get_system_capability_request.h"
+
+#include "application_manager/commands/command_request_test.h"
+#include "gtest/gtest.h"
+#include "interfaces/MOBILE_API.h"
+#include "smart_objects/smart_object.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace mobile_commands_test {
+namespace get_system_capability_request_test {
+
+using sdl_rpc_plugin::commands::GetSystemCapabilityRequest;
+using ::testing::_;
+using ::testing::Return;
+typedef std::shared_ptr<GetSystemCapabilityRequest>
+    GetSystemCapabilityRequestPtr;
+
+namespace strings = application_manager::strings;
+namespace {
+const uint32_t kConnectionKey = 1u;
+}
+
+class GetSystemCapabilityRequestTest
+    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+ protected:
+  void SetUp() OVERRIDE {
+    message_ = CreateMessage();
+    (*message_)[strings::params][strings::connection_key] = kConnectionKey;
+
+    command_ = CreateCommand<GetSystemCapabilityRequest>(message_);
+    mock_app_ = CreateMockApp();
+
+    ON_CALL(app_mngr_, application(kConnectionKey))
+        .WillByDefault(Return(mock_app_));
+  }
+
+  GetSystemCapabilityRequestPtr command_;
+  MessageSharedPtr message_;
+  MockAppPtr mock_app_;
+};
+
+TEST_F(
+    GetSystemCapabilityRequestTest,
+    Run_GetSystemDisplayCapabilities_SendMessageToMobileWithSUCCESSResultCode) {
+  (*message_)[strings::msg_params][strings::system_capability_type] =
+      mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  smart_objects::SmartObjectSPtr system_display_capabilities(
+      std::make_shared<smart_objects::SmartObject>());
+
+  ON_CALL(*mock_app_, display_capabilities())
+      .WillByDefault(Return(system_display_capabilities));
+
+  ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .WillByDefault(Return(system_display_capabilities));
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS),
+                          Command::CommandSource::SOURCE_SDL));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(
+    GetSystemCapabilityRequestTest,
+    Run_GetSystemDisplayCapabilities_CapabilitiesNotExistSendMessageToMobileWithDATA_NOT_AVAILABLEResultCode) {
+  (*message_)[strings::msg_params][strings::system_capability_type] =
+      mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  EXPECT_CALL(*mock_app_, display_capabilities()).WillOnce(Return(nullptr));
+
+  ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .WillByDefault(Return(nullptr));
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(
+                  MobileResultCodeIs(mobile_apis::Result::DATA_NOT_AVAILABLE),
+                  Command::CommandSource::SOURCE_SDL));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+}  // namespace get_system_capability_request_test
+}  // namespace mobile_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc
index 8b6f6696b7..06ecc1116e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/list_files_request_test.cc
@@ -60,6 +60,11 @@ namespace am = ::application_manager;
 using am::commands::MessageSharedPtr;
 using sdl_rpc_plugin::commands::ListFilesRequest;
 
+namespace {
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
 class ListFilesRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
@@ -86,7 +91,7 @@ TEST_F(ListFilesRequestTest, Run_TooManyHmiNone_UNSUCCESS) {
   std::shared_ptr<ListFilesRequest> command(CreateCommand<ListFilesRequest>());
 
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app));
-  ON_CALL(*app, hmi_level())
+  ON_CALL(*app, hmi_level(kDefaultWindowId))
       .WillByDefault(Return(mobile_apis::HMILevel::HMI_NONE));
 
   const uint32_t kListFilesInNoneAllowed = 1u;
@@ -121,7 +126,7 @@ TEST_F(ListFilesRequestTest, Run_SUCCESS) {
 
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app));
 
-  ON_CALL(*app, hmi_level())
+  ON_CALL(*app, hmi_level(kDefaultWindowId))
       .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
 
   ON_CALL(*app, increment_list_files_in_none_count()).WillByDefault(Return());
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc
index 1f514e09c5..e4536ddeea 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_button_notification_commands_test.cc
@@ -65,6 +65,8 @@ namespace {
 const uint32_t kAppId = 5u;
 const uint32_t kCustomButtonId = 3u;
 const mobile_apis::ButtonName::eType kButtonName = mobile_apis::ButtonName::OK;
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 template <class NotificationT,
@@ -217,7 +219,7 @@ TYPED_TEST(OnButtonNotificationCommandsTest, Run_CustomButton_SUCCESS) {
       this->template CreateCommand<Notification>(notification_msg));
 
   typename TestFixture::MockAppPtr mock_app = this->CreateMockApp();
-  ON_CALL(*mock_app, hmi_level())
+  ON_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
   EXPECT_CALL(this->app_mngr_, application(kAppId)).WillOnce(Return(mock_app));
   EXPECT_CALL(*mock_app, IsSubscribedToSoftButton(kCustomButtonId))
@@ -229,6 +231,35 @@ TYPED_TEST(OnButtonNotificationCommandsTest, Run_CustomButton_SUCCESS) {
   command->Run();
 }
 
+TYPED_TEST(OnButtonNotificationCommandsTest,
+           Run_CustomButton_SUCCESS_BACKGROUND) {
+  typedef typename TestFixture::Notification Notification;
+
+  MessageSharedPtr notification_msg(
+      this->CreateMessage(smart_objects::SmartType_Map));
+
+  (*notification_msg)[am::strings::msg_params][am::hmi_response::button_name] =
+      mobile_apis::ButtonName::CUSTOM_BUTTON;
+  (*notification_msg)[am::strings::msg_params][am::strings::app_id] = kAppId;
+  (*notification_msg)[am::strings::msg_params]
+                     [am::hmi_response::custom_button_id] = kCustomButtonId;
+
+  std::shared_ptr<Notification> command(
+      this->template CreateCommand<Notification>(notification_msg));
+
+  typename TestFixture::MockAppPtr mock_app = this->CreateMockApp();
+  ON_CALL(*mock_app, hmi_level(kDefaultWindowId))
+      .WillByDefault(Return(mobile_apis::HMILevel::HMI_BACKGROUND));
+  EXPECT_CALL(this->app_mngr_, application(kAppId)).WillOnce(Return(mock_app));
+  EXPECT_CALL(*mock_app, IsSubscribedToSoftButton(kCustomButtonId))
+      .WillOnce(Return(true));
+  EXPECT_CALL(this->mock_rpc_service_,
+              SendMessageToMobile(
+                  CheckNotificationMessage(TestFixture::kFunctionId), _));
+
+  command->Run();
+}
+
 TYPED_TEST(OnButtonNotificationCommandsTest, Run_NoSubscribedApps_UNSUCCESS) {
   typedef typename TestFixture::Notification Notification;
 
@@ -264,7 +295,7 @@ TYPED_TEST(OnButtonNotificationCommandsTest, Run_InvalidHmiLevel_UNSUCCESS) {
   std::vector<ApplicationSharedPtr> subscribed_apps_list;
   subscribed_apps_list.push_back(mock_app);
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_NONE));
 
   EXPECT_CALL(this->app_mngr_, applications_by_button(kButtonName))
@@ -290,7 +321,7 @@ TYPED_TEST(OnButtonNotificationCommandsTest,
   std::vector<ApplicationSharedPtr> subscribed_apps_list;
   subscribed_apps_list.push_back(mock_app);
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_LIMITED));
 
   EXPECT_CALL(this->app_mngr_, applications_by_button(kButtonName))
@@ -316,10 +347,11 @@ TYPED_TEST(OnButtonNotificationCommandsTest, Run_SUCCESS) {
   std::vector<ApplicationSharedPtr> subscribed_apps_list;
   subscribed_apps_list.push_back(mock_app);
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
 
   ON_CALL(*mock_app, IsFullscreen()).WillByDefault(Return(true));
+  ON_CALL(this->app_mngr_, application(kAppId)).WillByDefault(Return(mock_app));
 
   EXPECT_CALL(this->app_mngr_, applications_by_button(kButtonName))
       .WillOnce(Return(subscribed_apps_list));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc
index 501b4d8631..b7b827bb4c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_keyboard_input_notification_test.cc
@@ -48,6 +48,8 @@ namespace strings = application_manager::strings;
 
 namespace {
 const uint32_t kConnectionKey = 1u;
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 using application_manager::ApplicationSet;
@@ -102,7 +104,7 @@ TEST_F(OnKeyBoardInputNotificationTest, Run_ActionActive_SUCCESS) {
   EXPECT_CALL(*mock_app, is_perform_interaction_active()).WillOnce(Return(1));
   EXPECT_CALL(*mock_app, perform_interaction_layout())
       .WillOnce(Return(mobile_apis::LayoutMode::KEYBOARD));
-  EXPECT_CALL(*mock_app, hmi_level()).Times(0);
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId)).Times(0);
 
   EXPECT_CALL(*mock_app, app_id()).WillOnce(Return(kConnectionKey));
 
@@ -126,7 +128,7 @@ TEST_F(OnKeyBoardInputNotificationTest, Run_ActionNotActive_SUCCESS) {
   EXPECT_CALL(*mock_app, is_perform_interaction_active())
       .WillRepeatedly(Return(0));
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::eType::HMI_FULL));
 
   EXPECT_CALL(*mock_app, app_id()).WillOnce(Return(kConnectionKey));
@@ -151,7 +153,7 @@ TEST_F(OnKeyBoardInputNotificationTest, Run_InvalidApp_NoNotification) {
   EXPECT_CALL(*mock_app, is_perform_interaction_active())
       .WillRepeatedly(Return(0));
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::eType::HMI_BACKGROUND));
   EXPECT_CALL(mock_message_helper_, PrintSmartObject(_)).Times(0);
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc
new file mode 100644
index 0000000000..349ada66a2
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "mobile/on_system_capability_updated_notification.h"
+
+#include "application_manager/commands/commands_test.h"
+#include "application_manager/display_capabilities_builder.h"
+#include "gtest/gtest.h"
+#include "sdl_rpc_plugin/extensions/system_capability_app_extension.h"
+#include "sdl_rpc_plugin/sdl_rpc_plugin.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace mobile_commands_test {
+namespace on_system_capability_updated_notification {
+
+using sdl_rpc_plugin::commands::mobile::OnSystemCapabilityUpdatedNotification;
+using ::testing::_;
+using ::testing::Return;
+
+typedef std::shared_ptr<OnSystemCapabilityUpdatedNotification>
+    OnSystemCapabilityUpdatedNotificationPtr;
+
+namespace strings = application_manager::strings;
+namespace {
+const uint32_t kConnectionKey = 1u;
+const uint32_t kAppId = 2u;
+}  // namespace
+
+MATCHER_P(CheckDisplayCapabilities, display_capabilities, "") {
+  return *display_capabilities ==
+         (*arg)[strings::msg_params][strings::system_capability]
+               [strings::display_capabilities];
+}
+
+class OnSystemCapabilityUpdatedNotificationTest
+    : public CommandsTest<CommandsTestMocks::kIsNice> {
+ protected:
+  void SetUp() OVERRIDE {
+    message_ = CreateMessage();
+    (*message_)[strings::params][strings::connection_key] = kConnectionKey;
+
+    command_ = CreateCommand<OnSystemCapabilityUpdatedNotification>(message_);
+    mock_app_ = CreateMockApp();
+  }
+
+  OnSystemCapabilityUpdatedNotificationPtr command_;
+  MockAppPtr mock_app_;
+  MessageSharedPtr message_;
+};
+
+TEST_F(
+    OnSystemCapabilityUpdatedNotificationTest,
+    Run_AppExistSubscribedToNotification_SystemDisplayCapabilitiesSendToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  smart_objects::SmartObjectSPtr system_display_capabilities =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Null);
+
+  ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .WillByDefault(Return(system_display_capabilities));
+
+  sdl_rpc_plugin::SDLRPCPlugin sdl_rpc_plugin;
+
+  std::shared_ptr<sdl_rpc_plugin::SystemCapabilityAppExtension>
+      system_capability_app_extension(
+          std::make_shared<sdl_rpc_plugin::SystemCapabilityAppExtension>(
+              sdl_rpc_plugin, *mock_app_));
+  system_capability_app_extension->SubscribeTo(
+      mobile_apis::SystemCapabilityType::DISPLAYS);
+  application_manager::ApplicationSet apps({mock_app_});
+  std::shared_ptr<sync_primitives::Lock> apps_lock_(
+      std::make_shared<sync_primitives::Lock>());
+  DataAccessor<application_manager::ApplicationSet> apps_data(
+      DataAccessor<application_manager::ApplicationSet>(apps, apps_lock_));
+
+  ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_data));
+  ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
+  ON_CALL(*mock_app_, display_capabilities()).WillByDefault(Return(nullptr));
+  ON_CALL(*mock_app_,
+          QueryInterface(sdl_rpc_plugin::SystemCapabilityAppExtension::
+                             SystemCapabilityAppExtensionUID))
+      .WillByDefault(Return(system_capability_app_extension));
+  application_manager::DisplayCapabilitiesBuilder builder(*mock_app_);
+  ON_CALL(*mock_app_, display_capabilities_builder())
+      .WillByDefault(ReturnRef(builder));
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      SendMessageToMobile(CheckDisplayCapabilities(system_display_capabilities),
+                          false));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(
+    OnSystemCapabilityUpdatedNotificationTest,
+    Run_AppExistConnectionKeyNotEqualWithAppId_SystemDisplayCapabilitiesNotSendToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  smart_objects::SmartObjectSPtr system_display_capabilities =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Null);
+
+  ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .WillByDefault(Return(system_display_capabilities));
+
+  sdl_rpc_plugin::SDLRPCPlugin sdl_rpc_plugin;
+
+  std::shared_ptr<sdl_rpc_plugin::SystemCapabilityAppExtension>
+      system_capability_app_extension(
+          std::make_shared<sdl_rpc_plugin::SystemCapabilityAppExtension>(
+              sdl_rpc_plugin, *mock_app_));
+  system_capability_app_extension->SubscribeTo(
+      mobile_apis::SystemCapabilityType::DISPLAYS);
+  application_manager::ApplicationSet apps({mock_app_});
+  std::shared_ptr<sync_primitives::Lock> apps_lock_(
+      std::make_shared<sync_primitives::Lock>());
+  DataAccessor<application_manager::ApplicationSet> apps_data(
+      DataAccessor<application_manager::ApplicationSet>(apps, apps_lock_));
+
+  ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_data));
+  ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId));
+  ON_CALL(*mock_app_, display_capabilities()).WillByDefault(Return(nullptr));
+  ON_CALL(*mock_app_,
+          QueryInterface(sdl_rpc_plugin::SystemCapabilityAppExtension::
+                             SystemCapabilityAppExtensionUID))
+      .WillByDefault(Return(system_capability_app_extension));
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, _)).Times(0);
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(
+    OnSystemCapabilityUpdatedNotificationTest,
+    Run_AppExistNotSubscribedToNotification_SystemDisplayCapabilitiesNotSendToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+
+  smart_objects::SmartObjectSPtr system_display_capabilities =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Null);
+
+  ON_CALL(mock_hmi_capabilities_, system_display_capabilities())
+      .WillByDefault(Return(system_display_capabilities));
+
+  sdl_rpc_plugin::SDLRPCPlugin sdl_rpc_plugin;
+
+  std::shared_ptr<sdl_rpc_plugin::SystemCapabilityAppExtension>
+      system_capability_app_extension(
+          std::make_shared<sdl_rpc_plugin::SystemCapabilityAppExtension>(
+              sdl_rpc_plugin, *mock_app_));
+
+  application_manager::ApplicationSet apps({mock_app_});
+  std::shared_ptr<sync_primitives::Lock> apps_lock_(
+      std::make_shared<sync_primitives::Lock>());
+  DataAccessor<application_manager::ApplicationSet> apps_data(
+      DataAccessor<application_manager::ApplicationSet>(apps, apps_lock_));
+
+  ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_data));
+  ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
+  ON_CALL(*mock_app_, display_capabilities()).WillByDefault(Return(nullptr));
+  ON_CALL(*mock_app_,
+          QueryInterface(sdl_rpc_plugin::SystemCapabilityAppExtension::
+                             SystemCapabilityAppExtensionUID))
+      .WillByDefault(Return(system_capability_app_extension));
+
+  EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, _)).Times(0);
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(
+    OnSystemCapabilityUpdatedNotificationTest,
+    Run_AppDataEmpty_SystemDisplayCapabilitiesUpdatedNotificationNotSendToMobile) {
+  (*message_)[am::strings::msg_params][strings::system_capability]
+             [am::strings::system_capability_type] =
+                 mobile_apis::SystemCapabilityType::DISPLAYS;
+  application_manager::ApplicationSet apps;
+  std::shared_ptr<sync_primitives::Lock> apps_lock_(
+      std::make_shared<sync_primitives::Lock>());
+  DataAccessor<application_manager::ApplicationSet> apps_data(
+      DataAccessor<application_manager::ApplicationSet>(apps, apps_lock_));
+
+  ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_data));
+  EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(_, _)).Times(0);
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+}  // namespace on_system_capability_updated_notification
+}  // namespace mobile_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc
index 69ed8fb311..ffa7203f1f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_request_notification_test.cc
@@ -62,6 +62,7 @@ using testing::SaveArg;
 namespace {
 const uint32_t kConnectionKey = 1u;
 const std::string kPolicyAppId = "fake-app-id";
+const connection_handler::DeviceHandle kDeviceId = 1u;
 }  // namespace
 
 class OnSystemRequestNotificationTest
@@ -73,6 +74,7 @@ class OnSystemRequestNotificationTest
     ON_CALL(app_mngr_, application(kConnectionKey))
         .WillByDefault(Return(mock_app_));
     ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+    ON_CALL(*mock_app_, device()).WillByDefault(Return(kDeviceId));
   }
 
  protected:
@@ -90,12 +92,14 @@ TEST_F(OnSystemRequestNotificationTest, Run_ProprietaryType_SUCCESS) {
   std::shared_ptr<OnSystemRequestNotification> command =
       CreateCommand<OnSystemRequestNotification>(msg);
 
+  PreConditions();
+
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillRepeatedly(Return(mock_app_));
 
   EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId));
   EXPECT_CALL(mock_policy_handler_,
-              IsRequestTypeAllowed(kPolicyAppId, request_type))
+              IsRequestTypeAllowed(kDeviceId, kPolicyAppId, request_type))
       .WillRepeatedly(Return(true));
 
 #ifdef PROPRIETARY_MODE
@@ -130,10 +134,13 @@ TEST_F(OnSystemRequestNotificationTest, Run_HTTPType_SUCCESS) {
   std::shared_ptr<OnSystemRequestNotification> command =
       CreateCommand<OnSystemRequestNotification>(msg);
 
+  PreConditions();
+
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId));
-  EXPECT_CALL(mock_policy_handler_, IsRequestTypeAllowed(_, _))
+  EXPECT_CALL(mock_policy_handler_,
+              IsRequestTypeAllowed(kDeviceId, kPolicyAppId, request_type))
       .WillOnce(Return(true));
 
   EXPECT_CALL(mock_message_helper_, PrintSmartObject(_))
@@ -167,7 +174,7 @@ TEST_F(OnSystemRequestNotificationTest, Run_InvalidApp_NoNotification) {
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(MockAppPtr()));
   EXPECT_CALL(*mock_app_, policy_app_id()).Times(0);
-  EXPECT_CALL(mock_policy_handler_, IsRequestTypeAllowed(_, _)).Times(0);
+  EXPECT_CALL(mock_policy_handler_, IsRequestTypeAllowed(_, _, _)).Times(0);
 
   EXPECT_CALL(mock_message_helper_, PrintSmartObject(_)).Times(0);
 
@@ -187,10 +194,13 @@ TEST_F(OnSystemRequestNotificationTest, Run_RequestNotAllowed_NoNotification) {
   std::shared_ptr<OnSystemRequestNotification> command =
       CreateCommand<OnSystemRequestNotification>(msg);
 
+  PreConditions();
+
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId));
-  EXPECT_CALL(mock_policy_handler_, IsRequestTypeAllowed(_, _))
+  EXPECT_CALL(mock_policy_handler_,
+              IsRequestTypeAllowed(kDeviceId, kPolicyAppId, request_type))
       .WillOnce(Return(false));
 
   EXPECT_CALL(mock_message_helper_, PrintSmartObject(_)).Times(0);
@@ -214,7 +224,7 @@ TEST_F(
   PreConditions();
 
   EXPECT_CALL(mock_policy_handler_,
-              IsRequestTypeAllowed(kPolicyAppId, request_type))
+              IsRequestTypeAllowed(kDeviceId, kPolicyAppId, request_type))
       .WillOnce(Return(true));
   EXPECT_CALL(mock_policy_handler_,
               IsRequestSubTypeAllowed(kPolicyAppId, request_subtype))
@@ -241,7 +251,7 @@ TEST_F(OnSystemRequestNotificationTest,
   PreConditions();
 
   EXPECT_CALL(mock_policy_handler_,
-              IsRequestTypeAllowed(kPolicyAppId, request_type))
+              IsRequestTypeAllowed(kDeviceId, kPolicyAppId, request_type))
       .WillOnce(Return(true));
   EXPECT_CALL(mock_policy_handler_,
               IsRequestSubTypeAllowed(kPolicyAppId, request_subtype))
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc
index f1e1a291d3..c43dea76e1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_tbt_client_state_notification_test.cc
@@ -60,6 +60,8 @@ typedef std::shared_ptr<OnTBTClientStateNotification> NotificationPtr;
 
 namespace {
 const uint32_t kAppId = 1u;
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 class OnTBTClientStateNotificationTest
@@ -79,7 +81,7 @@ TEST_F(OnTBTClientStateNotificationTest, Run_HmiLevelNone_UNSUCCESS) {
   EXPECT_CALL(app_mngr_, applications_with_navi())
       .WillOnce(Return(applications_with_navi));
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_NONE));
 
   EXPECT_CALL(*mock_app, app_id()).Times(0);
@@ -122,7 +124,7 @@ TEST_F(OnTBTClientStateNotificationTest,
   EXPECT_CALL(app_mngr_, applications_with_navi())
       .WillOnce(Return(applications_with_navi));
 
-  EXPECT_CALL(*mock_app, hmi_level())
+  EXPECT_CALL(*mock_app, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_FULL));
 
   EXPECT_CALL(*mock_app, app_id()).WillOnce(Return(kAppId));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc
index 83958954cd..ec401ae2a8 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_way_point_change_notification_test.cc
@@ -59,19 +59,40 @@ using sdl_rpc_plugin::commands::OnWayPointChangeNotification;
 typedef std::shared_ptr<OnWayPointChangeNotification> NotificationPtr;
 
 namespace {
-const uint32_t kAppId = 1u;
+const uint32_t kApp1Id = 1u;
+const uint32_t kApp2Id = 2u;
 }  // namespace
 
 class OnWayPointChangeNotificationTest
     : public CommandsTest<CommandsTestMocks::kIsNice> {
  public:
-  OnWayPointChangeNotificationTest()
-      : command_(CreateCommand<OnWayPointChangeNotification>()) {}
+  OnWayPointChangeNotificationTest() {}
+
+  void SetUp() OVERRIDE {
+    command_ = CreateCommand();
+  }
+
+  std::shared_ptr<OnWayPointChangeNotification> CreateCommand() {
+    InitCommand(CommandsTest<CommandsTestMocks::kIsNice>::kDefaultTimeout_);
+    message_ = CreateMessage();
+    return std::make_shared<OnWayPointChangeNotification>(
+        message_,
+        app_mngr_,
+        mock_rpc_service_,
+        mock_hmi_capabilities_,
+        mock_policy_handler_);
+  }
+
+  MessageSharedPtr CreateMessage(
+      const smart_objects::SmartType type = smart_objects::SmartType_Null) {
+    return std::make_shared<SmartObject>(type);
+  }
 
   NotificationPtr command_;
+  MessageSharedPtr message_;
 };
 
-MATCHER(CheckMessageData, "") {
+MATCHER_P(CheckMessageData, appID, "") {
   const bool kIsMobileProtocolTypeCorrect =
       (*arg)[am::strings::params][am::strings::protocol_type].asInt() ==
       am::commands::CommandImpl::mobile_protocol_type_;
@@ -86,7 +107,7 @@ MATCHER(CheckMessageData, "") {
 
   const bool kIsConnectionKeyCorrect =
       (*arg)[am::strings::params][am::strings::connection_key].asUInt() ==
-      kAppId;
+      appID;
 
   using namespace helpers;
   return Compare<bool, EQ, ALL>(true,
@@ -99,11 +120,42 @@ MATCHER(CheckMessageData, "") {
 TEST_F(OnWayPointChangeNotificationTest,
        Run_NotEmptyListOfAppsSubscribedForWayPoints_SUCCESS) {
   std::set<uint32_t> apps_subscribed_for_way_points;
-  apps_subscribed_for_way_points.insert(kAppId);
+  apps_subscribed_for_way_points.insert(kApp1Id);
 
   EXPECT_CALL(app_mngr_, GetAppsSubscribedForWayPoints())
       .WillOnce(Return(apps_subscribed_for_way_points));
-  EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(CheckMessageData(), _));
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToMobile(CheckMessageData(kApp1Id), _));
+
+  command_->Run();
+}
+
+TEST_F(OnWayPointChangeNotificationTest,
+       Run_StoreWayPointsDuringNotification_SUCCESS) {
+  std::set<uint32_t> apps_subscribed_for_way_points;
+  apps_subscribed_for_way_points.insert(kApp1Id);
+
+  EXPECT_CALL(app_mngr_, GetAppsSubscribedForWayPoints())
+      .WillOnce(Return(apps_subscribed_for_way_points));
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToMobile(CheckMessageData(kApp1Id), _));
+  EXPECT_CALL(app_mngr_, SaveWayPointsMessage(message_));
+
+  command_->Run();
+}
+
+TEST_F(OnWayPointChangeNotificationTest,
+       Run_BroadcastingWayPointsToAllApps_SUCCESS) {
+  std::set<uint32_t> apps_subscribed_for_way_points;
+  apps_subscribed_for_way_points.insert(kApp1Id);
+  apps_subscribed_for_way_points.insert(kApp2Id);
+
+  EXPECT_CALL(app_mngr_, GetAppsSubscribedForWayPoints())
+      .WillOnce(Return(apps_subscribed_for_way_points));
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToMobile(CheckMessageData(kApp1Id), _));
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToMobile(CheckMessageData(kApp2Id), _));
 
   command_->Run();
 }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc
index b0df0e57d3..2915418d43 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_audio_pass_thru_test.cc
@@ -72,6 +72,8 @@ const std::string kCorrectDisplayText1 = "CorrectDisplayText1";
 const std::string kCorrectDisplayText2 = "CorrectDisplayText2";
 const std::string kFunctionId = "FunctionId";
 const uint32_t kTimeoutForTTSSpeak = 1u;
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 class PerformAudioPassThruRequestTest
@@ -109,7 +111,7 @@ class PerformAudioPassThruRequestTest
       msg_params_[field] = "prompt\\n";
     }
 
-    EXPECT_CALL(*application_sptr_, hmi_level())
+    EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
         .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
     CallRun caller(*command_sptr_);
@@ -206,7 +208,7 @@ TEST_F(PerformAudioPassThruRequestTest,
   (*mobile_request)[am::strings::msg_params][am::strings::initial_prompt] =
       initial_prompt;
 
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
   std::shared_ptr<PerformAudioPassThruRequest> command =
       CreateCommand<PerformAudioPassThruRequest>(mobile_request);
@@ -286,7 +288,7 @@ TEST_F(PerformAudioPassThruRequestTest,
 }
 
 TEST_F(PerformAudioPassThruRequestTest, Run_HmiLevelNone_Rejected) {
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_NONE));
 
   CallRun caller(*command_sptr_);
@@ -319,7 +321,7 @@ TEST_F(PerformAudioPassThruRequestTest,
   // First we need to call SendSpeakRequest()
   // to enable the "is_active_tts_speak" key
 
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   msg_params_[am::strings::initial_prompt][0][am::strings::text] =
@@ -407,7 +409,7 @@ TEST_F(PerformAudioPassThruRequestTest,
 
 TEST_F(PerformAudioPassThruRequestTest,
        Run_InitPromptCorrect_SpeakAndPerformAPTRequestsSendMuteTrue) {
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   msg_params_[am::strings::initial_prompt][0][am::strings::text] =
@@ -481,7 +483,7 @@ TEST_F(PerformAudioPassThruRequestTest,
 
 TEST_F(PerformAudioPassThruRequestTest,
        Run_InitPromptCorrect_SpeakAndPerformAPTRequestsSendMuteFalse) {
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   msg_params_[am::strings::initial_prompt][0][am::strings::text] =
@@ -536,7 +538,7 @@ TEST_F(PerformAudioPassThruRequestTest,
 TEST_F(
     PerformAudioPassThruRequestTest,
     Run_InitPromptEmpty_PerformAndRecordStartNotificationsAndStartRecording) {
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   MessageSharedPtr start_record_result_msg;
@@ -766,7 +768,7 @@ TEST_F(PerformAudioPassThruRequestTest,
   EXPECT_CALL(app_mngr_, EndAudioPassThru(app_id)).WillOnce(Return(true));
   EXPECT_CALL(app_mngr_, StopAudioPassThru(_));
 
-  EXPECT_CALL(*application_sptr_, hmi_level())
+  EXPECT_CALL(*application_sptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(am::mobile_api::HMILevel::HMI_FULL));
 
   msg_params_[am::strings::initial_prompt][0][am::strings::text] =
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc
index f1f7c4c907..193229eeb0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/perform_interaction_test.cc
@@ -70,35 +70,107 @@ namespace strings = ::application_manager::strings;
 namespace hmi_response = ::application_manager::hmi_response;
 
 namespace {
+const int32_t kCorrelationId = 1u;
 const int32_t kCommandId = 1;
 const uint32_t kCmdId = 1u;
 const uint32_t kConnectionKey = 2u;
+const int32_t kUiChoiceID = 1u;
+const int32_t kVrChoiceID = 2u;
+const int32_t kInvalidChoiceId = -1;
 }  // namespace
 
 class PerformInteractionRequestTest
     : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
-  PerformInteractionRequestTest() : mock_app_(CreateMockApp()) {}
+  PerformInteractionRequestTest()
+      : mock_app_(CreateMockApp())
+      , performinteraction_choice_set_lock_ptr_(
+            std::make_shared<sync_primitives::RecursiveLock>()) {}
 
   void SetUp() OVERRIDE {
+    smart_objects::SmartObject choice_set1(
+        smart_objects::SmartType::SmartType_Map);
+    smart_objects::SmartObject choice_set2(
+        smart_objects::SmartType::SmartType_Map);
+
+    choice_set1[strings::choice_set] =
+        smart_objects::SmartType::SmartType_Array;
+    choice_set2[strings::choice_set] =
+        smart_objects::SmartType::SmartType_Array;
+
+    choice_set1[strings::choice_set][0][strings::choice_id] = kUiChoiceID;
+    choice_set2[strings::choice_set][0][strings::choice_id] = kVrChoiceID;
+
+    choice_set_map_[kCorrelationId].insert(std::make_pair(
+        kUiChoiceID, new smart_objects::SmartObject(choice_set1)));
+    choice_set_map_[kCorrelationId].insert(std::make_pair(
+        kVrChoiceID, new smart_objects::SmartObject(choice_set2)));
+
     ON_CALL(app_mngr_, application(kConnectionKey))
         .WillByDefault(Return(mock_app_));
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
+    ON_CALL(*mock_app_, performinteraction_choice_set_map())
+        .WillByDefault(Return(DataAccessor<app_mngr::PerformChoiceSetMap>(
+            choice_set_map_, performinteraction_choice_set_lock_ptr_)));
   }
 
   void ResultCommandExpectations(MessageSharedPtr msg,
+                                 bool success,
+                                 hmi_apis::Common_Result::eType result_code,
                                  const std::string& info) {
-    EXPECT_EQ((*msg)[am::strings::msg_params][am::strings::success].asBool(),
-              true);
+    EXPECT_EQ((*msg)[strings::msg_params][strings::success].asBool(), success);
+    EXPECT_EQ((*msg)[strings::msg_params][strings::result_code].asInt(),
+              static_cast<int32_t>(result_code));
+    EXPECT_EQ((*msg)[strings::msg_params][strings::info].asString(), info);
+  }
+
+  void HMIRequestExpectations(MessageSharedPtr msg,
+                              hmi_apis::FunctionID::eType function_id,
+                              const std::string& method_name) {
+    EXPECT_EQ((*msg)[strings::params][strings::function_id].asInt(),
+              static_cast<int32_t>(function_id));
     EXPECT_EQ(
-        (*msg)[am::strings::msg_params][am::strings::result_code].asInt(),
-        static_cast<int32_t>(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE));
-    EXPECT_EQ((*msg)[am::strings::msg_params][am::strings::info].asString(),
-              info);
+        (*msg)[strings::msg_params][am::hmi_request::method_name].asString(),
+        method_name);
+  }
+
+  MessageSharedPtr CreateRequestMessage(
+      const mobile_apis::InteractionMode::eType& interaction_mode) {
+    MessageSharedPtr request_msg = CreateMessage(smart_objects::SmartType_Map);
+    (*request_msg)[strings::params][strings::connection_key] = kConnectionKey;
+    (*request_msg)[strings::params][strings::correlation_id] = kCorrelationId;
+    (*request_msg)[strings::msg_params][strings::interaction_mode] =
+        interaction_mode;
+    return request_msg;
+  }
+
+  MessageSharedPtr CreateHMIResponseMessage(
+      const hmi_apis::Common_Result::eType& response_code,
+      const std::string& message_info,
+      const int32_t command_id = kCommandId) {
+    MessageSharedPtr response_msg = CreateMessage(smart_objects::SmartType_Map);
+    (*response_msg)[strings::params][hmi_response::code] = response_code;
+    (*response_msg)[strings::msg_params][strings::cmd_id] = command_id;
+    (*response_msg)[strings::msg_params][strings::info] = message_info;
+    return response_msg;
+  }
+
+  MessageSharedPtr CreateHMIResponseMessageWithChoiceID(
+      const hmi_apis::Common_Result::eType& response_code,
+      const std::string& message_info,
+      const int32_t choice_id,
+      const int32_t command_id = kCommandId) {
+    MessageSharedPtr response_msg =
+        CreateHMIResponseMessage(response_code, message_info, kCommandId);
+    (*response_msg)[strings::msg_params][strings::choice_id] = choice_id;
+    return response_msg;
   }
 
   sync_primitives::Lock lock_;
   MockAppPtr mock_app_;
+  app_mngr::PerformChoiceSetMap choice_set_map_;
+  mutable std::shared_ptr<sync_primitives::RecursiveLock>
+      performinteraction_choice_set_lock_ptr_;
 };
 
 TEST_F(PerformInteractionRequestTest, OnTimeout_VR_GENERIC_ERROR) {
@@ -147,35 +219,101 @@ TEST_F(PerformInteractionRequestTest, OnTimeout_VR_GENERIC_ERROR) {
 }
 
 TEST_F(PerformInteractionRequestTest,
+       OnEvent_BOTHMode_UIChoiceIdReceivedFirst) {
+  MessageSharedPtr msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::BOTH);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
+  MessageSharedPtr response_msg_vr = CreateHMIResponseMessage(
+      hmi_apis::Common_Result::SUCCESS, "", kInvalidChoiceId);
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  MessageSharedPtr response_msg_ui = CreateHMIResponseMessageWithChoiceID(
+      hmi_apis::Common_Result::SUCCESS, "", kUiChoiceID);
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr response_to_mobile;
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command->on_event(event_ui);
+  command->on_event(event_vr);
+
+  EXPECT_EQ(
+      kUiChoiceID,
+      (*response_to_mobile)[strings::msg_params][strings::choice_id].asInt());
+}
+
+TEST_F(PerformInteractionRequestTest,
+       OnEvent_BOTHMode_VRChoiceIdReceivedFirst) {
+  MessageSharedPtr msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::BOTH);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
+  MessageSharedPtr response_msg_vr = CreateHMIResponseMessageWithChoiceID(
+      hmi_apis::Common_Result::SUCCESS, "", kVrChoiceID);
+  MessageSharedPtr response_msg_ui = CreateHMIResponseMessageWithChoiceID(
+      hmi_apis::Common_Result::SUCCESS, "", kInvalidChoiceId);
+
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr request_to_hmi;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  _, am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&request_to_hmi), Return(true)));
+
+  command->on_event(event_vr);
+  EXPECT_EQ(hmi_apis::FunctionID::UI_ClosePopUp,
+            (*request_to_hmi)[strings::params][strings::function_id].asInt());
+
+  MessageSharedPtr response_to_mobile;
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+  command->on_event(event_ui);
+
+  EXPECT_EQ(
+      kVrChoiceID,
+      (*response_to_mobile)[strings::msg_params][strings::choice_id].asInt());
+}
+
+TEST_F(PerformInteractionRequestTest,
        OnEvent_VRHmiSendSuccess_UNSUPPORTED_RESOURCE) {
   MessageSharedPtr msg_from_mobile =
-      CreateMessage(smart_objects::SmartType_Map);
-  (*msg_from_mobile)[strings::params][strings::connection_key] = kConnectionKey;
-  (*msg_from_mobile)[strings::msg_params][strings::interaction_mode] =
-      mobile_apis::InteractionMode::VR_ONLY;
+      CreateRequestMessage(mobile_apis::InteractionMode::VR_ONLY);
   std::shared_ptr<PerformInteractionRequest> command =
       CreateCommand<PerformInteractionRequest>(msg_from_mobile);
-  command->Init();
+
+  ASSERT_TRUE(command->Init());
 
   MockAppPtr mock_app;
   EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(mock_app));
 
   MessageSharedPtr response_msg_vr =
-      CreateMessage(smart_objects::SmartType_Map);
-  (*response_msg_vr)[strings::params][hmi_response::code] =
-      hmi_apis::Common_Result::UNSUPPORTED_RESOURCE;
-  (*response_msg_vr)[strings::msg_params][strings::cmd_id] = kCommandId;
-  (*response_msg_vr)[am::strings::msg_params][am::strings::info] =
-      "VR is not supported by system";
-
+      CreateHMIResponseMessage(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                               "VR is not supported by system");
   am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
   event_vr.set_smart_object(*response_msg_vr);
 
   MessageSharedPtr response_msg_ui =
-      CreateMessage(smart_objects::SmartType_Map);
-  (*response_msg_ui)[strings::params][hmi_response::code] =
-      hmi_apis::Common_Result::SUCCESS;
-
+      CreateHMIResponseMessage(hmi_apis::Common_Result::SUCCESS, "");
   am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
   event_ui.set_smart_object(*response_msg_ui);
 
@@ -197,61 +335,331 @@ TEST_F(PerformInteractionRequestTest,
   command->on_event(event_ui);
 
   ResultCommandExpectations(response_to_mobile,
+                            false,
+                            hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
                             "VR is not supported by system");
 }
 
 TEST_F(PerformInteractionRequestTest,
        OnEvent_UIHmiSendSuccess_UNSUPPORTED_RESOURCE) {
   MessageSharedPtr msg_from_mobile =
-      CreateMessage(smart_objects::SmartType_Map);
-  (*msg_from_mobile)[strings::params][strings::connection_key] = kConnectionKey;
-  (*msg_from_mobile)[strings::msg_params][strings::interaction_mode] =
-      mobile_apis::InteractionMode::VR_ONLY;
+      CreateRequestMessage(mobile_apis::InteractionMode::VR_ONLY);
   std::shared_ptr<PerformInteractionRequest> command =
       CreateCommand<PerformInteractionRequest>(msg_from_mobile);
 
-  ON_CALL(mock_hmi_interfaces_,
-          GetInterfaceState(am::HmiInterfaces::HMI_INTERFACE_UI))
+  ASSERT_TRUE(command->Init());
+
+  MockAppPtr mock_app;
+  EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(mock_app));
+
+  MessageSharedPtr response_msg_vr =
+      CreateHMIResponseMessage(hmi_apis::Common_Result::SUCCESS, "");
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  MessageSharedPtr response_msg_ui =
+      CreateHMIResponseMessage(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                               "UI is not supported by system");
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr response_to_mobile;
+
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command->on_event(event_vr);
+  command->on_event(event_ui);
+
+  ResultCommandExpectations(response_to_mobile,
+                            true,
+                            hmi_apis::Common_Result::SUCCESS,
+                            "UI is not supported by system");
+}
+
+TEST_F(
+    PerformInteractionRequestTest,
+    PrepareResultCodeAndResponseForMobile_GetVRResultCodeOnly_InVR_OnlyMode_SUCCESS) {
+  ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
       .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
-  ON_CALL(mock_hmi_interfaces_,
-          GetInterfaceState(am::HmiInterfaces::HMI_INTERFACE_VR))
+
+  MessageSharedPtr msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::VR_ONLY);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
+  MockAppPtr mock_app;
+  EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(mock_app));
+
+  MessageSharedPtr response_msg_vr =
+      CreateHMIResponseMessage(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                               "VR is not supported by system");
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  MessageSharedPtr response_msg_ui =
+      CreateHMIResponseMessage(hmi_apis::Common_Result::SUCCESS, "");
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr response_to_mobile;
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  command->on_event(event_vr);
+  command->on_event(event_ui);
+
+  ResultCommandExpectations(response_to_mobile,
+                            false,
+                            hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                            "VR is not supported by system");
+}
+
+TEST_F(
+    PerformInteractionRequestTest,
+    PrepareResultCodeAndResponseForMobile_GetVR_ErrorInfoAndCode_InBOTH_Mode_With_UI_success_result_code) {
+  ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
       .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
 
+  auto msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::BOTH);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
   MessageSharedPtr response_msg_vr =
-      CreateMessage(smart_objects::SmartType_Map);
-  (*response_msg_vr)[strings::params][hmi_response::code] =
-      hmi_apis::Common_Result::SUCCESS;
+      CreateHMIResponseMessage(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                               "VR is not supported by system");
   am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
   event_vr.set_smart_object(*response_msg_vr);
 
   MessageSharedPtr response_msg_ui =
-      CreateMessage(smart_objects::SmartType_Map);
-  (*response_msg_ui)[strings::params][hmi_response::code] =
-      hmi_apis::Common_Result::UNSUPPORTED_RESOURCE;
-  (*response_msg_ui)[strings::msg_params][strings::cmd_id] = kCommandId;
-  (*response_msg_ui)[am::strings::msg_params][am::strings::info] =
-      "UI is not supported by system";
+      CreateHMIResponseMessage(hmi_apis::Common_Result::SUCCESS, "");
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr response_to_mobile;
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  MessageSharedPtr request_to_hmi;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  _, am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&request_to_hmi), Return(true)));
+
+  command->on_event(event_vr);
+  command->on_event(event_ui);
+
+  HMIRequestExpectations(request_to_hmi,
+                         hmi_apis::FunctionID::UI_ClosePopUp,
+                         "UI.PerformInteraction");
+
+  ResultCommandExpectations(response_to_mobile,
+                            true,
+                            hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                            "VR is not supported by system");
+}
 
+TEST_F(
+    PerformInteractionRequestTest,
+    PrepareResultCodeAndResponseForMobile_Send_GENERIC_ERROR_To_Mobile_When_different_valid_choice_ids_received_in_BOTH_mode_SUCCESS) {
+  ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
+      .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
+
+  MessageSharedPtr msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::BOTH);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
+  MessageSharedPtr response_msg_vr = CreateHMIResponseMessageWithChoiceID(
+      hmi_apis::Common_Result::SUCCESS, "", kVrChoiceID);
+  MessageSharedPtr response_msg_ui = CreateHMIResponseMessageWithChoiceID(
+      hmi_apis::Common_Result::SUCCESS, "", kUiChoiceID);
+
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
   am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
   event_ui.set_smart_object(*response_msg_ui);
 
   MessageSharedPtr response_to_mobile;
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  MessageSharedPtr request_to_hmi;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  _, am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&request_to_hmi), Return(true)));
 
+  command->on_event(event_vr);
+  command->on_event(event_ui);
+
+  HMIRequestExpectations(request_to_hmi,
+                         hmi_apis::FunctionID::UI_ClosePopUp,
+                         "UI.PerformInteraction");
+
+  ResultCommandExpectations(response_to_mobile,
+                            false,
+                            hmi_apis::Common_Result::GENERIC_ERROR,
+                            "Received two different choice IDs");
+}
+
+TEST_F(
+    PerformInteractionRequestTest,
+    VR_response_WARNINGS_UI_response_SUCCESS_MobileResponseContains_true_WARNINGS_warnings_info) {
+  ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
+      .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
+
+  auto msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::VR_ONLY);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
+  MessageSharedPtr response_msg_vr = CreateHMIResponseMessage(
+      hmi_apis::Common_Result::WARNINGS, "WARNING MESSAGE");
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  MessageSharedPtr response_msg_ui =
+      CreateHMIResponseMessage(hmi_apis::Common_Result::SUCCESS, "");
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr response_to_mobile;
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  MessageSharedPtr request_to_hmi;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  _, am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&request_to_hmi), Return(true)));
+
+  command->on_event(event_vr);
+  command->on_event(event_ui);
+
+  HMIRequestExpectations(request_to_hmi,
+                         hmi_apis::FunctionID::UI_ClosePopUp,
+                         "UI.PerformInteraction");
+
+  ResultCommandExpectations(response_to_mobile,
+                            true,
+                            hmi_apis::Common_Result::WARNINGS,
+                            "WARNING MESSAGE");
+}
+
+TEST_F(
+    PerformInteractionRequestTest,
+    VR_response_SUCCESS_UI_response_WARNINGS_MobileResponseContains_true_WARNINGS_warnings_info) {
+  ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
+      .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
+
+  auto msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::BOTH);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
+
+  MessageSharedPtr response_msg_vr =
+      CreateHMIResponseMessage(hmi_apis::Common_Result::SUCCESS, "");
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  MessageSharedPtr response_msg_ui = CreateHMIResponseMessage(
+      hmi_apis::Common_Result::WARNINGS, "WARNING MESSAGE");
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
+
+  MessageSharedPtr response_to_mobile;
   EXPECT_CALL(
       mock_rpc_service_,
       ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
       .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
 
+  MessageSharedPtr request_to_hmi;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  _, am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&request_to_hmi), Return(true)));
+
   command->on_event(event_vr);
+  command->on_event(event_ui);
+
+  HMIRequestExpectations(request_to_hmi,
+                         hmi_apis::FunctionID::UI_ClosePopUp,
+                         "UI.PerformInteraction");
+
+  ResultCommandExpectations(response_to_mobile,
+                            true,
+                            hmi_apis::Common_Result::WARNINGS,
+                            "WARNING MESSAGE");
+}
+
+TEST_F(
+    PerformInteractionRequestTest,
+    VR_response_UNSUPPORTED_RESOURCE_UI_response_WARNINGS_MobileResponseContains_false_UNSUPPORTED_RESOURSE_error_info) {
+  ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
+      .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
+
+  auto msg_from_mobile =
+      CreateRequestMessage(mobile_apis::InteractionMode::BOTH);
+  std::shared_ptr<PerformInteractionRequest> command =
+      CreateCommand<PerformInteractionRequest>(msg_from_mobile);
+
+  ASSERT_TRUE(command->Init());
 
-  EXPECT_CALL(*mock_app_, is_perform_interaction_active())
-      .WillOnce(Return(false));
-  EXPECT_CALL(*mock_app_, DeletePerformInteractionChoiceSet(_));
+  MessageSharedPtr response_msg_vr = CreateHMIResponseMessage(
+      hmi_apis::Common_Result::UNSUPPORTED_RESOURCE, "VR error message");
+  am::event_engine::Event event_vr(hmi_apis::FunctionID::VR_PerformInteraction);
+  event_vr.set_smart_object(*response_msg_vr);
+
+  MessageSharedPtr response_msg_ui = CreateHMIResponseMessage(
+      hmi_apis::Common_Result::WARNINGS, "UI warning message");
+  am::event_engine::Event event_ui(hmi_apis::FunctionID::UI_PerformInteraction);
+  event_ui.set_smart_object(*response_msg_ui);
 
+  MessageSharedPtr response_to_mobile;
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true)));
+
+  MessageSharedPtr request_to_hmi;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  _, am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(DoAll(SaveArg<0>(&request_to_hmi), Return(true)));
+
+  command->on_event(event_vr);
   command->on_event(event_ui);
 
+  HMIRequestExpectations(request_to_hmi,
+                         hmi_apis::FunctionID::UI_ClosePopUp,
+                         "UI.PerformInteraction");
+
   ResultCommandExpectations(response_to_mobile,
-                            "UI is not supported by system");
+                            true,
+                            hmi_apis::Common_Result::UNSUPPORTED_RESOURCE,
+                            "UI warning message, VR error message");
 }
 
 }  // namespace perform_interaction_request
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc
index e8e03484ed..8db533f446 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/put_file_test.cc
@@ -78,6 +78,8 @@ const int64_t kZeroOffset = 0u;
 const std::string kStorageFolder = "./storage";
 const std::string kFolder = "folder";
 const std::string kAppFolder = "app_folder";
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
 class PutFileRequestTest
@@ -99,7 +101,7 @@ class PutFileRequestTest
 
     ON_CALL(app_mngr_, application(kConnectionKey))
         .WillByDefault(Return(mock_app_));
-    ON_CALL(*mock_app_, hmi_level())
+    ON_CALL(*mock_app_, hmi_level(kDefaultWindowId))
         .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
   }
 
@@ -179,7 +181,7 @@ TEST_F(PutFileRequestTest, Run_ApplicationIsNotRegistered_UNSUCCESS) {
 }
 
 TEST_F(PutFileRequestTest, Run_HmiLevelNone_UNSUCCESS) {
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_NONE));
 
   const uint32_t settings_put_file_in_none = 1u;
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
index 0e8374b75a..6376570106 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
@@ -67,6 +67,8 @@ using ::testing::_;
 using ::testing::DoAll;
 using ::testing::Return;
 using ::testing::ReturnRef;
+using ::testing::SaveArg;
+using ::testing::SetArgPointee;
 
 namespace am = ::application_manager;
 
@@ -75,12 +77,18 @@ using sdl_rpc_plugin::commands::RegisterAppInterfaceRequest;
 
 namespace {
 const uint32_t kConnectionKey = 1u;
+const uint32_t kConnectionKey2 = 2u;
+const connection_handler::DeviceHandle kDeviceHandle = 3u;
 const hmi_apis::Common_Language::eType kHmiLanguage =
     hmi_apis::Common_Language::EN_US;
 const mobile_apis::Language::eType kMobileLanguage =
     mobile_apis::Language::EN_US;
-const std::string kMacAddress = "test_mac_address";
-const std::string kAppId = "test_app_id";
+const mobile_apis::HybridAppPreference::eType kHybridAppPreference =
+    mobile_apis::HybridAppPreference::INVALID_ENUM;
+const std::string kMacAddress1 = "test_mac_address1";
+const std::string kMacAddress2 = "test_mac_address2";
+const std::string kAppId1 = "test_app1_id";
+const std::string kAppId2 = "test_app2_id";
 const std::string kFullAppId = "test_app_id_long";
 const std::string kDummyString = "test_string";
 const std::vector<uint32_t> kDummyDiagModes;
@@ -94,7 +102,9 @@ class RegisterAppInterfaceRequestTest
       : msg_(CreateMessage())
       , command_(CreateCommand<RegisterAppInterfaceRequest>(msg_))
       , app_name_("test_app_name_")
+      , app2_name_("test_app2_name_")
       , lock_ptr_(std::make_shared<sync_primitives::Lock>())
+      , pending_lock_ptr_(std::make_shared<sync_primitives::Lock>())
       , mock_application_helper_(
             application_manager_test::MockApplicationHelper::
                 application_helper_mock()) {
@@ -112,7 +122,7 @@ class RegisterAppInterfaceRequestTest
 
   void InitBasicMessage() {
     (*msg_)[am::strings::params][am::strings::connection_key] = kConnectionKey;
-    (*msg_)[am::strings::msg_params][am::strings::app_id] = kAppId;
+    (*msg_)[am::strings::msg_params][am::strings::app_id] = kAppId1;
     (*msg_)[am::strings::msg_params][am::strings::full_app_id] = kFullAppId;
     (*msg_)[am::strings::msg_params][am::strings::app_name] = app_name_;
     (*msg_)[am::strings::msg_params][am::strings::language_desired] =
@@ -130,11 +140,14 @@ class RegisterAppInterfaceRequestTest
   MockAppPtr CreateBasicMockedApp() {
     MockAppPtr mock_app = CreateMockApp();
     ON_CALL(*mock_app, name()).WillByDefault(ReturnRef(app_name_));
-    ON_CALL(*mock_app, mac_address()).WillByDefault(ReturnRef(kMacAddress));
+    ON_CALL(*mock_app, mac_address()).WillByDefault(ReturnRef(kMacAddress1));
     ON_CALL(*mock_app, app_icon_path()).WillByDefault(ReturnRef(kDummyString));
     ON_CALL(*mock_app, language()).WillByDefault(ReturnRef(kMobileLanguage));
     ON_CALL(*mock_app, ui_language()).WillByDefault(ReturnRef(kMobileLanguage));
-    ON_CALL(*mock_app, policy_app_id()).WillByDefault(Return(kAppId));
+    ON_CALL(*mock_app, is_cloud_app()).WillByDefault(Return(false));
+    ON_CALL(*mock_app, hybrid_app_preference())
+        .WillByDefault(ReturnRef(kHybridAppPreference));
+    ON_CALL(*mock_app, policy_app_id()).WillByDefault(Return(kAppId1));
     ON_CALL(*mock_app, msg_version())
         .WillByDefault(ReturnRef(mock_semantic_version));
     return mock_app;
@@ -154,7 +167,7 @@ class RegisterAppInterfaceRequestTest
 
   void InitGetters() {
     ON_CALL(app_mngr_, GetCorrectMobileIDFromMessage(msg_))
-        .WillByDefault(Return(kAppId));
+        .WillByDefault(Return(kAppId1));
     ON_CALL(app_mngr_, IsHMICooperating()).WillByDefault(Return(true));
     ON_CALL(app_mngr_, resume_controller())
         .WillByDefault(ReturnRef(mock_resume_crt_));
@@ -166,9 +179,31 @@ class RegisterAppInterfaceRequestTest
         .WillByDefault(ReturnRef(kDummyString));
     ON_CALL(mock_hmi_capabilities_, ccpu_version())
         .WillByDefault(ReturnRef(kDummyString));
+    ON_CALL(mock_hmi_capabilities_, speech_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, prerecorded_speech())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, vr_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, display_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, audio_pass_thru_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, vehicle_type())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, button_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, soft_button_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, preset_bank_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, hmi_zone_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
+    ON_CALL(mock_hmi_capabilities_, pcm_stream_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
     ON_CALL(app_mngr_settings_, supported_diag_modes())
         .WillByDefault(ReturnRef(kDummyDiagModes));
-    ON_CALL(mock_policy_handler_, GetAppRequestTypes(_))
+    ON_CALL(mock_policy_handler_, GetAppRequestTypes(_, _))
         .WillByDefault(Return(std::vector<std::string>()));
     ON_CALL(mock_policy_handler_, GetAppRequestTypeState(_))
         .WillByDefault(Return(policy::RequestType::State::EMPTY));
@@ -180,9 +215,11 @@ class RegisterAppInterfaceRequestTest
         .WillByDefault(Return(policy::DeviceConsent::kDeviceAllowed));
     ON_CALL(app_mngr_, GetDeviceTransportType(_))
         .WillByDefault(Return(hmi_apis::Common_TransportType::WIFI));
-    ON_CALL(app_mngr_, IsAppInReconnectMode(_)).WillByDefault(Return(false));
+    ON_CALL(app_mngr_, IsAppInReconnectMode(_, _)).WillByDefault(Return(false));
     ON_CALL(app_mngr_, application_by_policy_id(_))
         .WillByDefault(Return(ApplicationSharedPtr()));
+    ON_CALL(app_mngr_, pending_application_by_policy_id(_))
+        .WillByDefault(Return(ApplicationSharedPtr()));
     ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
         .WillByDefault(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE));
     ON_CALL(
@@ -201,7 +238,7 @@ class RegisterAppInterfaceRequestTest
 
   void SetCommonExpectionsOnSwitchedApplication(
       MockAppPtr mock_app, mobile_apis::Result::eType response_result_code) {
-    EXPECT_CALL(mock_policy_handler_, AddApplication(_, _)).Times(0);
+    EXPECT_CALL(mock_policy_handler_, AddApplication(_, _, _)).Times(0);
 
     EXPECT_CALL(
         mock_rpc_service_,
@@ -250,8 +287,11 @@ class RegisterAppInterfaceRequestTest
   std::shared_ptr<RegisterAppInterfaceRequest> command_;
 
   const utils::custom_string::CustomString app_name_;
+  const utils::custom_string::CustomString app2_name_;
   std::shared_ptr<sync_primitives::Lock> lock_ptr_;
   am::ApplicationSet app_set_;
+  std::shared_ptr<sync_primitives::Lock> pending_lock_ptr_;
+  am::AppsWaitRegistrationSet pending_app_set_;
 
   typedef IsNiceMock<policy_test::MockPolicyHandlerInterface,
                      kMocksAreNice>::Result MockPolicyHandlerInterface;
@@ -280,7 +320,7 @@ TEST_F(RegisterAppInterfaceRequestTest, Init_SUCCESS) {
 
 TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
   InitBasicMessage();
-  (*msg_)[am::strings::msg_params][am::strings::hash_id] = kAppId;
+  (*msg_)[am::strings::msg_params][am::strings::hash_id] = kAppId1;
   EXPECT_CALL(app_mngr_, IsStopping())
       .WillOnce(Return(false))
       .WillOnce(Return(true))
@@ -289,20 +329,35 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
   EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _));
   EXPECT_CALL(app_mngr_, IsApplicationForbidden(_, _)).WillOnce(Return(false));
 
+  connection_handler::DeviceHandle handle = 1;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(handle), Return(0)));
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(handle, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
+
   MockAppPtr mock_app = CreateBasicMockedApp();
-  EXPECT_CALL(app_mngr_, application(kConnectionKey))
-      .WillOnce(Return(ApplicationSharedPtr()))
-      .WillRepeatedly(Return(mock_app));
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
+  EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1))
+      .WillRepeatedly(Return(ApplicationSharedPtr()));
 
   ON_CALL(app_mngr_, applications())
       .WillByDefault(
           Return(DataAccessor<am::ApplicationSet>(app_set_, lock_ptr_)));
+  ON_CALL(app_mngr_, pending_applications())
+      .WillByDefault(Return(DataAccessor<am::AppsWaitRegistrationSet>(
+          pending_app_set_, pending_lock_ptr_)));
+
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app));
+
   ON_CALL(mock_policy_handler_, PolicyEnabled()).WillByDefault(Return(true));
-  ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId, _, _))
+  ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId1, _, _))
       .WillByDefault(Return(true));
   policy::StatusNotifier notify_upd_manager =
       std::make_shared<utils::CallNothing>();
-  ON_CALL(mock_policy_handler_, AddApplication(_, _))
+  ON_CALL(mock_policy_handler_, AddApplication(kMacAddress1, kAppId1, _))
       .WillByDefault(Return(notify_upd_manager));
 
   EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).WillOnce(Return(mock_app));
@@ -323,6 +378,7 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
               ManageMobileCommand(_, am::commands::Command::SOURCE_SDL))
       .Times(2);
   EXPECT_CALL(app_mngr_, SendDriverDistractionState(_));
+  ASSERT_TRUE(command_->Init());
   command_->Run();
 }
 
@@ -360,10 +416,21 @@ TEST_F(RegisterAppInterfaceRequestTest,
   EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _));
   EXPECT_CALL(app_mngr_, IsApplicationForbidden(_, _)).WillOnce(Return(false));
 
+  connection_handler::DeviceHandle handle = 1;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(handle), Return(0)));
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(_, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
+
   MockAppPtr mock_app = CreateBasicMockedApp();
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
+  EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1))
+      .WillRepeatedly(Return(ApplicationSharedPtr()));
+
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
-      .WillOnce(Return(ApplicationSharedPtr()))
-      .WillRepeatedly(Return(mock_app));
+      .WillOnce(Return(mock_app));
 
   MessageSharedPtr expected_message =
       CreateMessage(smart_objects::SmartType_Map);
@@ -387,25 +454,33 @@ TEST_F(RegisterAppInterfaceRequestTest,
       "test_templates_available";
   display_capabilities[am::hmi_response::screen_params] = "test_screen_params";
 
+  auto vehicle_type_ptr = std::make_shared<smart_objects::SmartObject>(
+      (*expected_message)[am::hmi_response::vehicle_type]);
   ON_CALL(mock_hmi_capabilities_, vehicle_type())
-      .WillByDefault(
-          Return(&(*expected_message)[am::hmi_response::vehicle_type]));
+      .WillByDefault(Return(vehicle_type_ptr));
+
+  auto vr_capabilities_ptr = std::make_shared<smart_objects::SmartObject>(
+      (*expected_message)[am::strings::vr_capabilities]);
   ON_CALL(mock_hmi_capabilities_, vr_capabilities())
-      .WillByDefault(
-          Return(&(*expected_message)[am::strings::vr_capabilities]));
+      .WillByDefault(Return(vr_capabilities_ptr));
+
+  auto display_capabilities_ptr = std::make_shared<smart_objects::SmartObject>(
+      (*expected_message)[am::hmi_response::display_capabilities]);
   ON_CALL(mock_hmi_capabilities_, display_capabilities())
-      .WillByDefault(
-          Return(&(*expected_message)[am::hmi_response::display_capabilities]));
+      .WillByDefault(Return(display_capabilities_ptr));
 
   ON_CALL(app_mngr_, applications())
       .WillByDefault(
           Return(DataAccessor<am::ApplicationSet>(app_set_, lock_ptr_)));
+  ON_CALL(app_mngr_, pending_applications())
+      .WillByDefault(Return(DataAccessor<am::AppsWaitRegistrationSet>(
+          pending_app_set_, pending_lock_ptr_)));
   ON_CALL(mock_policy_handler_, PolicyEnabled()).WillByDefault(Return(true));
-  ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId, _, _))
+  ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId1, _, _))
       .WillByDefault(Return(true));
   policy::StatusNotifier notify_upd_manager =
       std::make_shared<utils::CallNothing>();
-  ON_CALL(mock_policy_handler_, AddApplication(_, _))
+  ON_CALL(mock_policy_handler_, AddApplication(kMacAddress1, kAppId1, _))
       .WillByDefault(Return(notify_upd_manager));
 
   EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).WillOnce(Return(mock_app));
@@ -444,7 +519,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
               ManageMobileCommand(_, am::commands::Command::SOURCE_SDL))
       .Times(2);
   EXPECT_CALL(app_mngr_, SendDriverDistractionState(_));
-
+  ASSERT_TRUE(command_->Init());
   command_->Run();
 }
 
@@ -456,10 +531,19 @@ TEST_F(RegisterAppInterfaceRequestTest,
   (*msg_)[am::strings::msg_params][am::strings::hash_id] = request_hash_id;
 
   MockAppPtr mock_app = CreateBasicMockedApp();
-  EXPECT_CALL(app_mngr_, application_by_policy_id(kAppId))
-      .WillRepeatedly(Return(mock_app));
+  app_set_.insert(mock_app);
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(mock_app));
+
+  connection_handler::DeviceHandle device_id = 1;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(device_id), Return(0)));
 
-  EXPECT_CALL(app_mngr_, IsAppInReconnectMode(kAppId)).WillOnce(Return(true));
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
+
+  EXPECT_CALL(*mock_app, device()).WillOnce(Return(kDeviceHandle));
 
   EXPECT_CALL(app_mngr_, ProcessReconnection(_, kConnectionKey));
 
@@ -482,6 +566,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
   SetCommonExpectionsOnSwitchedApplication(mock_app,
                                            mobile_apis::Result::SUCCESS);
 
+  ASSERT_TRUE(command_->Init());
   command_->Run();
 }
 
@@ -492,11 +577,18 @@ TEST_F(RegisterAppInterfaceRequestTest,
   const std::string request_hash_id = "abc123";
   (*msg_)[am::strings::msg_params][am::strings::hash_id] = request_hash_id;
 
-  MockAppPtr mock_app = CreateBasicMockedApp();
-  EXPECT_CALL(app_mngr_, application_by_policy_id(kAppId))
-      .WillRepeatedly(Return(mock_app));
+  connection_handler::DeviceHandle device_id = 1;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(device_id), Return(0)));
 
-  EXPECT_CALL(app_mngr_, IsAppInReconnectMode(kAppId)).WillOnce(Return(true));
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
+
+  MockAppPtr mock_app = CreateBasicMockedApp();
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(mock_app));
+  EXPECT_CALL(*mock_app, device()).WillOnce(Return(kDeviceHandle));
 
   EXPECT_CALL(app_mngr_, ProcessReconnection(_, kConnectionKey));
 
@@ -520,7 +612,7 @@ TEST_F(RegisterAppInterfaceRequestTest,
 
   SetCommonExpectionsOnSwitchedApplication(mock_app,
                                            mobile_apis::Result::RESUME_FAILED);
-
+  ASSERT_TRUE(command_->Init());
   command_->Run();
 }
 
@@ -528,11 +620,18 @@ TEST_F(RegisterAppInterfaceRequestTest,
        SwitchApplication_NoHash_ExpectCleanupResumeFailed) {
   InitBasicMessage();
 
-  MockAppPtr mock_app = CreateBasicMockedApp();
-  EXPECT_CALL(app_mngr_, application_by_policy_id(kAppId))
-      .WillRepeatedly(Return(mock_app));
+  connection_handler::DeviceHandle device_id = 1;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(device_id), Return(0)));
+
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
-  EXPECT_CALL(app_mngr_, IsAppInReconnectMode(kAppId)).WillOnce(Return(true));
+  MockAppPtr mock_app = CreateBasicMockedApp();
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(mock_app));
+  EXPECT_CALL(*mock_app, device()).WillOnce(Return(kDeviceHandle));
 
   EXPECT_CALL(app_mngr_, ProcessReconnection(_, kConnectionKey));
 
@@ -550,6 +649,143 @@ TEST_F(RegisterAppInterfaceRequestTest,
   SetCommonExpectionsOnSwitchedApplication(mock_app,
                                            mobile_apis::Result::RESUME_FAILED);
 
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(RegisterAppInterfaceRequestTest,
+       RegisterApp_SameAppId_SameDeviceFailed) {
+  using namespace am;
+
+  InitBasicMessage();
+
+  MockAppPtr mock_app1 = CreateBasicMockedApp();
+
+  app_set_.insert(mock_app1);
+  ON_CALL(app_mngr_, applications())
+      .WillByDefault(
+          Return(DataAccessor<am::ApplicationSet>(app_set_, lock_ptr_)));
+  ON_CALL(app_mngr_, pending_applications())
+      .WillByDefault(Return(DataAccessor<am::AppsWaitRegistrationSet>(
+          pending_app_set_, pending_lock_ptr_)));
+
+  MockAppPtr mock_app2 = CreateBasicMockedApp();
+
+  connection_handler::DeviceHandle device_id = 1;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(device_id), Return(0)));
+
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
+
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
+  EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1))
+      .WillOnce(Return(mock_app1));
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(
+                  MobileResultCodeIs(
+                      mobile_apis::Result::APPLICATION_REGISTERED_ALREADY),
+                  am::commands::Command::SOURCE_SDL));
+
+  ASSERT_TRUE(command_->Init());
+  command_->Run();
+}
+
+TEST_F(RegisterAppInterfaceRequestTest,
+       RegisterApp_SameAppId_DifferentDevicesSuccess) {
+  MockAppPtr mock_app1 = CreateBasicMockedApp();
+  const connection_handler::DeviceHandle device_id1 = 1u;
+  ON_CALL(*mock_app1, device()).WillByDefault(Return(device_id1));
+  app_set_.insert(mock_app1);
+  ON_CALL(app_mngr_, applications())
+      .WillByDefault(
+          Return(DataAccessor<am::ApplicationSet>(app_set_, lock_ptr_)));
+  ON_CALL(app_mngr_, pending_applications())
+      .WillByDefault(Return(DataAccessor<am::AppsWaitRegistrationSet>(
+          pending_app_set_, pending_lock_ptr_)));
+
+  InitBasicMessage();
+  (*msg_)[am::strings::params][am::strings::connection_key] = kConnectionKey2;
+  EXPECT_CALL(app_mngr_, IsStopping())
+      .WillOnce(Return(false))
+      .WillOnce(Return(true))
+      .WillOnce(Return(false));
+  ON_CALL(app_mngr_, IsHMICooperating()).WillByDefault(Return(false));
+  EXPECT_CALL(app_mngr_, updateRequestTimeout(kConnectionKey2, _, _));
+  EXPECT_CALL(app_mngr_, IsApplicationForbidden(kConnectionKey2, kAppId1))
+      .WillOnce(Return(false));
+
+  connection_handler::DeviceHandle device_id2 = 2u;
+  ON_CALL(mock_connection_handler_,
+          GetDataOnSessionKey(kConnectionKey2, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(device_id2), Return(0)));
+
+  ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id2, _, _, _, _))
+      .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress2), Return(0)));
+
+  MockAppPtr mock_app2 = CreateBasicMockedApp();
+
+  ON_CALL(*mock_app2, device()).WillByDefault(Return(device_id2));
+  ON_CALL(*mock_app2, mac_address()).WillByDefault(ReturnRef(kMacAddress2));
+  EXPECT_CALL(app_mngr_, application(kMacAddress2, kAppId1))
+      .WillRepeatedly(Return(ApplicationSharedPtr()));
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
+
+  EXPECT_CALL(app_mngr_, application(kConnectionKey2))
+      .WillOnce(Return(mock_app2));
+
+  ON_CALL(mock_policy_handler_, PolicyEnabled()).WillByDefault(Return(true));
+  ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId1, _, _))
+      .WillByDefault(Return(true));
+  policy::StatusNotifier notify_upd_manager =
+      std::make_shared<utils::CallNothing>();
+  ON_CALL(mock_policy_handler_, AddApplication(kMacAddress2, kAppId1, _))
+      .WillByDefault(Return(notify_upd_manager));
+
+  EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).WillOnce(Return(mock_app2));
+
+  EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
+      .WillRepeatedly(Return(am::HmiInterfaces::STATE_AVAILABLE));
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(
+                  HMIResultCodeIs(
+                      hmi_apis::FunctionID::BasicCommunication_OnAppRegistered),
+                  _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription),
+          _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(hmi_apis::FunctionID::VR_ChangeRegistration), _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(hmi_apis::FunctionID::TTS_ChangeRegistration), _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageHMICommand(
+          HMIResultCodeIs(hmi_apis::FunctionID::UI_ChangeRegistration), _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(_, am::commands::Command::SOURCE_SDL))
+      .Times(2);
+  EXPECT_CALL(app_mngr_, SendDriverDistractionState(_));
+
+  ASSERT_TRUE(command_->Init());
   command_->Run();
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc
index 98c0ad098a..4b43c302e4 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc
@@ -139,8 +139,21 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidVrHelp_UNSUCCESS) {
       mobile_apis::GlobalProperty::KEYBOARDPROPERTIES;
 
   EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));
+  std::vector<std::string> help_prompt = {"help_prompt"};
+
+  EXPECT_CALL(app_mngr_settings_, help_prompt())
+      .WillOnce(ReturnRef(help_prompt));
+
+  smart_objects::SmartObject so_help_prompt =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+  so_help_prompt[am::strings::text] = help_prompt[0];
+  so_help_prompt[am::strings::type] =
+      hmi_apis::Common_SpeechCapabilities::SC_TEXT;
+
   smart_objects::SmartObject so_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
+  so_prompt[0] = so_help_prompt;
+
   EXPECT_CALL(*mock_app_, set_help_prompt(so_prompt));
 
   std::vector<std::string> time_out_prompt;
@@ -161,6 +174,15 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidVrHelp_UNSUCCESS) {
 
   EXPECT_CALL(*mock_app_, set_timeout_prompt(so_time_out_prompt));
 
+  std::string vr_help_title("vr_help_title");
+  EXPECT_CALL(app_mngr_settings_, vr_help_title())
+      .WillOnce(ReturnRef(vr_help_title));
+
+  smart_objects::SmartObject so_vr_help_title =
+      smart_objects::SmartObject(smart_objects::SmartType_String);
+  so_vr_help_title = vr_help_title;
+  EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
+
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
   EXPECT_CALL(*mock_app_, reset_vr_help());
 
@@ -190,8 +212,21 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) {
       mobile_apis::GlobalProperty::KEYBOARDPROPERTIES;
 
   EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey));
+
+  std::vector<std::string> help_prompt = {"help_prompt"};
+
+  EXPECT_CALL(app_mngr_settings_, help_prompt())
+      .WillOnce(ReturnRef(help_prompt));
+
+  smart_objects::SmartObject so_help_prompt =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+  so_help_prompt[am::strings::text] = help_prompt[0];
+  so_help_prompt[am::strings::type] =
+      hmi_apis::Common_SpeechCapabilities::SC_TEXT;
+
   smart_objects::SmartObject so_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
+  so_prompt[0] = so_help_prompt;
   EXPECT_CALL(*mock_app_, set_help_prompt(so_prompt));
 
   std::vector<std::string> time_out_prompt;
@@ -212,6 +247,15 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) {
 
   EXPECT_CALL(*mock_app_, set_timeout_prompt(so_time_out_prompt));
 
+  std::string vr_help_title("vr_help_title");
+  EXPECT_CALL(app_mngr_settings_, vr_help_title())
+      .WillOnce(ReturnRef(vr_help_title));
+
+  smart_objects::SmartObject so_vr_help_title =
+      smart_objects::SmartObject(smart_objects::SmartType_String);
+  so_vr_help_title = vr_help_title;
+  EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
+
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
   EXPECT_CALL(*mock_app_, reset_vr_help());
 
@@ -230,12 +274,8 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) {
   EXPECT_CALL(*mock_app_,
               set_menu_title(msg_params[am::hmi_request::menu_title]));
 
-  const smart_objects::SmartObjectSPtr so_help_prompt =
-      std::make_shared<smart_objects::SmartObject>(
-          smart_objects::SmartType_Map);
-  EXPECT_CALL(*mock_app_, help_prompt()).WillOnce(Return(so_help_prompt.get()));
-  EXPECT_CALL(*mock_app_, timeout_prompt())
-      .WillOnce(Return(so_help_prompt.get()));
+  EXPECT_CALL(*mock_app_, help_prompt()).WillOnce(Return(&so_help_prompt));
+  EXPECT_CALL(*mock_app_, timeout_prompt()).WillOnce(Return(&so_help_prompt));
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -267,6 +307,15 @@ TEST_F(ResetGlobalPropertiesRequestTest,
   (*msg_)[am::strings::msg_params][am::strings::properties][0] =
       mobile_apis::GlobalProperty::VRHELPTITLE;
 
+  std::string vr_help_title("vr_help_title");
+  EXPECT_CALL(app_mngr_settings_, vr_help_title())
+      .WillOnce(ReturnRef(vr_help_title));
+
+  smart_objects::SmartObject so_vr_help_title =
+      smart_objects::SmartObject(smart_objects::SmartType_String);
+  so_vr_help_title = vr_help_title;
+  EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
+
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
   EXPECT_CALL(*mock_app_, reset_vr_help());
   EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true));
@@ -363,6 +412,15 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) {
   (*msg_)[am::strings::msg_params][am::strings::properties][0] =
       mobile_apis::GlobalProperty::VRHELPTITLE;
 
+  std::string vr_help_title("vr_help_title");
+  EXPECT_CALL(app_mngr_settings_, vr_help_title())
+      .WillOnce(ReturnRef(vr_help_title));
+
+  smart_objects::SmartObject so_vr_help_title =
+      smart_objects::SmartObject(smart_objects::SmartType_String);
+  so_vr_help_title = vr_help_title;
+  EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
+
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
   EXPECT_CALL(*mock_app_, reset_vr_help());
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc
index 3820112ea5..6b17aa238d 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/scrollable_message_test.cc
@@ -175,7 +175,7 @@ TEST_F(ScrollableMessageRequestTest, Init_CorrectTimeout_SUCCESS) {
       mobile_apis::InteractionMode::MANUAL_ONLY;
   EXPECT_EQ(kDefaultTimeout_, command_->default_timeout());
   command_->Init();
-  EXPECT_EQ(kTimeOut, command_->default_timeout());
+  EXPECT_EQ(kTimeOut + kDefaultTimeout_, command_->default_timeout());
 }
 
 TEST_F(ScrollableMessageRequestTest, Init_CorrectTimeout_UNSUCCESS) {
@@ -183,7 +183,7 @@ TEST_F(ScrollableMessageRequestTest, Init_CorrectTimeout_UNSUCCESS) {
       mobile_apis::InteractionMode::MANUAL_ONLY;
   EXPECT_EQ(kDefaultTimeout_, command_->default_timeout());
   command_->Init();
-  EXPECT_EQ(kTimeOut, command_->default_timeout());
+  EXPECT_EQ(kDefaultTimeout_, command_->default_timeout());
 }
 
 TEST_F(ScrollableMessageRequestTest, Run_ApplicationIsNotRegistered_UNSUCCESS) {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc
index 5d90453278..968c91b5ce 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/send_location_request_test.cc
@@ -110,6 +110,8 @@ class SendLocationRequestTest
     (*message_)[strings::msg_params] =
         SmartObject(smart_objects::SmartType_Map);
     (*message_)[strings::msg_params][strings::address] = kCorrectAddress;
+    ON_CALL(mock_hmi_capabilities_, display_capabilities())
+        .WillByDefault(Return(smart_objects::SmartObjectSPtr()));
     EXPECT_CALL(app_mngr_, application(kConnectionKey))
         .WillOnce(Return(mock_app_));
 
@@ -130,8 +132,7 @@ class SendLocationRequestTest
         SmartObject(smart_objects::SmartType_Map);
     (*disp_cap_)[hmi_response::text_fields][0][strings::name] = field_name;
     EXPECT_CALL(mock_hmi_capabilities_, display_capabilities())
-        .Times(2)
-        .WillRepeatedly(Return(disp_cap_.get()));
+        .WillOnce(Return(disp_cap_));
   }
 
   void FinishSetup() {
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc
index cc2f042eac..cc3b5925ce 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_display_layout_test.cc
@@ -160,6 +160,7 @@ TEST_F(SetDisplayLayoutRequestTest,
       ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
       .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true)));
 
+  command->Init();
   command->on_event(event);
 
   ResultCommandExpectations(ui_command_result, "UI is not supported by system");
@@ -178,6 +179,7 @@ TEST_F(SetDisplayLayoutRequestTest, Run_InvalidApp_UNSUCCESS) {
                   MobileResultCodeIs(mobile_result::APPLICATION_NOT_REGISTERED),
                   am::commands::Command::CommandSource::SOURCE_SDL));
 
+  command->Init();
   command->Run();
 }
 
@@ -188,7 +190,7 @@ TEST_F(SetDisplayLayoutRequestTest, Run_SUCCESS) {
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app));
-  EXPECT_CALL(*mock_app, display_layout()).WillOnce(ReturnRef(kLayout));
+  EXPECT_CALL(*mock_app, display_layout()).WillOnce(Return(kLayout));
   EXPECT_CALL(*mock_app, app_id()).WillOnce(Return(kAppId));
 
   EXPECT_CALL(app_mngr_, GetNextHMICorrelationID())
@@ -204,20 +206,60 @@ TEST_F(SetDisplayLayoutRequestTest, Run_SUCCESS) {
               ManageHMICommand(CheckMshCorrId(kCorrelationKey), _))
       .WillOnce(Return(true));
 
+  command->Init();
   command->Run();
 }
 
 TEST_F(SetDisplayLayoutRequestTest, OnEvent_InvalidEventId_UNSUCCESS) {
-  CommandPtr command(CreateCommand<SetDisplayLayoutRequest>());
+  MessageSharedPtr msg(CreateMessage(smart_objects::SmartType_Map));
+  (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+  CommandPtr command(CreateCommand<SetDisplayLayoutRequest>(msg));
+
   am::event_engine::Event event(hmi_apis::FunctionID::INVALID_ENUM);
-  SmartObject msg(smart_objects::SmartType_Map);
 
-  event.set_smart_object(msg);
+  event.set_smart_object(*msg);
+  MockAppPtr mock_app(CreateMockApp());
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app));
+  command->Init();
+  command->on_event(event);
+}
+
+TEST_F(SetDisplayLayoutRequestTest, OnEvent_AppVersion_v6_WARNING) {
+  am::event_engine::Event event(hmi_apis::FunctionID::UI_SetDisplayLayout);
+  MessageSharedPtr msg = CreateMessage();
+
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::SUCCESS;
+  (*msg)[am::strings::msg_params][am::hmi_response::display_capabilities] = 0;
+  (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+  event.set_smart_object(*msg);
 
+  MessageSharedPtr dispaly_capabilities_msg = CreateMessage();
+  (*dispaly_capabilities_msg)[am::hmi_response::templates_available] =
+      "templates_available";
+
+  EXPECT_CALL(mock_hmi_capabilities_, display_capabilities())
+      .WillOnce(Return(dispaly_capabilities_msg));
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(MobileResultCodeIs(mobile_result::WARNINGS),
+                          am::commands::Command::CommandSource::SOURCE_SDL));
+
+  CommandPtr command(CreateCommand<SetDisplayLayoutRequest>(msg));
+  MockAppPtr mock_app(CreateMockApp());
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app));
+  ::application_manager::Version app_version;
+  app_version.max_supported_api_version =
+      ::application_manager::APIVersion::kAPIV6;
+  EXPECT_CALL(*mock_app, version()).WillOnce(ReturnRef(app_version));
+
+  command->Init();
   command->on_event(event);
 }
 
-TEST_F(SetDisplayLayoutRequestTest, OnEvent_SUCCESS) {
+TEST_F(SetDisplayLayoutRequestTest, OnEvent_AppVersion_v5_SUCCESS) {
   am::event_engine::Event event(hmi_apis::FunctionID::UI_SetDisplayLayout);
   MessageSharedPtr msg = CreateMessage();
 
@@ -232,13 +274,22 @@ TEST_F(SetDisplayLayoutRequestTest, OnEvent_SUCCESS) {
       "templates_available";
 
   EXPECT_CALL(mock_hmi_capabilities_, display_capabilities())
-      .WillOnce(Return(dispaly_capabilities_msg.get()));
+      .WillOnce(Return(dispaly_capabilities_msg));
   EXPECT_CALL(
       mock_rpc_service_,
       ManageMobileCommand(MobileResultCodeIs(mobile_result::SUCCESS),
                           am::commands::Command::CommandSource::SOURCE_SDL));
 
   CommandPtr command(CreateCommand<SetDisplayLayoutRequest>(msg));
+  MockAppPtr mock_app(CreateMockApp());
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app));
+  ::application_manager::Version app_version;
+  app_version.max_supported_api_version =
+      ::application_manager::APIVersion::kAPIV5;
+  EXPECT_CALL(*mock_app, version()).WillOnce(ReturnRef(app_version));
+
+  command->Init();
   command->on_event(event);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
index 3e791aef01..9b72d41f7e 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/set_global_properties_test.cc
@@ -39,6 +39,7 @@
 
 #include "application_manager/commands/command_request_test.h"
 #include "application_manager/event_engine/event.h"
+#include "application_manager/message_helper.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
 #include "application_manager/mock_help_prompt_manager.h"
@@ -70,6 +71,13 @@ const uint32_t kCmdId = 1u;
 const uint32_t kConnectionKey = 1u;
 const std::string kText = "one";
 const uint32_t kPosition = 1u;
+
+const std::vector<hmi_apis::Common_Result::eType> success_result_codes{
+    hmi_apis::Common_Result::SUCCESS,
+    hmi_apis::Common_Result::WARNINGS,
+    hmi_apis::Common_Result::WRONG_LANGUAGE,
+    hmi_apis::Common_Result::RETRY,
+    hmi_apis::Common_Result::SAVED};
 }  // namespace
 
 class SetGlobalPropertiesRequestTest
@@ -233,9 +241,16 @@ class SetGlobalPropertiesRequestTest
     ON_CALL(app_mngr_, application(kConnectionKey))
         .WillByDefault(Return(mock_app_));
     ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
-    ON_CALL(mock_hmi_interfaces_,
-            GetInterfaceState(am::HmiInterfaces::HMI_INTERFACE_UI))
+    ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_))
         .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
+    ON_CALL(mock_app_manager_, hmi_interfaces())
+        .WillByDefault(ReturnRef(mock_hmi_interfaces_));
+    ON_CALL(mock_message_helper_,
+            MobileToHMIResult(mobile_apis::Result::UNSUPPORTED_RESOURCE))
+        .WillByDefault(Return(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE));
+    ON_CALL(mock_message_helper_,
+            MobileToHMIResult(mobile_apis::Result::WARNINGS))
+        .WillByDefault(Return(hmi_apis::Common_Result::WARNINGS));
   }
 
   void ResultCommandExpectations(MessageSharedPtr msg,
@@ -243,8 +258,8 @@ class SetGlobalPropertiesRequestTest
     EXPECT_EQ((*msg)[am::strings::msg_params][am::strings::success].asBool(),
               true);
     EXPECT_EQ(
-        (*msg)[am::strings::msg_params][am::strings::result_code].asInt(),
-        static_cast<int32_t>(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE));
+        static_cast<int32_t>(hmi_apis::Common_Result::UNSUPPORTED_RESOURCE),
+        (*msg)[am::strings::msg_params][am::strings::result_code].asInt());
     EXPECT_EQ((*msg)[am::strings::msg_params][am::strings::info].asString(),
               info);
   }
@@ -265,10 +280,128 @@ class SetGlobalPropertiesRequestTest
             GetInterfaceState(am::HmiInterfaces::HMI_INTERFACE_TTS))
         .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE));
   }
+
+  // Checks total result code for each properties
+  void PrepareResultCodeForResponse_CheckTotalCode(
+      const hmi_apis::Common_Result::eType& ui_result,
+      const hmi_apis::Common_Result::eType& tts_result,
+      const hmi_apis::Common_Result::eType& rc_result,
+      const mobile_apis::Result::eType expected_total_result_code) {
+    using namespace application_manager;
+    using namespace hmi_apis;
+
+    commands::ResponseInfo ui_properties_info(
+        ui_result, HmiInterfaces::HMI_INTERFACE_UI, mock_app_manager_);
+    commands::ResponseInfo tts_properties_info(
+        tts_result, HmiInterfaces::HMI_INTERFACE_TTS, mock_app_manager_);
+    commands::ResponseInfo rc_properties_info(
+        rc_result, HmiInterfaces::HMI_INTERFACE_RC, mock_app_manager_);
+
+    MessageSharedPtr msg = CreateMsgParams();
+    std::shared_ptr<SetGlobalPropertiesRequest> command(
+        CreateCommand<SetGlobalPropertiesRequest>(msg));
+
+    auto result = command->PrepareResultCodeForResponse(
+        ui_properties_info, tts_properties_info, rc_properties_info);
+
+    EXPECT_EQ(expected_total_result_code, result);
+  }
+
+  // Sets in rotation for each result UNSUPPROTED result code and checks total
+  // result code
+  void PrepareResultCodeForResponse_CheckAllResultsForSpecifiedTotalResult(
+      mobile_apis::Result::eType expected_total_result_code) {
+    using namespace application_manager;
+    using namespace hmi_apis;
+
+    Common_Result::eType ui_result =
+        MessageHelper::MobileToHMIResult(expected_total_result_code);
+    Common_Result::eType tts_result = Common_Result::SUCCESS;
+    Common_Result::eType rc_result = Common_Result::SUCCESS;
+
+    PrepareResultCodeForResponse_CheckTotalCode(
+        ui_result, tts_result, rc_result, expected_total_result_code);
+
+    ui_result = Common_Result::SUCCESS;
+    tts_result = MessageHelper::MobileToHMIResult(expected_total_result_code);
+
+    PrepareResultCodeForResponse_CheckTotalCode(
+        ui_result, tts_result, rc_result, expected_total_result_code);
+
+    tts_result = Common_Result::SUCCESS;
+    rc_result = MessageHelper::MobileToHMIResult(expected_total_result_code);
+
+    PrepareResultCodeForResponse_CheckTotalCode(
+        ui_result, tts_result, rc_result, expected_total_result_code);
+  }
+
+  void PrepareResultForMobileResponse_CheckTotalReault(
+      const hmi_apis::Common_Result::eType& ui_result,
+      const hmi_apis::Common_Result::eType& tts_result,
+      const hmi_apis::Common_Result::eType& rc_result,
+      const bool expected_total_result) {
+    using namespace application_manager;
+    using namespace hmi_apis;
+
+    commands::ResponseInfo ui_properties_info(
+        ui_result, HmiInterfaces::HMI_INTERFACE_UI, mock_app_manager_);
+    commands::ResponseInfo tts_properties_info(
+        tts_result, HmiInterfaces::HMI_INTERFACE_TTS, mock_app_manager_);
+    commands::ResponseInfo rc_properties_info(
+        rc_result, HmiInterfaces::HMI_INTERFACE_RC, mock_app_manager_);
+
+    MessageSharedPtr msg = CreateMsgParams();
+    std::shared_ptr<SetGlobalPropertiesRequest> command(
+        CreateCommand<SetGlobalPropertiesRequest>(msg));
+
+    bool result = command->PrepareResultForMobileResponse(
+        ui_properties_info, tts_properties_info, rc_properties_info);
+
+    EXPECT_EQ(expected_total_result, result);
+  }
+
+  void PrepareResultForMobileResponse_CheckResultsForAllCases() {
+    using namespace application_manager;
+    using namespace hmi_apis;
+
+    Common_Result::eType ui_result = Common_Result::SUCCESS;
+    Common_Result::eType tts_result = Common_Result::SUCCESS;
+    Common_Result::eType rc_result = Common_Result::SUCCESS;
+
+    PrepareResultForMobileResponse_CheckTotalReault(
+        ui_result, tts_result, rc_result, true);
+
+    // Result code isn't success
+    EXPECT_FALSE(helpers::in_range(success_result_codes,
+                                   Common_Result::UNSUPPORTED_REQUEST));
+
+    ui_result = Common_Result::UNSUPPORTED_REQUEST;
+    tts_result = Common_Result::SUCCESS;
+    rc_result = Common_Result::SUCCESS;
+
+    PrepareResultForMobileResponse_CheckTotalReault(
+        ui_result, tts_result, rc_result, false);
+
+    ui_result = Common_Result::SUCCESS;
+    tts_result = Common_Result::UNSUPPORTED_REQUEST;
+    rc_result = Common_Result::SUCCESS;
+
+    PrepareResultForMobileResponse_CheckTotalReault(
+        ui_result, tts_result, rc_result, false);
+
+    ui_result = Common_Result::SUCCESS;
+    tts_result = Common_Result::SUCCESS;
+    rc_result = Common_Result::UNSUPPORTED_REQUEST;
+
+    PrepareResultForMobileResponse_CheckTotalReault(
+        ui_result, tts_result, rc_result, false);
+  }
+
   std::shared_ptr<sync_primitives::Lock> lock_ptr_;
   MockAppPtr mock_app_;
   std::shared_ptr<application_manager_test::MockHelpPromptManager>
       mock_help_prompt_manager_;
+  NiceMock<MockApplicationManager> mock_app_manager_;
 };
 
 TEST_F(SetGlobalPropertiesRequestTest,
@@ -332,6 +465,7 @@ TEST_F(SetGlobalPropertiesRequestTest,
       ManageHMICommand(
           HMIResultCodeIs(hmi_apis::FunctionID::TTS_SetGlobalProperties), _))
       .WillOnce(Return(true));
+
   (*msg_vr)[am::strings::params][am::hmi_response::code] =
       hmi_apis::Common_Result::SUCCESS;
   Event event_vr(hmi_apis::FunctionID::TTS_SetGlobalProperties);
@@ -1372,6 +1506,51 @@ TEST_F(SetGlobalPropertiesRequestTest,
       static_cast<int32_t>(hmi_apis::Common_Result::WARNINGS));
 }
 
+TEST_F(SetGlobalPropertiesRequestTest,
+       PrepareResultCodeForResponse_AllResultsAreSUCCESS_TotalResultSUCCESS) {
+  using namespace application_manager;
+  using namespace hmi_apis;
+  const auto expected_total_result = mobile_apis::Result::eType::SUCCESS;
+
+  Common_Result::eType ui_result = Common_Result::SUCCESS;
+  Common_Result::eType tts_result = Common_Result::SUCCESS;
+  Common_Result::eType rc_result = Common_Result::SUCCESS;
+
+  app_mngr::commands::ResponseInfo ui_properties_info(
+      ui_result, HmiInterfaces::HMI_INTERFACE_UI, mock_app_manager_);
+
+  app_mngr::commands::ResponseInfo tts_properties_info(
+      tts_result, HmiInterfaces::HMI_INTERFACE_TTS, mock_app_manager_);
+
+  app_mngr::commands::ResponseInfo rc_properties_info(
+      rc_result, HmiInterfaces::HMI_INTERFACE_RC, mock_app_manager_);
+
+  MessageSharedPtr msg = CreateMsgParams();
+  std::shared_ptr<SetGlobalPropertiesRequest> command(
+      CreateCommand<SetGlobalPropertiesRequest>(msg));
+
+  auto result = command->PrepareResultCodeForResponse(
+      ui_properties_info, tts_properties_info, rc_properties_info);
+
+  EXPECT_EQ(expected_total_result, result);
+}
+
+TEST_F(SetGlobalPropertiesRequestTest,
+       PrepareResultCodeForResponse_UNSUPPORTED) {
+  PrepareResultCodeForResponse_CheckAllResultsForSpecifiedTotalResult(
+      mobile_apis::Result::UNSUPPORTED_RESOURCE);
+}
+
+TEST_F(SetGlobalPropertiesRequestTest, PrepareResultCodeForResponse_WARNINGS) {
+  PrepareResultCodeForResponse_CheckAllResultsForSpecifiedTotalResult(
+      mobile_apis::Result::WARNINGS);
+}
+
+TEST_F(SetGlobalPropertiesRequestTest,
+       PrepareResultForMobileResponse_AllCases) {
+  PrepareResultForMobileResponse_CheckResultsForAllCases();
+}
+
 }  // namespace set_global_properties_request
 }  // namespace mobile_commands_test
 }  // namespace commands_test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc
index ed0f52a521..b8cfdd4bfc 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/show_test.cc
@@ -31,6 +31,7 @@
  */
 
 #include <stdint.h>
+#include <array>
 #include <memory>
 #include <set>
 #include <string>
@@ -68,8 +69,28 @@ const uint32_t kAppId = 1u;
 const uint32_t kCmdId = 1u;
 const uint32_t kConnectionKey = 2u;
 const uint32_t kFunctionID = 3u;
+const std::string kCurrentTemplatelayout = "current_template_layout";
+const std::string kNewTemplateLayout = "new_template_layout";
+const app_mngr::WindowID kCurrentWindowID = 1;
+typedef std::array<int, 3> rgb_color_scheme;
+const rgb_color_scheme kCurrentDayColorRGB = {75, 75, 75};
+const rgb_color_scheme kCurrentNightColorRGB = {200, 200, 200};
+const rgb_color_scheme kNewDayColorRGB = {80, 80, 80};
+const rgb_color_scheme kNewNightColorRGB = {222, 222, 222};
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
 }  // namespace
 
+MATCHER_P2(CheckMessageToMobile, result_code, success, "") {
+  const bool is_success =
+      (*arg)[am::strings::msg_params][am::strings::success].asBool() == success;
+
+  const bool is_result_code_correct =
+      (*arg)[am::strings::msg_params][am::strings::result_code].asInt() ==
+      static_cast<int32_t>(result_code);
+  return is_success && is_result_code_correct;
+}
+
 class ShowRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
   ShowRequestTest() {
@@ -104,6 +125,101 @@ class ShowRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> {
     return msg;
   }
 
+ protected:
+  void SetUp() OVERRIDE {
+    ON_CALL(app_mngr_, application(kConnectionKey))
+        .WillByDefault(Return(mock_app_));
+    ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
+    ON_CALL(*mock_app_, WindowIdExists(kCurrentWindowID))
+        .WillByDefault(Return(true));
+    ON_CALL(*mock_app_, window_layout(kCurrentWindowID))
+        .WillByDefault(Return(kCurrentTemplatelayout));
+  }
+
+  smart_objects::SmartObject CreateColorScheme(
+      const rgb_color_scheme& rgb_color_scheme) {
+    using namespace application_manager;
+
+    smart_objects::SmartObject primary_color(smart_objects::SmartType_Map);
+    smart_objects::SmartObject secondary_color(smart_objects::SmartType_Map);
+    smart_objects::SmartObject background_color(smart_objects::SmartType_Map);
+
+    primary_color[strings::red] = rgb_color_scheme[0];
+    primary_color[strings::green] = rgb_color_scheme[1];
+    primary_color[strings::blue] = rgb_color_scheme[2];
+
+    secondary_color[strings::red] = rgb_color_scheme[0];
+    secondary_color[strings::green] = rgb_color_scheme[1];
+    secondary_color[strings::blue] = rgb_color_scheme[2];
+
+    background_color[strings::red] = rgb_color_scheme[0];
+    background_color[strings::green] = rgb_color_scheme[1];
+    background_color[strings::blue] = rgb_color_scheme[2];
+
+    smart_objects::SmartObject color_scheme(smart_objects::SmartType_Map);
+    color_scheme[strings::primary_color] = primary_color;
+    color_scheme[strings::secondary_color] = secondary_color;
+    color_scheme[strings::background_color] = background_color;
+
+    return color_scheme;
+  }
+
+  smart_objects::SmartObject CreateTemplateConfiguration(
+      const std::string& layout) {
+    using namespace application_manager;
+
+    smart_objects::SmartObject template_configuration(
+        smart_objects::SmartType_Map);
+
+    template_configuration[strings::template_layout] = layout;
+
+    template_configuration[strings::day_color_scheme] =
+        CreateColorScheme(kCurrentDayColorRGB);
+
+    template_configuration[strings::night_color_scheme] =
+        CreateColorScheme(kCurrentNightColorRGB);
+
+    return template_configuration;
+  }
+
+  MessageSharedPtr CreateMessageWithTemplateLayout(const std::string& layout) {
+    auto msg = CreateMsgParams();
+    (*msg)[app_mngr::strings::msg_params][app_mngr::strings::window_id] =
+        kCurrentWindowID;
+    (*msg)[am::strings::msg_params][am::strings::template_configuration] =
+        CreateTemplateConfiguration(layout);
+
+    return msg;
+  }
+
+  std::shared_ptr<ShowRequest> SetupHelperLayout(
+      const std::string& layout,
+      const rgb_color_scheme& day_colors,
+      const rgb_color_scheme& night_colors) {
+    EXPECT_CALL(mock_rpc_service_,
+                ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_Show),
+                                 Command::CommandSource::SOURCE_SDL_TO_HMI))
+        .WillOnce(Return(true));
+    EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kConnectionKey));
+    EXPECT_CALL(*mock_app_, WindowIdExists(kCurrentWindowID))
+        .WillOnce(Return(true));
+    EXPECT_CALL(app_mngr_, application(kConnectionKey))
+        .WillOnce(Return(mock_app_));
+    const auto current_day_color_scheme = CreateColorScheme(day_colors);
+    ON_CALL(*mock_app_, day_color_scheme(kCurrentWindowID))
+        .WillByDefault(Return(current_day_color_scheme));
+    const auto current_night_color_scheme = CreateColorScheme(night_colors);
+    ON_CALL(*mock_app_, night_color_scheme(kCurrentWindowID))
+        .WillByDefault(Return(current_night_color_scheme));
+    ON_CALL(*mock_app_, window_layout(kCurrentWindowID))
+        .WillByDefault(Return(kCurrentTemplatelayout));
+
+    auto msg = CreateMessageWithTemplateLayout(layout);
+
+    auto command(CreateCommand<ShowRequest>(msg));
+    return command;
+  }
+
   void TestSetupHelper(MessageSharedPtr msg,
                        hmi_apis::Common_TextFieldName::eType field_name,
                        const char* field) {
@@ -269,9 +385,9 @@ TEST_F(ShowRequestTest, Run_SoftButtonExists_SUCCESS) {
   msg_params[am::hmi_request::show_strings] =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
 
-  EXPECT_CALL(
-      mock_message_helper_,
-      SubscribeApplicationToSoftButton(creation_msg_params, _, kFunctionID));
+  EXPECT_CALL(mock_message_helper_,
+              SubscribeApplicationToSoftButton(
+                  creation_msg_params, _, kFunctionID, kDefaultWindowId));
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _));
   EXPECT_CALL(*mock_app_, set_show_command(msg_params));
 
@@ -319,7 +435,8 @@ TEST_F(ShowRequestTest, Run_SoftButtonExists_Canceled) {
 
   EXPECT_CALL(*mock_app_, app_id()).Times(0);
 
-  EXPECT_CALL(mock_message_helper_, SubscribeApplicationToSoftButton(_, _, _))
+  EXPECT_CALL(mock_message_helper_,
+              SubscribeApplicationToSoftButton(_, _, _, kDefaultWindowId))
       .Times(0);
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
   EXPECT_CALL(*mock_app_, set_show_command(_)).Times(0);
@@ -729,10 +846,14 @@ TEST_F(ShowRequestTest, Run_MainField1_MetadataTagWithNoFieldData) {
       hmi_apis::Common_Result::SUCCESS;
   (*ev_msg)[am::strings::msg_params][am::strings::app_id] = kConnectionKey;
   (*ev_msg)[am::strings::msg_params][am::strings::info] = "";
+  (*ev_msg)[am::strings::params][am::strings::connection_key] = kConnectionKey;
 
   Event event(hmi_apis::FunctionID::UI_Show);
   event.set_smart_object(*ev_msg);
 
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+
   MessageSharedPtr ui_command_result;
   EXPECT_CALL(
       mock_rpc_service_,
@@ -886,34 +1007,328 @@ TEST_F(ShowRequestTest, Run_CustomPresets_WrongSyntax) {
   command->Run();
 }
 
-TEST_F(ShowRequestTest, Run_InvalidApp_Canceled) {
+TEST_F(ShowRequestTest,
+       Run_AppDoesNotExist_ExpectAppNotRegisteredResponseToMobile) {
+  const auto result_code = mobile_apis::Result::APPLICATION_NOT_REGISTERED;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(nullptr));
+
+  auto msg = CreateMsgParams();
+  auto command = CreateCommand<ShowRequest>(msg);
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(ShowRequestTest, Run_EmptyParams_Canceled) {
   MessageSharedPtr msg = CreateMsgParams();
 
   std::shared_ptr<ShowRequest> command(CreateCommand<ShowRequest>(msg));
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
-      .WillOnce(Return(MockAppPtr()));
+      .WillOnce(Return(mock_app_));
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _));
   EXPECT_CALL(*mock_app_, app_id()).Times(0);
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
   EXPECT_CALL(*mock_app_, set_show_command(_)).Times(0);
 
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
-TEST_F(ShowRequestTest, Run_EmptyParams_Canceled) {
-  MessageSharedPtr msg = CreateMsgParams();
+TEST_F(ShowRequestTest,
+       Run_WindowWithIDDoesNotExist_ExpectInvalidIDResponseToMobile) {
+  const auto result_code = mobile_apis::Result::INVALID_ID;
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(CheckMessageToMobile(result_code, false),
+                                  Command::CommandSource::SOURCE_SDL))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+  ON_CALL(*mock_app_, WindowIdExists(kCurrentWindowID))
+      .WillByDefault(Return(false));
 
-  std::shared_ptr<ShowRequest> command(CreateCommand<ShowRequest>(msg));
+  auto msg = CreateMsgParams();
+  (*msg)[am::strings::msg_params][am::strings::window_id] = kCurrentWindowID;
+
+  auto command = CreateCommand<ShowRequest>(msg);
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(ShowRequestTest,
+       Run_NoLayoutChangeWithoutBothColorScheme_SendRequestToHMI_SUCCESS) {
+  auto msg = CreateMsgParams();
+  (*msg)[app_mngr::strings::msg_params][app_mngr::strings::window_id] =
+      kCurrentWindowID;
+  (*msg)[am::strings::msg_params][am::strings::template_configuration]
+        [am::strings::template_layout] = kCurrentTemplatelayout;
+
+  auto command(CreateCommand<ShowRequest>(msg));
+
+  auto message_to_hmi = CreateMessage();
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_hmi), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  const auto template_layout =
+      (*message_to_hmi)[am::strings::msg_params]
+                       [am::strings::template_configuration]
+                       [am::strings::template_layout]
+                           .asString();
+  EXPECT_EQ(kCurrentTemplatelayout, template_layout);
+}
+
+TEST_F(ShowRequestTest,
+       Run_NoLayoutChangeDayColorSchemesNotEqual_Response_REJECTED) {
+  auto msg = CreateMessageWithTemplateLayout(kCurrentTemplatelayout);
+
+  const auto current_day_color_scheme = CreateColorScheme(kNewDayColorRGB);
+
+  auto command(CreateCommand<ShowRequest>(msg));
+
+  ON_CALL(*mock_app_, day_color_scheme(kCurrentWindowID))
+      .WillByDefault(Return(current_day_color_scheme));
+
+  auto message_to_mobile = CreateMessage();
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mobile), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  const bool success =
+      (*message_to_mobile)[am::strings::msg_params][am::strings::success]
+          .asBool();
+  EXPECT_FALSE(success);
+
+  const auto result_code = static_cast<mobile_apis::Result::eType>(
+      (*message_to_mobile)[am::strings::msg_params][am::strings::result_code]
+          .asUInt());
+
+  EXPECT_EQ(mobile_apis::Result::REJECTED, result_code);
+}
+
+TEST_F(ShowRequestTest,
+       Run_NoLayoutChangeNightColorSchemesNotEqual_Response_REJECTED) {
+  auto msg = CreateMessageWithTemplateLayout(kCurrentTemplatelayout);
+
+  const auto current_night_color_scheme = CreateColorScheme(kNewNightColorRGB);
+
+  auto command(CreateCommand<ShowRequest>(msg));
+
+  ON_CALL(*mock_app_, day_color_scheme(kCurrentWindowID))
+      .WillByDefault(Return(current_night_color_scheme));
+
+  auto message_to_mobile = CreateMessage();
+  EXPECT_CALL(
+      mock_rpc_service_,
+      ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mobile), Return(true)));
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  const bool success =
+      (*message_to_mobile)[am::strings::msg_params][am::strings::success]
+          .asBool();
+  EXPECT_FALSE(success);
 
+  const auto result_code = static_cast<mobile_apis::Result::eType>(
+      (*message_to_mobile)[am::strings::msg_params][am::strings::result_code]
+          .asUInt());
+
+  EXPECT_EQ(mobile_apis::Result::REJECTED, result_code);
+}
+
+TEST_F(ShowRequestTest,
+       Run_LayoutNotChangeBothColorSchemeEqual_SendRequestToHMI_SUCCESS) {
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_Show),
+                               Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kConnectionKey));
+  EXPECT_CALL(*mock_app_, WindowIdExists(kCurrentWindowID))
+      .WillOnce(Return(true));
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
-  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _));
-  EXPECT_CALL(*mock_app_, app_id()).Times(0);
-  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
-  EXPECT_CALL(*mock_app_, set_show_command(_)).Times(0);
+  const auto current_day_color_scheme = CreateColorScheme(kCurrentDayColorRGB);
+  ON_CALL(*mock_app_, day_color_scheme(kCurrentWindowID))
+      .WillByDefault(Return(current_day_color_scheme));
+  const auto current_night_color_scheme =
+      CreateColorScheme(kCurrentNightColorRGB);
+  ON_CALL(*mock_app_, night_color_scheme(kCurrentWindowID))
+      .WillByDefault(Return(current_night_color_scheme));
+  ON_CALL(*mock_app_, window_layout(kCurrentWindowID))
+      .WillByDefault(Return(kCurrentTemplatelayout));
+
+  auto msg = CreateMessageWithTemplateLayout(kCurrentTemplatelayout);
+
+  auto command(CreateCommand<ShowRequest>(msg));
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(ShowRequestTest,
+       Run_LayoutChangeBothColorSchemeNotEqual_SendRequestToHMI_SUCCESS) {
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_Show),
+                               Command::CommandSource::SOURCE_SDL_TO_HMI))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kConnectionKey));
+  EXPECT_CALL(*mock_app_, WindowIdExists(kCurrentWindowID))
+      .WillOnce(Return(true));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+  const auto current_day_color_scheme = CreateColorScheme(kNewDayColorRGB);
+  ON_CALL(*mock_app_, day_color_scheme(kCurrentWindowID))
+      .WillByDefault(Return(current_day_color_scheme));
+  const auto current_night_color_scheme = CreateColorScheme(kNewNightColorRGB);
+  ON_CALL(*mock_app_, night_color_scheme(kCurrentWindowID))
+      .WillByDefault(Return(current_night_color_scheme));
+  ON_CALL(*mock_app_, window_layout(kCurrentWindowID))
+      .WillByDefault(Return(kCurrentTemplatelayout));
+
+  auto msg = CreateMessageWithTemplateLayout(kNewTemplateLayout);
+
+  auto command(CreateCommand<ShowRequest>(msg));
+  ASSERT_TRUE(command->Init());
+  command->Run();
+}
+
+TEST_F(ShowRequestTest, OnEvent_SuccessResultCode_ExpectSetWindowLayoutOnly) {
+  // Precondition
+  auto command =
+      SetupHelperLayout(kNewTemplateLayout, kNewDayColorRGB, kNewNightColorRGB);
+  ASSERT_TRUE(command->Init());
+  command->Run();
+  // Expectation
+  EXPECT_CALL(*mock_app_,
+              set_window_layout(kCurrentWindowID, kNewTemplateLayout));
+  EXPECT_CALL(*mock_app_, set_day_color_scheme(_, _));
+  EXPECT_CALL(*mock_app_, set_night_color_scheme(_, _));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(
+                  CheckMessageToMobile(mobile_apis::Result::SUCCESS, true),
+                  Command::CommandSource::SOURCE_SDL));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+
+  auto msg = CreateMessage();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::eType::SUCCESS;
+  (*msg)[am::strings::msg_params] = SmartObject(smart_objects::SmartType_Map);
+
+  Event event(hmi_apis::FunctionID::UI_Show);
+  event.set_smart_object(*msg);
+
+  command->on_event(event);
+}
+
+TEST_F(ShowRequestTest,
+       OnEvent_SuccessResultCode_ExpectSetWindowLayoutAndSetDayColorScheme) {
+  // Precondition
+  auto command = SetupHelperLayout(
+      kNewTemplateLayout, kCurrentDayColorRGB, kNewNightColorRGB);
+  ASSERT_TRUE(command->Init());
+  command->Run();
+  // Expectation
+  EXPECT_CALL(*mock_app_,
+              set_window_layout(kCurrentWindowID, kNewTemplateLayout));
+  EXPECT_CALL(*mock_app_,
+              set_day_color_scheme(kCurrentWindowID,
+                                   CreateColorScheme(kCurrentDayColorRGB)));
+  EXPECT_CALL(*mock_app_, set_night_color_scheme(_, _));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(
+                  CheckMessageToMobile(mobile_apis::Result::SUCCESS, true),
+                  Command::CommandSource::SOURCE_SDL));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+
+  auto msg = CreateMessage();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::eType::SUCCESS;
+  (*msg)[am::strings::msg_params] = SmartObject(smart_objects::SmartType_Map);
+
+  Event event(hmi_apis::FunctionID::UI_Show);
+  event.set_smart_object(*msg);
+
+  command->on_event(event);
+}
+
+TEST_F(ShowRequestTest,
+       OnEvent_SuccessResultCode_ExpectSetWindowLayoutAndBothColorScheme) {
+  // Precondition
+  auto command = SetupHelperLayout(
+      kNewTemplateLayout, kCurrentDayColorRGB, kCurrentNightColorRGB);
+  ASSERT_TRUE(command->Init());
+  command->Run();
+  // Expectation
+  EXPECT_CALL(*mock_app_,
+              set_window_layout(kCurrentWindowID, kNewTemplateLayout));
+  EXPECT_CALL(*mock_app_,
+              set_day_color_scheme(kCurrentWindowID,
+                                   CreateColorScheme(kCurrentDayColorRGB)));
+  EXPECT_CALL(*mock_app_,
+              set_night_color_scheme(kCurrentWindowID,
+                                     CreateColorScheme(kCurrentNightColorRGB)));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(
+                  CheckMessageToMobile(mobile_apis::Result::SUCCESS, true),
+                  Command::CommandSource::SOURCE_SDL));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+
+  auto msg = CreateMessage();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::eType::SUCCESS;
+  (*msg)[am::strings::msg_params] = SmartObject(smart_objects::SmartType_Map);
+
+  Event event(hmi_apis::FunctionID::UI_Show);
+  event.set_smart_object(*msg);
 
+  command->on_event(event);
+}
+
+TEST_F(ShowRequestTest,
+       OnEvent_SuccessResultCode_ExpectBothColorSchemeWithoutSetWindowLayout) {
+  // Precondition
+  auto command = SetupHelperLayout(
+      kCurrentTemplatelayout, kCurrentDayColorRGB, kCurrentNightColorRGB);
+  ASSERT_TRUE(command->Init());
   command->Run();
+  // Expectation
+  EXPECT_CALL(*mock_app_, set_window_layout(_, _)).Times(0);
+  EXPECT_CALL(*mock_app_,
+              set_day_color_scheme(kCurrentWindowID,
+                                   CreateColorScheme(kCurrentDayColorRGB)));
+  EXPECT_CALL(*mock_app_,
+              set_night_color_scheme(kCurrentWindowID,
+                                     CreateColorScheme(kCurrentNightColorRGB)));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageMobileCommand(
+                  CheckMessageToMobile(mobile_apis::Result::SUCCESS, true),
+                  Command::CommandSource::SOURCE_SDL));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
+
+  auto msg = CreateMessage();
+  (*msg)[am::strings::params][am::hmi_response::code] =
+      hmi_apis::Common_Result::eType::SUCCESS;
+  (*msg)[am::strings::msg_params] = SmartObject(smart_objects::SmartType_Map);
+
+  Event event(hmi_apis::FunctionID::UI_Show);
+  event.set_smart_object(*msg);
+
+  command->on_event(event);
 }
 
 TEST_F(ShowRequestTest, OnEvent_SuccessResultCode_SUCCESS) {
@@ -931,7 +1346,7 @@ TEST_F(ShowRequestTest, OnEvent_SuccessResultCode_SUCCESS) {
   event.set_smart_object(*msg);
 
   EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(mock_app_));
-
+  ASSERT_TRUE(command->Init());
   command->on_event(event);
 }
 
@@ -957,6 +1372,10 @@ TEST_F(ShowRequestTest, OnEvent_WrongFunctionID_Canceled) {
   MessageSharedPtr msg = CreateMessage();
   (*msg)[am::strings::params][am::hmi_response::code] =
       mobile_apis::Result::SUCCESS;
+  (*msg)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+
+  ON_CALL(app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app_));
 
   std::shared_ptr<ShowRequest> command(CreateCommand<ShowRequest>(msg));
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc
index 786f2b6bd1..f3bfe12ab1 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_button_request_test.cc
@@ -162,7 +162,7 @@ TEST_F(SubscribeButtonRequestTest, Run_IsSubscribedToButton_UNSUCCESS) {
   (*button_caps_ptr)[0][am::hmi_response::button_name] = kButtonName;
 
   ON_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillByDefault(Return(button_caps_ptr.get()));
+      .WillByDefault(Return(button_caps_ptr));
 
   ON_CALL(*app, IsSubscribedToButton(_)).WillByDefault(Return(true));
 
@@ -193,7 +193,7 @@ TEST_F(SubscribeButtonRequestTest, Run_SUCCESS) {
   (*button_caps_ptr)[0][am::hmi_response::button_name] = kButtonName;
 
   ON_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillByDefault(Return(button_caps_ptr.get()));
+      .WillByDefault(Return(button_caps_ptr));
 
   ON_CALL(*app, IsSubscribedToButton(_)).WillByDefault(Return(false));
 
@@ -240,7 +240,7 @@ TEST_F(SubscribeButtonRequestTest, Run_NAV_SUCCESS) {
   (*button_caps_ptr)[0][am::hmi_response::button_name] = kButtonName;
 
   ON_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillByDefault(Return(button_caps_ptr.get()));
+      .WillByDefault(Return(button_caps_ptr));
 
   ON_CALL(*app, IsSubscribedToButton(_)).WillByDefault(Return(false));
 
@@ -289,7 +289,7 @@ TEST_F(SubscribeButtonRequestTest, Run_SUCCESS_App_Base_RPC_Version) {
       mobile_apis::ButtonName::PLAY_PAUSE;
 
   ON_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillByDefault(Return(button_caps_ptr.get()));
+      .WillByDefault(Return(button_caps_ptr));
 
   ON_CALL(*app, IsSubscribedToButton(_)).WillByDefault(Return(false));
 
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc
index 7351cd67d3..211888d6be 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/system_request_test.cc
@@ -74,6 +74,7 @@ const std::string kAppStorageFolder = "fake-storage";
 const std::string kSystemFilesPath = "/fake/system/files";
 const std::string kFileName = "Filename";
 const uint32_t kHmiAppId = 3u;
+const connection_handler::DeviceHandle kDeviceId = 1u;
 }  // namespace
 
 class SystemRequestTest
@@ -99,13 +100,15 @@ class SystemRequestTest
     ON_CALL(*mock_app_, policy_app_id()).WillByDefault(Return(kAppPolicyId));
     ON_CALL(*mock_app_, folder_name()).WillByDefault(Return(kAppFolderName));
     ON_CALL(*mock_app_, hmi_app_id()).WillByDefault(Return(kHmiAppId));
+    ON_CALL(*mock_app_, device()).WillByDefault(Return(kDeviceId));
 
     ON_CALL(app_mngr_settings_, system_files_path())
         .WillByDefault(ReturnRef(kSystemFilesPath));
     ON_CALL(app_mngr_settings_, app_storage_folder())
         .WillByDefault(ReturnRef(kAppStorageFolder));
 
-    ON_CALL(mock_policy_handler_, IsRequestTypeAllowed(kAppPolicyId, _))
+    ON_CALL(mock_policy_handler_,
+            IsRequestTypeAllowed(kDeviceId, kAppPolicyId, _))
         .WillByDefault(Return(true));
   }
 
@@ -146,9 +149,10 @@ TEST_F(SystemRequestTest,
 
   PreConditions();
 
-  EXPECT_CALL(mock_policy_handler_,
-              IsRequestTypeAllowed(kAppPolicyId,
-                                   mobile_apis::RequestType::OEM_SPECIFIC))
+  EXPECT_CALL(
+      mock_policy_handler_,
+      IsRequestTypeAllowed(
+          kDeviceId, kAppPolicyId, mobile_apis::RequestType::OEM_SPECIFIC))
       .WillOnce(Return(true));
 
   EXPECT_CALL(mock_policy_handler_,
@@ -191,9 +195,10 @@ TEST_F(
 
   PreConditions();
 
-  EXPECT_CALL(mock_policy_handler_,
-              IsRequestTypeAllowed(kAppPolicyId,
-                                   mobile_apis::RequestType::OEM_SPECIFIC))
+  EXPECT_CALL(
+      mock_policy_handler_,
+      IsRequestTypeAllowed(
+          kDeviceId, kAppPolicyId, mobile_apis::RequestType::OEM_SPECIFIC))
       .WillOnce(Return(true));
 
   EXPECT_CALL(mock_policy_handler_,
@@ -216,9 +221,10 @@ TEST_F(SystemRequestTest, Run_RequestTypeDisallowed_SendDisallowedResponse) {
 
   PreConditions();
 
-  EXPECT_CALL(mock_policy_handler_,
-              IsRequestTypeAllowed(kAppPolicyId,
-                                   mobile_apis::RequestType::OEM_SPECIFIC))
+  EXPECT_CALL(
+      mock_policy_handler_,
+      IsRequestTypeAllowed(
+          kDeviceId, kAppPolicyId, mobile_apis::RequestType::OEM_SPECIFIC))
       .WillOnce(Return(false));
 
   ExpectManageMobileCommandWithResultCode(mobile_apis::Result::DISALLOWED);
@@ -241,9 +247,9 @@ TEST_F(SystemRequestTest, Run_RequestType_IconURL_Success) {
   const std::vector<uint8_t> binary_data = {1u, 2u};
   (*msg)[am::strings::params][am::strings::binary_data] = binary_data;
 
-  EXPECT_CALL(
-      mock_policy_handler_,
-      IsRequestTypeAllowed(kAppPolicyId, mobile_apis::RequestType::ICON_URL))
+  EXPECT_CALL(mock_policy_handler_,
+              IsRequestTypeAllowed(
+                  kDeviceId, kAppPolicyId, mobile_apis::RequestType::ICON_URL))
       .WillOnce(Return(true));
   EXPECT_CALL(app_mngr_settings_, app_icons_folder())
       .WillOnce(ReturnRef(kAppStorageFolder));
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc
index 98d20dbbc4..5735610051 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_button_request_test.cc
@@ -70,7 +70,7 @@ TEST_F(UnsubscribeButtonRequestTest,
   MessageSharedPtr button_caps_ptr(CreateMessage(smart_objects::SmartType_Map));
   (*button_caps_ptr)[0][am::hmi_response::button_name] = kButtonId;
   EXPECT_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillOnce(Return(button_caps_ptr.get()));
+      .WillOnce(Return(button_caps_ptr));
 
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
@@ -106,7 +106,7 @@ TEST_F(UnsubscribeButtonRequestTest,
 
   MessageSharedPtr button_caps_ptr(CreateMessage(smart_objects::SmartType_Map));
   EXPECT_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillOnce(Return(button_caps_ptr.get()));
+      .WillOnce(Return(button_caps_ptr));
 
   EXPECT_CALL(mock_rpc_service_,
               ManageMobileCommand(
@@ -129,7 +129,7 @@ TEST_F(UnsubscribeButtonRequestTest, Run_SUCCESS) {
   MessageSharedPtr button_caps_ptr(CreateMessage(smart_objects::SmartType_Map));
   (*button_caps_ptr)[0][am::hmi_response::button_name] = kButtonId;
   EXPECT_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillOnce(Return(button_caps_ptr.get()));
+      .WillOnce(Return(button_caps_ptr));
 
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
@@ -172,7 +172,7 @@ TEST_F(UnsubscribeButtonRequestTest, Run_SUCCESS_Base_RPC_Version) {
       mobile_apis::ButtonName::PLAY_PAUSE;
 
   EXPECT_CALL(mock_hmi_capabilities_, button_capabilities())
-      .WillRepeatedly(Return(button_caps_ptr.get()));
+      .WillRepeatedly(Return(button_caps_ptr));
 
   MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/CMakeLists.txt b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/CMakeLists.txt
index 0e556a6993..8c29cccfff 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/CMakeLists.txt
@@ -45,18 +45,25 @@ collect_sources(VEHICLE_INFO_PLUGIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src")
 set(LIBRARIES
   HMI_API
   MOBILE_API
+  MessageHelper
   ApplicationManager
   v4_protocol_v1_2_no_extra
   SmartObjects
   Utils
+  jsoncpp
+  connectionHandler
 )
 
 if(ENABLE_LOG)
   list(APPEND LIBRARIES log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 
-add_library("vehicle_info_plugin" SHARED ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${VEHICLE_INFO_PLUGIN_SOURCES})
-target_link_libraries("vehicle_info_plugin" ${LIBRARIES})
+add_library("vehicle_info_plugin_static"  ${MOBILE_COMMANDS} ${HMI_COMMANDS} ${VEHICLE_INFO_PLUGIN_SOURCES})
+target_link_libraries("vehicle_info_plugin_static" ${LIBRARIES})
+
+add_library(vehicle_info_plugin SHARED "src/vehicle_info_plugin.cc" )
+target_link_libraries(vehicle_info_plugin vehicle_info_plugin_static)
+
 
 set(INSTALL_DESTINATION bin)
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h
index 103bfb56dc..be2f123f4a 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/on_vi_vehicle_data_notification.h
@@ -35,6 +35,7 @@
 
 #include "application_manager/application_manager.h"
 #include "application_manager/commands/notification_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -55,10 +56,7 @@ class OnVIVehicleDataNotification
    **/
   OnVIVehicleDataNotification(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief OnVIVehicleDataNotification class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h
index 162a6b338a..6ae6d1f7f6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -52,10 +53,7 @@ class VIDiagnosticMessageRequest : public app_mngr::commands::RequestToHMI {
    **/
   VIDiagnosticMessageRequest(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIDiagnosticMessageRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h
index a427bbe362..9b172b9e74 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_diagnostic_message_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_DIAGNOSTIC_MESSAGE_RESPONSE_H_
 
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -52,10 +53,7 @@ class VIDiagnosticMessageResponse : public app_mngr::commands::ResponseFromHMI {
    **/
   VIDiagnosticMessageResponse(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIDiagnosticMessageResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h
index df9e84eab4..c77464835b 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -51,10 +52,7 @@ class VIGetDTCsRequest : public app_mngr::commands::RequestToHMI {
    * @param message Incoming SmartObject message
    **/
   VIGetDTCsRequest(const app_mngr::commands::MessageSharedPtr& message,
-                   app_mngr::ApplicationManager& application_manager,
-                   app_mngr::rpc_service::RPCService& rpc_service,
-                   app_mngr::HMICapabilities& hmi_capabilities,
-                   policy::PolicyHandlerInterface& policy_handle);
+                   const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIGetDTCsRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h
index d8351c1a61..f1ddcbe373 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_dtcs_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_DTCS_RESPONSE_H_
 
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -51,10 +52,7 @@ class VIGetDTCsResponse : public app_mngr::commands::ResponseFromHMI {
    * @param message Incoming SmartObject message
    **/
   VIGetDTCsResponse(const app_mngr::commands::MessageSharedPtr& message,
-                    app_mngr::ApplicationManager& application_manager,
-                    app_mngr::rpc_service::RPCService& rpc_service,
-                    app_mngr::HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handle);
+                    const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIGetDTCsResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h
index 437e7c8933..bce49f8201 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h
@@ -34,6 +34,8 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_DATA_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -51,10 +53,7 @@ class VIGetVehicleDataRequest : public app_mngr::commands::RequestToHMI {
    * @param message Incoming SmartObject message
    **/
   VIGetVehicleDataRequest(const app_mngr::commands::MessageSharedPtr& message,
-                          app_mngr::ApplicationManager& application_manager,
-                          app_mngr::rpc_service::RPCService& rpc_service,
-                          app_mngr::HMICapabilities& hmi_capabilities,
-                          policy::PolicyHandlerInterface& policy_handle);
+                          const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIGetVehicleDataRequest class destructor
@@ -67,6 +66,8 @@ class VIGetVehicleDataRequest : public app_mngr::commands::RequestToHMI {
   virtual void Run();
 
  private:
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(VIGetVehicleDataRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h
index 651a0af79c..7504168aec 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h
@@ -35,6 +35,7 @@
 
 #include "application_manager/application_manager.h"
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -52,10 +53,7 @@ class VIGetVehicleDataResponse : public app_mngr::commands::ResponseFromHMI {
    * @param message Incoming SmartObject message
    **/
   VIGetVehicleDataResponse(const app_mngr::commands::MessageSharedPtr& message,
-                           app_mngr::ApplicationManager& application_manager,
-                           app_mngr::rpc_service::RPCService& rpc_service,
-                           app_mngr::HMICapabilities& hmi_capabilities,
-                           policy::PolicyHandlerInterface& policy_handle);
+                           const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIGetVehicleDataResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h
index 1166d3f774..7f2e8389ad 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -51,10 +52,7 @@ class VIGetVehicleTypeRequest : public app_mngr::commands::RequestToHMI {
    * @param message Incoming SmartObject message
    **/
   VIGetVehicleTypeRequest(const app_mngr::commands::MessageSharedPtr& message,
-                          app_mngr::ApplicationManager& application_manager,
-                          app_mngr::rpc_service::RPCService& rpc_service,
-                          app_mngr::HMICapabilities& hmi_capabilities,
-                          policy::PolicyHandlerInterface& policy_handle);
+                          const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIGetVehicleTypeRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h
index 00c1944c0f..f71eda8077 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_get_vehicle_type_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_GET_VEHICLE_TYPE_RESPONSE_H_
 
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -50,12 +51,8 @@ class VIGetVehicleTypeResponse : public app_mngr::commands::ResponseFromHMI {
    *
    * @param message Incoming SmartObject message
    **/
-  VIGetVehicleTypeResponse(
-      const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      application_manager::rpc_service::RPCService& rpc_service,
-      application_manager::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+  VIGetVehicleTypeResponse(const app_mngr::commands::MessageSharedPtr& message,
+                           const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIGetVehicleTypeResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h
index 7a8ca3a4b6..fa9bfebad4 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_IS_READY_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -52,10 +53,7 @@ class VIIsReadyRequest : public app_mngr::commands::RequestToHMI,
    * @param message Incoming SmartObject message
    **/
   VIIsReadyRequest(const app_mngr::commands::MessageSharedPtr& message,
-                   app_mngr::ApplicationManager& application_manager,
-                   app_mngr::rpc_service::RPCService& rpc_service,
-                   app_mngr::HMICapabilities& hmi_capabilities,
-                   policy::PolicyHandlerInterface& policy_handle);
+                   const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIIsReadyRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h
index e0ff20b8bb..f87d9370f5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_is_ready_response.h
@@ -35,6 +35,7 @@
 
 #include "application_manager/application_manager.h"
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -52,10 +53,7 @@ class VIIsReadyResponse : public app_mngr::commands::ResponseFromHMI {
    * @param message Incoming SmartObject message
    **/
   VIIsReadyResponse(const app_mngr::commands::MessageSharedPtr& message,
-                    app_mngr::ApplicationManager& application_manager,
-                    app_mngr::rpc_service::RPCService& rpc_service,
-                    app_mngr::HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handle);
+                    const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIIsReadyResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h
index 1e91a4c3af..63bbf10e41 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_request.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -51,10 +52,7 @@ class VIReadDIDRequest : public app_mngr::commands::RequestToHMI {
    * @param message Incoming SmartObject message
    **/
   VIReadDIDRequest(const app_mngr::commands::MessageSharedPtr& message,
-                   app_mngr::ApplicationManager& application_manager,
-                   app_mngr::rpc_service::RPCService& rpc_service,
-                   app_mngr::HMICapabilities& hmi_capabilities,
-                   policy::PolicyHandlerInterface& policy_handle);
+                   const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIReadDIDRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h
index f659f7ae87..307960e145 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_read_did_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_READ_DID_RESPONSE_H_
 
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -51,10 +52,7 @@ class VIReadDIDResponse : public app_mngr::commands::ResponseFromHMI {
    * @param message Incoming SmartObject message
    **/
   VIReadDIDResponse(const app_mngr::commands::MessageSharedPtr& message,
-                    app_mngr::ApplicationManager& application_manager,
-                    app_mngr::rpc_service::RPCService& rpc_service,
-                    app_mngr::HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handle);
+                    const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIReadDIDResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h
index dab5989e9e..0e91006e52 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h
@@ -34,6 +34,8 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -52,10 +54,7 @@ class VISubscribeVehicleDataRequest : public app_mngr::commands::RequestToHMI {
    **/
   VISubscribeVehicleDataRequest(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief VISubscribeVehicleDataRequest class destructor
@@ -68,6 +67,8 @@ class VISubscribeVehicleDataRequest : public app_mngr::commands::RequestToHMI {
   virtual void Run();
 
  private:
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(VISubscribeVehicleDataRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
index 8eea8d0cfa..523867d87e 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_SUBSCRIBE_VEHICLE_DATA_RESPONSE_H_
 
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -53,10 +54,7 @@ class VISubscribeVehicleDataResponse
    **/
   VISubscribeVehicleDataResponse(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief VISubscribeVehicleDataResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h
index a8ebf34ea2..4e3cc59c2e 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h
@@ -34,6 +34,8 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_REQUEST_H_
 
 #include "application_manager/commands/request_to_hmi.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -53,10 +55,7 @@ class VIUnsubscribeVehicleDataRequest
    **/
   VIUnsubscribeVehicleDataRequest(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIUnsubscribeVehicleDataRequest class destructor
@@ -69,6 +68,8 @@ class VIUnsubscribeVehicleDataRequest
   virtual void Run();
 
  private:
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(VIUnsubscribeVehicleDataRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
index 780d1e9eae..e8f2267ce6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_response.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_COMMANDS_HMI_VI_UNSUBSCRIBE_VEHICLE_DATA_RESPONSE_H_
 
 #include "application_manager/commands/response_from_hmi.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -53,10 +54,7 @@ class VIUnsubscribeVehicleDataResponse
    **/
   VIUnsubscribeVehicleDataResponse(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handle);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief VIUnsubscribeVehicleDataResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h
index bd9ce31325..56f0e39621 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_request.h
@@ -36,6 +36,7 @@
 
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -53,10 +54,7 @@ class DiagnosticMessageRequest : public app_mngr::commands::CommandRequestImpl {
    * @param message Incoming SmartObject message
    **/
   DiagnosticMessageRequest(const app_mngr::commands::MessageSharedPtr& message,
-                           app_mngr::ApplicationManager& application_manager,
-                           app_mngr::rpc_service::RPCService& rpc_service,
-                           app_mngr::HMICapabilities& hmi_capabilities,
-                           policy::PolicyHandlerInterface& policy_handler);
+                           const VehicleInfoCommandParams& params);
 
   /**
    * @brief DiagnosticMessageRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h
index 7b6364fe41..5308551f5a 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/diagnostic_message_response.h
@@ -36,6 +36,7 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -54,10 +55,7 @@ class DiagnosticMessageResponse
    * @param message Incoming SmartObject message
    **/
   DiagnosticMessageResponse(const app_mngr::commands::MessageSharedPtr& message,
-                            app_mngr::ApplicationManager& application_manager,
-                            app_mngr::rpc_service::RPCService& rpc_service,
-                            app_mngr::HMICapabilities& hmi_capabilities,
-                            policy::PolicyHandlerInterface& policy_handler);
+                            const VehicleInfoCommandParams& params);
 
   /**
    * @brief DiagnosticMessageResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h
index 9175900610..562d7f236b 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_request.h
@@ -36,6 +36,7 @@
 
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -53,10 +54,7 @@ class GetDTCsRequest : public app_mngr::commands::CommandRequestImpl {
    * @param message Incoming SmartObject message
    **/
   GetDTCsRequest(const app_mngr::commands::MessageSharedPtr& message,
-                 app_mngr::ApplicationManager& application_manager,
-                 app_mngr::rpc_service::RPCService& rpc_service,
-                 app_mngr::HMICapabilities& hmi_capabilities,
-                 policy::PolicyHandlerInterface& policy_handler);
+                 const VehicleInfoCommandParams& params);
 
   /**
    * @brief GetDTCsRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h
index 473174fd0d..52836e895f 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_dtcs_response.h
@@ -36,6 +36,7 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -53,10 +54,7 @@ class GetDTCsResponse : public app_mngr::commands::CommandResponseImpl {
    * @param message Incoming SmartObject message
    **/
   GetDTCsResponse(const app_mngr::commands::MessageSharedPtr& message,
-                  app_mngr::ApplicationManager& application_manager,
-                  app_mngr::rpc_service::RPCService& rpc_service,
-                  app_mngr::HMICapabilities& hmi_capabilities,
-                  policy::PolicyHandlerInterface& policy_handler);
+                  const VehicleInfoCommandParams& params);
 
   /**
    * @brief GetDTCsResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h
index ff04ca1e2c..8a594b0647 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h
@@ -36,12 +36,11 @@
 
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
-class SmartObject;
-
 namespace commands {
 
 /**
@@ -55,10 +54,7 @@ class GetVehicleDataRequest : public app_mngr::commands::CommandRequestImpl {
    * @param message Incoming SmartObject message
    **/
   GetVehicleDataRequest(const app_mngr::commands::MessageSharedPtr& message,
-                        app_mngr::ApplicationManager& application_manager,
-                        app_mngr::rpc_service::RPCService& rpc_service,
-                        app_mngr::HMICapabilities& hmi_capabilities,
-                        policy::PolicyHandlerInterface& policy_handler);
+                        const VehicleInfoCommandParams& params);
 
   /**
    * @brief GetVehicleDataRequest class destructor
@@ -73,6 +69,18 @@ class GetVehicleDataRequest : public app_mngr::commands::CommandRequestImpl {
  protected:
   virtual void on_event(const app_mngr::event_engine::Event& event);
 
+ private:
+  /**
+   * @brief CheckFrequency check if mobile does not spam SDL with frequent
+   * GetVehicleData requests
+   * @return
+   */
+  bool CheckFrequency(application_manager::Application& app);
+
+  std::set<std::string> pending_vehicle_data_;
+
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(GetVehicleDataRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h
index 25fd27b67c..8d9722b2b6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/get_vehicle_data_response.h
@@ -36,7 +36,7 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
-
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
@@ -53,10 +53,7 @@ class GetVehicleDataResponse : public app_mngr::commands::CommandResponseImpl {
    * @param message Incoming SmartObject message
    **/
   GetVehicleDataResponse(const app_mngr::commands::MessageSharedPtr& message,
-                         app_mngr::ApplicationManager& application_manager,
-                         app_mngr::rpc_service::RPCService& rpc_service,
-                         app_mngr::HMICapabilities& hmi_capabilities,
-                         policy::PolicyHandlerInterface& policy_handler);
+                         const VehicleInfoCommandParams& params);
 
   /**
    * @brief GetVehicleDataResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h
index ce1b732775..9163e78b5e 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/on_vehicle_data_notification.h
@@ -37,6 +37,8 @@
 #include "application_manager/application.h"
 #include "application_manager/commands/command_notification_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -56,10 +58,7 @@ class OnVehicleDataNotification
    * @param message Incoming SmartObject message
    **/
   OnVehicleDataNotification(const app_mngr::commands::MessageSharedPtr& message,
-                            app_mngr::ApplicationManager& application_manager,
-                            app_mngr::rpc_service::RPCService& rpc_service,
-                            app_mngr::HMICapabilities& hmi_capabilities,
-                            policy::PolicyHandlerInterface& policy_handler);
+                            const VehicleInfoCommandParams& params);
 
   /**
    * @brief OnVehicleDataNotification class destructor
@@ -79,6 +78,8 @@ class OnVehicleDataNotification
    */
   void SendVehicleData(app_mngr::ApplicationConstSharedPtr app);
 
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(OnVehicleDataNotification);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h
index d006cf02ef..8566075504 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_request.h
@@ -36,7 +36,7 @@
 
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
-
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
@@ -53,10 +53,7 @@ class ReadDIDRequest : public app_mngr::commands::CommandRequestImpl {
    * @param message Incoming SmartObject message
    **/
   ReadDIDRequest(const app_mngr::commands::MessageSharedPtr& message,
-                 app_mngr::ApplicationManager& application_manager,
-                 app_mngr::rpc_service::RPCService& rpc_service,
-                 app_mngr::HMICapabilities& hmi_capabilities,
-                 policy::PolicyHandlerInterface& policy_handler);
+                 const VehicleInfoCommandParams& params);
 
   /**
    * @brief ReadDIDRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h
index d3c0e14c93..30e5aa45de 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/read_did_response.h
@@ -36,7 +36,7 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
-
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
@@ -53,10 +53,7 @@ class ReadDIDResponse : public app_mngr::commands::CommandResponseImpl {
    * @param message Incoming SmartObject message
    **/
   ReadDIDResponse(const app_mngr::commands::MessageSharedPtr& message,
-                  app_mngr::ApplicationManager& application_manager,
-                  app_mngr::rpc_service::RPCService& rpc_service,
-                  app_mngr::HMICapabilities& hmi_capabilities,
-                  policy::PolicyHandlerInterface& policy_handler);
+                  const VehicleInfoCommandParams& params);
 
   /**
    * @brief ReadDIDResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h
index 2671173ba3..663e64f2a0 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h
@@ -40,7 +40,9 @@
 #include "application_manager/application.h"
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -60,10 +62,7 @@ class SubscribeVehicleDataRequest
    **/
   SubscribeVehicleDataRequest(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handler);
+      VehicleInfoCommandParams params);
 
   /**
    * @brief SubscribeButtonCommandRequest class destructor
@@ -94,7 +93,7 @@ class SubscribeVehicleDataRequest
    * @return true, if there are registered apps subscribed for VI parameter,
    * otherwise - false
    */
-  bool IsSomeoneSubscribedFor(const uint32_t param_id) const;
+  bool IsSomeoneSubscribedFor(const std::string& param_name) const;
 
   /**
    * @brief Adds VI parameters being subscribed by another or the same app to
@@ -104,14 +103,13 @@ class SubscribeVehicleDataRequest
   void AddAlreadySubscribedVI(smart_objects::SmartObject& msg_params) const;
 
   /**
-   * @brief Removes subscription for VI parameters which subsription attempt
-   * returned an error
+   * @brief Actual subscription to pending vehicle data after successful
+   * response from HMI
    * @param app Pointer to application sent subscribe request
    * @param msg_params 'message_parameters' response section reference
    */
-  void UnsubscribeFailedSubscriptions(
-      app_mngr::ApplicationSharedPtr app,
-      const smart_objects::SmartObject& msg_params) const;
+  bool SubscribePendingVehicleData(app_mngr::ApplicationSharedPtr app,
+                                   smart_objects::SmartObject& msg_params);
 
   /**
    * @brief Checks if current application and other applications
@@ -134,6 +132,43 @@ class SubscribeVehicleDataRequest
                             bool& out_result);
 
   /**
+   * @brief ConvertResponseToRequestName convert RPCSpec vehicle data names
+   * from response naming to request naming.
+   * This is workaround for cluster mode.
+   * Parameter named in request message as `cluster_mode` and in response
+   * message as `cluster_mode_status`
+   * @param name mobile RPCSpec vehicle data name
+   * @return hmi RPCSpec vehicle data name
+   */
+  const std::string& ConvertResponseToRequestName(const std::string& name);
+
+  /**
+   * @brief ConvertRequestToResponseName convert RPCSpec vehicle data names from
+   * request to response
+   * * This is workaround for cluster mode.
+   * Parameter named in request message as `cluster_mode` and in response
+   * message as `cluster_mode_status`
+   * @param name mobile RPCSpec vehicle data name
+   * @return hmi RPCSpec vehicle data name
+   */
+  const std::string& ConvertRequestToResponseName(const std::string& name);
+
+  /**
+   * @brief Appends data types for vehicle data in response to mobile
+   * @param msg_params 'message_parameters' response section reference
+   */
+  void AppendDataTypesToMobileResponse(
+      smart_objects::SmartObject& msg_params) const;
+
+  /**
+   * @brief Checks subscription status of certain vehicle_item
+   * @param vi_name name of vehicle item to be checked
+   * @param msg_params 'message_parameters' response section reference
+   */
+  bool CheckSubscriptionStatus(std::string vi_name,
+                               const smart_objects::SmartObject& msg_params);
+
+  /**
    * @brief VI parameters which had been already subscribed by another apps
    * befor particular app subscribed for these parameters
    */
@@ -149,6 +184,8 @@ class SubscribeVehicleDataRequest
    */
   VehicleInfoSubscriptions vi_waiting_for_subscribe_;
 
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(SubscribeVehicleDataRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h
index 2212af0846..39af8b019b 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_response.h
@@ -36,7 +36,7 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
-
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
@@ -55,10 +55,7 @@ class SubscribeVehicleDataResponse
    **/
   SubscribeVehicleDataResponse(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handler);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief UnsubscribeVehicleDataCommandRequest class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
index b246dbc9ef..4f2a01244f 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_request.h
@@ -37,7 +37,9 @@
 #include "application_manager/application.h"
 #include "application_manager/commands/command_request_impl.h"
 #include "utils/macro.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -57,10 +59,7 @@ class UnsubscribeVehicleDataRequest
    **/
   UnsubscribeVehicleDataRequest(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handler);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief UnsubscribeVehicleDataRequest class destructor
@@ -91,7 +90,7 @@ class UnsubscribeVehicleDataRequest
    * @return true, if there are registered apps subscribed for VI parameter,
    * otherwise - false
    */
-  bool IsSomeoneSubscribedFor(const uint32_t param_id) const;
+  bool IsSomeoneSubscribedFor(const std::string& param_name) const;
 
   /**
    * @brief Adds VI parameters being unsubscribed by another or the same app to
@@ -101,16 +100,67 @@ class UnsubscribeVehicleDataRequest
   void AddAlreadyUnsubscribedVI(smart_objects::SmartObject& response) const;
 
   /**
+   * @brief Actual unsubscription from all pending vehicle data. To be called
+   * after successful HMI response
+   * @param app shared pointer to application, which initialized unsubscription
+   * @param msg_params 'message_params' response section reference
+   */
+  bool UnsubscribePendingVehicleData(
+      app_mngr::ApplicationSharedPtr app,
+      const smart_objects::SmartObject& msg_params);
+
+  /**
+   * @brief ConvertRequestToResponseName convert RPCSpec vehicle data names
+   * from hmi api to mobile api
+   * @param name mobile RPCSpec vehicle data name
+   * @return hmi RPCSpec vehicle data name
+   */
+  const std::string& ConvertRequestToResponseName(const std::string& name);
+
+  /**
+   * @brief ConvertResponseToRequestName convert RPCSpec vehicle data names
+   * from hmi api to mobile api
+   * @param name mobile RPCSpec vehicle data name
+   * @return hmi RPCSpec vehicle data name
+   */
+  const std::string& ConvertResponseToRequestName(const std::string& name);
+
+  /**
+   * @brief Appends data types for vehicle data in response to mobile
+   * @param msg_params 'message_parameters' response section reference
+   */
+  void AppendDataTypesToMobileResponse(
+      smart_objects::SmartObject& msg_params) const;
+
+  /**
+   * @brief Checks subscription status of certain vehicle_item
+   * @param key name of vehicle item to be checked
+   * @param msg_params 'message_parameters' response section reference
+   */
+  bool CheckSubscriptionStatus(std::string key,
+                               const smart_objects::SmartObject& msg_params);
+
+  smart_objects::SmartObject response_params_;
+
+  /**
    * @brief VI parameters which still being subscribed by another apps after
    * particular app had been unsubscribed from these parameters
    */
   VehicleInfoSubscriptions vi_still_subscribed_by_another_apps_;
 
   /**
-   * @brief VI parameters which had been unsubscribed already by particular app
+   * @brief VI parameters which had been unsubscribed already by particular
+   * app
    */
   VehicleInfoSubscriptions vi_already_unsubscribed_by_this_app_;
 
+  /**
+   * @brief VI parameters to be unsubscribed after HMI response
+   */
+  VehicleInfoSubscriptions vi_waiting_for_unsubscribe_;
+
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+
   DISALLOW_COPY_AND_ASSIGN(UnsubscribeVehicleDataRequest);
 };
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h
index 67f09a68a8..f181e7f8c3 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/mobile/unsubscribe_vehicle_data_response.h
@@ -36,7 +36,7 @@
 
 #include "application_manager/commands/command_response_impl.h"
 #include "utils/macro.h"
-
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
@@ -55,10 +55,7 @@ class UnsubscribeVehicleDataResponse
    **/
   UnsubscribeVehicleDataResponse(
       const app_mngr::commands::MessageSharedPtr& message,
-      app_mngr::ApplicationManager& application_manager,
-      app_mngr::rpc_service::RPCService& rpc_service,
-      app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handler);
+      const VehicleInfoCommandParams& params);
 
   /**
    * @brief UnsubscribeVehicleDataResponse class destructor
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/custom_vehicle_data_manager.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/custom_vehicle_data_manager.h
new file mode 100644
index 0000000000..9cac76b954
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/custom_vehicle_data_manager.h
@@ -0,0 +1,55 @@
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_CUSTOM_VEHICLE_DATA_MANAGER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_CUSTOM_VEHICLE_DATA_MANAGER_H_
+#include <set>
+#include <string>
+
+#include "application_manager/plugin_manager/rpc_plugin.h"
+#include "application_manager/rpc_handler.h"
+#include "smart_objects/smart_object.h"
+
+namespace vehicle_info_plugin {
+
+namespace plugin_manager = application_manager::plugin_manager;
+
+class CustomVehicleDataManager {
+ public:
+  /**
+   * @brief Creates message params (nested if needed) to be sent to HMI
+   * according to vehicle data item schema
+   * @param item_names set of names of vehicle data items to be processed
+   * @return smartMap with prepared message params
+   */
+  virtual smart_objects::SmartObject CreateHMIMessageParams(
+      const std::set<std::string>& item_names) = 0;
+
+  /**
+   * @brief Gets data type of vehicle data item
+   * @param vehicle_data_item_name name of vehicle data
+   * @return data type of vehicle_data if one found, item name otherwise
+   */
+  virtual std::string GetVehicleDataItemType(
+      const std::string& vehicle_data_item_name) const = 0;
+
+  /**
+   * @brief Creates message params (nested if needed) to be sent to Mobile
+   * according to vehicle data item schema
+   * @param input_params message params received from hmi
+   */
+  virtual void CreateMobileMessageParams(
+      smart_objects::SmartObject& msg_params) = 0;
+
+  virtual void OnPolicyEvent(plugin_manager::PolicyEvent policy_event) = 0;
+
+  virtual bool IsValidCustomVehicleDataName(const std::string& name) const = 0;
+
+  /**
+   * @brief Checks whether custom vehicle data name was removed after the last
+   * PTU or not
+   * @param name vehicle item name to check
+   * @return true if vehicle data with this name was removed after the last PTU
+   */
+  virtual bool IsRemovedCustomVehicleDataName(
+      const std::string& name) const = 0;
+};
+}  // namespace vehicle_info_plugin
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_CUSTOM_VEHICLE_DATA_MANAGER_H_
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/custom_vehicle_data_manager_impl.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/custom_vehicle_data_manager_impl.h
new file mode 100644
index 0000000000..239c4edb90
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/custom_vehicle_data_manager_impl.h
@@ -0,0 +1,103 @@
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_VEHICLE_DATA_VALIDATION_MANAGER_IMPL_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_VEHICLE_DATA_VALIDATION_MANAGER_IMPL_H
+
+#include <boost/optional.hpp>
+
+#include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+
+namespace rpc {
+namespace policy_table_interface_base {
+class VehicleDataItem;
+}
+}  // namespace rpc
+
+namespace policy {
+class VehicleDataItemProvider;
+}
+
+namespace vehicle_info_plugin {
+namespace policy_table = rpc::policy_table_interface_base;
+namespace plugin_manager = application_manager::plugin_manager;
+
+typedef boost::optional<const policy_table::VehicleDataItem> OptionalDataItem;
+typedef std::set<std::string> VehicleInfoSubscriptions;
+
+class CustomVehicleDataManagerImpl : public CustomVehicleDataManager {
+ public:
+  CustomVehicleDataManagerImpl(
+      policy::VehicleDataItemProvider& vehicle_data_provider,
+      application_manager::rpc_service::RPCService& rpc_service);
+
+  virtual smart_objects::SmartObject CreateHMIMessageParams(
+      const std::set<std::string>& item_names) OVERRIDE;
+
+  std::string GetVehicleDataItemType(
+      const std::string& vehicle_data_item_name) const OVERRIDE;
+
+  virtual void CreateMobileMessageParams(
+      smart_objects::SmartObject& msg_params) OVERRIDE;
+
+  void OnPolicyEvent(plugin_manager::PolicyEvent policy_event) OVERRIDE;
+
+  bool IsValidCustomVehicleDataName(const std::string& name) const OVERRIDE;
+
+  bool IsRemovedCustomVehicleDataName(const std::string& name) const OVERRIDE;
+
+ private:
+  class RPCParams {
+   public:
+    RPCParams() {}
+    ~RPCParams() {}
+
+    void addBoolParam(
+        const std::pair<std::string, smart_objects::SMember>& param) {
+      rpc_params_bool_.insert(param);
+    }
+    void addVDRParam(
+        const std::pair<std::string, smart_objects::SMember>& param) {
+      rpc_params_vdr_.insert(param);
+    }
+    void addParam(const std::pair<std::string, smart_objects::SMember>& param) {
+      rpc_params_.insert(param);
+    }
+
+    const std::map<std::string, smart_objects::SMember>& getBoolParams() {
+      return rpc_params_bool_;
+    }
+    const std::map<std::string, smart_objects::SMember>& getVDRParams() {
+      return rpc_params_vdr_;
+    }
+    const std::map<std::string, smart_objects::SMember>& getParams() {
+      return rpc_params_;
+    }
+
+   private:
+    std::map<std::string, smart_objects::SMember> rpc_params_bool_;
+    std::map<std::string, smart_objects::SMember> rpc_params_vdr_;
+    std::map<std::string, smart_objects::SMember> rpc_params_;
+  };
+
+  /**
+   * @brief Updates vehicle data schemas according to policy update.
+   */
+  void UpdateVehicleDataItems();
+
+  const OptionalDataItem FindSchemaByNameNonRecursive(
+      const std::string& name) const;
+  const OptionalDataItem FindRemovedSchemaByNameNonRecursive(
+      const std::string& name) const;
+  const OptionalDataItem FindSchemaByKeyNonRecursive(
+      const std::string& key) const;
+  const OptionalDataItem FindSchemaByNameRecursive(
+      const std::string& name) const;
+  const OptionalDataItem FindSchemaByKeyRecursive(
+      const std::string& name) const;
+
+  policy::VehicleDataItemProvider& vehicle_data_provider_;
+  application_manager::rpc_service::RPCService& rpc_service_;
+};
+
+}  // namespace vehicle_info_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_SDL_RPC_PLUGIN_INCLUDE_SDL_RPC_PLUGIN_VEHICLE_DATA_VALIDATION_MANAGER_IMPL_H
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_data_item_schema.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_data_item_schema.h
new file mode 100644
index 0000000000..5ea73e2dec
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_data_item_schema.h
@@ -0,0 +1,115 @@
+#ifndef VEHICLE_DATA_ITEM_SCHEMA_H
+#define VEHICLE_DATA_ITEM_SCHEMA_H
+#include "policy/policy_table/types.h"
+#include "smart_objects/always_false_schema_item.h"
+#include "smart_objects/always_true_schema_item.h"
+#include "smart_objects/array_schema_item.h"
+#include "smart_objects/bool_schema_item.h"
+#include "smart_objects/enum_schema_item.h"
+#include "smart_objects/number_schema_item.h"
+#include "smart_objects/object_schema_item.h"
+#include "smart_objects/schema_item.h"
+#include "smart_objects/schema_item_parameter.h"
+#include "smart_objects/smart_object.h"
+#include "smart_objects/string_schema_item.h"
+#include "utils/logger.h"
+
+namespace vehicle_info_plugin {
+namespace smart_objects = ns_smart_device_link::ns_smart_objects;
+namespace policy_table = rpc::policy_table_interface_base;
+
+class VehicleDataItemSchema;
+typedef std::shared_ptr<VehicleDataItemSchema> VehicleDataItemSchemaPtr;
+typedef smart_objects::TSchemaItemParameter<policy_table::VehicleDataItem>
+    PolicyDataItem;
+
+/**
+ * @brief VehicleData schema item.
+ **/
+class VehicleDataItemSchema : public smart_objects::ISchemaItem {
+ public:
+  enum SchemaType { MOBILE = 0, HMI };
+
+  /**
+   * @brief Create a new schema item.
+   * @param PolicyDataItem& SchemaItem for VehicleDataItem elements.
+   * @return Shared pointer to a new schema item.
+   **/
+  static VehicleDataItemSchemaPtr create(PolicyDataItem& policy_item,
+                                         SchemaType schema_type);
+
+  /**
+   * @brief Validate smart object.
+   * @param Object Object to validate.
+   * @param report__ object for reporting errors during validation
+   * @param MessageVersion to check mobile RPC version against RPC Spec History
+   * @param allow_unknown_enums
+   *   false - unknown enum values (left as string values after applySchema)
+   *   will be considered invalid.
+   *   true - such values will be considered valid.
+   * @return ns_smart_objects::errors::eType
+   **/
+  smart_objects::errors::eType validate(
+      const smart_objects::SmartObject& Object,
+      rpc::ValidationReport* report__,
+      const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
+      const bool allow_unknown_enums = false) OVERRIDE;
+
+ private:
+  /**
+   * @brief Constructor.
+   * @param PolicyDataItem& SchemaItem for VehicleDataItem elements.
+   * @param SchemaType defines api type for schema to be generated.
+   **/
+  VehicleDataItemSchema(PolicyDataItem& policy_item, SchemaType schema_type);
+
+  /*
+   * @brief Check whether provided type is POD type
+   * @param const std::string& type_name - name of type to check
+   * @return true - if type is POD type and false - if not
+   */
+  const bool isPODType(const std::string& type_name) const;
+
+  /*
+   * @brief Get Enum schema for provided type
+   * @param const std::string& type_name - name of enum type to provide
+   * @return Shared pointer to a new schema item. If no schema found - nullptr
+   * is returned.
+   */
+  smart_objects::ISchemaItemPtr getEnumSchema(
+      const std::string& type_name) const;
+
+  /**
+   * @brief Apply schema.
+   * @param Object Object to apply schema.
+   * @param remove_unknown_parameters contains true if need to remove unknown
+   * parameters from smart object otherwise contains false.
+   **/
+  void applySchema(smart_objects::SmartObject& Object,
+                   const bool remove_unknown_parameters,
+                   const utils::SemanticVersion& MessageVersion) OVERRIDE;
+
+  /**
+   * @brief Unapply schema.
+   * @param Object Object to unapply schema.
+   * @param remove_unknown_parameters contains true if need to remove unknown
+   * parameters
+   **/
+  void unapplySchema(smart_objects::SmartObject& Object,
+                     const bool remove_unknown_parameters) OVERRIDE;
+
+  /*
+   * @brief Get schema for a POD type
+   * @param const VehicleDataItem& policy_item - item, that contains info about
+   * type
+   * @return Shared pointer to a new schema item. If no schema found - nullptr
+   * is returned.
+   */
+  smart_objects::ISchemaItemPtr GetPODTypeSchema(
+      const policy_table::VehicleDataItem& policy_item, SchemaType schema_type);
+
+  smart_objects::ISchemaItemPtr so_schema_item_;
+};
+
+}  // namespace vehicle_info_plugin
+#endif  // VEHICLE_DATA_ITEM_SCHEMA_H
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h
index b3ba768b1b..fb7c2b0f82 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_app_extension.h
@@ -47,7 +47,7 @@ typedef mobile_apis::VehicleDataType::eType VehicleDataType;
 /**
  * @brief Defines set of vehicle info types
  */
-typedef std::set<mobile_apis::VehicleDataType::eType> VehicleInfoSubscriptions;
+typedef std::set<std::string> VehicleInfoSubscriptions;
 
 class VehicleInfoAppExtension : public app_mngr::AppExtension {
  public:
@@ -66,7 +66,7 @@ class VehicleInfoAppExtension : public app_mngr::AppExtension {
    * @param vehicle_data data to subscribe
    * @return true in case if subscription is successful
    */
-  bool subscribeToVehicleInfo(const VehicleDataType vehicle_data);
+  bool subscribeToVehicleInfo(const std::string& vehicle_data);
 
   /**
    * @brief unsubscribeFromVehicleInfo remove vehicle_data from list of
@@ -74,7 +74,7 @@ class VehicleInfoAppExtension : public app_mngr::AppExtension {
    * @param vehicle_data data to unsubscribe
    * @return true in case if unsubscription is successful
    */
-  bool unsubscribeFromVehicleInfo(const VehicleDataType vehicle_data);
+  bool unsubscribeFromVehicleInfo(const std::string& vehicle_data);
   /**
    * @brief unsubscribeFromVehicleInfo unsubscribe from all vehicle info data
    */
@@ -87,7 +87,7 @@ class VehicleInfoAppExtension : public app_mngr::AppExtension {
    * @return true if extension is subscribed this vehicle_data_type, otherwise
    * return false
    */
-  bool isSubscribedToVehicleInfo(const VehicleDataType vehicle_data_type) const;
+  bool isSubscribedToVehicleInfo(const std::string& vehicle_data_type) const;
 
   /**
    * @brief Subscriptions get list of subscriptions for application extension
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
index 58100ba1ae..3356f0f823 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_factory.h
@@ -34,36 +34,37 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_COMMAND_FACTORY_H
 
 #include "application_manager/application_manager.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 #include "vehicle_info_plugin/vehicle_info_hmi_command_factory.h"
 #include "vehicle_info_plugin/vehicle_info_mobile_command_factory.h"
 
 namespace vehicle_info_plugin {
 
-namespace app_mngr = application_manager;
-namespace commands = application_manager::commands;
-
 /**
  * @brief The Vehicle Info command factory.
  */
-class VehicleInfoCommandFactory : public app_mngr::CommandFactory {
+class VehicleInfoCommandFactory : public application_manager::CommandFactory {
  public:
-  VehicleInfoCommandFactory(app_mngr::ApplicationManager& application_manager,
-                            app_mngr::rpc_service::RPCService& rpc_service,
-                            app_mngr::HMICapabilities& hmi_capabilities,
-                            policy::PolicyHandlerInterface& policy_handler);
+  VehicleInfoCommandFactory(
+      application_manager::ApplicationManager& application_manager,
+      application_manager::rpc_service::RPCService& rpc_service,
+      application_manager::HMICapabilities& hmi_capabilities,
+      policy::PolicyHandlerInterface& policy_handler,
+      CustomVehicleDataManager& custom_vehicle_data_manager);
   virtual ~VehicleInfoCommandFactory();
 
-  app_mngr::CommandSharedPtr CreateCommand(
-      const commands::MessageSharedPtr& message,
-      commands::Command::CommandSource source) OVERRIDE;
+  application_manager::CommandSharedPtr CreateCommand(
+      const application_manager::commands::MessageSharedPtr& message,
+      application_manager::commands::Command::CommandSource source) OVERRIDE;
 
   bool IsAbleToProcess(
       const int32_t function_id,
-      const commands::Command::CommandSource source) const OVERRIDE;
+      const application_manager::commands::Command::CommandSource source)
+      const OVERRIDE;
 
  private:
-  std::unique_ptr<app_mngr::CommandFactory> hmi_command_factory_;
-  std::unique_ptr<app_mngr::CommandFactory> mob_command_factory_;
+  std::unique_ptr<application_manager::CommandFactory> hmi_command_factory_;
+  std::unique_ptr<application_manager::CommandFactory> mob_command_factory_;
 };
 }  // namespace vehicle_info_plugin
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_params.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_params.h
new file mode 100644
index 0000000000..df8dbfd802
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_command_params.h
@@ -0,0 +1,31 @@
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_COMMAND_PARAMS_H
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_COMMAND_PARAMS_H
+
+namespace application_manager {
+class ApplicationManager;
+class HMICapabilities;
+namespace rpc_service {
+class RPCService;
+}
+class ApplicationManager;
+}  // namespace application_manager
+
+namespace policy {
+class PolicyHandlerInterface;
+}
+
+namespace vehicle_info_plugin {
+namespace app_mngr = application_manager;
+
+class CustomVehicleDataManager;
+
+struct VehicleInfoCommandParams {
+  app_mngr::ApplicationManager& application_manager_;
+  app_mngr::rpc_service::RPCService& rpc_service_;
+  app_mngr::HMICapabilities& hmi_capabilities_;
+  policy::PolicyHandlerInterface& policy_handler_;
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
+};
+}  // namespace vehicle_info_plugin
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_COMMAND_PARAMS_H
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h
index c927f3f2bb..60d81b5446 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_hmi_command_factory.h
@@ -34,6 +34,8 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_HMI_COMMAND_FACTORY_H
 
 #include "application_manager/application_manager.h"
+#include "application_manager/command_factory.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
@@ -47,7 +49,8 @@ class VehicleInfoHmiCommandFactory : public app_mngr::CommandFactory {
       app_mngr::ApplicationManager& application_manager,
       app_mngr::rpc_service::RPCService& rpc_service,
       app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handler);
+      policy::PolicyHandlerInterface& policy_handler,
+      CustomVehicleDataManager& custom_vehicle_data_manager);
 
   app_mngr::CommandSharedPtr CreateCommand(
       const app_mngr::commands::MessageSharedPtr& message,
@@ -62,6 +65,7 @@ class VehicleInfoHmiCommandFactory : public app_mngr::CommandFactory {
   app_mngr::rpc_service::RPCService& rpc_service_;
   app_mngr::HMICapabilities& hmi_capabilities_;
   policy::PolicyHandlerInterface& policy_handler_;
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
 
   app_mngr::CommandCreator& buildCommandCreator(
       const int32_t function_id, const int32_t message_type) const;
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h
index 41bd355852..e3403df5e5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_mobile_command_factory.h
@@ -34,7 +34,8 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_MOBILE_COMMAND_FACTORY_H
 
 #include "application_manager/application_manager.h"
-
+#include "application_manager/command_factory.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 namespace vehicle_info_plugin {
 namespace app_mngr = application_manager;
 
@@ -47,7 +48,8 @@ class VehicleInfoMobileCommandFactory : public app_mngr::CommandFactory {
       app_mngr::ApplicationManager& application_manager,
       app_mngr::rpc_service::RPCService& rpc_service,
       app_mngr::HMICapabilities& hmi_capabilities,
-      policy::PolicyHandlerInterface& policy_handler);
+      policy::PolicyHandlerInterface& policy_handler,
+      CustomVehicleDataManager& custom_vehicle_data_manager);
 
   app_mngr::CommandSharedPtr CreateCommand(
       const app_mngr::commands::MessageSharedPtr& message,
@@ -62,6 +64,7 @@ class VehicleInfoMobileCommandFactory : public app_mngr::CommandFactory {
   app_mngr::rpc_service::RPCService& rpc_service_;
   app_mngr::HMICapabilities& hmi_capabilities_;
   policy::PolicyHandlerInterface& policy_handler_;
+  CustomVehicleDataManager& custom_vehicle_data_manager_;
 
   app_mngr::CommandCreator& get_creator_factory(
       const mobile_apis::FunctionID::eType function_id,
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
index d0e4926a65..80336b6967 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/vehicle_info_plugin.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_PLUGIN_H
 
 #include "application_manager/command_factory.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 
 namespace vehicle_info_plugin {
 class VehicleInfoAppExtension;
@@ -47,7 +48,15 @@ class VehicleInfoPlugin : public plugins::RPCPlugin {
   bool Init(app_mngr::ApplicationManager& application_manager,
             app_mngr::rpc_service::RPCService& rpc_service,
             app_mngr::HMICapabilities& hmi_capabilities,
-            policy::PolicyHandlerInterface& policy_handler) OVERRIDE;
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastStateWrapperPtr last_state) OVERRIDE;
+
+  DEPRECATED
+  bool Init(app_mngr::ApplicationManager& application_manager,
+            app_mngr::rpc_service::RPCService& rpc_service,
+            app_mngr::HMICapabilities& hmi_capabilities,
+            policy::PolicyHandlerInterface& policy_handler,
+            resumption::LastState& last_state) OVERRIDE;
 
   bool IsAbleToProcess(
       const int32_t function_id,
@@ -70,13 +79,17 @@ class VehicleInfoPlugin : public plugins::RPCPlugin {
                                      VehicleInfoAppExtension& ext);
 
  private:
+  void UnsubscribeFromRemovedVDItems();
+  smart_objects::SmartObjectSPtr GetUnsubscribeIVIRequest(
+      const std::vector<std::string>& ivi_names);
   void DeleteSubscriptions(app_mngr::ApplicationSharedPtr app);
 
   std::unique_ptr<app_mngr::CommandFactory> command_factory_;
+  std::unique_ptr<CustomVehicleDataManager> custom_vehicle_data_manager_;
   app_mngr::ApplicationManager* application_manager_;
 };
 }  // namespace vehicle_info_plugin
 
 extern "C" application_manager::plugin_manager::RPCPlugin* Create();
-
+extern "C" void Delete(application_manager::plugin_manager::RPCPlugin* data);
 #endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_INCLUDE_VEHICLE_INFO_PLUGIN_VEHICLE_INFO_PLUGIN_H
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc
index 23dd3da879..b8d1b3a100 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/on_vi_vehicle_data_notification.cc
@@ -40,15 +40,12 @@ namespace commands {
 
 OnVIVehicleDataNotification::OnVIVehicleDataNotification(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : NotificationFromHMI(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handle) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 OnVIVehicleDataNotification::~OnVIVehicleDataNotification() {}
 
@@ -62,9 +59,8 @@ void OnVIVehicleDataNotification::Run() {
   const smart_objects::SmartObject& msg_params =
       (*message_)[strings::msg_params];
   if (msg_params.keyExists(strings::odometer)) {
-    application_manager_.IviInfoUpdated(
-        mobile_apis::VehicleDataType::VEHICLEDATA_ODOMETER,
-        msg_params[strings::odometer].asInt());
+    application_manager_.IviInfoUpdated(strings::odometer,
+                                        msg_params[strings::odometer].asInt());
   }
 
   SendNotificationToMobile(message_);
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc
index 97d035a20b..ae64c74f26 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_request.cc
@@ -38,16 +38,13 @@ using namespace application_manager;
 namespace commands {
 
 VIDiagnosticMessageRequest::VIDiagnosticMessageRequest(
-    const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const app_mngr::commands::MessageSharedPtr& message,
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_) {}
 
 VIDiagnosticMessageRequest::~VIDiagnosticMessageRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc
index f4079fc6fd..6482d97d10 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_diagnostic_message_response.cc
@@ -40,15 +40,12 @@ namespace commands {
 
 VIDiagnosticMessageResponse::VIDiagnosticMessageResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIDiagnosticMessageResponse::~VIDiagnosticMessageResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc
index d67d0909a9..620ee4c3e4 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_request.cc
@@ -39,15 +39,12 @@ namespace commands {
 
 VIGetDTCsRequest::VIGetDTCsRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_) {}
 
 VIGetDTCsRequest::~VIGetDTCsRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc
index 494e779c4d..64e948a4e1 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_dtcs_response.cc
@@ -40,15 +40,12 @@ namespace commands {
 
 VIGetDTCsResponse::VIGetDTCsResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIGetDTCsResponse::~VIGetDTCsResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc
index e2c1ed4e3a..eded6c685b 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_request.h"
+#include "application_manager/message_helper.h"
 
 namespace vehicle_info_plugin {
 using namespace application_manager;
@@ -39,24 +40,39 @@ namespace commands {
 
 VIGetVehicleDataRequest::VIGetVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 VIGetVehicleDataRequest::~VIGetVehicleDataRequest() {}
 
 void VIGetVehicleDataRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
+  const auto& rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  auto& msg_params = (*message_)[strings::msg_params];
+
+  smart_objects::SmartObject custom_data;
+  for (const auto& name : msg_params.enumerate()) {
+    const auto& found_it = rpc_spec_vehicle_data.find(name);
+    if (rpc_spec_vehicle_data.end() == found_it) {
+      custom_data[name] = msg_params[name];
+      msg_params.erase(name);
+    }
+  }
+
+  auto hmi_custom_msg_params =
+      custom_vehicle_data_manager_.CreateHMIMessageParams(
+          custom_data.enumerate());
+  for (const auto& param : hmi_custom_msg_params.enumerate()) {
+    msg_params[param] = hmi_custom_msg_params[param];
+  }
 
   SendRequest();
 }
 
 }  // namespace commands
-
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc
index a4b778a487..763ddf1cfa 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_data_response.cc
@@ -31,6 +31,8 @@
  */
 #include "vehicle_info_plugin/commands/hmi/vi_get_vehicle_data_response.h"
 #include "application_manager/event_engine/event.h"
+#include "application_manager/policies/policy_handler_interface.h"
+
 #include "interfaces/HMI_API.h"
 
 namespace vehicle_info_plugin {
@@ -39,15 +41,12 @@ namespace commands {
 
 VIGetVehicleDataResponse::VIGetVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIGetVehicleDataResponse::~VIGetVehicleDataResponse() {}
 
@@ -56,32 +55,14 @@ void VIGetVehicleDataResponse::Run() {
 
   event_engine::Event event(hmi_apis::FunctionID::VehicleInfo_GetVehicleData);
 
-  if ((*message_)[strings::params][strings::message_type] ==
-      static_cast<int32_t>(hmi_apis::messageType::error_response)) {
-    smart_objects::SmartObject result(smart_objects::SmartType_Map);
-
-    if ((*message_)[strings::params].keyExists(strings::data)) {
-      result[strings::msg_params] = (*message_)[strings::params][strings::data];
-      result[strings::params][hmi_response::code] =
-          (*message_)[strings::params][hmi_response::code];
-      result[strings::params][strings::correlation_id] =
-          (*message_)[strings::params][strings::correlation_id];
-      result[strings::params][strings::error_msg] =
-          (*message_)[strings::params][strings::error_msg];
-      result[strings::params][strings::message_type] =
-          (*message_)[strings::params][strings::message_type];
-      result[strings::params][strings::protocol_type] =
-          (*message_)[strings::params][strings::protocol_type];
-      result[strings::params][strings::protocol_version] =
-          (*message_)[strings::params][strings::protocol_version];
-    }
-
-    event.set_smart_object(result);
-  } else {
-    event.set_smart_object(*message_);
+  const bool error_response =
+      (*message_)[strings::params][strings::message_type] ==
+      static_cast<int32_t>(hmi_apis::messageType::error_response);
+  if (!error_response) {
     policy_handler_.OnVehicleDataUpdated(*message_);
   }
 
+  event.set_smart_object(*message_);
   event.raise(application_manager_.event_dispatcher());
 }
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc
index 96d27a120b..250584bd12 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_request.cc
@@ -39,15 +39,12 @@ namespace commands {
 
 VIGetVehicleTypeRequest::VIGetVehicleTypeRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_) {}
 
 VIGetVehicleTypeRequest::~VIGetVehicleTypeRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc
index add55f9a40..fb6eadf747 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_get_vehicle_type_response.cc
@@ -38,15 +38,12 @@ namespace commands {
 
 VIGetVehicleTypeResponse::VIGetVehicleTypeResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIGetVehicleTypeResponse::~VIGetVehicleTypeResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc
index 6479676094..93781a7420 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_request.cc
@@ -32,6 +32,7 @@
 
 #include "vehicle_info_plugin/commands/hmi/vi_is_ready_request.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/rpc_service.h"
 
 namespace vehicle_info_plugin {
@@ -41,16 +42,13 @@ namespace commands {
 
 VIIsReadyRequest::VIIsReadyRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle)
-    , EventObserver(application_manager.event_dispatcher()) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_)
+    , EventObserver(application_manager_.event_dispatcher()) {}
 
 VIIsReadyRequest::~VIIsReadyRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc
index 0db30afb87..349a1137ce 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_is_ready_response.cc
@@ -38,15 +38,12 @@ namespace commands {
 
 VIIsReadyResponse::VIIsReadyResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIIsReadyResponse::~VIIsReadyResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc
index fbcc59849d..47373bb4bf 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_request.cc
@@ -39,15 +39,12 @@ namespace commands {
 
 VIReadDIDRequest::VIReadDIDRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_) {}
 
 VIReadDIDRequest::~VIReadDIDRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc
index 0b8d0f3055..7c2db1e875 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_read_did_response.cc
@@ -39,15 +39,12 @@ namespace commands {
 
 VIReadDIDResponse::VIReadDIDResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIReadDIDResponse::~VIReadDIDResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc
index 84e41a26dc..4c5f067d0d 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "vehicle_info_plugin/commands/hmi/vi_subscribe_vehicle_data_request.h"
+#include "application_manager/message_helper.h"
 
 namespace vehicle_info_plugin {
 using namespace application_manager;
@@ -39,24 +40,39 @@ namespace commands {
 
 VISubscribeVehicleDataRequest::VISubscribeVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 VISubscribeVehicleDataRequest::~VISubscribeVehicleDataRequest() {}
 
 void VISubscribeVehicleDataRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
+  const auto& rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  auto& msg_params = (*message_)[strings::msg_params];
+
+  smart_objects::SmartObject custom_data;
+  for (const auto& name : msg_params.enumerate()) {
+    const auto& found_it = rpc_spec_vehicle_data.find(name);
+    if (rpc_spec_vehicle_data.end() == found_it) {
+      custom_data[name] = msg_params[name];
+      msg_params.erase(name);
+    }
+  }
+
+  auto hmi_custom_msg_params =
+      custom_vehicle_data_manager_.CreateHMIMessageParams(
+          custom_data.enumerate());
+  for (const auto& item : hmi_custom_msg_params.enumerate()) {
+    msg_params[item] = hmi_custom_msg_params[item];
+  }
 
   SendRequest();
 }
 
 }  // namespace commands
-
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc
index 25d876a125..061e13c766 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_subscribe_vehicle_data_response.cc
@@ -39,15 +39,12 @@ namespace commands {
 
 VISubscribeVehicleDataResponse::VISubscribeVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VISubscribeVehicleDataResponse::~VISubscribeVehicleDataResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc
index 50565e95d2..aa24ac7375 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_request.cc
@@ -31,6 +31,7 @@
  */
 
 #include "vehicle_info_plugin/commands/hmi/vi_unsubscribe_vehicle_data_request.h"
+#include "application_manager/message_helper.h"
 
 namespace vehicle_info_plugin {
 using namespace application_manager;
@@ -39,24 +40,39 @@ namespace commands {
 
 VIUnsubscribeVehicleDataRequest::VIUnsubscribeVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : RequestToHMI(message,
-                   application_manager,
-                   rpc_service,
-                   hmi_capabilities,
-                   policy_handle) {}
+                   params.application_manager_,
+                   params.rpc_service_,
+                   params.hmi_capabilities_,
+                   params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 VIUnsubscribeVehicleDataRequest::~VIUnsubscribeVehicleDataRequest() {}
 
 void VIUnsubscribeVehicleDataRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
+  const auto& rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  auto& msg_params = (*message_)[strings::msg_params];
+
+  smart_objects::SmartObject custom_data;
+  for (const auto& name : msg_params.enumerate()) {
+    const auto& found_it = rpc_spec_vehicle_data.find(name);
+    if (rpc_spec_vehicle_data.end() == found_it) {
+      custom_data[name] = msg_params[name];
+      msg_params.erase(name);
+    }
+  }
+
+  auto hmi_custom_msg_params =
+      custom_vehicle_data_manager_.CreateHMIMessageParams(
+          custom_data.enumerate());
+  for (const auto& param : hmi_custom_msg_params.enumerate()) {
+    msg_params[param] = true;
+  }
 
   SendRequest();
 }
 
 }  // namespace commands
-
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc
index 722073edc7..01fc521b10 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/hmi/vi_unsubscribe_vehicle_data_response.cc
@@ -39,15 +39,12 @@ namespace commands {
 
 VIUnsubscribeVehicleDataResponse::VIUnsubscribeVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handle)
+    const VehicleInfoCommandParams& params)
     : ResponseFromHMI(message,
-                      application_manager,
-                      rpc_service,
-                      hmi_capabilities,
-                      policy_handle) {}
+                      params.application_manager_,
+                      params.rpc_service_,
+                      params.hmi_capabilities_,
+                      params.policy_handler_) {}
 
 VIUnsubscribeVehicleDataResponse::~VIUnsubscribeVehicleDataResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc
index a1dfe1e936..ef6c284faf 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_request.cc
@@ -46,15 +46,12 @@ namespace commands {
 
 DiagnosticMessageRequest::DiagnosticMessageRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                         params.application_manager_,
+                         params.rpc_service_,
+                         params.hmi_capabilities_,
+                         params.policy_handler_) {}
 
 DiagnosticMessageRequest::~DiagnosticMessageRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc
index f5ad1c89a2..f5ccc4d0a7 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/diagnostic_message_response.cc
@@ -41,15 +41,12 @@ namespace commands {
 
 DiagnosticMessageResponse::DiagnosticMessageResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 DiagnosticMessageResponse::~DiagnosticMessageResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc
index af941e3ea7..dfa1cf305b 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_request.cc
@@ -44,15 +44,12 @@ namespace commands {
 
 GetDTCsRequest::GetDTCsRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                         params.application_manager_,
+                         params.rpc_service_,
+                         params.hmi_capabilities_,
+                         params.policy_handler_) {}
 
 GetDTCsRequest::~GetDTCsRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc
index 894c564a0b..33945a2f00 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_dtcs_response.cc
@@ -41,15 +41,12 @@ namespace commands {
 
 GetDTCsResponse::GetDTCsResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 GetDTCsResponse::~GetDTCsResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc
index 8d762e30e5..d15cf6a580 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_request.cc
@@ -32,12 +32,15 @@
  */
 
 #include "vehicle_info_plugin/commands/mobile/get_vehicle_data_request.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+
 #include <string>
 
 #include "application_manager/application_impl.h"
 #include "application_manager/message_helper.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
+#include "policy/policy_table/types.h"
 
 namespace vehicle_info_plugin {
 using namespace application_manager;
@@ -48,55 +51,57 @@ namespace str = strings;
 
 GetVehicleDataRequest::GetVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                         params.application_manager_,
+                         params.rpc_service_,
+                         params.hmi_capabilities_,
+                         params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 GetVehicleDataRequest::~GetVehicleDataRequest() {}
 
 void GetVehicleDataRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  int32_t app_id =
-      (*message_)[strings::params][strings::connection_key].asUInt();
-  ApplicationSharedPtr app = application_manager_.application(app_id);
+  auto app = application_manager_.application(connection_key());
 
   if (!app) {
-    LOG4CXX_ERROR(logger_, "NULL pointer");
+    LOG4CXX_ERROR(logger_, "No such application : " << connection_key());
     SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
     return;
   }
 
-  if (app->AreCommandLimitsExceeded(
-          static_cast<mobile_apis::FunctionID::eType>(function_id()),
-          application_manager::TLimitSource::CONFIG_FILE)) {
-    LOG4CXX_ERROR(logger_, "GetVehicleData frequency is too high.");
+  if (!CheckFrequency(*app)) {
     SendResponse(false, mobile_apis::Result::REJECTED);
     return;
   }
-  const VehicleData& vehicle_data = MessageHelper::vehicle_data();
-  VehicleData::const_iterator it = vehicle_data.begin();
-  smart_objects::SmartObject msg_params =
+
+  auto hmi_msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
-  msg_params[strings::app_id] = app->app_id();
-  const uint32_t min_length_msg_params = 1;
-  for (; vehicle_data.end() != it; ++it) {
-    if (true == (*message_)[str::msg_params].keyExists(it->first) &&
-        true == (*message_)[str::msg_params][it->first].asBool()) {
-      msg_params[it->first] = (*message_)[strings::msg_params][it->first];
+  hmi_msg_params[strings::app_id] = app->app_id();
+
+  int params_count = 0;
+  auto& msg_params = (*message_)[strings::msg_params];
+  for (const auto& name : msg_params.enumerate()) {
+    auto enabled = msg_params[name].asBool();
+    if (!enabled) {
+      continue;
     }
+    hmi_msg_params[name] = msg_params[name];
+    params_count++;
   }
-  if (msg_params.length() > min_length_msg_params) {
+
+  const int minimal_params_count = 1;
+
+  if (params_count >= minimal_params_count) {
+    for (const auto& param : msg_params.enumerate()) {
+      pending_vehicle_data_.insert(param);
+    }
     StartAwaitForInterface(HmiInterfaces::HMI_INTERFACE_VehicleInfo);
-    SendHMIRequest(
-        hmi_apis::FunctionID::VehicleInfo_GetVehicleData, &msg_params, true);
-    return;
+    SendHMIRequest(hmi_apis::FunctionID::VehicleInfo_GetVehicleData,
+                   &hmi_msg_params,
+                   true);
   } else if (HasDisallowedParams()) {
     SendResponse(false, mobile_apis::Result::DISALLOWED);
   } else {
@@ -111,16 +116,31 @@ void GetVehicleDataRequest::on_event(const event_engine::Event& event) {
   switch (event.id()) {
     case hmi_apis::FunctionID::VehicleInfo_GetVehicleData: {
       EndAwaitForInterface(HmiInterfaces::HMI_INTERFACE_VehicleInfo);
-      hmi_apis::Common_Result::eType result_code =
-          static_cast<hmi_apis::Common_Result::eType>(
-              message[strings::params][hmi_response::code].asInt());
+      auto result_code = static_cast<hmi_apis::Common_Result::eType>(
+          message[strings::params][hmi_response::code].asInt());
+      auto mobile_result_code = GetMobileResultCode(result_code);
       bool result = PrepareResultForMobileResponse(
           result_code, HmiInterfaces::HMI_INTERFACE_VehicleInfo);
       std::string response_info;
       GetInfo(message, response_info);
-      result = result ||
-               ((hmi_apis::Common_Result::DATA_NOT_AVAILABLE == result_code) &&
-                (message[strings::msg_params].length() > 1));
+
+      auto data_not_available_with_params = [this, &result_code, &message]() {
+        if (hmi_apis::Common_Result::DATA_NOT_AVAILABLE != result_code) {
+          return false;
+        }
+
+        const auto& vehicle_data = MessageHelper::vehicle_data();
+        const auto& msg_params = message[strings::msg_params];
+        for (const auto& item : msg_params.enumerate()) {
+          if (vehicle_data.end() != vehicle_data.find(item) ||
+              custom_vehicle_data_manager_.IsValidCustomVehicleDataName(item)) {
+            return true;
+          }
+        }
+        return false;
+      };
+
+      result = result || data_not_available_with_params();
 
       if (true ==
           message[strings::msg_params].keyExists(hmi_response::method)) {
@@ -129,8 +149,30 @@ void GetVehicleDataRequest::on_event(const event_engine::Event& event) {
       if (true == message[strings::params].keyExists(strings::error_msg)) {
         response_info = message[strings::params][strings::error_msg].asString();
       }
+
+      custom_vehicle_data_manager_.CreateMobileMessageParams(
+          const_cast<smart_objects::SmartObject&>(
+              message[strings::msg_params]));
+
+      if (result) {
+        for (const auto& item : message[strings::msg_params].enumerate()) {
+          const auto& found_item = pending_vehicle_data_.find(item);
+          if (pending_vehicle_data_.end() == found_item) {
+            message[strings::msg_params].erase(item);
+          }
+        }
+
+        if (message[strings::msg_params].empty() &&
+            hmi_apis::Common_Result::DATA_NOT_AVAILABLE != result_code) {
+          response_info = "Failed to retrieve data from vehicle";
+          SendResponse(
+              false, mobile_apis::Result::GENERIC_ERROR, response_info.c_str());
+          return;
+        }
+      }
+
       SendResponse(result,
-                   MessageHelper::HMIToMobileResult(result_code),
+                   mobile_result_code,
                    response_info.empty() ? NULL : response_info.c_str(),
                    &(message[strings::msg_params]));
       break;
@@ -142,6 +184,15 @@ void GetVehicleDataRequest::on_event(const event_engine::Event& event) {
   }
 }
 
-}  // namespace commands
+bool GetVehicleDataRequest::CheckFrequency(Application& app) {
+  if (app.AreCommandLimitsExceeded(
+          static_cast<mobile_apis::FunctionID::eType>(function_id()),
+          application_manager::TLimitSource::CONFIG_FILE)) {
+    LOG4CXX_ERROR(logger_, "GetVehicleData frequency is too high.");
+    return false;
+  }
+  return true;
+}
 
+}  // namespace commands
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc
index f634915354..60a44745a5 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/get_vehicle_data_response.cc
@@ -42,15 +42,12 @@ namespace commands {
 
 GetVehicleDataResponse::GetVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    rpc_service::RPCService& rpc_service,
-    HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 GetVehicleDataResponse::~GetVehicleDataResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
index 7d34bbbe37..79134cae40 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
@@ -47,90 +47,74 @@ namespace commands {
 
 OnVehicleDataNotification::OnVehicleDataNotification(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandNotificationImpl(message,
-                              application_manager,
-                              rpc_service,
-                              hmi_capabilities,
-                              policy_handler) {}
+                              params.application_manager_,
+                              params.rpc_service_,
+                              params.hmi_capabilities_,
+                              params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 OnVehicleDataNotification::~OnVehicleDataNotification() {}
 
 void OnVehicleDataNotification::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  std::vector<ApplicationSharedPtr> appNotification;
-  std::vector<ApplicationSharedPtr>::iterator appNotification_it =
-      appNotification.begin();
+  std::vector<ApplicationSharedPtr> notify_apps;
+  std::vector<ApplicationSharedPtr>::iterator notified_app_it =
+      notify_apps.begin();
   std::vector<smart_objects::SmartObject> appSO;
 
-  const VehicleData& vehicle_data = MessageHelper::vehicle_data();
-  VehicleData::const_iterator it = vehicle_data.begin();
-
-  for (; vehicle_data.end() != it; ++it) {
-    if (true == (*message_)[strings::msg_params].keyExists(it->first)) {
-      LOG4CXX_DEBUG(logger_, "vehicle_data name" << it->first);
-      auto vehicle_data_value =
-          (*message_)[strings::msg_params][it->first].asInt();
-
-      application_manager_.IviInfoUpdated(it->second, vehicle_data_value);
-
-      auto subscribed_to_ivi_predicate = [&it](const ApplicationSharedPtr app) {
-        DCHECK_OR_RETURN(app, false);
-        auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
-        return ext.isSubscribedToVehicleInfo(it->second);
-      };
-
-      const std::vector<ApplicationSharedPtr>& applications =
-          application_manager::FindAllApps(application_manager_.applications(),
-                                           subscribed_to_ivi_predicate);
-
-      std::vector<ApplicationSharedPtr>::const_iterator app_it =
-          applications.begin();
-
-      for (; applications.end() != app_it; ++app_it) {
-        const ApplicationSharedPtr app = *app_it;
-        if (!app) {
-          LOG4CXX_ERROR(logger_, "NULL pointer");
-          continue;
-        }
-
-        appNotification_it =
-            find(appNotification.begin(), appNotification.end(), app);
-        if (appNotification_it == appNotification.end()) {
-          appNotification.push_back(app);
-          smart_objects::SmartObject msg_param =
-              smart_objects::SmartObject(smart_objects::SmartType_Map);
-          msg_param[it->first] = (*message_)[strings::msg_params][it->first];
-          appSO.push_back(msg_param);
-        } else {
-          size_t idx =
-              std::distance(appNotification.begin(), appNotification_it);
-          appSO[idx][it->first] = (*message_)[strings::msg_params][it->first];
-        }
+  custom_vehicle_data_manager_.CreateMobileMessageParams(
+      (*message_)[strings::msg_params]);
+
+  const auto& param_names = (*message_)[strings::msg_params].enumerate();
+  for (const auto& name : param_names) {
+    LOG4CXX_DEBUG(logger_, "vehicle_data name: " << name);
+    auto vehicle_data_value = (*message_)[strings::msg_params][name].asInt();
+    application_manager_.IviInfoUpdated(name, vehicle_data_value);
+
+    auto subscribed_to_ivi_predicate = [&name](const ApplicationSharedPtr app) {
+      DCHECK_OR_RETURN(app, false);
+      auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
+      return ext.isSubscribedToVehicleInfo(name);
+    };
+
+    const auto& applications = application_manager::FindAllApps(
+        application_manager_.applications(), subscribed_to_ivi_predicate);
+    for (const auto& app : applications) {
+      if (!app) {
+        LOG4CXX_ERROR(logger_, "NULL pointer");
+        continue;
+      }
+      notified_app_it = find(notify_apps.begin(), notify_apps.end(), app);
+      if (notified_app_it == notify_apps.end()) {
+        notify_apps.push_back(app);
+        smart_objects::SmartObject msg_param =
+            smart_objects::SmartObject(smart_objects::SmartType_Map);
+        msg_param[name] = (*message_)[strings::msg_params][name];
+        appSO.push_back(msg_param);
+      } else {
+        size_t idx = std::distance(notify_apps.begin(), notified_app_it);
+        appSO[idx][name] = (*message_)[strings::msg_params][name];
       }
     }
   }
 
-  LOG4CXX_DEBUG(
-      logger_,
-      "Number of Notifications to be send: " << appNotification.size());
+  LOG4CXX_DEBUG(logger_,
+                "Number of Notifications to be send: " << notify_apps.size());
 
-  for (size_t idx = 0; idx < appNotification.size(); idx++) {
+  for (size_t idx = 0; idx < notify_apps.size(); idx++) {
     LOG4CXX_INFO(logger_,
                  "Send OnVehicleData PRNDL notification to "
-                     << appNotification[idx]->name().c_str()
-                     << " application id " << appNotification[idx]->app_id());
+                     << notify_apps[idx]->name().c_str() << " application id "
+                     << notify_apps[idx]->app_id());
     (*message_)[strings::params][strings::connection_key] =
-        appNotification[idx]->app_id();
+        notify_apps[idx]->app_id();
     (*message_)[strings::msg_params] = appSO[idx];
     SendNotification();
   }
 }
 
 }  // namespace commands
-
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc
index ed83f53516..c090df7852 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_request.cc
@@ -45,15 +45,12 @@ namespace commands {
 
 ReadDIDRequest::ReadDIDRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                         params.application_manager_,
+                         params.rpc_service_,
+                         params.hmi_capabilities_,
+                         params.policy_handler_) {}
 
 ReadDIDRequest::~ReadDIDRequest() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc
index f0b9e3097a..42e7fc1ba9 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/read_did_response.cc
@@ -41,15 +41,12 @@ namespace commands {
 
 ReadDIDResponse::ReadDIDResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 ReadDIDResponse::~ReadDIDResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
index 815ffeb3d2..36d972d5fd 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_request.cc
@@ -29,26 +29,28 @@
 
 #include "vehicle_info_plugin/commands/mobile/subscribe_vehicle_data_request.h"
 
+#include <boost/algorithm/string.hpp>
 #include "application_manager/application_impl.h"
 #include "application_manager/message_helper.h"
+#include "smart_objects/enum_schema_item.h"
 #include "utils/helpers.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
 
+namespace VD_ResultCode = hmi_apis::Common_VehicleDataResultCode;
+
 namespace vehicle_info_plugin {
 using namespace application_manager;
 namespace commands {
 
 SubscribeVehicleDataRequest::SubscribeVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    VehicleInfoCommandParams params)
     : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                         params.application_manager_,
+                         params.rpc_service_,
+                         params.hmi_capabilities_,
+                         params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 SubscribeVehicleDataRequest::~SubscribeVehicleDataRequest() {}
 
@@ -73,6 +75,7 @@ void SubscribeVehicleDataRequest::Run() {
       app, info, result_code, response_params, msg_params, result);
 
   if (mobile_apis::Result::INVALID_ENUM != result_code) {
+    AppendDataTypesToMobileResponse(response_params);
     SendResponse(result,
                  result_code,
                  info.empty() ? NULL : info.c_str(),
@@ -118,35 +121,121 @@ void SubscribeVehicleDataRequest::on_event(const event_engine::Event& event) {
   mobile_apis::Result::eType result_code =
       MessageHelper::HMIToMobileResult(hmi_result);
 
+  smart_objects::SmartObject converted_msg_params(message[strings::msg_params]);
+  custom_vehicle_data_manager_.CreateMobileMessageParams(converted_msg_params);
+
   if (is_succeeded) {
     if (!vi_already_subscribed_by_this_app_.empty()) {
       result_code = mobile_apis::Result::IGNORED;
       response_info = "Already subscribed on some provided VehicleData.";
     }
 
-    if (!vi_waiting_for_subscribe_.empty()) {
-      LOG4CXX_DEBUG(logger_, "Subscribing to all pending VehicleData");
-      VehicleInfoSubscriptions::const_iterator key =
-          vi_waiting_for_subscribe_.begin();
-      for (; key != vi_waiting_for_subscribe_.end(); ++key) {
-        auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
-        ext.subscribeToVehicleInfo(*key);
+    for (const auto& param : converted_msg_params.enumerate()) {
+      const auto& converted_name = ConvertResponseToRequestName(param);
+      if (vi_waiting_for_subscribe_.end() ==
+          vi_waiting_for_subscribe_.find(converted_name)) {
+        LOG4CXX_DEBUG(logger_, "erase " << converted_name);
+        converted_msg_params.erase(param);
       }
     }
-  }
 
-  UnsubscribeFailedSubscriptions(app, message[strings::msg_params]);
+    if (!SubscribePendingVehicleData(app, converted_msg_params)) {
+      result_code = mobile_apis::Result::GENERIC_ERROR;
+      response_info = "Subscription failed for some Vehicle data";
+      SendResponse(false, result_code, response_info.c_str());
+      return;
+    }
+  }
 
   if (!vi_already_subscribed_by_another_apps_.empty() ||
       !vi_already_subscribed_by_this_app_.empty()) {
-    AddAlreadySubscribedVI(
-        const_cast<smart_objects::SmartObject&>(message[strings::msg_params]));
+    AddAlreadySubscribedVI(converted_msg_params);
   }
+  AppendDataTypesToMobileResponse(converted_msg_params);
 
   SendResponse(is_succeeded,
                result_code,
                response_info.empty() ? NULL : response_info.c_str(),
-               &(message[strings::msg_params]));
+               &converted_msg_params);
+}
+
+void SubscribeVehicleDataRequest::AppendDataTypesToMobileResponse(
+    smart_objects::SmartObject& msg_params) const {
+  using namespace smart_objects;
+
+  std::string oem_vehicle_data_type_str;
+  EnumConversionHelper<VehicleDataType>::EnumToString(
+      VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA, &oem_vehicle_data_type_str);
+
+  const auto& rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  for (const auto& item : msg_params.enumerate()) {
+    const auto& rpc_spec_vehicle_data_item = rpc_spec_vehicle_data.find(item);
+    if (rpc_spec_vehicle_data.end() == rpc_spec_vehicle_data_item) {
+      msg_params[item][strings::data_type] = oem_vehicle_data_type_str;
+      msg_params[item][strings::oem_custom_data_type] =
+          custom_vehicle_data_manager_.GetVehicleDataItemType(item);
+    } else {
+      msg_params[item][strings::data_type] = rpc_spec_vehicle_data_item->second;
+    }
+  }
+}
+
+bool SubscribeVehicleDataRequest::CheckSubscriptionStatus(
+    std::string vi_name, const smart_objects::SmartObject& msg_params) {
+  const auto subscribed_items = msg_params.enumerate();
+  if (subscribed_items.end() == subscribed_items.find(vi_name)) {
+    LOG4CXX_WARN(logger_,
+                 vi_name << " is waiting to be subscribed, but missing in "
+                            "vehicle response.");
+    return false;
+  }
+
+  auto res_code = msg_params[vi_name][strings::result_code].asInt();
+  if (VD_ResultCode::VDRC_SUCCESS != res_code &&
+      VD_ResultCode::VDRC_DATA_ALREADY_SUBSCRIBED != res_code) {
+    LOG4CXX_WARN(logger_,
+                 "Subscription to " << vi_name << " for " << connection_key()
+                                    << " failed.");
+    return false;
+  }
+  return true;
+}
+
+bool SubscribeVehicleDataRequest::SubscribePendingVehicleData(
+    ApplicationSharedPtr app, smart_objects::SmartObject& msg_params) {
+  LOG4CXX_DEBUG(logger_, "Subscribing to all pending VehicleData");
+
+  std::set<hmi_apis::Common_VehicleDataResultCode::eType> skiped_result_codes(
+      {VD_ResultCode::VDRC_TRUNCATED_DATA,
+       VD_ResultCode::VDRC_DISALLOWED,
+       VD_ResultCode::VDRC_USER_DISALLOWED,
+       VD_ResultCode::VDRC_INVALID_ID,
+       VD_ResultCode::VDRC_DATA_NOT_AVAILABLE,
+       VD_ResultCode::VDRC_DATA_NOT_SUBSCRIBED,
+       VD_ResultCode::VDRC_IGNORED});
+
+  for (auto vi_name = vi_waiting_for_subscribe_.begin();
+       vi_name != vi_waiting_for_subscribe_.end();) {
+    const bool is_subscription_successful = CheckSubscriptionStatus(
+        ConvertRequestToResponseName(*vi_name), msg_params);
+
+    if (is_subscription_successful) {
+      auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
+      ext.subscribeToVehicleInfo(*vi_name);
+      vi_name = vi_waiting_for_subscribe_.erase(vi_name);
+    } else {
+      auto res_code =
+          static_cast<hmi_apis::Common_VehicleDataResultCode::eType>(
+              msg_params[*vi_name][strings::result_code].asInt());
+      if (skiped_result_codes.find(res_code) != skiped_result_codes.end()) {
+        msg_params[*vi_name][strings::result_code] = res_code;
+        vi_name = vi_waiting_for_subscribe_.erase(vi_name);
+      } else {
+        ++vi_name;
+      }
+    }
+  }
+  return vi_waiting_for_subscribe_.empty();
 }
 
 bool SubscribeVehicleDataRequest::Init() {
@@ -158,76 +247,33 @@ void SubscribeVehicleDataRequest::AddAlreadySubscribedVI(
     smart_objects::SmartObject& msg_params) const {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace mobile_apis;
-  auto vi_to_string =
-      [](const mobile_apis::VehicleDataType::eType vehicle_data) {
-        for (auto& vi_str_to_int_pair : MessageHelper::vehicle_data()) {
-          if (vehicle_data == vi_str_to_int_pair.second) {
-            return vi_str_to_int_pair.first;
-          }
-        }
-        return std::string();
-      };
 
-  VehicleInfoSubscriptions::const_iterator it_same_app =
-      vi_already_subscribed_by_this_app_.begin();
-  for (; vi_already_subscribed_by_this_app_.end() != it_same_app;
-       ++it_same_app) {
-    msg_params[vi_to_string(*it_same_app)][strings::result_code] =
+  for (const auto& item : vi_already_subscribed_by_this_app_) {
+    msg_params[item][strings::result_code] =
         VehicleDataResultCode::VDRC_DATA_ALREADY_SUBSCRIBED;
-    msg_params[vi_to_string(*it_same_app)][strings::data_type] = *it_same_app;
   }
 
-  VehicleInfoSubscriptions::const_iterator it_another_app =
-      vi_already_subscribed_by_another_apps_.begin();
-  for (; vi_already_subscribed_by_another_apps_.end() != it_another_app;
-       ++it_another_app) {
-    msg_params[vi_to_string(*it_another_app)][strings::result_code] =
+  for (const auto& item : vi_already_subscribed_by_another_apps_) {
+    msg_params[item][strings::result_code] =
         VehicleDataResultCode::VDRC_SUCCESS;
-    msg_params[vi_to_string(*it_another_app)][strings::data_type] =
-        *it_another_app;
-  }
-}
-
-void SubscribeVehicleDataRequest::UnsubscribeFailedSubscriptions(
-    ApplicationSharedPtr app,
-    const smart_objects::SmartObject& msg_params) const {
-  LOG4CXX_AUTO_TRACE(logger_);
-  const VehicleData& vehicle_data = MessageHelper::vehicle_data();
-  VehicleData::const_iterator it = vehicle_data.begin();
-
-  for (; vehicle_data.end() != it; ++it) {
-    if (msg_params.keyExists(it->first)) {
-      if (msg_params[it->first][strings::result_code].asInt() !=
-          hmi_apis::Common_VehicleDataResultCode::VDRC_SUCCESS) {
-        LOG4CXX_DEBUG(logger_,
-                      "Subscription for VehicleDataType "
-                          << it->first
-                          << " is unsuccessfull. "
-                             "Unsubscribing app with connection key "
-                          << connection_key() << " from it.");
-        VehicleInfoAppExtension::ExtractVIExtension(*app)
-            .unsubscribeFromVehicleInfo(it->second);
-      }
-    }
   }
 }
 
 struct SubscribedToIVIPredicate {
-  int32_t vehicle_info_;
-  SubscribedToIVIPredicate(int32_t vehicle_info)
+  std::string vehicle_info_;
+  SubscribedToIVIPredicate(std::string vehicle_info)
       : vehicle_info_(vehicle_info) {}
   bool operator()(const ApplicationSharedPtr app) const {
     DCHECK_OR_RETURN(app, false);
     auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
-    return ext.isSubscribedToVehicleInfo(
-        static_cast<mobile_apis::VehicleDataType::eType>(vehicle_info_));
+    return ext.isSubscribedToVehicleInfo(vehicle_info_);
   }
 };
 
 bool SubscribeVehicleDataRequest::IsSomeoneSubscribedFor(
-    const uint32_t param_id) const {
+    const std::string& param_name) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  SubscribedToIVIPredicate finder(param_id);
+  SubscribedToIVIPredicate finder(param_name);
   DataAccessor<ApplicationSet> accessor = application_manager_.applications();
   ApplicationSetConstIt it = std::find_if(
       accessor.GetData().begin(), accessor.GetData().end(), finder);
@@ -241,86 +287,95 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions(
     smart_objects::SmartObject& out_response_params,
     smart_objects::SmartObject& out_request_params,
     bool& out_result) {
-  // counter for items to subscribe
-  VehicleInfoSubscriptions::size_type items_to_subscribe = 0;
-  // counter for subscribed items by application
-  uint32_t subscribed_items = 0;
+  const bool is_interface_not_available =
+      (HmiInterfaces::STATE_NOT_AVAILABLE ==
+       application_manager_.hmi_interfaces().GetInterfaceState(
+           HmiInterfaces::HMI_INTERFACE_VehicleInfo));
+
+  VehicleInfoSubscriptions::size_type subscribed_items = 0;
+
+  auto app_already_subscribed =
+      [this, &out_response_params](
+          const std::string& key_name,
+          const mobile_apis::VehicleDataType::eType vd_type) {
+        LOG4CXX_DEBUG(
+            logger_,
+            "App with connection key "
+                << connection_key()
+                << " is subscribed already for VehicleData: " << key_name);
+        vi_already_subscribed_by_this_app_.insert(key_name);
+        out_response_params[key_name][strings::data_type] = vd_type;
+        out_response_params[key_name][strings::result_code] =
+            mobile_apis::VehicleDataResultCode::VDRC_DATA_ALREADY_SUBSCRIBED;
+      };
 
-  const VehicleData& vehicle_data = MessageHelper::vehicle_data();
-  VehicleData::const_iterator it = vehicle_data.begin();
+  auto another_app_subscribed =
+      [this, &out_response_params, &subscribed_items](
+          const std::string& key_name,
+          const mobile_apis::VehicleDataType::eType vd_type,
+          vehicle_info_plugin::VehicleInfoAppExtension& ext) {
+        LOG4CXX_DEBUG(logger_,
+                      "There are apps subscribed already for "
+                      "VehicleDataType: "
+                          << key_name);
+
+        if (!ext.subscribeToVehicleInfo(key_name)) {
+          LOG4CXX_ERROR(
+              logger_, "Unable to subscribe for VehicleDataType: " << key_name);
+          return;
+        }
+        LOG4CXX_DEBUG(
+            logger_,
+            "App with connection key "
+                << connection_key()
+                << " have been subscribed for VehicleDataType: " << key_name);
+        vi_already_subscribed_by_another_apps_.insert(key_name);
+        out_response_params[key_name][strings::data_type] = vd_type;
+        out_response_params[key_name][strings::result_code] =
+            mobile_apis::VehicleDataResultCode::VDRC_SUCCESS;
+        ++subscribed_items;
+      };
 
-  HmiInterfaces::InterfaceState interface_state =
-      application_manager_.hmi_interfaces().GetInterfaceState(
-          HmiInterfaces::HMI_INTERFACE_VehicleInfo);
+  auto first_subscription = [this, &out_request_params, &subscribed_items](
+                                const std::string& vi_name) {
+    out_request_params[vi_name] = (*message_)[strings::msg_params][vi_name];
 
-  const bool is_interface_not_available =
-      interface_state == HmiInterfaces::STATE_NOT_AVAILABLE;
-
-  for (; vehicle_data.end() != it; ++it) {
-    const std::string& key_name = it->first;
-    if ((*message_)[strings::msg_params].keyExists(key_name)) {
-      const bool is_key_enabled =
-          (*message_)[strings::msg_params][key_name].asBool();
-      if (is_key_enabled) {
-        ++items_to_subscribe;
-      }
-      if (!is_interface_not_available && is_key_enabled) {
-        mobile_apis::VehicleDataType::eType key_type = it->second;
-        const auto is_subscribed =
-            VehicleInfoAppExtension::ExtractVIExtension(*app)
-                .isSubscribedToVehicleInfo(key_type);
-        if (is_subscribed) {
-          LOG4CXX_DEBUG(logger_,
-                        "App with connection key "
-                            << connection_key()
-                            << " is subscribed already for VehicleDataType: "
-                            << key_type);
-          ++subscribed_items;
-          vi_already_subscribed_by_this_app_.insert(key_type);
-          out_response_params[key_name][strings::data_type] = key_type;
-          out_response_params[key_name][strings::result_code] =
-              mobile_apis::VehicleDataResultCode::VDRC_DATA_ALREADY_SUBSCRIBED;
-          continue;
-        }
+    vi_waiting_for_subscribe_.insert(vi_name);
+    LOG4CXX_DEBUG(
+        logger_,
+        "App with connection key "
+            << connection_key()
+            << " will be subscribed for VehicleDataType: " << vi_name);
+    ++subscribed_items;
+    return true;
+  };
 
-        if (IsSomeoneSubscribedFor(key_type)) {
-          LOG4CXX_DEBUG(logger_,
-                        "There are apps subscribed already for "
-                        "VehicleDataType: "
-                            << key_type);
-          auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
-
-          if (!ext.subscribeToVehicleInfo(key_type)) {
-            LOG4CXX_ERROR(
-                logger_,
-                "Unable to subscribe for VehicleDataType: " << key_type);
-            continue;
-          }
-          LOG4CXX_DEBUG(
-              logger_,
-              "App with connection key "
-                  << connection_key()
-                  << " have been subscribed for VehicleDataType: " << key_type);
-          ++subscribed_items;
-          vi_already_subscribed_by_another_apps_.insert(key_type);
-          out_response_params[key_name][strings::data_type] = key_type;
-          out_response_params[key_name][strings::result_code] =
-              mobile_apis::VehicleDataResultCode::VDRC_SUCCESS;
-          continue;
-        }
+  auto rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
 
-        out_request_params[key_name] = is_key_enabled;
+  VehicleInfoSubscriptions::size_type items_to_subscribe = 0;
+  auto item_names = (*message_)[strings::msg_params].enumerate();
+  if (!is_interface_not_available) {
+    for (const auto& name : item_names) {
+      auto enabled = (*message_)[strings::msg_params][name].asBool();
+      if (!enabled) {
+        continue;
+      }
 
-        if (is_key_enabled) {
-          vi_waiting_for_subscribe_.insert(key_type);
-          LOG4CXX_DEBUG(
-              logger_,
-              "App with connection key "
-                  << connection_key()
-                  << " will be subscribed for VehicleDataType: " << key_type);
-          ++subscribed_items;
-        }
+      auto vehicle_data = rpc_spec_vehicle_data.find(name);
+      auto vehicle_data_type =
+          (vehicle_data == rpc_spec_vehicle_data.end())
+              ? VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA
+              : vehicle_data->second;
+      if (ext.isSubscribedToVehicleInfo(name)) {
+        app_already_subscribed(name, vehicle_data_type);
+      } else if (IsSomeoneSubscribedFor(name)) {
+        another_app_subscribed(name, vehicle_data_type, ext);
+      } else if (!first_subscription(name)) {
+        continue;
       }
+
+      ++items_to_subscribe;
     }
   }
 
@@ -336,12 +391,14 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions(
       out_info = "No data in the request";
     }
     out_result = false;
+    return;
   }
 
   if (0 == subscribed_items && !is_interface_not_available) {
     out_result_code = mobile_apis::Result::IGNORED;
     out_info = "Already subscribed on provided VehicleData.";
     out_result = false;
+    return;
   }
 
   if (is_everything_already_subscribed) {
@@ -352,8 +409,35 @@ void SubscribeVehicleDataRequest::CheckVISubscriptions(
       out_info = "Already subscribed on some provided VehicleData.";
     }
     out_result = true;
+    return;
   }
 }
 
+const std::string& SubscribeVehicleDataRequest::ConvertResponseToRequestName(
+    const std::string& name) {
+  static std::map<std::string, std::string> parameter_name_conversion_map = {
+      {strings::cluster_modes, strings::cluster_mode_status}};
+  const auto converted_it = parameter_name_conversion_map.find(name);
+  auto result = parameter_name_conversion_map.end() == converted_it
+                    ? name
+                    : converted_it->second;
+  return parameter_name_conversion_map.end() == converted_it
+             ? name
+             : converted_it->second;
+}
+
+const std::string& SubscribeVehicleDataRequest::ConvertRequestToResponseName(
+    const std::string& name) {
+  static std::map<std::string, std::string> parameter_name_conversion_map = {
+      {strings::cluster_mode_status, strings::cluster_modes}};
+  const auto converted_it = parameter_name_conversion_map.find(name);
+  auto result = parameter_name_conversion_map.end() == converted_it
+                    ? name
+                    : converted_it->second;
+  return parameter_name_conversion_map.end() == converted_it
+             ? name
+             : converted_it->second;
+}
+
 }  // namespace commands
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc
index b0d09e1a5b..8330176af6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/subscribe_vehicle_data_response.cc
@@ -42,15 +42,12 @@ namespace commands {
 
 SubscribeVehicleDataResponse::SubscribeVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 SubscribeVehicleDataResponse::~SubscribeVehicleDataResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
index 40bd9182e7..32d63f0c35 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_request.cc
@@ -39,6 +39,7 @@
 #include "application_manager/smart_object_keys.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
+#include "smart_objects/enum_schema_item.h"
 #include "utils/helpers.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
 
@@ -48,15 +49,13 @@ namespace commands {
 
 UnsubscribeVehicleDataRequest::UnsubscribeVehicleDataRequest(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandRequestImpl(message,
-                         application_manager,
-                         rpc_service,
-                         hmi_capabilities,
-                         policy_handler) {}
+                         params.application_manager_,
+                         params.rpc_service_,
+                         params.hmi_capabilities_,
+                         params.policy_handler_)
+    , custom_vehicle_data_manager_(params.custom_vehicle_data_manager_) {}
 
 UnsubscribeVehicleDataRequest::~UnsubscribeVehicleDataRequest() {}
 
@@ -74,67 +73,64 @@ void UnsubscribeVehicleDataRequest::Run() {
   int32_t items_to_unsubscribe = 0;
   int32_t unsubscribed_items = 0;
 
-  const VehicleData& vehicle_data = MessageHelper::vehicle_data();
-  VehicleData::const_iterator it = vehicle_data.begin();
-
   smart_objects::SmartObject msg_params =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
-  smart_objects::SmartObject response_params =
-      smart_objects::SmartObject(smart_objects::SmartType_Map);
+  response_params_ = smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  auto rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  std::set<std::string> custom_vehicle_data;
+
+  auto app_not_subscribed_response = [this](const std::string& key_name) {
+    LOG4CXX_DEBUG(logger_,
+                  "App with connection key "
+                      << connection_key()
+                      << " is not subscribed for VehicleData: " << key_name);
+    vi_already_unsubscribed_by_this_app_.insert(key_name);
+    response_params_[key_name][strings::result_code] =
+        mobile_apis::VehicleDataResultCode::VDRC_DATA_NOT_SUBSCRIBED;
+  };
+
+  auto other_app_subscribed_response = [this](const std::string& key_name) {
+    LOG4CXX_DEBUG(logger_,
+                  "There are apps still subscribed for "
+                  "VehicleDataType: "
+                      << key_name);
+    vi_still_subscribed_by_another_apps_.insert(key_name);
+    response_params_[key_name][strings::result_code] =
+        mobile_apis::VehicleDataResultCode::VDRC_SUCCESS;
+  };
+
+  auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
+
+  const auto& param_names = (*message_)[strings::msg_params].enumerate();
+  for (const auto& name : param_names) {
+    const bool enabled = (*message_)[strings::msg_params][name].asBool();
+    if (!enabled) {
+      continue;
+    }
 
-  for (; vehicle_data.end() != it; ++it) {
-    const std::string& key_name = it->first;
-    if ((*message_)[strings::msg_params].keyExists(key_name)) {
-      bool is_key_enabled = (*message_)[strings::msg_params][key_name].asBool();
-      if (is_key_enabled) {
-        ++items_to_unsubscribe;
-
-        mobile_apis::VehicleDataType::eType key_type = it->second;
-        const auto is_subscribed =
-            VehicleInfoAppExtension::ExtractVIExtension(*app)
-                .isSubscribedToVehicleInfo(key_type);
-        if (!is_subscribed) {
-          ++unsubscribed_items;
-          vi_already_unsubscribed_by_this_app_.insert(key_type);
-          response_params[key_name][strings::data_type] = key_type;
-          response_params[key_name][strings::result_code] =
-              mobile_apis::VehicleDataResultCode::VDRC_DATA_NOT_SUBSCRIBED;
-          continue;
-        }
-
-        if (!VehicleInfoAppExtension::ExtractVIExtension(*app)
-                 .unsubscribeFromVehicleInfo(it->second)) {
-          LOG4CXX_ERROR(logger_,
-                        "Unable to unsubscribe from "
-                        "VehicleDataType: "
-                            << key_type);
-          continue;
-        }
-
-        LOG4CXX_DEBUG(logger_,
-                      "Unsubscribed app with connection key "
-                          << connection_key()
-                          << " from VehicleDataType: " << key_type);
-
-        ++unsubscribed_items;
-
-        if (IsSomeoneSubscribedFor(key_type)) {
-          LOG4CXX_DEBUG(logger_,
-                        "There are another apps still subscribed for "
-                        "VehicleDataType: "
-                            << key_type);
-
-          vi_still_subscribed_by_another_apps_.insert(key_type);
-          response_params[key_name][strings::data_type] = key_type;
-          response_params[key_name][strings::result_code] =
-              mobile_apis::VehicleDataResultCode::VDRC_SUCCESS;
-          continue;
-        }
-
-        msg_params[key_name] = is_key_enabled;
-      }
+    ++items_to_unsubscribe;
+
+    if (!(ext.isSubscribedToVehicleInfo(name))) {
+      app_not_subscribed_response(name);
+      continue;
+    }
+
+    LOG4CXX_DEBUG(logger_,
+                  "Unsubscribed app with connection key "
+                      << connection_key() << " from VehicleDataType: " << name);
+
+    ++unsubscribed_items;
+
+    if (IsSomeoneSubscribedFor(name)) {
+      other_app_subscribed_response(name);
+      ext.unsubscribeFromVehicleInfo(name);
+      continue;
     }
+
+    vi_waiting_for_unsubscribe_.insert(name);
+    msg_params[name] = true;
   }
 
   bool is_everything_already_unsubscribed =
@@ -142,6 +138,8 @@ void UnsubscribeVehicleDataRequest::Run() {
       vi_still_subscribed_by_another_apps_.size() +
           vi_already_unsubscribed_by_this_app_.size();
 
+  AppendDataTypesToMobileResponse(response_params_);
+
   if (0 == items_to_unsubscribe) {
     if (HasDisallowedParams()) {
       SendResponse(false, mobile_apis::Result::DISALLOWED);
@@ -156,7 +154,7 @@ void UnsubscribeVehicleDataRequest::Run() {
     SendResponse(false,
                  mobile_apis::Result::IGNORED,
                  "Was not subscribed on any VehicleData.",
-                 &response_params);
+                 &response_params_);
     return;
   }
 
@@ -165,9 +163,9 @@ void UnsubscribeVehicleDataRequest::Run() {
       SendResponse(false,
                    mobile_apis::Result::IGNORED,
                    "Some provided VehicleData was not subscribed.",
-                   &response_params);
+                   &response_params_);
     } else {
-      SendResponse(true, mobile_apis::Result::SUCCESS, NULL, &response_params);
+      SendResponse(true, mobile_apis::Result::SUCCESS, NULL, &response_params_);
     }
     return;
   }
@@ -203,36 +201,56 @@ void UnsubscribeVehicleDataRequest::on_event(const event_engine::Event& event) {
           message[strings::params][hmi_response::code].asInt());
   std::string response_info;
   GetInfo(message, response_info);
-  const bool result = PrepareResultForMobileResponse(
+  bool result = PrepareResultForMobileResponse(
       hmi_result, HmiInterfaces::HMI_INTERFACE_VehicleInfo);
 
+  auto hmi_response_msg_params = message[strings::msg_params];
+
   mobile_apis::Result::eType result_code =
       MessageHelper::HMIToMobileResult(hmi_result);
 
+  custom_vehicle_data_manager_.CreateMobileMessageParams(
+      hmi_response_msg_params);
+
+  if (!vi_still_subscribed_by_another_apps_.empty() ||
+      !vi_already_unsubscribed_by_this_app_.empty()) {
+    AddAlreadyUnsubscribedVI(hmi_response_msg_params);
+  }
+
   if (result) {
     if (vi_already_unsubscribed_by_this_app_.size()) {
       result_code = mobile_apis::Result::IGNORED;
       response_info = "Some provided VehicleData was not subscribed.";
     }
-  }
 
-  if (!vi_still_subscribed_by_another_apps_.empty() ||
-      !vi_already_unsubscribed_by_this_app_.empty()) {
-    AddAlreadyUnsubscribedVI(
-        const_cast<smart_objects::SmartObject&>(message[strings::msg_params]));
-  }
+    for (const auto& param : hmi_response_msg_params.enumerate()) {
+      const auto converted_param = ConvertResponseToRequestName(param);
+      if (vi_waiting_for_unsubscribe_.end() ==
+          vi_waiting_for_unsubscribe_.find(converted_param)) {
+        hmi_response_msg_params.erase(param);
+      }
+    }
 
-  if (result) {
-    SetAllowedToTerminate(false);
+    if (!UnsubscribePendingVehicleData(app, hmi_response_msg_params)) {
+      result = false;
+      result_code = mobile_apis::Result::GENERIC_ERROR;
+      response_info = "Unsubscription failed for some Vehicle data";
+      hmi_response_msg_params = smart_objects::SmartObject();
+    }
   }
-  SendResponse(result,
-               result_code,
-               response_info.empty() ? NULL : response_info.c_str(),
-               &(message[strings::msg_params]));
-  if (result) {
-    application_manager_.TerminateRequest(
-        connection_key(), correlation_id(), function_id());
+
+  AppendDataTypesToMobileResponse(hmi_response_msg_params);
+  for (const auto& key : hmi_response_msg_params.enumerate()) {
+    response_params_[key] = hmi_response_msg_params[key];
   }
+
+  SendResponse(
+      result,
+      result_code,
+      response_info.empty() ? NULL : response_info.c_str(),
+      smart_objects::SmartType::SmartType_Null == response_params_.getType()
+          ? NULL
+          : &response_params_);
 }
 
 bool UnsubscribeVehicleDataRequest::Init() {
@@ -240,25 +258,23 @@ bool UnsubscribeVehicleDataRequest::Init() {
   return true;
 }
 
-struct SubscribedToIVIPredicate {
-  int32_t vehicle_info_;
-  SubscribedToIVIPredicate(int32_t vehicle_info)
-      : vehicle_info_(vehicle_info) {}
-  bool operator()(const ApplicationSharedPtr app) const {
+bool UnsubscribeVehicleDataRequest::IsSomeoneSubscribedFor(
+    const std::string& param_name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto conn_key = connection_key();
+  auto subscribed_to_ivi = [&param_name,
+                            &conn_key](const ApplicationSharedPtr app) {
     DCHECK_OR_RETURN(app, false);
+    if (conn_key == app->app_id()) {
+      return false;
+    }
     auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
-    return ext.isSubscribedToVehicleInfo(
-        static_cast<mobile_apis::VehicleDataType::eType>(vehicle_info_));
-  }
-};
+    return (ext.isSubscribedToVehicleInfo(param_name));
+  };
 
-bool UnsubscribeVehicleDataRequest::IsSomeoneSubscribedFor(
-    const uint32_t param_id) const {
-  LOG4CXX_AUTO_TRACE(logger_);
-  SubscribedToIVIPredicate finder(param_id);
   DataAccessor<ApplicationSet> accessor = application_manager_.applications();
   ApplicationSetConstIt it = std::find_if(
-      accessor.GetData().begin(), accessor.GetData().end(), finder);
+      accessor.GetData().begin(), accessor.GetData().end(), subscribed_to_ivi);
   return it != accessor.GetData().end();
 }
 
@@ -266,20 +282,92 @@ void UnsubscribeVehicleDataRequest::AddAlreadyUnsubscribedVI(
     smart_objects::SmartObject& response) const {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace mobile_apis;
-  VehicleInfoSubscriptions::const_iterator it_same_app =
-      vi_already_unsubscribed_by_this_app_.begin();
-  for (; vi_already_unsubscribed_by_this_app_.end() != it_same_app;
-       ++it_same_app) {
-    response[*it_same_app][strings::result_code] =
+
+  for (const auto& item : vi_already_unsubscribed_by_this_app_) {
+    response[item][strings::result_code] =
         VehicleDataResultCode::VDRC_DATA_NOT_SUBSCRIBED;
   }
 
-  VehicleInfoSubscriptions::const_iterator it_another_app =
-      vi_still_subscribed_by_another_apps_.begin();
-  for (; vi_still_subscribed_by_another_apps_.end() != it_another_app;
-       ++it_another_app) {
-    response[*it_another_app][strings::result_code] =
-        VehicleDataResultCode::VDRC_SUCCESS;
+  for (const auto& item : vi_still_subscribed_by_another_apps_) {
+    response[item][strings::result_code] = VehicleDataResultCode::VDRC_SUCCESS;
+  }
+}
+
+bool UnsubscribeVehicleDataRequest::CheckSubscriptionStatus(
+    std::string key, const smart_objects::SmartObject& msg_params) {
+  const auto unsubscribed_items = msg_params.enumerate();
+  if (unsubscribed_items.end() == unsubscribed_items.find(key)) {
+    LOG4CXX_WARN(logger_,
+                 key << " is waiting to be unsubscribed, but missing in "
+                        "vehicle response.");
+    return false;
+  }
+
+  auto res_code = msg_params[key][strings::result_code].asInt();
+  if (hmi_apis::Common_VehicleDataResultCode::VDRC_SUCCESS != res_code) {
+    LOG4CXX_WARN(logger_,
+                 "Unubscribing from " << key << " for " << connection_key()
+                                      << " failed.");
+    return false;
+  }
+  return true;
+}
+
+bool UnsubscribeVehicleDataRequest::UnsubscribePendingVehicleData(
+    ApplicationSharedPtr app, const smart_objects::SmartObject& msg_params) {
+  LOG4CXX_DEBUG(logger_, "Unsubscribing from all pending VehicleData");
+
+  for (const auto& vi_name : vi_waiting_for_unsubscribe_) {
+    const auto converted_item = ConvertRequestToResponseName(vi_name);
+    const bool is_unsubscription_successful =
+        CheckSubscriptionStatus(converted_item, msg_params);
+    if (is_unsubscription_successful) {
+      auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
+      ext.unsubscribeFromVehicleInfo(vi_name);
+      vi_waiting_for_unsubscribe_.erase(vi_name);
+    }
+  }
+  return vi_waiting_for_unsubscribe_.empty();
+}
+
+const std::string& UnsubscribeVehicleDataRequest::ConvertRequestToResponseName(
+    const std::string& name) {
+  static std::map<std::string, std::string> parameter_name_converion_map = {
+      {strings::cluster_mode_status, strings::cluster_modes}};
+  const auto converted_it = parameter_name_converion_map.find(name);
+  return parameter_name_converion_map.end() == converted_it
+             ? name
+             : converted_it->second;
+}
+
+const std::string& UnsubscribeVehicleDataRequest::ConvertResponseToRequestName(
+    const std::string& name) {
+  static std::map<std::string, std::string> parameter_name_converion_map = {
+      {strings::cluster_modes, strings::cluster_mode_status}};
+  const auto converted_it = parameter_name_converion_map.find(name);
+  return parameter_name_converion_map.end() == converted_it
+             ? name
+             : converted_it->second;
+}
+
+void UnsubscribeVehicleDataRequest::AppendDataTypesToMobileResponse(
+    smart_objects::SmartObject& msg_params) const {
+  using namespace smart_objects;
+
+  std::string oem_vehicle_data_type_str;
+  EnumConversionHelper<VehicleDataType>::EnumToString(
+      VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA, &oem_vehicle_data_type_str);
+
+  const auto& rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  for (const auto& item : msg_params.enumerate()) {
+    const auto& rpc_spec_vehicle_data_item = rpc_spec_vehicle_data.find(item);
+    if (rpc_spec_vehicle_data.end() == rpc_spec_vehicle_data_item) {
+      msg_params[item][strings::data_type] = oem_vehicle_data_type_str;
+      msg_params[item][strings::oem_custom_data_type] =
+          custom_vehicle_data_manager_.GetVehicleDataItemType(item);
+    } else {
+      msg_params[item][strings::data_type] = rpc_spec_vehicle_data_item->second;
+    }
   }
 }
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc
index a4a486a5e7..352239c331 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/unsubscribe_vehicle_data_response.cc
@@ -40,15 +40,12 @@ namespace commands {
 
 UnsubscribeVehicleDataResponse::UnsubscribeVehicleDataResponse(
     const application_manager::commands::MessageSharedPtr& message,
-    ApplicationManager& application_manager,
-    app_mngr::rpc_service::RPCService& rpc_service,
-    app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    const VehicleInfoCommandParams& params)
     : CommandResponseImpl(message,
-                          application_manager,
-                          rpc_service,
-                          hmi_capabilities,
-                          policy_handler) {}
+                          params.application_manager_,
+                          params.rpc_service_,
+                          params.hmi_capabilities_,
+                          params.policy_handler_) {}
 
 UnsubscribeVehicleDataResponse::~UnsubscribeVehicleDataResponse() {}
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc
new file mode 100644
index 0000000000..9df6d922aa
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/custom_vehicle_data_manager_impl.cc
@@ -0,0 +1,575 @@
+/**
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "vehicle_info_plugin/custom_vehicle_data_manager_impl.h"
+#include <strings.h>
+#include <limits>
+#include "policy/policy_table/types.h"
+#include "vehicle_info_plugin/vehicle_data_item_schema.h"
+
+#include "application_manager/application_manager.h"
+#include "application_manager/message_helper.h"
+#include "application_manager/policies/custom_vehicle_data_provider.h"
+#include "interfaces/MOBILE_API_schema.h"
+#include "policy/policy_table/policy_enum_schema_factory.h"
+#include "smart_objects/enum_schema_item.h"
+#include "utils/helpers.h"
+#include "utils/optional.h"
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin")
+
+namespace vehicle_info_plugin {
+
+template <typename T, typename U>
+U GetOptional(const rpc::Optional<T>& optional, U def_val) {
+  return optional.is_initialized() ? static_cast<U>(*optional) : def_val;
+}
+
+enum SearchMethod { RECURSIVE = 0, NON_RECURSIVE };
+
+CustomVehicleDataManagerImpl::CustomVehicleDataManagerImpl(
+    policy::VehicleDataItemProvider& vehicle_data_provider,
+    application_manager::rpc_service::RPCService& rpc_service)
+    : vehicle_data_provider_(vehicle_data_provider)
+    , rpc_service_(rpc_service) {}
+
+std::string CustomVehicleDataManagerImpl::GetVehicleDataItemType(
+    const std::string& vehicle_data_item_name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto& schema = FindSchemaByNameNonRecursive(vehicle_data_item_name);
+
+  return schema.is_initialized() ? std::string(schema->type)
+                                 : vehicle_data_item_name;
+}
+
+bool CustomVehicleDataManagerImpl::IsValidCustomVehicleDataName(
+    const std::string& name) const {
+  const auto& schema = FindSchemaByNameNonRecursive(name);
+  return schema.is_initialized();
+}
+
+bool CustomVehicleDataManagerImpl::IsRemovedCustomVehicleDataName(
+    const std::string& name) const {
+  const auto& schema = FindRemovedSchemaByNameNonRecursive(name);
+  return schema.is_initialized();
+}
+
+void CustomVehicleDataManagerImpl::CreateMobileMessageParams(
+    smart_objects::SmartObject& msg_params) {
+  using namespace application_manager;
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  typedef std::function<smart_objects::SmartObject(
+      const smart_objects::SmartObject& input_params,
+      SearchMethod search_method)>
+      MobileMsgConstructor;
+
+  MobileMsgConstructor fill_mobile_msg =
+      [this, &fill_mobile_msg](
+          const smart_objects::SmartObject& input_params,
+          SearchMethod search_method) -> smart_objects::SmartObject {
+    smart_objects::SmartObject out_params;
+
+    const auto& items = input_params.enumerate();
+    for (const auto& key : items) {
+      auto schema = search_method == SearchMethod::RECURSIVE
+                        ? FindSchemaByKeyRecursive(key)
+                        : FindSchemaByKeyNonRecursive(key);
+      if (!schema.is_initialized()) {
+        LOG4CXX_DEBUG(logger_, "Schema for: " << key << " cannot be found");
+        continue;
+      }
+
+      const auto& item_name = schema->name;
+      if (policy_table::VehicleDataItem::kStruct == std::string(schema->type)) {
+        auto& input_param = input_params[key];
+        if (*schema->array &&
+            input_param.getType() == smart_objects::SmartType_Array) {
+          for (size_t i = 0; i < input_param.length(); i++) {
+            const auto param =
+                fill_mobile_msg(input_param[i], SearchMethod::RECURSIVE);
+            out_params[item_name][i] = param;
+          }
+          continue;
+        } else {
+          const auto param =
+              fill_mobile_msg(input_param, SearchMethod::RECURSIVE);
+          if (!param.empty()) {
+            out_params[item_name] = param;
+            continue;
+          }
+        }
+      }
+
+      out_params[item_name] = input_params[key];
+    }
+
+    return out_params;
+  };
+
+  const auto& rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+  const auto& item_names = msg_params.enumerate();
+  smart_objects::SmartObject params_to_convert;
+
+  for (const auto& item_key : item_names) {
+    const auto& found_it = rpc_spec_vehicle_data.find(item_key);
+    if (found_it == rpc_spec_vehicle_data.end()) {
+      params_to_convert[item_key] = msg_params[item_key];
+      msg_params.erase(item_key);
+    }
+  }
+
+  const auto& mobile_msg_params =
+      fill_mobile_msg(params_to_convert, SearchMethod::NON_RECURSIVE);
+  for (const auto& name : mobile_msg_params.enumerate()) {
+    msg_params[name] = mobile_msg_params[name];
+  }
+}
+
+smart_objects::SmartObject CustomVehicleDataManagerImpl::CreateHMIMessageParams(
+    const std::set<std::string>& item_names) {
+  typedef std::function<smart_objects::SmartObject(
+      const policy_table::VehicleDataItem&)>
+      ParamsConstructor;
+
+  auto fill_param = [](ParamsConstructor& constructor,
+                       const policy_table::VehicleDataItem& param,
+                       smart_objects::SmartObject* out_params) {
+    DCHECK_OR_RETURN_VOID(out_params)
+    const auto param_key = std::string(param.key);
+    const auto param_type = std::string(param.type);
+    if (policy_table::VehicleDataItem::kStruct == param_type) {
+      (*out_params)[param_key] = constructor(param);
+    } else {
+      (*out_params)[param_key] = true;
+    }
+  };
+
+  ParamsConstructor fill_hmi_params =
+      [&fill_hmi_params,
+       fill_param](const policy_table::VehicleDataItem& item) {
+        smart_objects::SmartObject out_params;
+        DCHECK(policy_table::VehicleDataItem::kStruct ==
+               std::string(item.type));
+        for (auto& param : *(item.params)) {
+          fill_param(fill_hmi_params, param, &out_params);
+        }
+        return out_params;
+      };
+
+  smart_objects::SmartObject out_params(smart_objects::SmartType_Map);
+  for (const auto& name : item_names) {
+    auto schema = FindSchemaByNameNonRecursive(name);
+    if (schema.is_initialized()) {
+      fill_param(fill_hmi_params, *schema, &out_params);
+      continue;
+    }
+
+    auto removed_schema = FindRemovedSchemaByNameNonRecursive(name);
+    if (removed_schema.is_initialized()) {
+      fill_param(fill_hmi_params, *removed_schema, &out_params);
+    }
+  }
+
+  return out_params;
+}
+
+template <typename Comparer>
+const OptionalDataItem FindSchema(
+    const std::vector<policy_table::VehicleDataItem>& oem_items,
+    SearchMethod search_method,
+    Comparer comparer) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  std::vector<policy_table::VehicleDataItem> items;
+  for (const auto& item : oem_items) {
+    if (comparer(item)) {
+      items.push_back(item);
+    }
+    if (search_method == SearchMethod::RECURSIVE &&
+        policy_table::VehicleDataItem::kStruct == std::string(item.type)) {
+      auto found_in_params =
+          FindSchema(*(item.params), search_method, comparer);
+      if (found_in_params.is_initialized()) {
+        items.push_back(*found_in_params);
+      }
+    }
+  }
+  std::sort(items.begin(),
+            items.end(),
+            [](const policy_table::VehicleDataItem& left,
+               const policy_table::VehicleDataItem& right) {
+              if (!right.since.is_initialized()) {
+                return false;
+              }
+              if (!left.since.is_initialized()) {
+                return true;
+              }
+              const std::string l = *left.since;
+              const std::string r = *right.since;
+              return std::stof(l.c_str()) > std::stof(r.c_str());
+            });
+
+  if (!items.empty()) {
+    return OptionalDataItem(*items.begin());
+  }
+
+  return OptionalDataItem();
+}
+
+void CustomVehicleDataManagerImpl::UpdateVehicleDataItems() {
+  using namespace ns_smart_device_link::ns_smart_objects;
+  using namespace policy_table;
+
+  enum class SMemberType {
+    SMEMBER_MOBILE,
+    SMEMBER_HMI,
+    SMEMBER_BOOL_MOBILE,
+    SMEMBER_BOOL_HMI,
+    SMEMBER_VDR_MOBILE,
+    SMEMBER_VDR_HMI
+  };
+
+  auto get_custom_vdi = [this]()
+      -> std::vector<rpc::policy_table_interface_base::VehicleDataItem> {
+    using namespace rpc::policy_table_interface_base;
+    std::vector<VehicleDataItem> custom_vehicle_data_items;
+    auto vehicle_data_items = vehicle_data_provider_.GetVehicleDataItems();
+    for (const auto& item : vehicle_data_items) {
+      policy_table::Parameter parameter_enum;
+      if (!policy_table::EnumFromJsonString(item.name, &parameter_enum)) {
+        custom_vehicle_data_items.push_back(item);
+      }
+    }
+    return custom_vehicle_data_items;
+  };
+
+  auto vehicle_data_items = get_custom_vdi();
+
+  auto get_ischema_item = [](const VehicleDataItem& item,
+                             SMemberType type,
+                             std::vector<SMember> history = {}) -> SMember {
+    switch (type) {
+      case SMemberType::SMEMBER_BOOL_MOBILE: {
+        auto member_schema =
+            CBoolSchemaItem::create(TSchemaItemParameter<bool>());
+        return SMember(
+            member_schema,
+            false,  // root level items should not be mandatory
+            item.since.is_initialized() ? std::string(*item.since) : "",
+            item.until.is_initialized() ? std::string(*item.until) : "",
+            bool(*item.deprecated),
+            bool(*item.removed),
+            history);
+      }
+      case SMemberType::SMEMBER_VDR_MOBILE: {
+        // valid since struct_schema_items is not used in
+        // InitStructSchemaItem_VehicleDataResult
+        mobile_apis::MOBILE_API::TStructsSchemaItems mobile_struct_schema_items;
+        auto member_schema =
+            mobile_apis::MOBILE_API::InitStructSchemaItem_VehicleDataResult(
+                mobile_struct_schema_items);
+        return SMember(
+            member_schema,
+            false,  // root level items should not be mandatory
+            item.since.is_initialized() ? std::string(*item.since) : "",
+            item.until.is_initialized() ? std::string(*item.until) : "",
+            bool(*item.deprecated),
+            bool(*item.removed),
+            history);
+      }
+      case SMemberType::SMEMBER_MOBILE: {
+        TSchemaItemParameter<VehicleDataItem> tschema_item(item);
+        auto member_schema = VehicleDataItemSchema::create(
+            tschema_item, VehicleDataItemSchema::SchemaType::MOBILE);
+        return SMember(
+            member_schema,
+            false,  // root level items should not be mandatory
+            item.since.is_initialized() ? std::string(*item.since) : "",
+            item.until.is_initialized() ? std::string(*item.until) : "",
+            bool(*item.deprecated),
+            bool(*item.removed),
+            history);
+      }
+      case SMemberType::SMEMBER_BOOL_HMI: {
+        auto member_schema =
+            CBoolSchemaItem::create(TSchemaItemParameter<bool>());
+        return SMember(member_schema,
+                       false  // root level items should not be mandatory
+        );
+      }
+      case SMemberType::SMEMBER_VDR_HMI: {
+        // valid since struct_schema_items is not used in
+        // InitStructSchemaItem_Common_VehicleDataResult
+        hmi_apis::HMI_API::TStructsSchemaItems hmi_struct_schema_items;
+        auto member_schema =
+            hmi_apis::HMI_API::InitStructSchemaItem_Common_VehicleDataResult(
+                hmi_struct_schema_items);
+        return SMember(
+            member_schema, false  // root level items should not be mandatory
+        );
+      }
+      case SMemberType::SMEMBER_HMI: {
+        TSchemaItemParameter<VehicleDataItem> tschema_item(item);
+        auto member_schema = VehicleDataItemSchema::create(
+            tschema_item, VehicleDataItemSchema::SchemaType::HMI);
+        return SMember(
+            member_schema, false  // root level items should not be mandatory
+        );
+      }
+      default: {
+        auto member_schema = CAlwaysFalseSchemaItem::create();
+        return SMember(member_schema, false);
+      }
+    }
+  };
+
+  auto get_vehicle_data_history =
+      [&vehicle_data_items](std::string name) -> std::vector<VehicleDataItem> {
+    std::vector<VehicleDataItem> result;
+    std::copy_if(vehicle_data_items.begin(),
+                 vehicle_data_items.end(),
+                 std::back_inserter(result),
+                 [&name](VehicleDataItem& item) { return item.name == name; });
+
+    std::sort(result.begin(),
+              result.end(),
+              [](const policy_table::VehicleDataItem& left,
+                 const policy_table::VehicleDataItem& right) {
+                if (!right.since.is_initialized()) {
+                  return false;
+                }
+                if (!left.since.is_initialized()) {
+                  return true;
+                }
+                const std::string l = *left.since;
+                const std::string r = *right.since;
+                return std::stof(l.c_str()) > std::stof(r.c_str());
+              });
+
+    return result;
+  };
+
+  auto get_member_with_history = [&get_ischema_item](
+                                     std::vector<VehicleDataItem> items,
+                                     SMemberType type) -> SMember {
+    std::vector<SMember> history = {};
+    std::vector<SMemberType> types{SMemberType::SMEMBER_MOBILE,
+                                   SMemberType::SMEMBER_VDR_MOBILE,
+                                   SMemberType::SMEMBER_BOOL_MOBILE};
+    if (helpers::in_range(types, type) && items.size() > 1) {
+      auto history_iterator = items.begin() + 1;
+      for (; history_iterator < items.end(); ++history_iterator) {
+        const auto& item = (*history_iterator);
+        history.push_back(get_ischema_item(item, type));
+      }
+    }
+
+    auto latest_item = (*items.begin());
+    return get_ischema_item(latest_item, type, history);
+  };
+
+  CustomVehicleDataManagerImpl::RPCParams mobile_params;
+  CustomVehicleDataManagerImpl::RPCParams hmi_params;
+
+  std::set<std::string> vehicle_data_names;
+  for (const auto& item : vehicle_data_items) {
+    vehicle_data_names.insert(item.name);
+  }
+
+  for (const auto& name : vehicle_data_names) {
+    auto vehicle_data_history = get_vehicle_data_history(name);
+    const auto& vdi = vehicle_data_history.begin();
+
+    SMember member_bool_hmi = get_member_with_history(
+        vehicle_data_history, SMemberType::SMEMBER_BOOL_HMI);
+    SMember member_bool_mobile = get_member_with_history(
+        vehicle_data_history, SMemberType::SMEMBER_BOOL_MOBILE);
+
+    SMember member_vdr_hmi = get_member_with_history(
+        vehicle_data_history, SMemberType::SMEMBER_VDR_HMI);
+    SMember member_vdr_mobile = get_member_with_history(
+        vehicle_data_history, SMemberType::SMEMBER_VDR_MOBILE);
+    SMember member_hmi =
+        get_member_with_history(vehicle_data_history, SMemberType::SMEMBER_HMI);
+    SMember member_mobile = get_member_with_history(
+        vehicle_data_history, SMemberType::SMEMBER_MOBILE);
+
+    mobile_params.addBoolParam(
+        std::pair<std::string, SMember>(vdi->name, member_bool_mobile));
+    mobile_params.addVDRParam(
+        std::pair<std::string, SMember>(vdi->name, member_vdr_mobile));
+    mobile_params.addParam(
+        std::pair<std::string, SMember>(vdi->name, member_mobile));
+
+    hmi_params.addBoolParam(
+        std::pair<std::string, SMember>(vdi->key, member_bool_hmi));
+    hmi_params.addVDRParam(
+        std::pair<std::string, SMember>(vdi->key, member_vdr_hmi));
+    hmi_params.addParam(std::pair<std::string, SMember>(vdi->key, member_hmi));
+  }
+
+  std::vector<mobile_apis::FunctionID::eType> mobile_subscribe_functions{
+      mobile_apis::FunctionID::SubscribeVehicleDataID,
+      mobile_apis::FunctionID::UnsubscribeVehicleDataID};
+
+  for (const auto& function_id : mobile_subscribe_functions) {
+    rpc_service_.UpdateMobileRPCParams(function_id,
+                                       mobile_apis::messageType::request,
+                                       mobile_params.getBoolParams());
+    rpc_service_.UpdateMobileRPCParams(function_id,
+                                       mobile_apis::messageType::response,
+                                       mobile_params.getVDRParams());
+  }
+
+  std::vector<hmi_apis::FunctionID::eType> hmi_subscribe_functions{
+      hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData,
+      hmi_apis::FunctionID::VehicleInfo_UnsubscribeVehicleData};
+
+  for (const auto& function_id : hmi_subscribe_functions) {
+    rpc_service_.UpdateHMIRPCParams(function_id,
+                                    hmi_apis::messageType::request,
+                                    hmi_params.getBoolParams());
+    rpc_service_.UpdateHMIRPCParams(function_id,
+                                    hmi_apis::messageType::response,
+                                    hmi_params.getVDRParams());
+  }
+
+  rpc_service_.UpdateMobileRPCParams(mobile_apis::FunctionID::GetVehicleDataID,
+                                     mobile_apis::messageType::request,
+                                     mobile_params.getBoolParams());
+
+  rpc_service_.UpdateMobileRPCParams(mobile_apis::FunctionID::GetVehicleDataID,
+                                     mobile_apis::messageType::response,
+                                     mobile_params.getParams());
+
+  rpc_service_.UpdateMobileRPCParams(mobile_apis::FunctionID::OnVehicleDataID,
+                                     mobile_apis::messageType::notification,
+                                     mobile_params.getParams());
+
+  rpc_service_.UpdateHMIRPCParams(
+      hmi_apis::FunctionID::VehicleInfo_GetVehicleData,
+      hmi_apis::messageType::request,
+      hmi_params.getBoolParams());
+
+  rpc_service_.UpdateHMIRPCParams(
+      hmi_apis::FunctionID::VehicleInfo_GetVehicleData,
+      hmi_apis::messageType::response,
+      hmi_params.getParams());
+
+  rpc_service_.UpdateHMIRPCParams(
+      hmi_apis::FunctionID::VehicleInfo_OnVehicleData,
+      hmi_apis::messageType::notification,
+      hmi_params.getParams());
+}
+
+void CustomVehicleDataManagerImpl::OnPolicyEvent(
+    plugin_manager::PolicyEvent policy_event) {
+  using namespace plugin_manager;
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  switch (policy_event) {
+    case kApplicationPolicyUpdated:
+      UpdateVehicleDataItems();
+      break;
+    case kApplicationsDisabled:
+    default:
+      return;
+  }
+}
+
+const OptionalDataItem
+CustomVehicleDataManagerImpl::FindSchemaByNameNonRecursive(
+    const std::string& name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto& oem_items = vehicle_data_provider_.GetVehicleDataItems();
+  auto compare_by_name = [&name](const policy_table::VehicleDataItem& item) {
+    return (name == std::string(item.name));
+  };
+
+  return FindSchema(oem_items, SearchMethod::NON_RECURSIVE, compare_by_name);
+}
+
+const OptionalDataItem
+CustomVehicleDataManagerImpl::FindRemovedSchemaByNameNonRecursive(
+    const std::string& name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto& removed_oem_items =
+      vehicle_data_provider_.GetRemovedVehicleDataItems();
+  auto compare_by_name = [&name](const policy_table::VehicleDataItem& item) {
+    return (name == std::string(item.name));
+  };
+
+  return FindSchema(
+      removed_oem_items, SearchMethod::NON_RECURSIVE, compare_by_name);
+}
+
+const OptionalDataItem CustomVehicleDataManagerImpl::FindSchemaByNameRecursive(
+    const std::string& name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto& oem_items = vehicle_data_provider_.GetVehicleDataItems();
+  auto compare_by_name = [&name](const policy_table::VehicleDataItem& item) {
+    return (name == std::string(item.name));
+  };
+
+  return FindSchema(oem_items, SearchMethod::RECURSIVE, compare_by_name);
+}
+
+const OptionalDataItem
+CustomVehicleDataManagerImpl::FindSchemaByKeyNonRecursive(
+    const std::string& key) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto& oem_items = vehicle_data_provider_.GetVehicleDataItems();
+  auto compare_by_key = [&key](const policy_table::VehicleDataItem& item) {
+    return (key == std::string(item.key));
+  };
+
+  return FindSchema(oem_items, SearchMethod::NON_RECURSIVE, compare_by_key);
+}
+
+const OptionalDataItem CustomVehicleDataManagerImpl::FindSchemaByKeyRecursive(
+    const std::string& key) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto& oem_items = vehicle_data_provider_.GetVehicleDataItems();
+  auto compare_by_key = [&key](const policy_table::VehicleDataItem& item) {
+    return (key == std::string(item.key));
+  };
+
+  return FindSchema(oem_items, SearchMethod::RECURSIVE, compare_by_key);
+}
+
+}  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_data_item_schema.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_data_item_schema.cc
new file mode 100644
index 0000000000..750da9fa6e
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_data_item_schema.cc
@@ -0,0 +1,188 @@
+#include "vehicle_info_plugin/vehicle_data_item_schema.h"
+#include <limits>
+
+namespace vehicle_info_plugin {
+
+#ifdef ENABLE_LOG
+CREATE_LOGGERPTR_LOCAL(vehicle_data_logger, "VehicleDataItemSchema");
+#endif  // ENABLE_LOG
+
+VehicleDataItemSchema::VehicleDataItemSchema(PolicyDataItem& policy_item,
+                                             SchemaType schema_type) {
+  policy_table::VehicleDataItem policy_data_item;
+  policy_item.getValue(policy_data_item);
+
+  auto get_object_schema = [&policy_data_item,
+                            &schema_type]() -> decltype(so_schema_item_) {
+    smart_objects::Members members;
+    auto object_schema = smart_objects::CObjectSchemaItem::create(members);
+
+    for (auto& e : *policy_data_item.params) {
+      auto schema_item = PolicyDataItem(e);
+      smart_objects::SMember member(create(schema_item, schema_type),
+                                    bool(e.mandatory),
+                                    std::string(*e.since),
+                                    std::string(*e.until),
+                                    bool(*e.deprecated),
+                                    bool(*e.removed));
+      std::string name;
+      switch (schema_type) {
+        case VehicleDataItemSchema::SchemaType::HMI:
+          name = e.key;
+          break;
+        case VehicleDataItemSchema::SchemaType::MOBILE:
+        default:
+          name = e.name;
+          break;
+      }
+      object_schema->AddMemberSchemaItem(name, member);
+    }
+
+    return object_schema;
+  };
+
+  auto get_schema = [&policy_data_item,
+                     &get_object_schema,
+                     &schema_type,
+                     this]() -> decltype(so_schema_item_) {
+    // Check if policy item has POD type
+    if (isPODType(policy_data_item.type)) {
+      return GetPODTypeSchema(policy_data_item, schema_type);
+    }
+
+    // Check if policy item has Struct type
+    if (policy_data_item.type == policy_table::VehicleDataItem::kStruct) {
+      return get_object_schema();
+    }
+
+    // Check if policy item has Enum type
+    auto enum_schema = getEnumSchema(policy_data_item.type);
+    if (enum_schema != nullptr) {
+      return enum_schema;
+    }
+
+    // If an unknown type is present in the policy table, it is assumed that it
+    // is a future enum type. Since normal validation cannot be performed on
+    // this value, it is treated as a raw string instead
+    policy_data_item.type = "String";
+
+    return GetPODTypeSchema(policy_data_item, schema_type);
+  };
+
+  if (*policy_data_item.array) {
+    so_schema_item_ = smart_objects::CArraySchemaItem::create(
+        get_schema(),
+        policy_data_item.minsize.is_initialized()
+            ? smart_objects::TSchemaItemParameter<size_t>(
+                  *policy_data_item.minsize)
+            : smart_objects::TSchemaItemParameter<size_t>(),
+        policy_data_item.maxsize.is_initialized()
+            ? smart_objects::TSchemaItemParameter<size_t>(
+                  *policy_data_item.maxsize)
+            : smart_objects::TSchemaItemParameter<size_t>());
+  } else {
+    so_schema_item_ = get_schema();
+  }
+}
+
+VehicleDataItemSchemaPtr VehicleDataItemSchema::create(
+    PolicyDataItem& policy_item, SchemaType schema_type) {
+  return VehicleDataItemSchemaPtr(
+      new VehicleDataItemSchema(policy_item, schema_type));
+}
+
+smart_objects::errors::eType
+vehicle_info_plugin::VehicleDataItemSchema::validate(
+    const smart_objects::SmartObject& Object,
+    rpc::ValidationReport* report__,
+    const utils::SemanticVersion& MessageVersion,
+    const bool allow_unknown_enums) {
+  if (!so_schema_item_) {
+    std::string validation_info =
+        "Invalid type: " +
+        smart_objects::SmartObject::typeToString(Object.getType());
+    report__->set_validation_info(validation_info);
+    return smart_objects::errors::eType::ERROR;
+  }
+
+  return so_schema_item_->validate(
+      Object, report__, MessageVersion, allow_unknown_enums);
+}
+
+smart_objects::ISchemaItemPtr VehicleDataItemSchema::GetPODTypeSchema(
+    const policy_table::VehicleDataItem& policy_item, SchemaType schema_type) {
+  using IntSchemaItem = smart_objects::TNumberSchemaItem<int64_t>;
+  using IntItemParam = smart_objects::TSchemaItemParameter<int64_t>;
+  using FloatSchemaItem = smart_objects::TNumberSchemaItem<double>;
+  using FloatItemParam = smart_objects::TSchemaItemParameter<double>;
+  using StringSchemaItem = smart_objects::CStringSchemaItem;
+  using StringItemParam = smart_objects::TSchemaItemParameter<size_t>;
+  using BoolSchemaItem = smart_objects::CBoolSchemaItem;
+  using BoolItemParam = smart_objects::TSchemaItemParameter<bool>;
+
+  if (policy_item.type == policy_table::VehicleDataItem::kInteger) {
+    return IntSchemaItem::create(policy_item.minvalue.is_initialized()
+                                     ? IntItemParam(*policy_item.minvalue)
+                                     : IntItemParam(),
+                                 policy_item.maxvalue.is_initialized()
+                                     ? IntItemParam(*policy_item.maxvalue)
+                                     : IntItemParam());
+  }
+  if (policy_item.type == policy_table::VehicleDataItem::kFloat ||
+      policy_item.type == policy_table::VehicleDataItem::kDouble) {
+    return FloatSchemaItem::create(
+        policy_item.minvalue.is_initialized()
+            ? FloatItemParam(double(*policy_item.minvalue))
+            : FloatItemParam(),
+        policy_item.maxvalue.is_initialized()
+            ? FloatItemParam(double(*policy_item.maxvalue))
+            : FloatItemParam());
+  }
+  if (policy_item.type == policy_table::VehicleDataItem::kString) {
+    return StringSchemaItem::create(
+        StringItemParam(policy_item.minlength.is_initialized()
+                            ? *policy_item.minlength
+                            : 0),
+        policy_item.maxlength.is_initialized()
+            ? StringItemParam(*policy_item.maxlength)
+            : StringItemParam());
+  }
+  if (policy_item.type == policy_table::VehicleDataItem::kBoolean) {
+    return BoolSchemaItem::create(BoolItemParam(true));
+  }
+
+  std::string error_msg = std::string("Invalid POD type provided: ") +
+                          std::string(policy_item.type);
+  LOG4CXX_ERROR(vehicle_data_logger, error_msg.c_str());
+  return nullptr;
+}
+
+const bool VehicleDataItemSchema::isPODType(
+    const std::string& type_name) const {
+  return std::find(policy_table::VehicleDataItem::kPODTypes.begin(),
+                   policy_table::VehicleDataItem::kPODTypes.end(),
+                   type_name) != policy_table::VehicleDataItem::kPODTypes.end();
+}
+
+smart_objects::ISchemaItemPtr VehicleDataItemSchema::getEnumSchema(
+    const std::string& type_name) const {
+  auto enum_schema = policy_table::EnumSchemaItemFactory::Get(type_name);
+  if (!enum_schema) {
+    LOG4CXX_ERROR(vehicle_data_logger, "NULL pointer: " << type_name);
+  }
+  return enum_schema;
+}
+
+void VehicleDataItemSchema::applySchema(
+    smart_objects::SmartObject& Object,
+    const bool remove_unknown_parameters,
+    const utils::SemanticVersion& MessageVersion) {
+  so_schema_item_->applySchema(
+      Object, remove_unknown_parameters, MessageVersion);
+}
+
+void VehicleDataItemSchema::unapplySchema(
+    smart_objects::SmartObject& Object, const bool remove_unknown_parameters) {
+  so_schema_item_->unapplySchema(Object, remove_unknown_parameters);
+}
+}  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc
index 730812e9c8..149299d3bb 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_app_extension.cc
@@ -53,13 +53,13 @@ VehicleInfoAppExtension::~VehicleInfoAppExtension() {
 }
 
 bool VehicleInfoAppExtension::subscribeToVehicleInfo(
-    const VehicleDataType vehicle_data) {
+    const std::string& vehicle_data) {
   LOG4CXX_DEBUG(logger_, vehicle_data);
   return subscribed_data_.insert(vehicle_data).second;
 }
 
 bool VehicleInfoAppExtension::unsubscribeFromVehicleInfo(
-    const VehicleDataType vehicle_data) {
+    const std::string& vehicle_data) {
   LOG4CXX_DEBUG(logger_, vehicle_data);
   auto it = subscribed_data_.find(vehicle_data);
   if (it != subscribed_data_.end()) {
@@ -75,7 +75,7 @@ void VehicleInfoAppExtension::unsubscribeFromVehicleInfo() {
 }
 
 bool VehicleInfoAppExtension::isSubscribedToVehicleInfo(
-    const VehicleDataType vehicle_data) const {
+    const std::string& vehicle_data) const {
   LOG4CXX_DEBUG(logger_, vehicle_data);
   return subscribed_data_.find(vehicle_data) != subscribed_data_.end();
 }
@@ -91,7 +91,7 @@ void VehicleInfoAppExtension::SaveResumptionData(
       smart_objects::SmartObject(smart_objects::SmartType_Array);
   int i = 0;
   for (const auto& subscription : subscribed_data_) {
-    resumption_data[application_vehicle_info][i] = subscription;
+    resumption_data[application_vehicle_info][i++] = subscription;
   }
 }
 
@@ -99,13 +99,12 @@ void VehicleInfoAppExtension::ProcessResumption(
     const smart_objects::SmartObject& resumption_data) {
   const char* application_vehicle_info = "vehicleInfo";
   if (resumption_data.keyExists(application_vehicle_info)) {
-    const smart_objects::SmartObject& subscriptions_ivi =
-        resumption_data[application_vehicle_info];
-    for (size_t i = 0; i < subscriptions_ivi.length(); ++i) {
-      mobile_apis::VehicleDataType::eType ivi =
-          static_cast<mobile_apis::VehicleDataType::eType>(
-              (resumption_data[i]).asInt());
-      subscribeToVehicleInfo(ivi);
+    const auto* subscriptions_ivi =
+        resumption_data[application_vehicle_info].asArray();
+    if (subscriptions_ivi) {
+      for (const auto& ivi : (*subscriptions_ivi)) {
+        subscribeToVehicleInfo(ivi.asString());
+      }
     }
     plugin_.ProcessResumptionSubscription(app_, *this);
   }
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
index 617925589f..52ee9f476d 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_command_factory.cc
@@ -36,15 +36,27 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin")
 
 namespace vehicle_info_plugin {
 
+namespace app_mngr = application_manager;
+namespace commands = application_manager::commands;
+
 VehicleInfoCommandFactory::VehicleInfoCommandFactory(
     app_mngr::ApplicationManager& application_manager,
     app_mngr::rpc_service::RPCService& rpc_service,
     app_mngr::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
-    : hmi_command_factory_(new VehicleInfoHmiCommandFactory(
-          application_manager, rpc_service, hmi_capabilities, policy_handler))
-    , mob_command_factory_(new VehicleInfoMobileCommandFactory(
-          application_manager, rpc_service, hmi_capabilities, policy_handler)) {
+    policy::PolicyHandlerInterface& policy_handler,
+    CustomVehicleDataManager& custom_vehicle_data_manager)
+    : hmi_command_factory_(
+          new VehicleInfoHmiCommandFactory(application_manager,
+                                           rpc_service,
+                                           hmi_capabilities,
+                                           policy_handler,
+                                           custom_vehicle_data_manager))
+    , mob_command_factory_(
+          new VehicleInfoMobileCommandFactory(application_manager,
+                                              rpc_service,
+                                              hmi_capabilities,
+                                              policy_handler,
+                                              custom_vehicle_data_manager)) {
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc
index dd3b43920a..e8d852b612 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_hmi_command_factory.cc
@@ -57,15 +57,75 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin")
 namespace vehicle_info_plugin {
 namespace strings = app_mngr::strings;
 
+template <typename VehicleInfoCommandType>
+class VehicleInfoCommandCreator : public application_manager::CommandCreator {
+ public:
+  VehicleInfoCommandCreator(const VehicleInfoCommandParams& params)
+      : params_(params) {}
+
+ private:
+  bool CanBeCreated() const override {
+    return true;
+  }
+
+  application_manager::CommandSharedPtr create(
+      const application_manager::commands::MessageSharedPtr& message)
+      const override {
+    application_manager::CommandSharedPtr command(
+        new VehicleInfoCommandType(message, params_));
+    return command;
+  }
+
+  VehicleInfoCommandParams params_;
+};
+
+struct VehicleInfoInvalidCommand {};
+
+template <>
+class VehicleInfoCommandCreator<VehicleInfoInvalidCommand>
+    : public application_manager::CommandCreator {
+ public:
+  VehicleInfoCommandCreator(const VehicleInfoCommandParams& params) {
+    UNUSED(params);
+  }
+
+ private:
+  bool CanBeCreated() const override {
+    return false;
+  }
+
+  application_manager::CommandSharedPtr create(
+      const application_manager::commands::MessageSharedPtr& message)
+      const override {
+    UNUSED(message);
+    return application_manager::CommandSharedPtr();
+  }
+};
+
+struct VehicleInfoCommandCreatorFactory {
+  VehicleInfoCommandCreatorFactory(const VehicleInfoCommandParams& params)
+      : params_(params) {}
+
+  template <typename VehicleInfoCommandType>
+  application_manager::CommandCreator& GetCreator() {
+    LOG4CXX_AUTO_TRACE(logger_);
+    static VehicleInfoCommandCreator<VehicleInfoCommandType> res(params_);
+    return res;
+  }
+  const VehicleInfoCommandParams params_;
+};
+
 VehicleInfoHmiCommandFactory::VehicleInfoHmiCommandFactory(
     application_manager::ApplicationManager& application_manager,
     application_manager::rpc_service::RPCService& rpc_service,
     application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    policy::PolicyHandlerInterface& policy_handler,
+    CustomVehicleDataManager& custom_vehicle_data_manager)
     : application_manager_(application_manager)
     , rpc_service_(rpc_service)
     , hmi_capabilities_(hmi_capabilities)
-    , policy_handler_(policy_handler) {
+    , policy_handler_(policy_handler)
+    , custom_vehicle_data_manager_(custom_vehicle_data_manager) {
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
@@ -107,9 +167,12 @@ bool VehicleInfoHmiCommandFactory::IsAbleToProcess(
 
 app_mngr::CommandCreator& VehicleInfoHmiCommandFactory::buildCommandCreator(
     const int32_t function_id, const int32_t message_type) const {
-  auto factory = app_mngr::CommandCreatorFactory(
-      application_manager_, rpc_service_, hmi_capabilities_, policy_handler_);
-
+  VehicleInfoCommandParams params = {application_manager_,
+                                     rpc_service_,
+                                     hmi_capabilities_,
+                                     policy_handler_,
+                                     custom_vehicle_data_manager_};
+  auto factory = VehicleInfoCommandCreatorFactory(params);
   switch (function_id) {
     case hmi_apis::FunctionID::VehicleInfo_GetVehicleType:
       return hmi_apis::messageType::request == message_type
@@ -150,7 +213,7 @@ app_mngr::CommandCreator& VehicleInfoHmiCommandFactory::buildCommandCreator(
                  : factory.GetCreator<commands::VIDiagnosticMessageResponse>();
     default:
       LOG4CXX_WARN(logger_, "Unsupported function_id: " << function_id);
-      return factory.GetCreator<app_mngr::InvalidCommand>();
+      return factory.GetCreator<VehicleInfoInvalidCommand>();
   }
 }
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc
index dffc836a89..c3c8d9c8d7 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_mobile_command_factory.cc
@@ -34,6 +34,9 @@
 
 #include "application_manager/message.h"
 #include "interfaces/MOBILE_API.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
+
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
 
 #include "vehicle_info_plugin/commands/mobile/diagnostic_message_request.h"
 #include "vehicle_info_plugin/commands/mobile/diagnostic_message_response.h"
@@ -54,21 +57,83 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin")
 namespace vehicle_info_plugin {
 namespace strings = app_mngr::strings;
 
+template <typename VehicleInfoCommandType>
+class VehicleInfoCommandCreator : public application_manager::CommandCreator {
+ public:
+  VehicleInfoCommandCreator(const VehicleInfoCommandParams& params)
+      : params_(params) {}
+
+ private:
+  bool CanBeCreated() const override {
+    return true;
+  }
+
+  application_manager::CommandSharedPtr create(
+      const application_manager::commands::MessageSharedPtr& message)
+      const override {
+    application_manager::CommandSharedPtr command(
+        new VehicleInfoCommandType(message, params_));
+    return command;
+  }
+
+  VehicleInfoCommandParams params_;
+};
+
+struct VehicleInfoInvalidCommand {};
+
+template <>
+class VehicleInfoCommandCreator<VehicleInfoInvalidCommand>
+    : public application_manager::CommandCreator {
+ public:
+  VehicleInfoCommandCreator(const VehicleInfoCommandParams& params) {
+    UNUSED(params);
+  }
+
+ private:
+  bool CanBeCreated() const override {
+    return false;
+  }
+
+  application_manager::CommandSharedPtr create(
+      const application_manager::commands::MessageSharedPtr& message)
+      const override {
+    UNUSED(message);
+    return application_manager::CommandSharedPtr();
+  }
+};
+
+struct VehicleInfoCommandCreatorFactory {
+  VehicleInfoCommandCreatorFactory(const VehicleInfoCommandParams& params)
+      : params_(params) {}
+
+  template <typename VehicleInfoCommandType>
+  application_manager::CommandCreator& GetCreator() {
+    LOG4CXX_AUTO_TRACE(logger_);
+    static VehicleInfoCommandCreator<VehicleInfoCommandType> res(params_);
+    return res;
+  }
+  const VehicleInfoCommandParams params_;
+};
+
 VehicleInfoMobileCommandFactory::VehicleInfoMobileCommandFactory(
     application_manager::ApplicationManager& application_manager,
     application_manager::rpc_service::RPCService& rpc_service,
     application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    policy::PolicyHandlerInterface& policy_handler,
+    CustomVehicleDataManager& custom_vehicle_data_manager)
     : application_manager_(application_manager)
     , rpc_service_(rpc_service)
     , hmi_capabilities_(hmi_capabilities)
-    , policy_handler_(policy_handler) {
+    , policy_handler_(policy_handler)
+    , custom_vehicle_data_manager_(custom_vehicle_data_manager) {
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
 app_mngr::CommandSharedPtr VehicleInfoMobileCommandFactory::CreateCommand(
     const app_mngr::commands::MessageSharedPtr& message,
     app_mngr::commands::Command::CommandSource source) {
+  UNUSED(source);
+
   const mobile_apis::FunctionID::eType function_id =
       static_cast<mobile_apis::FunctionID::eType>(
           (*message)[strings::params][strings::function_id].asInt());
@@ -105,8 +170,12 @@ bool VehicleInfoMobileCommandFactory::IsAbleToProcess(
 app_mngr::CommandCreator& VehicleInfoMobileCommandFactory::get_command_creator(
     const mobile_apis::FunctionID::eType id,
     const mobile_apis::messageType::eType message_type) const {
-  auto factory = app_mngr::CommandCreatorFactory(
-      application_manager_, rpc_service_, hmi_capabilities_, policy_handler_);
+  VehicleInfoCommandParams params = {application_manager_,
+                                     rpc_service_,
+                                     hmi_capabilities_,
+                                     policy_handler_,
+                                     custom_vehicle_data_manager_};
+  auto factory = VehicleInfoCommandCreatorFactory(params);
   switch (id) {
     case mobile_apis::FunctionID::GetVehicleDataID: {
       return mobile_apis::messageType::request == message_type
@@ -141,21 +210,25 @@ app_mngr::CommandCreator& VehicleInfoMobileCommandFactory::get_command_creator(
     }
     default: {}
   }
-  return factory.GetCreator<app_mngr::InvalidCommand>();
+  return factory.GetCreator<VehicleInfoInvalidCommand>();
 }
 
 app_mngr::CommandCreator&
 VehicleInfoMobileCommandFactory::get_notification_creator(
     const mobile_apis::FunctionID::eType id) const {
-  auto factory = app_mngr::CommandCreatorFactory(
-      application_manager_, rpc_service_, hmi_capabilities_, policy_handler_);
+  VehicleInfoCommandParams params = {application_manager_,
+                                     rpc_service_,
+                                     hmi_capabilities_,
+                                     policy_handler_,
+                                     custom_vehicle_data_manager_};
+  auto factory = VehicleInfoCommandCreatorFactory(params);
   switch (id) {
     case mobile_apis::FunctionID::OnVehicleDataID: {
       return factory.GetCreator<commands::OnVehicleDataNotification>();
     }
     default: {}
   }
-  return factory.GetCreator<app_mngr::InvalidCommand>();
+  return factory.GetCreator<VehicleInfoInvalidCommand>();
 }
 
 app_mngr::CommandCreator& VehicleInfoMobileCommandFactory::get_creator_factory(
@@ -183,8 +256,12 @@ app_mngr::CommandCreator& VehicleInfoMobileCommandFactory::get_creator_factory(
     }
     default: {}
   }
-  auto factory = app_mngr::CommandCreatorFactory(
-      application_manager_, rpc_service_, hmi_capabilities_, policy_handler_);
-  return factory.GetCreator<app_mngr::InvalidCommand>();
+  VehicleInfoCommandParams params = {application_manager_,
+                                     rpc_service_,
+                                     hmi_capabilities_,
+                                     policy_handler_,
+                                     custom_vehicle_data_manager_};
+  auto factory = VehicleInfoCommandCreatorFactory(params);
+  return factory.GetCreator<VehicleInfoInvalidCommand>();
 }
 }  // namespace vehicle_info_plugin
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc
index 70210f704e..3e8ef6b29d 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/vehicle_info_plugin.cc
@@ -33,7 +33,9 @@
 #include "vehicle_info_plugin/vehicle_info_plugin.h"
 #include "application_manager/message_helper.h"
 #include "application_manager/plugin_manager/plugin_keys.h"
+#include "application_manager/rpc_handler.h"
 #include "application_manager/smart_object_keys.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager_impl.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
 #include "vehicle_info_plugin/vehicle_info_command_factory.h"
 
@@ -42,6 +44,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "VehicleInfoPlugin")
 
 namespace strings = application_manager::strings;
 namespace plugins = application_manager::plugin_manager;
+namespace commands = application_manager::commands;
 
 VehicleInfoPlugin::VehicleInfoPlugin() : application_manager_(nullptr) {}
 
@@ -49,10 +52,37 @@ bool VehicleInfoPlugin::Init(
     application_manager::ApplicationManager& app_manager,
     application_manager::rpc_service::RPCService& rpc_service,
     application_manager::HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler) {
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastStateWrapperPtr last_state) {
+  UNUSED(last_state);
   application_manager_ = &app_manager;
+  custom_vehicle_data_manager_.reset(
+      new CustomVehicleDataManagerImpl(policy_handler, rpc_service));
   command_factory_.reset(new vehicle_info_plugin::VehicleInfoCommandFactory(
-      app_manager, rpc_service, hmi_capabilities, policy_handler));
+      app_manager,
+      rpc_service,
+      hmi_capabilities,
+      policy_handler,
+      *(custom_vehicle_data_manager_.get())));
+  return true;
+}
+
+bool VehicleInfoPlugin::Init(
+    application_manager::ApplicationManager& application_manager,
+    application_manager::rpc_service::RPCService& rpc_service,
+    application_manager::HMICapabilities& hmi_capabilities,
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastState& last_state) {
+  UNUSED(last_state);
+  application_manager_ = &application_manager;
+  custom_vehicle_data_manager_.reset(
+      new CustomVehicleDataManagerImpl(policy_handler, rpc_service));
+  command_factory_.reset(new vehicle_info_plugin::VehicleInfoCommandFactory(
+      application_manager,
+      rpc_service,
+      hmi_capabilities,
+      policy_handler,
+      *(custom_vehicle_data_manager_.get())));
   return true;
 }
 
@@ -69,7 +99,10 @@ app_mngr::CommandFactory& VehicleInfoPlugin::GetCommandFactory() {
   return *command_factory_;
 }
 
-void VehicleInfoPlugin::OnPolicyEvent(plugins::PolicyEvent event) {}
+void VehicleInfoPlugin::OnPolicyEvent(plugins::PolicyEvent event) {
+  UnsubscribeFromRemovedVDItems();
+  custom_vehicle_data_manager_->OnPolicyEvent(event);
+}
 
 void VehicleInfoPlugin::OnApplicationEvent(
     plugins::ApplicationEvent event,
@@ -77,11 +110,50 @@ void VehicleInfoPlugin::OnApplicationEvent(
   if (plugins::ApplicationEvent::kApplicationRegistered == event) {
     application->AddExtension(
         std::make_shared<VehicleInfoAppExtension>(*this, *application));
-  } else if (plugins::ApplicationEvent::kDeleteApplicationData == event) {
+  } else if ((plugins::ApplicationEvent::kDeleteApplicationData == event) ||
+             (plugins::ApplicationEvent::kApplicationUnregistered == event)) {
     DeleteSubscriptions(application);
   }
 }
 
+void VehicleInfoPlugin::UnsubscribeFromRemovedVDItems() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  typedef std::vector<std::string> StringsVector;
+
+  auto get_items_to_unsubscribe = [this]() -> StringsVector {
+    StringsVector output_items_list;
+    auto applications = application_manager_->applications();
+    for (auto& app : applications.GetData()) {
+      auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
+      auto subscription_names = ext.Subscriptions();
+      for (auto& subscription_name : subscription_names) {
+        if (custom_vehicle_data_manager_->IsRemovedCustomVehicleDataName(
+                subscription_name)) {
+          ext.unsubscribeFromVehicleInfo(subscription_name);
+          if (!helpers::in_range(output_items_list, subscription_name)) {
+            LOG4CXX_DEBUG(logger_,
+                          "Vehicle data item "
+                              << subscription_name
+                              << " has been removed by policy");
+            output_items_list.push_back(subscription_name);
+          }
+        }
+      }
+    }
+    return output_items_list;
+  };
+
+  const StringsVector items_to_unsubscribe = get_items_to_unsubscribe();
+
+  if (items_to_unsubscribe.empty()) {
+    LOG4CXX_DEBUG(logger_, "There is no data to unsubscribe");
+    return;
+  }
+
+  auto message = GetUnsubscribeIVIRequest(items_to_unsubscribe);
+  application_manager_->GetRPCService().ManageHMICommand(message);
+}
+
 void VehicleInfoPlugin::ProcessResumptionSubscription(
     application_manager::Application& app, VehicleInfoAppExtension& ext) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -89,13 +161,15 @@ void VehicleInfoPlugin::ProcessResumptionSubscription(
       smart_objects::SmartObject(smart_objects::SmartType_Map);
   msg_params[strings::app_id] = app.app_id();
   const auto& subscriptions = ext.Subscriptions();
-  for (auto& ivi_data : application_manager::MessageHelper::vehicle_data()) {
-    mobile_apis::VehicleDataType::eType type_id = ivi_data.second;
-    if (subscriptions.end() != subscriptions.find(type_id)) {
-      std::string key_name = ivi_data.first;
-      msg_params[key_name] = true;
-    }
+  if (subscriptions.empty()) {
+    LOG4CXX_DEBUG(logger_, "No vehicle data to subscribe. Exiting");
+    return;
+  }
+
+  for (const auto& item : subscriptions) {
+    msg_params[item] = true;
   }
+
   smart_objects::SmartObjectSPtr request =
       application_manager::MessageHelper::CreateModuleInfoSO(
           hmi_apis::FunctionID::VehicleInfo_SubscribeVehicleData,
@@ -105,38 +179,56 @@ void VehicleInfoPlugin::ProcessResumptionSubscription(
 }
 
 application_manager::ApplicationSharedPtr FindAppSubscribedToIVI(
-    mobile_apis::VehicleDataType::eType ivi_data,
+    const std::string& ivi_name,
     application_manager::ApplicationManager& app_mngr) {
   auto applications = app_mngr.applications();
 
   for (auto& app : applications.GetData()) {
     auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
-    if (ext.isSubscribedToVehicleInfo(ivi_data)) {
+    if (ext.isSubscribedToVehicleInfo(ivi_name)) {
       return app;
     }
   }
   return application_manager::ApplicationSharedPtr();
 }
 
-smart_objects::SmartObjectSPtr GetUnsubscribeIVIRequest(
-    int32_t ivi_id, application_manager::ApplicationManager& app_mngr) {
+smart_objects::SmartObjectSPtr VehicleInfoPlugin::GetUnsubscribeIVIRequest(
+    const std::vector<std::string>& ivi_names) {
+  LOG4CXX_AUTO_TRACE(logger_);
   using namespace smart_objects;
 
-  auto find_ivi_name = [ivi_id]() {
+  auto msg_params = smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  auto find_ivi_name = [](const std::string& ivi_name) {
     for (auto item : application_manager::MessageHelper::vehicle_data()) {
-      if (ivi_id == item.second) {
+      if (ivi_name == item.first) {
         return item.first;
       }
     }
     return std::string();
   };
-  std::string key_name = find_ivi_name();
-  DCHECK_OR_RETURN(!key_name.empty(), smart_objects::SmartObjectSPtr());
-  auto msg_params = smart_objects::SmartObject(smart_objects::SmartType_Map);
-  msg_params[key_name] = true;
+
+  for (const auto& ivi_name : ivi_names) {
+    // try to find the name in vehicle data types
+    std::string key_name = find_ivi_name(ivi_name);
+
+    if (key_name.empty()) {
+      // the name hasn't been found in vehicle data types
+      if (custom_vehicle_data_manager_->IsValidCustomVehicleDataName(
+              ivi_name) ||
+          custom_vehicle_data_manager_->IsRemovedCustomVehicleDataName(
+              ivi_name)) {
+        key_name = ivi_name;
+      }
+    }
+
+    DCHECK_OR_RETURN(!key_name.empty(), smart_objects::SmartObjectSPtr());
+    msg_params[key_name] = true;
+  }
 
   auto message = application_manager::MessageHelper::CreateMessageForHMI(
-      hmi_apis::messageType::request, app_mngr.GetNextHMICorrelationID());
+      hmi_apis::messageType::request,
+      application_manager_->GetNextHMICorrelationID());
   DCHECK(message);
 
   SmartObject& object = *message;
@@ -151,18 +243,31 @@ void VehicleInfoPlugin::DeleteSubscriptions(
     application_manager::ApplicationSharedPtr app) {
   auto& ext = VehicleInfoAppExtension::ExtractVIExtension(*app);
   auto subscriptions = ext.Subscriptions();
+  std::vector<std::string> ivi_to_unsubscribe;
   for (auto& ivi : subscriptions) {
     ext.unsubscribeFromVehicleInfo(ivi);
     auto still_subscribed_app =
         FindAppSubscribedToIVI(ivi, *application_manager_);
     if (!still_subscribed_app) {
-      auto message = GetUnsubscribeIVIRequest(ivi, *application_manager_);
-      application_manager_->GetRPCService().ManageHMICommand(message);
+      ivi_to_unsubscribe.push_back(ivi);
     }
   }
+
+  if (!ivi_to_unsubscribe.empty()) {
+    auto message = GetUnsubscribeIVIRequest(ivi_to_unsubscribe);
+    application_manager_->GetRPCService().ManageHMICommand(message);
+  }
 }
 }  // namespace vehicle_info_plugin
 
-extern "C" application_manager::plugin_manager::RPCPlugin* Create() {
+extern "C" __attribute__((visibility("default")))
+application_manager::plugin_manager::RPCPlugin*
+Create() {
   return new vehicle_info_plugin::VehicleInfoPlugin();
 }
+
+extern "C" __attribute__((visibility("default"))) void Delete(
+    application_manager::plugin_manager::RPCPlugin* data) {
+  delete data;
+  DELETE_THREAD_LOGGER(vehicle_info_plugin::logger_);
+}
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt
index 3ea4a50a8a..a8193c17f0 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/CMakeLists.txt
@@ -31,23 +31,30 @@
 include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
 
 include_directories(
+  include
   ${GMOCK_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}/application_manager/rpc_plugins/vehicle_info_plugin/include
-  ${COMPONENTS_DIR}/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands/
+  ${COMPONENTS_DIR}/application_manager/rpc_plugins/vehicle_info_plugin/include/vehicle_info_plugin/commands
   ${COMPONENTS_DIR}/application_manager/test/include/
-)  
-
-
+  ${COMPONENTS_DIR}/include/test/application_manager/
+  ${COMPONENTS_DIR}/resumption/include/resumption/
+  )
 set(COMMANDS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/commands)
 
 file(GLOB SOURCES
   ${COMPONENTS_DIR}/application_manager/test/mock_message_helper.cc
   ${COMPONENTS_DIR}/application_manager/test/mock_application_helper.cc
   ${COMPONENTS_DIR}/application_manager/src/smart_object_keys.cc
+  ${COMPONENTS_DIR}/${POLICY_PATH}/src/policy_table/types.cc
+  ${COMPONENTS_DIR}/${POLICY_PATH}/src/policy_table/validation.cc
+  ${COMPONENTS_DIR}/${POLICY_PATH}/src/policy_table/enums.cc
   ${COMMANDS_TEST_DIR}/hmi/*
   ${COMMANDS_TEST_DIR}/mobile/*
+  ${CMAKE_CURRENT_SOURCE_DIR}/custom_vehicle_data_manager_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/vehicle_data_item_schema_test.cc
   ${COMPONENTS_DIR}/application_manager/src/message.cc
   ${COMPONENTS_DIR}/application_manager/src/event_engine/*
+  ${COMPONENTS_DIR}/resumption/src/last_state_wrapper_impl.cc
 )
 
 set(LIBRARIES
@@ -58,6 +65,8 @@ set(LIBRARIES
   MOBILE_API
   connectionHandler
   vehicle_info_plugin
+  SmartObjects
+  formatters
   jsoncpp
 )
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_request_test.cc
new file mode 100644
index 0000000000..6bc956f65f
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_request_test.cc
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/vi_get_vehicle_data_request.h"
+
+#include "gtest/gtest.h"
+
+#include "smart_objects/enum_schema_item.h"
+#include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace vi_get_vehicle_data_request {
+
+using ::testing::_;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+using vehicle_info_plugin::commands::VIGetVehicleDataRequest;
+
+namespace {
+const std::string kMobileParam = "mobile_param";
+const std::string kHMIParam = "hmi_param";
+}  // namespace
+
+class VIGetVehicleDataRequestTest
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {};
+
+MATCHER_P(EqualMsgParams, msg_params, "") {
+  using namespace app_mngr;
+  auto message = static_cast<smart_objects::SmartObject>(*arg);
+  if (!message.keyExists(strings::msg_params)) {
+    return false;
+  }
+
+  return msg_params == message[strings::msg_params];
+}
+
+TEST_F(VIGetVehicleDataRequestTest, Run_Success) {
+  using namespace app_mngr;
+  auto command_msg = CreateMessage(smart_objects::SmartType_Map);
+  (*command_msg)[strings::msg_params][strings::rpm] = true;
+  (*command_msg)[strings::msg_params][kMobileParam] = true;
+
+  am::VehicleData vehicle_data;
+  vehicle_data.insert(am::VehicleData::value_type(
+      strings::rpm, mobile_apis::VehicleDataType::VEHICLEDATA_RPM));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
+
+  std::string oem_vehicle_data_type_str;
+  smart_objects::EnumConversionHelper<mobile_apis::VehicleDataType::eType>::
+      EnumToString(mobile_apis::VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA,
+                   &oem_vehicle_data_type_str);
+
+  smart_objects::SmartObject hmi_params;
+  hmi_params[kHMIParam] = smart_objects::SmartType_Map;
+  hmi_params[kHMIParam][strings::data_type] = oem_vehicle_data_type_str;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(hmi_params));
+
+  smart_objects::SmartObject hmi_request_msg;
+  hmi_request_msg[strings::rpm] =
+      (*command_msg)[strings::msg_params][strings::rpm];
+  hmi_request_msg[kHMIParam] = hmi_params[kHMIParam];
+
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToHMI(EqualMsgParams(hmi_request_msg)));
+
+  auto command = CreateCommandVI<VIGetVehicleDataRequest>(command_msg);
+  command->Run();
+}
+
+}  // namespace vi_get_vehicle_data_request
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc
index 575df4ce50..ea8dab0366 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_get_vehicle_data_response_test.cc
@@ -37,7 +37,6 @@
 #include "gtest/gtest.h"
 
 #include "application_manager/application.h"
-#include "application_manager/commands/commands_test.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/message_helper.h"
 #include "application_manager/mock_application_manager.h"
@@ -47,6 +46,7 @@
 #include "application_manager/smart_object_keys.h"
 #include "hmi/vi_get_vehicle_data_response.h"
 #include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_commands_test.h"
 
 namespace test {
 namespace components {
@@ -74,7 +74,7 @@ const std::string kStrNumber = "123";
 }  // namespace
 
 class VIGetVehicleDataResponseTest
-    : public CommandsTest<CommandsTestMocks::kIsNice> {};
+    : public VICommandsTest<CommandsTestMocks::kIsNice> {};
 
 TEST_F(VIGetVehicleDataResponseTest, RUN_SUCCESS) {
   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
@@ -84,7 +84,7 @@ TEST_F(VIGetVehicleDataResponseTest, RUN_SUCCESS) {
       hmi_apis::messageType::response;
 
   VIGetVehicleDataResponsePtr command(
-      CreateCommand<VIGetVehicleDataResponse>(command_msg));
+      CreateCommandVI<VIGetVehicleDataResponse>(command_msg));
 
   am::event_engine::Event event(
       hmi_apis::FunctionID::VehicleInfo_GetVehicleData);
@@ -97,10 +97,12 @@ TEST_F(VIGetVehicleDataResponseTest, RUN_SUCCESS) {
       .WillOnce(ReturnRef(mock_event_dispatcher));
   EXPECT_CALL(mock_event_dispatcher, raise_event(_));
 
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
-TEST_F(VIGetVehicleDataResponseTest, ErrorResponse_SUCCESS) {
+TEST_F(VIGetVehicleDataResponseTest,
+       ErrorResponse_OnVehicleDataUpdated_NotCalled) {
   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
   (*command_msg)[strings::msg_params][strings::number] = kStrNumber;
   (*command_msg)[strings::params][strings::connection_key] = kConnectionKey;
@@ -108,7 +110,7 @@ TEST_F(VIGetVehicleDataResponseTest, ErrorResponse_SUCCESS) {
       hmi_apis::messageType::error_response;
   (*command_msg)[strings::params][strings::data][strings::slider_position] = 1;
   (*command_msg)[strings::params][hmi_response::code] =
-      hmi_apis::Common_Result::SUCCESS;
+      hmi_apis::Common_Result::ABORTED;
   (*command_msg)[strings::params][strings::correlation_id] = kCorrelationId;
   (*command_msg)[am::strings::params][am::strings::error_msg] = "test_error";
   (*command_msg)[am::strings::params][am::strings::protocol_type] =
@@ -116,33 +118,18 @@ TEST_F(VIGetVehicleDataResponseTest, ErrorResponse_SUCCESS) {
   (*command_msg)[strings::params][strings::protocol_version] =
       am::commands::CommandImpl::protocol_version_;
 
-  smart_objects::SmartObject result(smart_objects::SmartType_Map);
-  result[strings::msg_params] = (*command_msg)[strings::params][strings::data];
-  result[strings::params][hmi_response::code] =
-      (*command_msg)[strings::params][hmi_response::code];
-  result[strings::params][strings::correlation_id] =
-      (*command_msg)[strings::params][strings::correlation_id];
-  result[strings::params][strings::error_msg] =
-      (*command_msg)[strings::params][strings::error_msg];
-  result[strings::params][strings::message_type] =
-      (*command_msg)[strings::params][strings::message_type];
-  result[strings::params][strings::protocol_type] =
-      (*command_msg)[strings::params][strings::protocol_type];
-  result[strings::params][strings::protocol_version] =
-      (*command_msg)[strings::params][strings::protocol_version];
-
   VIGetVehicleDataResponsePtr command(
-      CreateCommand<VIGetVehicleDataResponse>(command_msg));
+      CreateCommandVI<VIGetVehicleDataResponse>(command_msg));
 
-  am::event_engine::Event event(
-      hmi_apis::FunctionID::VehicleInfo_GetVehicleData);
-  event.set_smart_object(result);
+  EXPECT_CALL(mock_policy_handler_, OnVehicleDataUpdated(*command_msg))
+      .Times(0);
 
   MockEventDispatcher mock_event_dispatcher;
   EXPECT_CALL(app_mngr_, event_dispatcher())
       .WillOnce(ReturnRef(mock_event_dispatcher));
   EXPECT_CALL(mock_event_dispatcher, raise_event(_));
 
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc
index 8c77b492ee..c083bf4d60 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_is_ready_request_test.cc
@@ -34,7 +34,6 @@
 
 #include "gtest/gtest.h"
 
-#include "application_manager/commands/command_request_test.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/hmi_interfaces.h"
 #include "application_manager/mock_application_manager.h"
@@ -44,6 +43,7 @@
 #include "application_manager/policies/mock_policy_handler_interface.h"
 #include "application_manager/smart_object_keys.h"
 #include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
 
 namespace test {
 namespace components {
@@ -62,9 +62,9 @@ using vehicle_info_plugin::commands::VIIsReadyRequest;
 typedef std::shared_ptr<VIIsReadyRequest> VIIsReadyRequestPtr;
 
 class VIIsReadyRequestTest
-    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
-  VIIsReadyRequestTest() : command_(CreateCommand<VIIsReadyRequest>()) {}
+  VIIsReadyRequestTest() : command_(CreateCommandVI<VIIsReadyRequest>()) {}
 
   void SetUpExpectations(bool is_vi_cooperating_available,
                          bool is_send_message_to_hmi,
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_subscribe_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_subscribe_vehicle_data_request_test.cc
new file mode 100644
index 0000000000..fbaabfed06
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_subscribe_vehicle_data_request_test.cc
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/vi_subscribe_vehicle_data_request.h"
+
+#include "gtest/gtest.h"
+
+#include "smart_objects/enum_schema_item.h"
+#include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace vi_subscribe_vehicle_data_request {
+
+using ::testing::_;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+using vehicle_info_plugin::commands::VISubscribeVehicleDataRequest;
+
+namespace {
+const std::string kMobileParam = "mobile_param";
+const std::string kHMIParam = "hmi_param";
+}  // namespace
+
+class VISubscribeVehicleDataRequestTest
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {};
+
+MATCHER_P(EqualMsgParams, msg_params, "") {
+  using namespace app_mngr;
+  auto message = static_cast<smart_objects::SmartObject>(*arg);
+  if (!message.keyExists(strings::msg_params)) {
+    return false;
+  }
+
+  return msg_params == message[strings::msg_params];
+}
+
+TEST_F(VISubscribeVehicleDataRequestTest, Run_Success) {
+  using namespace app_mngr;
+  auto command_msg = CreateMessage(smart_objects::SmartType_Map);
+  (*command_msg)[strings::msg_params][strings::rpm] = true;
+  (*command_msg)[strings::msg_params][kMobileParam] = true;
+
+  am::VehicleData vehicle_data;
+  vehicle_data.insert(am::VehicleData::value_type(
+      strings::rpm, mobile_apis::VehicleDataType::VEHICLEDATA_RPM));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
+
+  std::string oem_vehicle_data_type_str;
+  smart_objects::EnumConversionHelper<mobile_apis::VehicleDataType::eType>::
+      EnumToString(mobile_apis::VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA,
+                   &oem_vehicle_data_type_str);
+
+  smart_objects::SmartObject hmi_params;
+  hmi_params[kHMIParam] = smart_objects::SmartType_Map;
+  hmi_params[kHMIParam][strings::data_type] = oem_vehicle_data_type_str;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(hmi_params));
+
+  smart_objects::SmartObject hmi_request_msg;
+  hmi_request_msg[strings::rpm] =
+      (*command_msg)[strings::msg_params][strings::rpm];
+  hmi_request_msg[kHMIParam] = hmi_params[kHMIParam];
+
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToHMI(EqualMsgParams(hmi_request_msg)));
+
+  auto command = CreateCommandVI<VISubscribeVehicleDataRequest>(command_msg);
+  command->Run();
+}
+
+}  // namespace vi_subscribe_vehicle_data_request
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_unsubscribe_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_unsubscribe_vehicle_data_request_test.cc
new file mode 100644
index 0000000000..2ce04aa21a
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/hmi/vi_unsubscribe_vehicle_data_request_test.cc
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "hmi/vi_unsubscribe_vehicle_data_request.h"
+
+#include "gtest/gtest.h"
+
+#include "smart_objects/enum_schema_item.h"
+#include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+namespace hmi_commands_test {
+namespace vi_unsubscribe_vehicle_data_request {
+
+using ::testing::_;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+using vehicle_info_plugin::commands::VIUnsubscribeVehicleDataRequest;
+
+namespace {
+const std::string kMobileParam = "mobile_param";
+const std::string kHMIParam = "hmi_param";
+}  // namespace
+
+class VIUnsubscribeVehicleDataRequestTest
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {};
+
+MATCHER_P(EqualMsgParams, msg_params, "") {
+  using namespace app_mngr;
+  auto message = static_cast<smart_objects::SmartObject>(*arg);
+  if (!message.keyExists(strings::msg_params)) {
+    return false;
+  }
+
+  return msg_params == message[strings::msg_params];
+}
+
+TEST_F(VIUnsubscribeVehicleDataRequestTest, Run_Success) {
+  using namespace app_mngr;
+  auto command_msg = CreateMessage(smart_objects::SmartType_Map);
+  (*command_msg)[strings::msg_params][strings::rpm] = true;
+  (*command_msg)[strings::msg_params][kMobileParam] = true;
+
+  am::VehicleData vehicle_data;
+  vehicle_data.insert(am::VehicleData::value_type(
+      strings::rpm, mobile_apis::VehicleDataType::VEHICLEDATA_RPM));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
+
+  std::string oem_vehicle_data_type_str;
+  smart_objects::EnumConversionHelper<mobile_apis::VehicleDataType::eType>::
+      EnumToString(mobile_apis::VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA,
+                   &oem_vehicle_data_type_str);
+
+  smart_objects::SmartObject hmi_params;
+  hmi_params[kHMIParam] = smart_objects::SmartType_Map;
+  hmi_params[kHMIParam][strings::data_type] = oem_vehicle_data_type_str;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(hmi_params));
+
+  smart_objects::SmartObject hmi_request_msg;
+  hmi_request_msg[strings::rpm] = true;
+  hmi_request_msg[kHMIParam] = true;
+
+  EXPECT_CALL(mock_rpc_service_,
+              SendMessageToHMI(EqualMsgParams(hmi_request_msg)));
+
+  auto command = CreateCommandVI<VIUnsubscribeVehicleDataRequest>(command_msg);
+  command->Run();
+}
+
+}  // namespace vi_unsubscribe_vehicle_data_request
+}  // namespace hmi_commands_test
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc
index 3763e033fc..afafd1c6c6 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/diagnostic_message_request_test.cc
@@ -37,8 +37,6 @@
 #include "gtest/gtest.h"
 
 #include "application_manager/application.h"
-#include "application_manager/commands/command_request_test.h"
-#include "application_manager/commands/commands_test.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
@@ -47,6 +45,8 @@
 #include "interfaces/MOBILE_API.h"
 #include "smart_objects/smart_object.h"
 #include "vehicle_info_plugin/commands/mobile/diagnostic_message_request.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
+#include "vehicle_info_plugin/mock_custom_vehicle_data_manager.h"
 
 namespace test {
 namespace components {
@@ -71,7 +71,7 @@ const uint32_t kDiagnosticMode = 5u;
 }  // namespace
 
 class DiagnosticMessageRequestTest
-    : public CommandRequestTest<CommandsTestMocks::kIsNice> {};
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {};
 
 TEST_F(DiagnosticMessageRequestTest, Run_ApplicationIsNotRegistered_UNSUCCESS) {
   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
@@ -79,7 +79,7 @@ TEST_F(DiagnosticMessageRequestTest, Run_ApplicationIsNotRegistered_UNSUCCESS) {
       kConnectionKey;
 
   DiagnosticMessageRequestPtr command(
-      CreateCommand<DiagnosticMessageRequest>(command_msg));
+      CreateCommandVI<DiagnosticMessageRequest>(command_msg));
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(ApplicationSharedPtr()));
@@ -100,7 +100,7 @@ TEST_F(DiagnosticMessageRequestTest, Run_NotSupportedDiagnosticMode_UNSUCCESS) {
       kConnectionKey;
 
   DiagnosticMessageRequestPtr command(
-      CreateCommand<DiagnosticMessageRequest>(command_msg));
+      CreateCommandVI<DiagnosticMessageRequest>(command_msg));
 
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
@@ -127,7 +127,7 @@ TEST_F(DiagnosticMessageRequestTest, Run_SUCCESS) {
       kConnectionKey;
 
   DiagnosticMessageRequestPtr command(
-      CreateCommand<DiagnosticMessageRequest>(command_msg));
+      CreateCommandVI<DiagnosticMessageRequest>(command_msg));
 
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
@@ -154,7 +154,7 @@ TEST_F(DiagnosticMessageRequestTest, OnEvent_UNSUCCESS) {
   Event event(hmi_apis::FunctionID::INVALID_ENUM);
 
   DiagnosticMessageRequestPtr command(
-      CreateCommand<DiagnosticMessageRequest>());
+      CreateCommandVI<DiagnosticMessageRequest>());
 
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
 
@@ -171,7 +171,7 @@ TEST_F(DiagnosticMessageRequestTest, OnEvent_SUCCESS) {
   event.set_smart_object(*event_message);
 
   DiagnosticMessageRequestPtr command(
-      CreateCommand<DiagnosticMessageRequest>());
+      CreateCommandVI<DiagnosticMessageRequest>());
 
   EXPECT_CALL(
       mock_rpc_service_,
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc
index 1575fe2bd8..e4613feb83 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_dtcs_request_test.cc
@@ -37,8 +37,6 @@
 #include "gtest/gtest.h"
 
 #include "application_manager/application.h"
-#include "application_manager/commands/command_request_test.h"
-#include "application_manager/commands/commands_test.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
@@ -47,6 +45,7 @@
 #include "interfaces/MOBILE_API.h"
 #include "mobile/get_dtcs_request.h"
 #include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
 
 namespace test {
 namespace components {
@@ -67,13 +66,13 @@ namespace mobile_result = mobile_apis::Result;
 typedef std::shared_ptr<GetDTCsRequest> GetDTCsRequestPtr;
 
 class GetDTCsRequestTest
-    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
-  GetDTCsRequestTest() : CommandRequestTest<CommandsTestMocks::kIsNice>() {}
+  GetDTCsRequestTest() : VICommandRequestTest<CommandsTestMocks::kIsNice>() {}
 };
 
 TEST_F(GetDTCsRequestTest, Run_ApplicationIsNotRegistered_UNSUCCESS) {
-  GetDTCsRequestPtr command(CreateCommand<GetDTCsRequest>());
+  GetDTCsRequestPtr command(CreateCommandVI<GetDTCsRequest>());
 
   EXPECT_CALL(app_mngr_, application(_))
       .WillOnce(Return(ApplicationSharedPtr()));
@@ -93,7 +92,7 @@ TEST_F(GetDTCsRequestTest, Run_SUCCESS) {
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
 
-  GetDTCsRequestPtr command(CreateCommand<GetDTCsRequest>(command_msg));
+  GetDTCsRequestPtr command(CreateCommandVI<GetDTCsRequest>(command_msg));
 
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
@@ -107,7 +106,7 @@ TEST_F(GetDTCsRequestTest, Run_SUCCESS) {
 }
 
 TEST_F(GetDTCsRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
-  GetDTCsRequestPtr command(CreateCommand<GetDTCsRequest>());
+  GetDTCsRequestPtr command(CreateCommandVI<GetDTCsRequest>());
 
   Event event(hmi_apis::FunctionID::INVALID_ENUM);
 
@@ -132,7 +131,7 @@ TEST_F(GetDTCsRequestTest, OnEvent_SUCCESS) {
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(app));
 
-  GetDTCsRequestPtr command(CreateCommand<GetDTCsRequest>());
+  GetDTCsRequestPtr command(CreateCommandVI<GetDTCsRequest>());
   command->on_event(event);
 }
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc
index ed9fe9d1c0..d27e332601 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_request_test.cc
@@ -37,8 +37,6 @@
 #include "gtest/gtest.h"
 
 #include "application_manager/application.h"
-#include "application_manager/commands/command_request_test.h"
-#include "application_manager/commands/commands_test.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/message_helper.h"
 #include "application_manager/mock_application_manager.h"
@@ -47,6 +45,8 @@
 #include "interfaces/MOBILE_API.h"
 #include "mobile/get_vehicle_data_request.h"
 #include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
 
 namespace test {
 namespace components {
@@ -70,20 +70,14 @@ const uint32_t kConnectionKey = 2u;
 }  // namespace
 
 class GetVehicleDataRequestTest
-    : public CommandRequestTest<CommandsTestMocks::kIsNice> {};
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {};
 
 class UnwrappedGetVehicleDataRequest : public GetVehicleDataRequest {
  public:
-  UnwrappedGetVehicleDataRequest(const MessageSharedPtr& message,
-                                 am::ApplicationManager& application_manager,
-                                 app_mngr::rpc_service::RPCService& rpc_service,
-                                 app_mngr::HMICapabilities& hmi_capabilities,
-                                 policy::PolicyHandlerInterface& policy_handler)
-      : GetVehicleDataRequest(message,
-                              application_manager,
-                              rpc_service,
-                              hmi_capabilities,
-                              policy_handler) {}
+  UnwrappedGetVehicleDataRequest(
+      const MessageSharedPtr& message,
+      const vehicle_info_plugin::VehicleInfoCommandParams& params)
+      : GetVehicleDataRequest(message, params) {}
 
   policy::RPCParams& get_disallowed_params() {
     return removed_parameters_permissions_.disallowed_params;
@@ -93,7 +87,7 @@ class UnwrappedGetVehicleDataRequest : public GetVehicleDataRequest {
 };
 
 TEST_F(GetVehicleDataRequestTest, Run_ApplicationIsNotRegistered_UNSUCCESS) {
-  GetVehicleDataRequestPtr command(CreateCommand<GetVehicleDataRequest>());
+  GetVehicleDataRequestPtr command(CreateCommandVI<GetVehicleDataRequest>());
 
   EXPECT_CALL(app_mngr_, application(_))
       .WillOnce(Return(ApplicationSharedPtr()));
@@ -115,7 +109,7 @@ TEST_F(GetVehicleDataRequestTest, Run_TooHighFrequency_UNSUCCESS) {
       kConnectionKey;
 
   GetVehicleDataRequestPtr command(
-      CreateCommand<GetVehicleDataRequest>(command_msg));
+      CreateCommandVI<GetVehicleDataRequest>(command_msg));
 
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
@@ -138,14 +132,17 @@ TEST_F(GetVehicleDataRequestTest, Run_EmptyMsgParams_UNSUCCESS) {
       kConnectionKey;
 
   GetVehicleDataRequestPtr command(
-      CreateCommand<GetVehicleDataRequest>(command_msg));
+      CreateCommandVI<GetVehicleDataRequest>(command_msg));
 
   const am::VehicleData kEmptyVehicleData;
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(kEmptyVehicleData));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(kEmptyVehicleData));
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
 
   MockAppPtr app(CreateMockApp());
-  EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
+  ON_CALL(app_mngr_, application(kConnectionKey)).WillByDefault(Return(app));
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -161,11 +158,15 @@ TEST_F(GetVehicleDataRequestTest,
       kConnectionKey;
 
   std::shared_ptr<UnwrappedGetVehicleDataRequest> command(
-      CreateCommand<UnwrappedGetVehicleDataRequest>(command_msg));
+      CreateCommandVI<UnwrappedGetVehicleDataRequest>(command_msg));
+
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
 
   const am::VehicleData kEmptyVehicleData;
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillRepeatedly(ReturnRef(kEmptyVehicleData));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(kEmptyVehicleData));
 
   policy::RPCParams& disallowed_params = command->get_disallowed_params();
   disallowed_params.insert("test_param");
@@ -189,13 +190,13 @@ TEST_F(GetVehicleDataRequestTest, Run_SUCCESS) {
   (*command_msg)[am::strings::msg_params][kMsgParamKey] = true;
 
   GetVehicleDataRequestPtr command(
-      CreateCommand<GetVehicleDataRequest>(command_msg));
+      CreateCommandVI<GetVehicleDataRequest>(command_msg));
 
   am::VehicleData vehicle_data;
   vehicle_data.insert(am::VehicleData::value_type(
       kMsgParamKey, mobile_apis::VehicleDataType::VEHICLEDATA_SPEED));
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
 
   MockAppPtr app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey)).WillOnce(Return(app));
@@ -215,7 +216,7 @@ TEST_F(GetVehicleDataRequestTest, OnEvent_UnknownEvent_UNSUCCESS) {
       kConnectionKey;
 
   std::shared_ptr<UnwrappedGetVehicleDataRequest> command(
-      CreateCommand<UnwrappedGetVehicleDataRequest>(command_msg));
+      CreateCommandVI<UnwrappedGetVehicleDataRequest>(command_msg));
 
   Event event(hmi_apis::FunctionID::INVALID_ENUM);
 
@@ -228,14 +229,18 @@ TEST_F(GetVehicleDataRequestTest, OnEvent_DataNotAvailable_SUCCESS) {
   const hmi_apis::Common_Result::eType hmi_response_code =
       hmi_apis::Common_Result::DATA_NOT_AVAILABLE;
   const mobile_result::eType mobile_response_code =
-      mobile_result::DATA_NOT_AVAILABLE;
+      mobile_result::VEHICLE_DATA_NOT_AVAILABLE;
+
+  am::VehicleData vehicle_data;
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
 
   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
 
   std::shared_ptr<UnwrappedGetVehicleDataRequest> command(
-      CreateCommand<UnwrappedGetVehicleDataRequest>(command_msg));
+      CreateCommandVI<UnwrappedGetVehicleDataRequest>(command_msg));
 
   MessageSharedPtr event_msg(CreateMessage(smart_objects::SmartType_Map));
   (*event_msg)[am::strings::params][am::hmi_response::code] = hmi_response_code;
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_response_test.cc
index fb14373bcf..ad7a14ce40 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/get_vehicle_data_response_test.cc
@@ -33,6 +33,8 @@
 #include "gtest/gtest.h"
 
 #include "application_manager/commands/commands_test.h"
+#include "vehicle_info_plugin/commands/vi_commands_test.h"
+
 #include "mobile/get_vehicle_data_response.h"
 #include "smart_objects/smart_object.h"
 
@@ -49,12 +51,12 @@ using vehicle_info_plugin::commands::GetVehicleDataResponse;
 typedef std::shared_ptr<GetVehicleDataResponse> GetVehicleDataResponsePtr;
 
 class GetVehicleDataResponseTest
-    : public CommandsTest<CommandsTestMocks::kIsNice> {};
+    : public VICommandsTest<CommandsTestMocks::kIsNice> {};
 
 TEST_F(GetVehicleDataResponseTest, GetVehicleDataResponse_SUCCESS) {
   MessageSharedPtr message(CreateMessage(smart_objects::SmartType_Map));
   GetVehicleDataResponsePtr command(
-      CreateCommand<GetVehicleDataResponse>(message));
+      CreateCommandVI<GetVehicleDataResponse>(message));
 
   EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(message, _));
   command->Run();
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc
index 8df00521de..82eb19c45f 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/on_vehicle_data_notification_test.cc
@@ -43,6 +43,7 @@
 #include "smart_objects/smart_object.h"
 #include "utils/custom_string.h"
 #include "utils/helpers.h"
+#include "vehicle_info_plugin/commands/vi_commands_test.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
 #include "vehicle_info_plugin/vehicle_info_plugin.h"
 
@@ -72,7 +73,7 @@ const utils::custom_string::CustomString kAppName("test_app");
 }  // namespace
 
 class OnVehicleDataNotificationTest
-    : public CommandsTest<CommandsTestMocks::kIsNice> {
+    : public VICommandsTest<CommandsTestMocks::kIsNice> {
  public:
   OnVehicleDataNotificationTest() : mock_app_(CreateMockApp()) {}
 
@@ -87,47 +88,47 @@ class OnVehicleDataNotificationTest
   MockAppPtr mock_app_;
 };
 
-TEST_F(OnVehicleDataNotificationTest, OnVehicleDataNotification_SUCCESS) {
-  MessageSharedPtr message(CreateMessage(smart_objects::SmartType_Map));
-  smart_objects::SmartObject gps_data;
-  gps_data[am::strings::longitude_degrees] = 1.0;
-  gps_data[am::strings::latitude_degrees] = 1.0;
-  gps_data[am::strings::shifted] = true;
+MATCHER_P(SmartObjectCheck, checker, "") {
+  return checker(arg);
+}
 
-  (*message)[am::strings::msg_params][am::strings::gps] = gps_data;
-  (*message)[am::strings::msg_params][am::strings::speed] = 0;
+TEST_F(OnVehicleDataNotificationTest, OnVehicleDataNotification_SUCCESS) {
+  am::VehicleData vehicle_data;
+  vehicle_data.insert(am::VehicleData::value_type(
+      am::strings::gps, mobile_apis::VehicleDataType::VEHICLEDATA_GPS));
+  vehicle_data.insert(am::VehicleData::value_type(
+      am::strings::speed, mobile_apis::VehicleDataType::VEHICLEDATA_SPEED));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
 
-  NotificationPtr command(CreateCommand<OnVehicleDataNotification>(message));
+  application_manager::ApplicationSet apps;
+  apps.insert(mock_app_);
+  std::shared_ptr<sync_primitives::Lock> apps_lock =
+      std::make_shared<sync_primitives::Lock>();
+  ApplicationSetDA apps_da(apps, apps_lock);
+  ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_da));
 
   vehicle_info_plugin::VehicleInfoPlugin vi_plugin;
   VehicleInfoAppExtensionPtr vi_app_extention_ptr =
       std::make_shared<vehicle_info_plugin::VehicleInfoAppExtension>(
           vi_plugin, *mock_app_);
-  vi_app_extention_ptr->subscribeToVehicleInfo(
-      mobile_apis::VehicleDataType::VEHICLEDATA_GPS);
-  vi_app_extention_ptr->subscribeToVehicleInfo(
-      mobile_apis::VehicleDataType::VEHICLEDATA_SPEED);
-
-  EXPECT_CALL(*mock_app_,
-              QueryInterface(vehicle_info_plugin::VehicleInfoAppExtension::
-                                 VehicleInfoAppExtensionUID))
-      .WillOnce(Return(vi_app_extention_ptr));
+  vi_app_extention_ptr->subscribeToVehicleInfo("gps");
+  vi_app_extention_ptr->subscribeToVehicleInfo("speed");
+  ON_CALL(*mock_app_,
+          QueryInterface(vehicle_info_plugin::VehicleInfoAppExtension::
+                             VehicleInfoAppExtensionUID))
+      .WillByDefault(Return(vi_app_extention_ptr));
 
-  application_manager::ApplicationSet apps;
-  apps.insert(mock_app_);
-  std::shared_ptr<sync_primitives::Lock> apps_lock =
-      std::make_shared<sync_primitives::Lock>();
-  ApplicationSetDA apps_da(apps, apps_lock);
-  EXPECT_CALL(app_mngr_, applications()).WillOnce(Return(apps_da));
+  MessageSharedPtr message(CreateMessage(smart_objects::SmartType_Map));
+  smart_objects::SmartObject gps_data;
+  gps_data[am::strings::longitude_degrees] = 1.0;
+  gps_data[am::strings::latitude_degrees] = 1.0;
+  gps_data[am::strings::shifted] = true;
 
-  am::VehicleData vehicle_data;
-  vehicle_data.insert(am::VehicleData::value_type(
-      am::strings::gps, mobile_apis::VehicleDataType::VEHICLEDATA_GPS));
-  vehicle_data.insert(am::VehicleData::value_type(
-      am::strings::gps, mobile_apis::VehicleDataType::VEHICLEDATA_SPEED));
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
+  (*message)[am::strings::msg_params][am::strings::gps] = gps_data;
+  (*message)[am::strings::msg_params][am::strings::speed] = 0;
 
+  NotificationPtr command(CreateCommandVI<OnVehicleDataNotification>(message));
   EXPECT_CALL(mock_rpc_service_, SendMessageToMobile(message, _));
 
   command->Run();
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
index baf75bd93b..372d562965 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/read_did_request_test.cc
@@ -36,8 +36,6 @@
 #include "gtest/gtest.h"
 
 #include "application_manager/application.h"
-#include "application_manager/commands/command_request_test.h"
-#include "application_manager/commands/commands_test.h"
 #include "application_manager/event_engine/event.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
@@ -47,6 +45,7 @@
 #include "interfaces/MOBILE_API.h"
 #include "smart_objects/smart_object.h"
 #include "vehicle_info_plugin/commands/mobile/read_did_request.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
 
 namespace test {
 namespace components {
@@ -64,11 +63,11 @@ using am::event_engine::Event;
 using vehicle_info_plugin::commands::ReadDIDRequest;
 
 class ReadDIDRequestTest
-    : public CommandRequestTest<CommandsTestMocks::kIsNice> {};
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {};
 
 TEST_F(ReadDIDRequestTest, OnEvent_WrongEventId_UNSUCCESS) {
   Event event(Event::EventID::INVALID_ENUM);
-  std::shared_ptr<ReadDIDRequest> command(CreateCommand<ReadDIDRequest>());
+  std::shared_ptr<ReadDIDRequest> command(CreateCommandVI<ReadDIDRequest>());
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0);
   command->on_event(event);
 }
@@ -76,7 +75,7 @@ TEST_F(ReadDIDRequestTest, OnEvent_WrongEventId_UNSUCCESS) {
 TEST_F(ReadDIDRequestTest, OnEvent_SUCCESS) {
   Event event(Event::EventID::VehicleInfo_ReadDID);
 
-  std::shared_ptr<ReadDIDRequest> command(CreateCommand<ReadDIDRequest>());
+  std::shared_ptr<ReadDIDRequest> command(CreateCommandVI<ReadDIDRequest>());
 
   const hmi_apis::Common_Result::eType hmi_response_code =
       hmi_apis::Common_Result::SUCCESS;
@@ -98,7 +97,7 @@ TEST_F(ReadDIDRequestTest, OnEvent_SUCCESS) {
 }
 
 TEST_F(ReadDIDRequestTest, Run_AppNotRegistered_UNSUCCESS) {
-  std::shared_ptr<ReadDIDRequest> command(CreateCommand<ReadDIDRequest>());
+  std::shared_ptr<ReadDIDRequest> command(CreateCommandVI<ReadDIDRequest>());
 
   ON_CALL(app_mngr_, application(_))
       .WillByDefault(Return(std::shared_ptr<am::Application>()));
@@ -111,7 +110,7 @@ TEST_F(ReadDIDRequestTest, Run_AppNotRegistered_UNSUCCESS) {
 }
 
 TEST_F(ReadDIDRequestTest, Run_CommandLimitsExceeded_UNSUCCESS) {
-  std::shared_ptr<ReadDIDRequest> command(CreateCommand<ReadDIDRequest>());
+  std::shared_ptr<ReadDIDRequest> command(CreateCommandVI<ReadDIDRequest>());
 
   MockAppPtr app(CreateMockApp());
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app));
@@ -127,7 +126,7 @@ TEST_F(ReadDIDRequestTest, Run_CommandLimitsExceeded_UNSUCCESS) {
 
 TEST_F(ReadDIDRequestTest, Run_EmptyDidLocation_UNSUCCESS) {
   MockAppPtr app(CreateMockApp());
-  std::shared_ptr<ReadDIDRequest> command(CreateCommand<ReadDIDRequest>());
+  std::shared_ptr<ReadDIDRequest> command(CreateCommandVI<ReadDIDRequest>());
 
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app));
 
@@ -144,7 +143,7 @@ TEST_F(ReadDIDRequestTest, Run_SUCCESS) {
   MockAppPtr app(CreateMockApp());
   MessageSharedPtr msg(CreateMessage(smart_objects::SmartType_Map));
   (*msg)[am::strings::msg_params][am::strings::did_location]["SomeData"] = 0;
-  std::shared_ptr<ReadDIDRequest> command(CreateCommand<ReadDIDRequest>(msg));
+  std::shared_ptr<ReadDIDRequest> command(CreateCommandVI<ReadDIDRequest>(msg));
 
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app));
 
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
index 0126e7c762..450bb5ac26 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_request_test.cc
@@ -39,9 +39,14 @@
 #include "application_manager/mock_application_manager.h"
 #include "application_manager/mock_message_helper.h"
 #include "mobile/unsubscribe_vehicle_data_request.h"
+#include "resumption/last_state_wrapper_impl.h"
+#include "resumption/mock_last_state.h"
+#include "vehicle_info_plugin/commands/vi_command_request_test.h"
 #include "vehicle_info_plugin/vehicle_info_app_extension.h"
 #include "vehicle_info_plugin/vehicle_info_plugin.h"
 
+#include "application_manager/mock_rpc_handler.h"
+
 namespace test {
 namespace components {
 namespace commands_test {
@@ -63,25 +68,32 @@ const uint32_t kConnectionKey = 1u;
 const std::string kMsgParamKey = "test_key";
 const mobile_apis::VehicleDataType::eType kVehicleType =
     mobile_apis::VehicleDataType::VEHICLEDATA_SPEED;
+const std::string kVehicleTypeStr = am::strings::speed;
 }  // namespace
 
 class UnsubscribeVehicleRequestTest
-    : public CommandRequestTest<CommandsTestMocks::kIsNice> {
+    : public VICommandRequestTest<CommandsTestMocks::kIsNice> {
  public:
   UnsubscribeVehicleRequestTest()
       : mock_app_(CreateMockApp())
       , vi_app_extension_ptr_(
             std::make_shared<vehicle_info_plugin::VehicleInfoAppExtension>(
                 vi_plugin_, *mock_app_))
-      , app_set_lock_ptr_(std::make_shared<sync_primitives::Lock>()) {}
+      , app_set_lock_ptr_(std::make_shared<sync_primitives::Lock>())
+      , mock_last_state_(std::make_shared<resumption::LastStateWrapperImpl>(
+            std::make_shared<resumption_test::MockLastState>())) {}
 
  protected:
   void UnsubscribeSuccessfully();
   void SetUp() OVERRIDE {
+    ON_CALL(app_mngr_, GetRPCHandler())
+        .WillByDefault(ReturnRef(mock_rpc_handler_));
+
     vi_plugin_.Init(app_mngr_,
                     mock_rpc_service_,
                     mock_hmi_capabilities_,
-                    mock_policy_handler_);
+                    mock_policy_handler_,
+                    mock_last_state_);
     ON_CALL(*mock_app_, AddExtension(vi_app_extension_ptr_));
     vi_plugin_.OnApplicationEvent(application_manager::plugin_manager::
                                       ApplicationEvent::kApplicationRegistered,
@@ -90,16 +102,19 @@ class UnsubscribeVehicleRequestTest
             QueryInterface(vehicle_info_plugin::VehicleInfoAppExtension::
                                VehicleInfoAppExtensionUID))
         .WillByDefault(Return(vi_app_extension_ptr_));
+    ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey));
   }
 
   MockAppPtr mock_app_;
   application_manager::AppExtensionPtr vi_app_extension_ptr_;
   std::shared_ptr<sync_primitives::Lock> app_set_lock_ptr_;
   vehicle_info_plugin::VehicleInfoPlugin vi_plugin_;
+  application_manager_test::MockRPCHandler mock_rpc_handler_;
+  resumption::LastStateWrapperPtr mock_last_state_;
 };
 
 TEST_F(UnsubscribeVehicleRequestTest, Run_AppNotRegistered_UNSUCCESS) {
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>());
+  CommandPtr command(CreateCommandVI<UnsubscribeVehicleDataRequest>());
   EXPECT_CALL(app_mngr_, application(_))
       .WillOnce(Return(ApplicationSharedPtr()));
 
@@ -117,11 +132,18 @@ TEST_F(UnsubscribeVehicleRequestTest,
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
   (*command_msg)[am::strings::msg_params][am::strings::button_name] =
-      kVehicleType;
+      kVehicleTypeStr;
 
   am::VehicleData data;
-  EXPECT_CALL(mock_message_helper_, vehicle_data()).WillOnce(ReturnRef(data));
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
+  EXPECT_CALL(mock_message_helper_, vehicle_data())
+      .WillRepeatedly(ReturnRef(data));
+
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
+
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
@@ -138,12 +160,15 @@ TEST_F(UnsubscribeVehicleRequestTest,
   MessageSharedPtr command_msg(CreateMessage(smart_objects::SmartType_Map));
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
-  (*command_msg)[am::strings::msg_params][kMsgParamKey] = true;
+  (*command_msg)[am::strings::msg_params][kVehicleTypeStr] = true;
 
   am::VehicleData vehicle_data;
   vehicle_data.insert(am::VehicleData::value_type(kMsgParamKey, kVehicleType));
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
+
+  smart_objects::SmartObject hmi_custom_params(smart_objects::SmartType_Map);
+  hmi_custom_params[kVehicleTypeStr] = true;
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
@@ -157,13 +182,14 @@ TEST_F(UnsubscribeVehicleRequestTest,
   vehicle_info_plugin::VehicleInfoAppExtension* vi_app_extension =
       dynamic_cast<vehicle_info_plugin::VehicleInfoAppExtension*>(
           vi_app_extension_ptr_.get());
-  ASSERT_TRUE(vi_app_extension->subscribeToVehicleInfo(kVehicleType));
+  ASSERT_TRUE(vi_app_extension->subscribeToVehicleInfo(kVehicleTypeStr));
   application_manager::ApplicationSet app_set = {mock_app_};
   DataAccessor<application_manager::ApplicationSet> accessor(app_set,
                                                              app_set_lock_ptr_);
   // Expectations
   EXPECT_CALL(app_mngr_, applications()).WillRepeatedly(Return(accessor));
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
   command->Run();
 }
 
@@ -171,9 +197,12 @@ TEST_F(UnsubscribeVehicleRequestTest,
        Run_EmptyVehicleData_INVALID_DATA_SentToMobile) {
   am::VehicleData vehicle_data;
   EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
+      .WillRepeatedly(ReturnRef(vehicle_data));
+
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
 
-  MockAppPtr mock_app(CreateMockApp());
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
 
@@ -185,17 +214,21 @@ TEST_F(UnsubscribeVehicleRequestTest,
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
   (*command_msg)[am::strings::msg_params][kMsgParamKey] = false;
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
   command->Run();
 }
 
 TEST_F(UnsubscribeVehicleRequestTest,
        Run_UnsubscribeFromNotSubscribedBeforeData_UNSUCCESS) {
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
+
   am::VehicleData vehicle_data;
   vehicle_data.insert(am::VehicleData::value_type(kMsgParamKey, kVehicleType));
   EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
-
+      .WillRepeatedly(ReturnRef(vehicle_data));
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillOnce(Return(mock_app_));
 
@@ -207,7 +240,8 @@ TEST_F(UnsubscribeVehicleRequestTest,
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
   (*command_msg)[am::strings::msg_params][kMsgParamKey] = true;
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
   command->Run();
 }
 
@@ -216,15 +250,19 @@ TEST_F(UnsubscribeVehicleRequestTest, Run_UnsubscribeDataDisabled_UNSUCCESS) {
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
 
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
+
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
+
   am::VehicleData vehicle_data;
   vehicle_data.insert(am::VehicleData::value_type(kMsgParamKey, kVehicleType));
   EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
-
-  MockAppPtr mock_app(CreateMockApp());
+      .WillRepeatedly(ReturnRef(vehicle_data));
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
-      .WillOnce(Return(mock_app));
+      .WillOnce(Return(mock_app_));
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -238,7 +276,8 @@ TEST_F(UnsubscribeVehicleRequestTest, OnEvent_DataNotSubscribed_IGNORED) {
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
   (*command_msg)[am::strings::msg_params][kMsgParamKey] = true;
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
 
   am::VehicleData vehicle_data;
 
@@ -246,7 +285,11 @@ TEST_F(UnsubscribeVehicleRequestTest, OnEvent_DataNotSubscribed_IGNORED) {
       .WillRepeatedly(Return(mock_app_));
   vehicle_data.insert(am::VehicleData::value_type(kMsgParamKey, kVehicleType));
   EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
+      .WillRepeatedly(ReturnRef(vehicle_data));
+
+  smart_objects::SmartObject empty_hmi_custom_params;
+  ON_CALL(mock_custom_vehicle_data_manager_, CreateHMIMessageParams(_))
+      .WillByDefault(Return(empty_hmi_custom_params));
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -276,7 +319,8 @@ TEST_F(UnsubscribeVehicleRequestTest, OnEvent_DataUnsubscribed_SUCCESS) {
   (*command_msg)[am::strings::params][am::strings::connection_key] =
       kConnectionKey;
   (*command_msg)[am::strings::msg_params][kMsgParamKey] = true;
-  CommandPtr command(CreateCommand<UnsubscribeVehicleDataRequest>(command_msg));
+  CommandPtr command(
+      CreateCommandVI<UnsubscribeVehicleDataRequest>(command_msg));
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey))
       .WillRepeatedly(Return(mock_app_));
@@ -289,6 +333,11 @@ TEST_F(UnsubscribeVehicleRequestTest, OnEvent_DataUnsubscribed_SUCCESS) {
   message[am::strings::msg_params][kMsgParamKey] = true;
   test_event.set_smart_object(message);
 
+  am::VehicleData vehicle_data;
+  vehicle_data.insert(am::VehicleData::value_type(kMsgParamKey, kVehicleType));
+  EXPECT_CALL(mock_message_helper_, vehicle_data())
+      .WillRepeatedly(ReturnRef(vehicle_data));
+
   EXPECT_CALL(
       mock_rpc_service_,
       ManageMobileCommand(MobileResultCodeIs(mobile_result::SUCCESS), _));
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc
index 89dbfe1cdb..7c610c8adb 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/commands/mobile/unsubscribe_vehicle_response_test.cc
@@ -32,11 +32,13 @@
 
 #include <stdint.h>
 #include <string>
+#include "application_manager/mock_application_manager.h"
 #include "gtest/gtest.h"
 #include "mobile/unsubscribe_vehicle_data_response.h"
 
-#include "application_manager/commands/commands_test.h"
-#include "application_manager/mock_application_manager.h"
+#include "vehicle_info_plugin/commands/vi_commands_test.h"
+#include "vehicle_info_plugin/mock_custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_factory.h"
 
 namespace test {
 namespace components {
@@ -55,7 +57,7 @@ using vehicle_info_plugin::commands::UnsubscribeVehicleDataResponse;
 namespace am = ::application_manager;
 
 class UnsubscribeVehicleResponseTest
-    : public CommandsTest<CommandsTestMocks::kIsNice> {};
+    : public VICommandsTest<CommandsTestMocks::kIsNice> {};
 
 MATCHER_P(ResultCodeIs, result_code, "") {
   return result_code ==
@@ -70,7 +72,7 @@ TEST_F(UnsubscribeVehicleResponseTest,
   (*command_msg)[am::strings::msg_params][am::strings::success] = false;
 
   std::shared_ptr<UnsubscribeVehicleDataResponse> command =
-      CreateCommand<UnsubscribeVehicleDataResponse>(command_msg);
+      CreateCommandVI<UnsubscribeVehicleDataResponse>(command_msg);
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -84,7 +86,7 @@ TEST_F(UnsubscribeVehicleResponseTest,
       std::make_shared<SmartObject>(smart_objects::SmartType_Map);
   (*command_msg)[am::strings::msg_params][am::strings::success] = true;
   std::shared_ptr<UnsubscribeVehicleDataResponse> command =
-      CreateCommand<UnsubscribeVehicleDataResponse>(command_msg);
+      CreateCommandVI<UnsubscribeVehicleDataResponse>(command_msg);
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -102,7 +104,7 @@ TEST_F(UnsubscribeVehicleResponseTest,
   (*command_msg)[am::strings::msg_params][am::strings::result_code] =
       result_type;
   std::shared_ptr<UnsubscribeVehicleDataResponse> command =
-      CreateCommand<UnsubscribeVehicleDataResponse>(command_msg);
+      CreateCommandVI<UnsubscribeVehicleDataResponse>(command_msg);
 
   command->Run();
 }
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/custom_vehicle_data_manager_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/custom_vehicle_data_manager_test.cc
new file mode 100644
index 0000000000..7d65d989bf
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/custom_vehicle_data_manager_test.cc
@@ -0,0 +1,318 @@
+/*
+ * Copyright (c) 2018, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE. */
+
+#include "application_manager/mock_message_helper.h"
+#include "application_manager/mock_rpc_service.h"
+#include "application_manager/policies/mock_custom_vehicle_data_provider.h"
+#include "gtest/gtest.h"
+#include "test/application_manager/mock_application_manager.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager_impl.h"
+
+namespace vehicle_info_plugin_test {
+
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+using application_manager::MockMessageHelper;
+namespace {
+std::string kName = "rpm";
+std::string kKey = "VD_RPM";
+}  // namespace
+class CustomVehicleDataManagerTest : public ::testing::Test {
+ public:
+  CustomVehicleDataManagerTest()
+      : mock_message_helper_(
+            *application_manager::MockMessageHelper::message_helper_mock()) {}
+
+  void SetUp() OVERRIDE {}
+
+  void InitValidationManager(const policy_table::VehicleDataItems& items) {
+    using vehicle_info_plugin::CustomVehicleDataManagerImpl;
+
+    ON_CALL(mock_custom_vehicle_data_provider_, GetVehicleDataItems())
+        .WillByDefault(Return(items));
+    ON_CALL(mock_custom_vehicle_data_provider_, GetRemovedVehicleDataItems())
+        .WillByDefault(Return(policy_table::VehicleDataItems()));
+    custom_vd_manager_.reset(new CustomVehicleDataManagerImpl(
+        mock_custom_vehicle_data_provider_, mock_rpc_service_));
+  }
+
+  test::components::application_manager_test::MockApplicationManager
+      app_manager_mock_;
+  std::unique_ptr<vehicle_info_plugin::CustomVehicleDataManager>
+      custom_vd_manager_;
+  NiceMock<test::components::policy_test::MockCustomVehicleDataProvider>
+      mock_custom_vehicle_data_provider_;
+  NiceMock<test::components::application_manager_test::MockRPCService>
+      mock_rpc_service_;
+  MockMessageHelper& mock_message_helper_;
+};
+
+TEST_F(CustomVehicleDataManagerTest, CreateHMIMessageParamsEmptyItems) {
+  policy_table::VehicleDataItems schema_items;
+  InitValidationManager(schema_items);
+  const std::set<std::string> items;
+  const auto msg_params = custom_vd_manager_->CreateHMIMessageParams(items);
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_TRUE(msg_params.empty());
+}
+
+TEST_F(CustomVehicleDataManagerTest, CreateHMIMessageParamsOnePODItem) {
+  policy_table::VehicleDataItem rpm;
+  rpm.mark_initialized();
+  rpm.name = kName;
+  rpm.type = "Integer";
+  rpm.key = "OEM_REF_RPM";
+  rpm.mandatory = false;
+  *rpm.array = false;
+  rpm.params->mark_initialized();
+
+  policy_table::VehicleDataItems schema_items;
+  schema_items.push_back(rpm);
+  InitValidationManager(schema_items);
+
+  const std::set<std::string> items = {kName};
+  const auto msg_params = custom_vd_manager_->CreateHMIMessageParams(items);
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_EQ(msg_params.length(), 1u);
+  EXPECT_TRUE(msg_params.keyExists("OEM_REF_RPM"));
+  auto key_value = msg_params["OEM_REF_RPM"];
+  EXPECT_TRUE(key_value.asBool());
+}
+
+TEST_F(CustomVehicleDataManagerTest, CreateHMIMessageParamsSeveralPODItems) {
+  policy_table::VehicleDataItem rpm;
+  rpm.mark_initialized();
+  rpm.name = kName;
+  rpm.type = "Integer";
+  rpm.key = "OEM_REF_RPM";
+  rpm.mandatory = false;
+  *rpm.array = false;
+  rpm.params->mark_initialized();
+
+  policy_table::VehicleDataItem speed;
+  speed.mark_initialized();
+  speed.name = "speed";
+  speed.type = "float";
+  speed.key = "OEM_REF_SPEED";
+  speed.mandatory = false;
+  *speed.array = false;
+  speed.params->mark_initialized();
+
+  policy_table::VehicleDataItems schema_items;
+  schema_items.push_back(rpm);
+  schema_items.push_back(speed);
+  InitValidationManager(schema_items);
+
+  const std::set<std::string> items = {kName, "speed"};
+
+  const auto msg_params = custom_vd_manager_->CreateHMIMessageParams(items);
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_EQ(msg_params.length(), 2u);
+
+  EXPECT_TRUE(msg_params.keyExists("OEM_REF_RPM"));
+  auto rpm_key_value = msg_params["OEM_REF_RPM"];
+  EXPECT_TRUE(rpm_key_value.asBool());
+
+  EXPECT_TRUE(msg_params.keyExists("OEM_REF_SPEED"));
+  auto speed_key_value = msg_params["OEM_REF_SPEED"];
+  EXPECT_TRUE(speed_key_value.asBool());
+}
+
+TEST_F(CustomVehicleDataManagerTest,
+       CreateHMIMessageParamsSchemaWithSeveralItemsRequestWithOneItem) {
+  policy_table::VehicleDataItem rpm;
+  rpm.mark_initialized();
+  rpm.name = kName;
+  rpm.type = "Integer";
+  rpm.key = "OEM_REF_RPM";
+  rpm.mandatory = false;
+  *rpm.array = false;
+  rpm.params->mark_initialized();
+
+  policy_table::VehicleDataItem speed;
+  speed.mark_initialized();
+  speed.name = "speed";
+  speed.type = "float";
+  speed.key = "OEM_REF_SPEED";
+  speed.mandatory = false;
+  *speed.array = false;
+  speed.params->mark_initialized();
+
+  policy_table::VehicleDataItems schema_items;
+  schema_items.push_back(rpm);
+  schema_items.push_back(speed);
+  InitValidationManager(schema_items);
+
+  const std::set<std::string> items = {kName};
+
+  const auto msg_params = custom_vd_manager_->CreateHMIMessageParams(items);
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_EQ(msg_params.length(), 1u);
+
+  EXPECT_TRUE(msg_params.keyExists("OEM_REF_RPM"));
+  auto rpm_key_value = msg_params["OEM_REF_RPM"];
+  EXPECT_TRUE(rpm_key_value.asBool());
+}
+
+TEST_F(CustomVehicleDataManagerTest, CreateHMIMessageParamsStructType) {
+  policy_table::VehicleDataItem alss;
+  alss.mark_initialized();
+  alss.name = "ambientLightSensorStatus";
+  alss.type = "AmbientLightStatus";
+  alss.key = "OEM_REF_AMB_LIGHT";
+  alss.mandatory = false;
+  alss.params->mark_initialized();
+
+  policy_table::VehicleDataItem lss;
+  lss.mark_initialized();
+  lss.name = "LightSensorStatus";
+  lss.type = "Struct";
+  lss.key = "OEM_REF_SEN_LIGHT";
+  lss.mandatory = false;
+  lss.params->mark_initialized();
+  lss.params->push_back(alss);
+
+  policy_table::VehicleDataItem hbo;
+  hbo.mark_initialized();
+  hbo.name = "highBeamsOn";
+  hbo.type = "Boolean";
+  hbo.key = "OEM_REF_HIGH_BEAM";
+  hbo.mandatory = true;
+  hbo.params->mark_initialized();
+
+  policy_table::VehicleDataItem lbo;
+  lbo.mark_initialized();
+  lbo.name = "lowBeamsOn";
+  lbo.type = "Boolean";
+  lbo.key = "OEM_REF_LOW_BEAM";
+  lbo.mandatory = false;
+  lbo.params->mark_initialized();
+
+  policy_table::VehicleDataItem hls;
+  hls.mark_initialized();
+  hls.name = "headLampStatus";
+  hls.type = "Struct";
+  hls.key = "OEM_REF_HLSTATUS";
+  hls.mandatory = false;
+  hls.params->mark_initialized();
+  hls.params->push_back(lss);
+  hls.params->push_back(lbo);
+  hls.params->push_back(hbo);
+
+  policy_table::VehicleDataItems schema_items;
+  schema_items.push_back(hls);
+  InitValidationManager(schema_items);
+
+  const std::set<std::string> items = {"headLampStatus"};
+
+  const auto msg_params = custom_vd_manager_->CreateHMIMessageParams(items);
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_EQ(msg_params.length(), 1u);
+
+  EXPECT_TRUE(msg_params.keyExists("OEM_REF_HLSTATUS"));
+  const auto head_lamp_status = msg_params["OEM_REF_HLSTATUS"];
+  EXPECT_EQ(head_lamp_status.getType(), smart_objects::SmartType_Map);
+
+  EXPECT_EQ(head_lamp_status.length(), 3u);
+
+  EXPECT_TRUE(head_lamp_status.keyExists("OEM_REF_HIGH_BEAM"));
+  EXPECT_TRUE(head_lamp_status.keyExists("OEM_REF_LOW_BEAM"));
+  EXPECT_TRUE(head_lamp_status.keyExists("OEM_REF_SEN_LIGHT"));
+
+  EXPECT_TRUE(head_lamp_status["OEM_REF_HIGH_BEAM"].asBool());
+  EXPECT_TRUE(head_lamp_status["OEM_REF_LOW_BEAM"].asBool());
+  auto light_sensor_status = head_lamp_status["OEM_REF_SEN_LIGHT"];
+
+  EXPECT_EQ(light_sensor_status.length(), 1u);
+  EXPECT_TRUE(light_sensor_status.keyExists("OEM_REF_AMB_LIGHT"));
+  EXPECT_TRUE(light_sensor_status["OEM_REF_AMB_LIGHT"].asBool());
+}
+
+TEST_F(CustomVehicleDataManagerTest, CreateHMIMessageParamsNoSchemaForItem) {
+  policy_table::VehicleDataItems schema_items;
+  InitValidationManager(schema_items);
+
+  const std::set<std::string> items = {kName};
+
+  const auto msg_params = custom_vd_manager_->CreateHMIMessageParams(items);
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_TRUE(msg_params.empty());
+}
+
+TEST_F(CustomVehicleDataManagerTest, CreateMobileMessageParamsStruct) {
+  const application_manager::VehicleData kEmptyVehicleData;
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(kEmptyVehicleData));
+
+  policy_table::VehicleDataItems schema_items;
+
+  policy_table::VehicleDataItem custom_vd_item11_struct;
+  custom_vd_item11_struct.mark_initialized();
+  custom_vd_item11_struct.name = "custom_vd_item11_struct";
+  custom_vd_item11_struct.type = "Struct";
+  custom_vd_item11_struct.key = "OEM_REF_STRUCT";
+  custom_vd_item11_struct.mandatory = false;
+  custom_vd_item11_struct.params->mark_initialized();
+
+  policy_table::VehicleDataItem struct_element_1_int;
+  struct_element_1_int.mark_initialized();
+  struct_element_1_int.name = "struct_element_1_int";
+  struct_element_1_int.type = "Integer";
+  struct_element_1_int.key = "OEM_REF_STRUCT_1_INT";
+  struct_element_1_int.mandatory = false;
+  struct_element_1_int.params->mark_initialized();
+  custom_vd_item11_struct.params->push_back(struct_element_1_int);
+  schema_items.push_back(custom_vd_item11_struct);
+  InitValidationManager(schema_items);
+
+  smart_objects::SmartObject msg_params(smart_objects::SmartType_Map);
+  msg_params["OEM_REF_STRUCT"] =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+  auto& oem_ref_struct = msg_params["OEM_REF_STRUCT"];
+  oem_ref_struct["OEM_REF_STRUCT_1_INT"] = 100;
+  custom_vd_manager_->CreateMobileMessageParams(msg_params);
+
+  EXPECT_EQ(msg_params.getType(), smart_objects::SmartType_Map);
+  EXPECT_TRUE(msg_params.keyExists("custom_vd_item11_struct"));
+
+  auto& mobile_response_vd_item_11 = msg_params["custom_vd_item11_struct"];
+  EXPECT_EQ(mobile_response_vd_item_11.getType(), smart_objects::SmartType_Map);
+  EXPECT_TRUE(mobile_response_vd_item_11.keyExists("struct_element_1_int"));
+
+  auto& mobile_response_element1 =
+      mobile_response_vd_item_11["struct_element_1_int"];
+  EXPECT_EQ(mobile_response_element1.getType(),
+            smart_objects::SmartType_Integer);
+  EXPECT_EQ(mobile_response_element1.asInt(), 100);
+}
+}  // namespace vehicle_info_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/commands/vi_command_request_test.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/commands/vi_command_request_test.h
new file mode 100644
index 0000000000..a6eac01e1c
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/commands/vi_command_request_test.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VIHICLE_INFO_PLUGIN_COMMANDS_VI_COMMAND_REQUEST_TEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VIHICLE_INFO_PLUGIN_COMMANDS_VI_COMMAND_REQUEST_TEST_H_
+
+#include <stdint.h>
+
+#include "gtest/gtest.h"
+
+#include "application_manager/commands/command_request_impl.h"
+#include "application_manager/commands/command_request_test.h"
+#include "application_manager/event_engine/event.h"
+#include "application_manager/smart_object_keys.h"
+#include "smart_objects/smart_object.h"
+#include "vehicle_info_plugin/mock_custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+
+using ::test::components::event_engine_test::MockEventDispatcher;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::SaveArg;
+namespace am = ::application_manager;
+using am::commands::Command;
+using am::commands::CommandRequestImpl;
+using am::event_engine::Event;
+
+template <const CommandsTestMocks kIsNice = CommandsTestMocks::kNotNice>
+class VICommandRequestTest : public CommandRequestTest<kIsNice> {
+ public:
+  enum { kDefaultTimeout_ = 100 };
+
+  template <class Command>
+  std::shared_ptr<Command> CreateCommandVI() {
+    auto msg = CommandsTest<kIsNice>::CreateMessage();
+    return CreateCommandVI<Command>(msg);
+  }
+
+  template <class Command>
+  std::shared_ptr<Command> CreateCommandVI(MessageSharedPtr& msg) {
+    InitCommandVI(kDefaultTimeout_);
+    vehicle_info_plugin::VehicleInfoCommandParams params = {
+        CommandsTest<kIsNice>::app_mngr_,
+        CommandsTest<kIsNice>::mock_rpc_service_,
+        CommandsTest<kIsNice>::mock_hmi_capabilities_,
+        CommandsTest<kIsNice>::mock_policy_handler_,
+        mock_custom_vehicle_data_manager_};
+    return std::make_shared<Command>(msg, params);
+  }
+
+  testing::NiceMock<vehicle_info_plugin::MockCustomVehicleDataManager>
+      mock_custom_vehicle_data_manager_;
+
+ protected:
+  VICommandRequestTest() : CommandRequestTest<kIsNice>() {}
+
+  void InitCommandVI(const uint32_t& timeout) {
+    CommandRequestTest<kIsNice>::InitCommand(kDefaultTimeout_);
+  }
+};
+
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VIHICLE_INFO_PLUGIN_COMMANDS_VI_COMMAND_REQUEST_TEST_H_
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/commands/vi_commands_test.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/commands/vi_commands_test.h
new file mode 100644
index 0000000000..ae25acea87
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/commands/vi_commands_test.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VI_COMMAND_TEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VI_COMMAND_TEST_H_
+
+#include <stdint.h>
+#include "gtest/gtest.h"
+
+#include "application_manager/commands/command.h"
+#include "smart_objects/smart_object.h"
+
+#include "application_manager/commands/commands_test.h"
+#include "application_manager/mock_application.h"
+#include "application_manager/mock_application_manager_settings.h"
+#include "application_manager/mock_hmi_interface.h"
+#include "application_manager/mock_message_helper.h"
+#include "application_manager/policies/mock_policy_handler_interface.h"
+#include "vehicle_info_plugin/mock_custom_vehicle_data_manager.h"
+#include "vehicle_info_plugin/vehicle_info_command_params.h"
+
+namespace test {
+namespace components {
+namespace commands_test {
+
+namespace am = ::application_manager;
+
+using ::testing::_;
+using ::testing::Mock;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+using am::commands::MessageSharedPtr;
+using ::smart_objects::SmartObject;
+
+template <const CommandsTestMocks kIsNice = CommandsTestMocks::kNotNice>
+class VICommandsTest : public CommandsTest<kIsNice> {
+ public:
+  enum { kDefaultTimeout_ = 100 };
+
+  template <class Command>
+  std::shared_ptr<Command> CreateCommandVI() {
+    auto msg = CommandsTest<kIsNice>::CreateMessage();
+    return CreateCommandVI<Command>(msg);
+  }
+
+  template <class Command>
+  std::shared_ptr<Command> CreateCommandVI(MessageSharedPtr& msg) {
+    InitCommandVI(kDefaultTimeout_);
+    vehicle_info_plugin::VehicleInfoCommandParams params = {
+        CommandsTest<kIsNice>::app_mngr_,
+        CommandsTest<kIsNice>::mock_rpc_service_,
+        CommandsTest<kIsNice>::mock_hmi_capabilities_,
+        CommandsTest<kIsNice>::mock_policy_handler_,
+        mock_custom_vehicle_data_manager_};
+    return std::make_shared<Command>(msg, params);
+  }
+
+  testing::NiceMock<vehicle_info_plugin::MockCustomVehicleDataManager>
+      mock_custom_vehicle_data_manager_;
+
+ protected:
+  void InitCommandVI(const uint32_t& timeout) {
+    ON_CALL(CommandsTest<kIsNice>::app_mngr_, get_settings())
+        .WillByDefault(ReturnRef(CommandsTest<kIsNice>::app_mngr_settings_));
+    ON_CALL(CommandsTest<kIsNice>::app_mngr_settings_, default_timeout())
+        .WillByDefault(ReturnRef(timeout));
+  }
+};
+}  // namespace commands_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VI_COMMAND_TEST_H_
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/mock_custom_vehicle_data_manager.h b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/mock_custom_vehicle_data_manager.h
new file mode 100644
index 0000000000..9a7435f980
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/include/vehicle_info_plugin/mock_custom_vehicle_data_manager.h
@@ -0,0 +1,26 @@
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VEHICLE_INFO_PLUGIN_MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VEHICLE_INFO_PLUGIN_MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H_
+
+#include "gmock/gmock.h"
+#include "vehicle_info_plugin/custom_vehicle_data_manager.h"
+
+namespace vehicle_info_plugin {
+namespace plugin_manager = application_manager::plugin_manager;
+class MockCustomVehicleDataManager : public CustomVehicleDataManager {
+ public:
+  MOCK_METHOD1(
+      CreateHMIMessageParams,
+      smart_objects::SmartObject(const std::set<std::string>& msg_params));
+  MOCK_METHOD1(CreateMobileMessageParams,
+               void(smart_objects::SmartObject& msg_params));
+  MOCK_CONST_METHOD1(GetVehicleDataItemType,
+                     std::string(const std::string& vehicle_data_item_name));
+  MOCK_METHOD1(OnPolicyEvent, void(plugin_manager::PolicyEvent policy_event));
+  MOCK_CONST_METHOD1(IsValidCustomVehicleDataName,
+                     bool(const std::string& name));
+  MOCK_CONST_METHOD1(IsRemovedCustomVehicleDataName,
+                     bool(const std::string& name));
+};
+
+}  // namespace vehicle_info_plugin
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_RPC_PLUGINS_VEHICLE_INFO_PLUGIN_TEST_INCLUDE_VEHICLE_INFO_PLUGIN_MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H_
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/vehicle_data_item_schema_test.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/vehicle_data_item_schema_test.cc
new file mode 100644
index 0000000000..2443310409
--- /dev/null
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/test/vehicle_data_item_schema_test.cc
@@ -0,0 +1,396 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE. */
+
+#include "vehicle_info_plugin/vehicle_data_item_schema.h"
+#include <limits>
+#include <set>
+#include <type_traits>
+#include "formatters/formatter_json_rpc.h"
+#include "formatters/generic_json_formatter.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "interfaces/HMI_API.h"
+#include "smart_objects/smart_object.h"
+
+namespace vehicle_info_plugin_test {
+using namespace vehicle_info_plugin;
+using namespace rpc;
+namespace smart_objects = ns_smart_device_link::ns_smart_objects;
+namespace policy_table = rpc::policy_table_interface_base;
+
+using namespace ns_smart_device_link::ns_json_handler::strings;
+using namespace hmi_apis;
+
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+using ErrorCode = smart_objects::errors::eType;
+
+namespace {
+const int kInvalidValue = std::numeric_limits<int32_t>::max();
+const int kDefaultInteger = 20;
+const double kDefaultFloat = 10.05;
+const bool kDefaultBoolean = true;
+const std::string kDefaultString = "string value";
+const std::string kVehicleDataKey = "key";
+}  // namespace
+
+typedef Common_ComponentVolumeStatus::eType TestEnumType;
+
+class VehicleDataItemSchemaTest : public ::testing::Test {
+ public:
+  /*
+   * @brief
+   * Specifies whether user wants to generate valid value of SmartObject or not.
+   */
+  enum class SetValidItemValue { NO = 0, YES = 1 };
+
+  /*
+   * @brief
+   * VehicleDataTestObject struct combines schema and data structures for test
+   * object.
+   */
+  struct VehicleDataTestObject {
+    VehicleDataTestObject(const int& key_number) {
+      schema.mark_initialized();
+      schema.params->mark_initialized();
+      schema.mandatory = true;
+      *schema.array = false;
+      // default value bounds
+      *schema.minvalue = 10;
+      *schema.maxvalue = 100;
+      // default string length
+      *schema.minlength = 5;
+      *schema.maxlength = 30;
+      // default array length
+      *schema.minsize = 5;
+      *schema.maxsize = 30;
+      // generate schema unique key
+      schema.key = kVehicleDataKey + std::to_string(key_number);
+    }
+
+    policy_table::VehicleDataItem schema;
+    smart_objects::SmartObject data;
+  };
+
+ public:
+  VehicleDataItemSchemaTest() : key_number_(1) {
+    test_enum_.insert(TestEnumType::CVS_UNKNOWN);
+    test_enum_.insert(TestEnumType::CVS_NORMAL);
+    test_enum_.insert(TestEnumType::CVS_LOW);
+    test_enum_.insert(TestEnumType::CVS_FAULT);
+    test_enum_.insert(TestEnumType::CVS_ALERT);
+    test_enum_.insert(TestEnumType::CVS_NOT_SUPPORTED);
+  }
+
+  void assertSmartObjectSize(const size_t& expected_size,
+                             const size_t& actual_size) {
+    ASSERT_EQ(expected_size, actual_size);
+  }
+
+  std::vector<VehicleDataTestObject> generatePODObjects(
+      const SetValidItemValue& set_valid_item) {
+    std::vector<VehicleDataTestObject> generated_objects;
+    VehicleDataTestObject custom_object(key_number_++);
+
+    // Integer item
+    custom_object.schema.type = policy_table::VehicleDataItem::kInteger;
+    if (set_valid_item == SetValidItemValue::YES) {
+      custom_object.data = kDefaultInteger;
+    } else {
+      custom_object.data = kInvalidValue;
+    }
+    generated_objects.push_back(custom_object);
+
+    // Float item
+    custom_object.schema.type = policy_table::VehicleDataItem::kFloat;
+    if (set_valid_item == SetValidItemValue::YES) {
+      custom_object.data = kDefaultFloat;
+    } else {
+      custom_object.data = kInvalidValue;
+    }
+    generated_objects.push_back(custom_object);
+
+    // String item
+    custom_object.schema.type = policy_table::VehicleDataItem::kString;
+    if (set_valid_item == SetValidItemValue::YES) {
+      custom_object.data = kDefaultString;
+    } else {
+      custom_object.data = kInvalidValue;
+    }
+    generated_objects.push_back(custom_object);
+
+    // Boolean item
+    custom_object.schema.type = policy_table::VehicleDataItem::kBoolean;
+    if (set_valid_item == SetValidItemValue::YES) {
+      custom_object.data = kDefaultBoolean;
+    } else {
+      custom_object.data = kInvalidValue;
+    }
+    generated_objects.push_back(custom_object);
+
+    return generated_objects;
+  }
+
+  VehicleDataTestObject generateTestObject(
+      const SetValidItemValue& set_valid_item) {
+    // Enum parameter
+    VehicleDataTestObject enum_object(key_number_++);
+    enum_object.schema.type = "ComponentVolumeStatus";
+    enum_object.data = (set_valid_item == SetValidItemValue::YES)
+                           ? TestEnumType::CVS_LOW
+                           : kInvalidValue;
+
+    // Integer parameter
+    VehicleDataTestObject int_object(key_number_++);
+    int_object.schema.type = policy_table::VehicleDataItem::kInteger;
+    int_object.data = (set_valid_item == SetValidItemValue::YES)
+                          ? kDefaultInteger
+                          : kInvalidValue;
+
+    // Main object
+    VehicleDataTestObject main_object(key_number_++);
+    main_object.schema.type = policy_table::VehicleDataItem::kStruct;
+    *main_object.schema.params = std::vector<policy_table::VehicleDataItem>{
+        enum_object.schema, int_object.schema};
+    main_object.data[enum_object.schema.key] = enum_object.data;
+    main_object.data[int_object.schema.key] = int_object.data;
+
+    assertSmartObjectSize(2u, main_object.data.length());
+    return main_object;
+  }
+
+  VehicleDataTestObject generateRecursiveTestObject(
+      const SetValidItemValue& set_valid_item) {
+    // Float item
+    VehicleDataTestObject float_object(key_number_++);
+    float_object.schema.type = policy_table::VehicleDataItem::kFloat;
+    if (set_valid_item == SetValidItemValue::YES) {
+      float_object.data = kDefaultFloat;
+    } else {
+      float_object.data = kInvalidValue;
+    }
+
+    // String item
+    VehicleDataTestObject string_object(key_number_++);
+    string_object.schema.type = policy_table::VehicleDataItem::kString;
+    if (set_valid_item == SetValidItemValue::YES) {
+      string_object.data = kDefaultString;
+    } else {
+      string_object.data = kInvalidValue;
+    }
+
+    // Sub Object
+    VehicleDataTestObject sub_object = generateTestObject(set_valid_item);
+
+    // Main Object
+    VehicleDataTestObject main_object(key_number_++);
+    main_object.schema.type = policy_table::VehicleDataItem::kStruct;
+    *main_object.schema.params = std::vector<policy_table::VehicleDataItem>{
+        float_object.schema, string_object.schema, sub_object.schema};
+    main_object.data[float_object.schema.key] = float_object.data;
+    main_object.data[string_object.schema.key] = string_object.data;
+    main_object.data[sub_object.schema.key] = sub_object.data;
+
+    assertSmartObjectSize(3u, main_object.data.length());
+    return main_object;
+  }
+
+ protected:
+  std::set<TestEnumType> test_enum_;
+  int key_number_;
+};
+
+TEST_F(VehicleDataItemSchemaTest, ValidatePOD_SUCCESS) {
+  rpc::ValidationReport report("RPC");
+  auto valid_pod_objects = generatePODObjects(SetValidItemValue::YES);
+
+  for (auto& object : valid_pod_objects) {
+    auto test_param = PolicyDataItem(object.schema);
+    auto result = VehicleDataItemSchema::create(
+        test_param, VehicleDataItemSchema::SchemaType::HMI);
+    EXPECT_EQ(ErrorCode::OK, result->validate(object.data, &report));
+    EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+  }
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidatePOD_FAIL) {
+  rpc::ValidationReport report("RPC");
+  std::vector<VehicleDataTestObject> valid_pod_objects =
+      generatePODObjects(SetValidItemValue::NO);
+
+  for (auto& object : valid_pod_objects) {
+    auto test_param = PolicyDataItem(object.schema);
+    auto result = VehicleDataItemSchema::create(
+        test_param, VehicleDataItemSchema::SchemaType::MOBILE);
+    EXPECT_NE(ErrorCode::OK, result->validate(object.data, &report));
+    EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+  }
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateEnum_SUCCESS) {
+  rpc::ValidationReport report("RPC");
+
+  VehicleDataTestObject test_enum_object(key_number_++);
+  test_enum_object.schema.type = "ComponentVolumeStatus";
+  test_enum_object.data = TestEnumType::CVS_NORMAL;
+
+  auto test_schema = PolicyDataItem(test_enum_object.schema);
+
+  for (auto& enum_value : test_enum_) {
+    test_enum_object.data = enum_value;
+    auto result = VehicleDataItemSchema::create(
+        test_schema, VehicleDataItemSchema::SchemaType::HMI);
+    EXPECT_EQ(ErrorCode::OK, result->validate(test_enum_object.data, &report));
+    EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+  }
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateEnum_FAIL) {
+  rpc::ValidationReport report("RPC");
+
+  VehicleDataTestObject test_enum_object(key_number_++);
+  test_enum_object.schema.type = "ComponentVolumeStatus";
+  test_enum_object.data = kInvalidValue;
+
+  auto test_schema = PolicyDataItem(test_enum_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_EQ(ErrorCode::OUT_OF_RANGE,
+            result->validate(test_enum_object.data, &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateObject_SUCCESS) {
+  rpc::ValidationReport report("RPC");
+  VehicleDataTestObject complex_object =
+      generateTestObject(SetValidItemValue::YES);
+  auto test_schema = PolicyDataItem(complex_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_EQ(ErrorCode::OK, result->validate(complex_object.data, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateObject_FAIL) {
+  rpc::ValidationReport report("RPC");
+  VehicleDataTestObject complex_object =
+      generateTestObject(SetValidItemValue::NO);
+  auto test_schema = PolicyDataItem(complex_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_NE(ErrorCode::OK, result->validate(complex_object.data, &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateRecursiveObject_SUCCESS) {
+  rpc::ValidationReport report("RPC");
+  VehicleDataTestObject complex_recursive_object =
+      generateRecursiveTestObject(SetValidItemValue::YES);
+  auto test_schema = PolicyDataItem(complex_recursive_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_EQ(ErrorCode::OK,
+            result->validate(complex_recursive_object.data, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateRecursiveObject_FAIL) {
+  rpc::ValidationReport report("RPC");
+  VehicleDataTestObject complex_recursive_object =
+      generateRecursiveTestObject(SetValidItemValue::NO);
+  auto test_schema = PolicyDataItem(complex_recursive_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_NE(ErrorCode::OK,
+            result->validate(complex_recursive_object.data, &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateArray_SUCCESS) {
+  rpc::ValidationReport report("RPC");
+  VehicleDataTestObject array_object(key_number_++);
+  *array_object.schema.array = true;
+  array_object.schema.type = policy_table::VehicleDataItem::kInteger;
+  array_object.data =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(10));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(20));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(30));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(40));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(50));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(60));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(70));
+
+  auto test_schema = PolicyDataItem(array_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_EQ(ErrorCode::OK, result->validate(array_object.data, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateArray_FAIL) {
+  rpc::ValidationReport report("RPC");
+  VehicleDataTestObject array_object(key_number_++);
+  *array_object.schema.array = true;
+  array_object.schema.type = policy_table::VehicleDataItem::kInteger;
+  array_object.data =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(10));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(20));
+  array_object.data.asArray()->push_back(smart_objects::SmartObject(30));
+
+  auto test_schema = PolicyDataItem(array_object.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  EXPECT_NE(ErrorCode::OK, result->validate(array_object.data, &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(VehicleDataItemSchemaTest, ValidateUnknownType) {
+  rpc::ValidationReport report("RPC");
+
+  VehicleDataTestObject test_object_with_invalid_type(key_number_++);
+  // Set invalid name of type
+  test_object_with_invalid_type.schema.type = "omponentolumetatus";
+  test_object_with_invalid_type.data = TestEnumType::CVS_NORMAL;
+
+  auto test_schema = PolicyDataItem(test_object_with_invalid_type.schema);
+  auto result = VehicleDataItemSchema::create(
+      test_schema, VehicleDataItemSchema::SchemaType::HMI);
+  test_object_with_invalid_type.data = "CVS_NORMAL";
+  EXPECT_EQ(ErrorCode::OK,
+            result->validate(test_object_with_invalid_type.data, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+}  // namespace vehicle_info_plugin_test
diff --git a/src/components/application_manager/src/app_launch/app_launch_data_json.cc b/src/components/application_manager/src/app_launch/app_launch_data_json.cc
index 984997e424..86d585f215 100644
--- a/src/components/application_manager/src/app_launch/app_launch_data_json.cc
+++ b/src/components/application_manager/src/app_launch/app_launch_data_json.cc
@@ -32,26 +32,27 @@
 #include "application_manager/app_launch/app_launch_data_json.h"
 #include <algorithm>
 #include "application_manager/smart_object_keys.h"
-#include "smart_objects/smart_object.h"
-
 #include "json/json.h"
+#include "smart_objects/smart_object.h"
 #include "utils/date_time.h"
 
 namespace app_launch {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "AppLaunch")
 
-AppLaunchDataJson::AppLaunchDataJson(const AppLaunchSettings& settings,
-                                     resumption::LastState& last_state)
-    : AppLaunchDataImpl(settings), last_state_(last_state) {}
+AppLaunchDataJson::AppLaunchDataJson(
+    const AppLaunchSettings& settings,
+    resumption::LastStateWrapperPtr last_state_wrapper)
+    : AppLaunchDataImpl(settings), last_state_wrapper_(last_state_wrapper) {}
 
 AppLaunchDataJson::~AppLaunchDataJson() {}
 
-Json::Value& AppLaunchDataJson::GetSavedApplicationDataList() const {
+Json::Value& AppLaunchDataJson::GetSavedApplicationDataList(
+    Json::Value& dictionary) const {
   using namespace application_manager;
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(app_launch_json_lock_);
-  Json::Value& app_launch = GetApplicationData();
+  Json::Value& app_launch = GetApplicationData(dictionary);
   if (!app_launch.isMember(strings::app_launch_list)) {
     app_launch[strings::app_launch_list] = Json::Value(Json::arrayValue);
     LOG4CXX_WARN(logger_, "app_list section is missed");
@@ -64,11 +65,11 @@ Json::Value& AppLaunchDataJson::GetSavedApplicationDataList() const {
   return app_launch_list;
 }
 
-Json::Value& AppLaunchDataJson::GetApplicationData() const {
+Json::Value& AppLaunchDataJson::GetApplicationData(
+    Json::Value& dictionary) const {
   using namespace application_manager;
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(app_launch_json_lock_);
-  Json::Value& dictionary = last_state().get_dictionary();
   if (!dictionary.isMember(strings::app_launch)) {
     dictionary[strings::app_launch] = Json::Value(Json::objectValue);
     LOG4CXX_WARN(logger_, "app_launch section is missed");
@@ -82,12 +83,14 @@ Json::Value& AppLaunchDataJson::GetApplicationData() const {
 }
 
 Json::Value& AppLaunchDataJson::GetApplicationListAndIndex(
-    const ApplicationData& app_data, int32_t& founded_index) const {
+    const ApplicationData& app_data,
+    int32_t& found_index,
+    Json::Value& dictionary) const {
   using namespace application_manager;
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(app_launch_json_lock_);
 
-  Json::Value& apps_list = GetSavedApplicationDataList();
+  Json::Value& apps_list = GetSavedApplicationDataList(dictionary);
   const Json::ArrayIndex size = apps_list.size();
 
   for (Json::ArrayIndex idx = 0; idx != size; ++idx) {
@@ -103,7 +106,7 @@ Json::Value& AppLaunchDataJson::GetApplicationListAndIndex(
 
       if (deviceID == app_data.device_mac_ && bundleID == app_data.bundle_id_ &&
           appID == app_data.mobile_app_id_) {
-        founded_index = idx;
+        found_index = idx;
       }
     }
   }
@@ -116,7 +119,11 @@ bool AppLaunchDataJson::IsAppDataAlreadyExisted(
   LOG4CXX_AUTO_TRACE(logger_);
 
   int32_t index = NotFound;
-  GetApplicationListAndIndex(app_data, index);
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  GetApplicationListAndIndex(app_data, index, dictionary);
+  accessor.GetMutableData().set_dictionary(dictionary);
   return index == NotFound ? false : true;
 }
 
@@ -127,7 +134,10 @@ bool AppLaunchDataJson::RefreshAppSessionTime(const ApplicationData& app_data) {
   bool retVal = false;
 
   int32_t index = NotFound;
-  Json::Value& json_data_list = GetApplicationListAndIndex(app_data, index);
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& json_data_list =
+      GetApplicationListAndIndex(app_data, index, dictionary);
   if (index != NotFound) {
     if (json_data_list.empty() == false) {
       json_data_list[index][strings::app_launch_last_session] =
@@ -135,6 +145,7 @@ bool AppLaunchDataJson::RefreshAppSessionTime(const ApplicationData& app_data) {
       retVal = true;
     }
   }
+  accessor.GetMutableData().set_dictionary(dictionary);
   return retVal;
 }
 
@@ -144,20 +155,22 @@ bool AppLaunchDataJson::AddNewAppData(const ApplicationData& app_data) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(app_launch_json_lock_);
 
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   Json::Value& json_app_data =
-      GetSavedApplicationDataList().append(Json::Value());
+      GetSavedApplicationDataList(dictionary).append(Json::Value());
   json_app_data[strings::device_id] = app_data.device_mac_;
   json_app_data[strings::app_id] = app_data.mobile_app_id_;
   json_app_data[strings::bundle_id] = app_data.bundle_id_;
   json_app_data[strings::app_launch_last_session] =
       static_cast<Json::Value::UInt64>(getSecs(getCurrentTime()));
+  accessor.GetMutableData().set_dictionary(dictionary);
 
   LOG4CXX_DEBUG(logger_,
                 "New application data saved. Detatils device_id: "
                     << app_data.device_mac_
                     << ", app_id: " << app_data.mobile_app_id_
                     << ", bundle_id: " << app_data.bundle_id_ << ".");
-
   return true;
 }
 
@@ -167,7 +180,9 @@ std::vector<ApplicationDataPtr> AppLaunchDataJson::GetAppDataByDevMac(
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock autolock(app_launch_json_lock_);
   std::vector<ApplicationDataPtr> dev_apps;
-  const Json::Value& apps_list = GetSavedApplicationDataList();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& apps_list = GetSavedApplicationDataList(dictionary);
   const Json::ArrayIndex size = apps_list.size();
 
   for (Json::ArrayIndex idx = 0; idx != size; ++idx) {
@@ -187,15 +202,16 @@ std::vector<ApplicationDataPtr> AppLaunchDataJson::GetAppDataByDevMac(
       }
     }
   }
-
+  accessor.GetMutableData().set_dictionary(dictionary);
   return dev_apps;
 }
 
 bool AppLaunchDataJson::Clear() {
   LOG4CXX_AUTO_TRACE(logger_);
-
-  GetSavedApplicationDataList().clear();
-
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  GetSavedApplicationDataList(dictionary).clear();
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_DEBUG(logger_,
                 "Application launch JSON section successfully cleared.");
 
@@ -204,9 +220,10 @@ bool AppLaunchDataJson::Clear() {
 
 uint32_t AppLaunchDataJson::GetCurentNumberOfAppData() const {
   LOG4CXX_AUTO_TRACE(logger_);
-
-  uint32_t list_size = GetSavedApplicationDataList().size();
-
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const uint32_t list_size = GetSavedApplicationDataList(dictionary).size();
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_DEBUG(logger_,
                 "Successfully was gotten app_launch list. Size: " << list_size);
 
@@ -219,7 +236,9 @@ bool AppLaunchDataJson::DeleteOldestAppData() {
   sync_primitives::AutoLock autolock(app_launch_json_lock_);
   std::vector<uint64_t> temp_array;
   std::vector<Json::Value> temp_json_list;
-  Json::Value& apps_list = GetSavedApplicationDataList();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& apps_list = GetSavedApplicationDataList(dictionary);
   const Json::ArrayIndex size = apps_list.size();
 
   // Search oldest record in Json
@@ -241,9 +260,7 @@ bool AppLaunchDataJson::DeleteOldestAppData() {
 
   // Copy in temporary vector Json list without oldest record
   int32_t i = 0;
-  for (Json::Value::iterator it = GetSavedApplicationDataList().begin();
-       it != GetSavedApplicationDataList().end();
-       ++it, i++) {
+  for (auto it = apps_list.begin(); it != apps_list.end(); ++it, i++) {
     if ((*it).isMember(strings::device_id) &&
         (*it).isMember(strings::bundle_id) && (*it).isMember(strings::app_id) &&
         (*it).isMember(strings::app_launch_last_session)) {
@@ -255,15 +272,13 @@ bool AppLaunchDataJson::DeleteOldestAppData() {
   }
 
   // Clear Json list
-  GetSavedApplicationDataList().clear();
+  GetSavedApplicationDataList(dictionary).clear();
 
   // Copy to Json new list without oldest one
-  for (std::vector<Json::Value>::iterator it = temp_json_list.begin();
-       it != temp_json_list.end();
-       ++it) {
-    GetSavedApplicationDataList().append((*it));
+  for (const auto& item : temp_json_list) {
+    GetSavedApplicationDataList(dictionary).append(item);
   }
-
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_DEBUG(
       logger_, "Oldest application launch data had been successfully deleted.");
 
@@ -272,8 +287,7 @@ bool AppLaunchDataJson::DeleteOldestAppData() {
 
 bool AppLaunchDataJson::Persist() {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(app_launch_json_lock_);
-  last_state().SaveStateToFileSystem();
+  last_state_wrapper_->get_accessor().GetMutableData().SaveToFileSystem();
   return true;
 }
 
diff --git a/src/components/application_manager/src/app_service_manager.cc b/src/components/application_manager/src/app_service_manager.cc
index a85921a8cd..3e7b4b99fe 100644
--- a/src/components/application_manager/src/app_service_manager.cc
+++ b/src/components/application_manager/src/app_service_manager.cc
@@ -53,7 +53,7 @@ const char* kAppServiceSection = "AppServices";
 const char* kDefaults = "defaults";
 
 AppServiceManager::AppServiceManager(ApplicationManager& app_manager,
-                                     resumption::LastState& last_state)
+                                     resumption::LastStateWrapperPtr last_state)
     : app_manager_(app_manager)
     , last_state_(last_state)
     , rpc_passing_handler_(*this, app_manager_) {}
@@ -139,13 +139,14 @@ smart_objects::SmartObject AppServiceManager::PublishAppService(
   std::string default_app_id = DefaultServiceByType(service_type);
   if (default_app_id.empty() && !mobile_service) {
     auto embedded_services = app_manager_.get_settings().embedded_services();
-    for (auto it = embedded_services.begin(); it != embedded_services.end();
-         ++it) {
-      if (*it == service_type) {
-        Json::Value& dictionary = last_state_.get_dictionary();
+    for (const auto& embedded_service : embedded_services) {
+      if (embedded_service == service_type) {
+        auto last_state_accessor = last_state_->get_accessor();
+        Json::Value dictionary = last_state_accessor.GetData().dictionary();
         dictionary[kAppServiceSection][kDefaults][service_type] =
             kEmbeddedService;
         default_app_id = kEmbeddedService;
+        last_state_accessor.GetMutableData().set_dictionary(dictionary);
       }
     }
   }
@@ -223,13 +224,21 @@ bool AppServiceManager::UnpublishAppService(const std::string service_id) {
 void AppServiceManager::UnpublishServices(const uint32_t connection_key) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_, "Unpublishing all app services: " << connection_key);
-  sync_primitives::AutoLock lock(published_services_lock_);
-  for (auto it = published_services_.begin(); it != published_services_.end();
-       ++it) {
-    if (it->second.connection_key == connection_key) {
-      UnpublishAppService(it->first);
+
+  std::list<std::string> app_published_services;
+  {
+    sync_primitives::AutoLock lock(published_services_lock_);
+    for (auto it = published_services_.begin(); it != published_services_.end();
+         ++it) {
+      if (it->second.connection_key == connection_key) {
+        app_published_services.push_back(it->first);
+      }
     }
   }
+
+  for (auto& service_id : app_published_services) {
+    UnpublishAppService(service_id);
+  }
 }
 
 void AppServiceManager::OnAppActivated(ApplicationConstSharedPtr app) {
@@ -332,9 +341,11 @@ bool AppServiceManager::SetDefaultService(const std::string service_id) {
   }
   service.default_service = true;
 
-  Json::Value& dictionary = last_state_.get_dictionary();
+  auto last_state_accessor = last_state_->get_accessor();
+  Json::Value dictionary = last_state_accessor.GetData().dictionary();
   dictionary[kAppServiceSection][kDefaults][service_type] =
       GetPolicyAppID(service);
+  last_state_accessor.GetMutableData().set_dictionary(dictionary);
   return true;
 }
 
@@ -357,8 +368,11 @@ bool AppServiceManager::RemoveDefaultService(const std::string service_id) {
   std::string service_type =
       service.record[strings::service_manifest][strings::service_type]
           .asString();
-  Json::Value& dictionary = last_state_.get_dictionary();
+
+  auto last_state_accessor = last_state_->get_accessor();
+  Json::Value dictionary = last_state_accessor.GetData().dictionary();
   dictionary[kAppServiceSection][kDefaults].removeMember(service_type);
+  last_state_accessor.GetMutableData().set_dictionary(dictionary);
   return true;
 }
 
@@ -539,7 +553,9 @@ AppService* AppServiceManager::FindServiceByName(std::string name) {
 std::string AppServiceManager::DefaultServiceByType(
     const std::string service_type) {
   LOG4CXX_AUTO_TRACE(logger_);
-  Json::Value& dictionary = last_state_.get_dictionary();
+
+  auto last_state_accessor = last_state_->get_accessor();
+  Json::Value dictionary = last_state_accessor.GetData().dictionary();
   if (dictionary[kAppServiceSection][kDefaults].isMember(service_type)) {
     return dictionary[kAppServiceSection][kDefaults][service_type].asString();
   }
diff --git a/src/components/application_manager/src/application_data_impl.cc b/src/components/application_manager/src/application_data_impl.cc
index 048c4b4a70..59b8f7ad9a 100644
--- a/src/components/application_manager/src/application_data_impl.cc
+++ b/src/components/application_manager/src/application_data_impl.cc
@@ -39,6 +39,25 @@
 namespace application_manager {
 CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager")
 
+namespace {
+struct CommandIdComparator {
+  CommandIdComparator(const std::string& key, const uint32_t id)
+      : key_(key), target_id_(id) {}
+
+  bool operator()(const CommandsMap::value_type& new_command) const {
+    smart_objects::SmartObject& command = *(new_command.second);
+    if (command.keyExists(key_)) {
+      return command[key_].asUInt() == target_id_;
+    }
+    return false;
+  }
+
+ private:
+  std::string key_;
+  uint32_t target_id_;
+};
+}  // namespace
+
 InitialApplicationDataImpl::InitialApplicationDataImpl()
     : app_types_(NULL)
     , vr_synonyms_(NULL)
@@ -173,19 +192,16 @@ InitialApplicationDataImpl::perform_interaction_layout() const {
 }
 
 DynamicApplicationDataImpl::DynamicApplicationDataImpl()
-    : help_prompt_(NULL)
-    , timeout_prompt_(NULL)
-    , vr_help_title_(NULL)
-    , vr_help_(NULL)
+    : help_prompt_(nullptr)
+    , timeout_prompt_(nullptr)
+    , vr_help_title_(nullptr)
+    , vr_help_(nullptr)
     , tbt_state_(mobile_api::TBTState::INVALID_ENUM)
-    , show_command_(NULL)
-    , keyboard_props_(NULL)
-    , menu_title_(NULL)
-    , menu_icon_(NULL)
-    , tbt_show_command_(NULL)
-    , day_color_scheme_(NULL)
-    , night_color_scheme_(NULL)
-    , display_layout_("")
+    , show_command_(nullptr)
+    , keyboard_props_(nullptr)
+    , menu_title_(nullptr)
+    , menu_icon_(nullptr)
+    , tbt_show_command_(nullptr)
     , commands_()
     , commands_lock_ptr_(std::make_shared<sync_primitives::RecursiveLock>())
     , sub_menu_()
@@ -195,9 +211,12 @@ DynamicApplicationDataImpl::DynamicApplicationDataImpl()
     , performinteraction_choice_set_map_()
     , performinteraction_choice_set_lock_ptr_(
           std::make_shared<sync_primitives::RecursiveLock>())
+    , window_params_map_()
+    , window_params_map_lock_ptr_(std::make_shared<sync_primitives::Lock>())
     , is_perform_interaction_active_(false)
     , is_reset_global_properties_active_(false)
-    , perform_interaction_mode_(-1) {}
+    , perform_interaction_mode_(-1)
+    , display_capabilities_builder_(*this) {}
 
 DynamicApplicationDataImpl::~DynamicApplicationDataImpl() {
   if (help_prompt_) {
@@ -225,19 +244,24 @@ DynamicApplicationDataImpl::~DynamicApplicationDataImpl() {
     show_command_ = NULL;
   }
 
-  if (tbt_show_command_) {
-    delete tbt_show_command_;
-    tbt_show_command_ = NULL;
+  if (keyboard_props_) {
+    delete keyboard_props_;
+    keyboard_props_ = NULL;
   }
 
-  if (day_color_scheme_) {
-    delete day_color_scheme_;
-    day_color_scheme_ = NULL;
+  if (menu_title_) {
+    delete menu_title_;
+    menu_title_ = NULL;
   }
 
-  if (night_color_scheme_) {
-    delete night_color_scheme_;
-    night_color_scheme_ = NULL;
+  if (menu_icon_) {
+    delete menu_icon_;
+    menu_icon_ = NULL;
+  }
+
+  if (tbt_show_command_) {
+    delete tbt_show_command_;
+    tbt_show_command_ = NULL;
   }
 
   for (CommandsMap::iterator command_it = commands_.begin();
@@ -254,6 +278,11 @@ DynamicApplicationDataImpl::~DynamicApplicationDataImpl() {
   }
   sub_menu_.clear();
 
+  for (auto command : choice_set_map_) {
+    delete command.second;
+  }
+  choice_set_map_.clear();
+
   PerformChoiceSetMap::iterator it = performinteraction_choice_set_map_.begin();
   for (; performinteraction_choice_set_map_.end() != it; ++it) {
     PerformChoice::iterator choice_it =
@@ -265,6 +294,8 @@ DynamicApplicationDataImpl::~DynamicApplicationDataImpl() {
     performinteraction_choice_set_map_[it->first].clear();
   }
   performinteraction_choice_set_map_.clear();
+
+  window_params_map_.clear();
 }
 
 const smart_objects::SmartObject* DynamicApplicationDataImpl::help_prompt()
@@ -316,18 +347,93 @@ const smart_objects::SmartObject* DynamicApplicationDataImpl::menu_icon()
   return menu_icon_;
 }
 
-const smart_objects::SmartObject* DynamicApplicationDataImpl::day_color_scheme()
+smart_objects::SmartObject DynamicApplicationDataImpl::day_color_scheme()
     const {
-  return day_color_scheme_;
+  using namespace mobile_apis::PredefinedWindows;
+  auto default_window_it = window_templates_.find(DEFAULT_WINDOW);
+
+  if (window_templates_.end() != default_window_it) {
+    const smart_objects::SmartObject template_config =
+        default_window_it->second;
+    if (template_config.keyExists(strings::day_color_scheme)) {
+      return template_config[strings::day_color_scheme];
+    }
+  }
+
+  return smart_objects::SmartObject(smart_objects::SmartType::SmartType_Null);
 }
 
-const smart_objects::SmartObject*
-DynamicApplicationDataImpl::night_color_scheme() const {
-  return night_color_scheme_;
+smart_objects::SmartObject DynamicApplicationDataImpl::night_color_scheme()
+    const {
+  using namespace mobile_apis::PredefinedWindows;
+  auto default_window_it = window_templates_.find(DEFAULT_WINDOW);
+
+  if (window_templates_.end() != default_window_it) {
+    const smart_objects::SmartObject template_config =
+        default_window_it->second;
+    if (template_config.keyExists(strings::night_color_scheme)) {
+      return template_config[strings::night_color_scheme];
+    }
+  }
+
+  return smart_objects::SmartObject(smart_objects::SmartType::SmartType_Null);
 }
 
-const std::string& DynamicApplicationDataImpl::display_layout() const {
-  return display_layout_;
+std::string DynamicApplicationDataImpl::display_layout() const {
+  using namespace mobile_apis::PredefinedWindows;
+  auto default_window_it = window_templates_.find(DEFAULT_WINDOW);
+
+  if (window_templates_.end() != default_window_it) {
+    smart_objects::SmartObject template_config = default_window_it->second;
+    if (template_config.keyExists(strings::template_layout)) {
+      return template_config[strings::template_layout].asString();
+    }
+  }
+
+  return std::string();
+}
+
+smart_objects::SmartObjectSPtr
+DynamicApplicationDataImpl::display_capabilities() const {
+  return display_capabilities_;
+}
+
+smart_objects::SmartObjectSPtr DynamicApplicationDataImpl::display_capabilities(
+    const WindowID window_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto result_display_caps = std::make_shared<smart_objects::SmartObject>(
+      smart_objects::SmartType_Array);
+  const auto window_caps =
+      (*display_capabilities_)[0][strings::window_capabilities].asArray();
+  if (!window_caps) {
+    LOG4CXX_WARN(logger_, "Current window capabilities are empty");
+    // SDL still needs to retreive display capabilities
+    return display_capabilities_;
+  }
+  auto find_res =
+      std::find_if(window_caps->begin(),
+                   window_caps->end(),
+                   [&window_id](const smart_objects::SmartObject& element) {
+                     if (window_id == element[strings::window_id].asInt()) {
+                       return true;
+                     }
+
+                     return false;
+                   });
+
+  DCHECK(find_res != window_caps->end());
+  const auto disp_caps_keys = (*display_capabilities_)[0].enumerate();
+  for (const auto& key : disp_caps_keys) {
+    if (strings::window_capabilities == key) {
+      continue;
+    }
+    (*result_display_caps)[0][key] = (*display_capabilities_)[0][key];
+  }
+
+  (*result_display_caps)[0][strings::window_capabilities][0] = *find_res;
+
+  return result_display_caps;
 }
 
 void DynamicApplicationDataImpl::load_global_properties(
@@ -447,24 +553,205 @@ void DynamicApplicationDataImpl::set_menu_icon(
 
 void DynamicApplicationDataImpl::set_day_color_scheme(
     const smart_objects::SmartObject& color_scheme) {
-  if (day_color_scheme_) {
-    delete day_color_scheme_;
+  using namespace mobile_apis::PredefinedWindows;
+  DCHECK(color_scheme.getType() == smart_objects::SmartType_Map);
+  window_templates_[DEFAULT_WINDOW][strings::day_color_scheme] = color_scheme;
+}
+
+void DynamicApplicationDataImpl::set_night_color_scheme(
+    const smart_objects::SmartObject& color_scheme) {
+  using namespace mobile_apis::PredefinedWindows;
+  DCHECK(color_scheme.getType() == smart_objects::SmartType_Map);
+  window_templates_[DEFAULT_WINDOW][strings::night_color_scheme] = color_scheme;
+}
+
+void DynamicApplicationDataImpl::set_display_layout(const std::string& layout) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace mobile_apis::PredefinedWindows;
+  smart_objects::SmartObject template_config(smart_objects::SmartType_Map);
+  template_config[strings::template_layout] = layout;
+  window_templates_[DEFAULT_WINDOW] = template_config;
+}
+
+void DynamicApplicationDataImpl::set_display_capabilities(
+    const smart_objects::SmartObject& display_capabilities) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto& incoming_window_capabilities =
+      display_capabilities[0][strings::window_capabilities];
+
+  smart_objects::SmartObject tmp_window_capabilities;
+  if (display_capabilities_) {
+    tmp_window_capabilities =
+        (*display_capabilities_)[0][strings::window_capabilities];
+  }
+
+  display_capabilities_.reset(
+      new smart_objects::SmartObject(display_capabilities));
+
+  auto get_window_index = [&tmp_window_capabilities](const WindowID window_id) {
+    const auto tmp_window_capabilities_arr = tmp_window_capabilities.asArray();
+    if (!tmp_window_capabilities_arr) {
+      return -1;
+    }
+
+    int index = 0;
+    for (auto element : *tmp_window_capabilities_arr) {
+      if (element.keyExists(strings::window_id)) {
+        if (window_id == element[strings::window_id].asInt())
+          return index;
+      } else if (window_id == 0) {
+        return index;
+      }
+      index++;
+    }
+    return -1;
+  };
+
+  for (uint32_t i = 0; i < incoming_window_capabilities.length(); ++i) {
+    int64_t window_id = 0;
+    if (incoming_window_capabilities[i].keyExists(strings::window_id)) {
+      window_id = incoming_window_capabilities[i][strings::window_id].asInt();
+    }
+    int found_index = get_window_index(window_id);
+    if (0 <= found_index) {
+      // Update the existing window capability
+      tmp_window_capabilities[found_index] = incoming_window_capabilities[i];
+    } else {
+      tmp_window_capabilities[tmp_window_capabilities.length()] =
+          incoming_window_capabilities[i];
+    }
   }
 
-  day_color_scheme_ = new smart_objects::SmartObject(color_scheme);
+  (*display_capabilities_)[0][strings::window_capabilities] =
+      tmp_window_capabilities;
+}
+
+void DynamicApplicationDataImpl::remove_window_capability(
+    const WindowID window_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto window_capabilities =
+      (*display_capabilities_)[0][strings::window_capabilities].asArray();
+  DCHECK_OR_RETURN_VOID(window_capabilities);
+
+  for (auto it = window_capabilities->begin(); it != window_capabilities->end();
+       ++it) {
+    const auto cur_window_id = (*it).keyExists(strings::window_id)
+                                   ? (*it)[strings::window_id].asInt()
+                                   : 0;
+    if (window_id == cur_window_id) {
+      window_capabilities->erase(it);
+      return;
+    }
+  }
+
+  LOG4CXX_WARN(
+      logger_,
+      "No window id " << window_id << " found in display capabilities");
+}
+
+bool DynamicApplicationDataImpl::menu_layout_supported(
+    const mobile_apis::MenuLayout::eType layout) const {
+  if (!display_capabilities_)
+    return false;
+
+  const auto tmp_window_capabilities_arr =
+      (*display_capabilities_)[0][strings::window_capabilities].asArray();
+
+  if (!tmp_window_capabilities_arr)
+    return false;
+
+  for (auto element : *tmp_window_capabilities_arr) {
+    if ((!element.keyExists(strings::window_id) ||
+         element[strings::window_id].asInt() == 0) &&
+        element.keyExists(strings::menu_layouts_available)) {
+      for (uint32_t i = 0;
+           i < element[strings::menu_layouts_available].length();
+           ++i) {
+        if (static_cast<mobile_apis::MenuLayout::eType>(
+                element[strings::menu_layouts_available][i].asUInt()) ==
+            layout) {
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+void DynamicApplicationDataImpl::set_window_layout(const WindowID window_id,
+                                                   const std::string& layout) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  smart_objects::SmartObject template_config(smart_objects::SmartType_Map);
+
+  template_config[strings::template_layout] = layout;
+  window_templates_[window_id] = template_config;
+}
+
+void DynamicApplicationDataImpl::set_day_color_scheme(
+    const WindowID window_id, const smart_objects::SmartObject& color_scheme) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK(color_scheme.getType() == smart_objects::SmartType_Map);
+  window_templates_[window_id][strings::day_color_scheme] = color_scheme;
 }
 
 void DynamicApplicationDataImpl::set_night_color_scheme(
-    const smart_objects::SmartObject& color_scheme) {
-  if (night_color_scheme_) {
-    delete night_color_scheme_;
+    const WindowID window_id, const smart_objects::SmartObject& color_scheme) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK(color_scheme.getType() == smart_objects::SmartType_Map);
+  window_templates_[window_id][strings::night_color_scheme] = color_scheme;
+}
+
+std::string DynamicApplicationDataImpl::window_layout(
+    const WindowID window_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  AppWindowsTemplates::const_iterator window_template_it =
+      window_templates_.find(window_id);
+
+  if (window_templates_.end() != window_template_it) {
+    const smart_objects::SmartObject template_config =
+        window_template_it->second;
+    if (template_config.keyExists(strings::template_layout)) {
+      return template_config[strings::template_layout].asString();
+    }
   }
 
-  night_color_scheme_ = new smart_objects::SmartObject(color_scheme);
+  return std::string();
 }
 
-void DynamicApplicationDataImpl::set_display_layout(const std::string& layout) {
-  display_layout_ = layout;
+smart_objects::SmartObject DynamicApplicationDataImpl::day_color_scheme(
+    const WindowID window_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  AppWindowsTemplates::const_iterator window_template_it =
+      window_templates_.find(window_id);
+
+  if (window_templates_.end() != window_template_it) {
+    const smart_objects::SmartObject template_config =
+        window_template_it->second;
+    if (template_config.keyExists(strings::day_color_scheme)) {
+      return template_config[strings::day_color_scheme];
+    }
+  }
+
+  return smart_objects::SmartObject(smart_objects::SmartType::SmartType_Null);
+}
+
+smart_objects::SmartObject DynamicApplicationDataImpl::night_color_scheme(
+    const WindowID window_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  AppWindowsTemplates::const_iterator window_template_it =
+      window_templates_.find(window_id);
+
+  if (window_templates_.end() != window_template_it) {
+    const smart_objects::SmartObject template_config =
+        window_template_it->second;
+    if (template_config.keyExists(strings::night_color_scheme)) {
+      return template_config[strings::night_color_scheme];
+    }
+  }
+
+  return smart_objects::SmartObject(smart_objects::SmartType::SmartType_Null);
 }
 
 void DynamicApplicationDataImpl::SetGlobalProperties(
@@ -483,28 +770,53 @@ void DynamicApplicationDataImpl::SetGlobalProperties(
 }
 
 void DynamicApplicationDataImpl::AddCommand(
-    uint32_t cmd_id, const smart_objects::SmartObject& command) {
+    const uint32_t internal_id, const smart_objects::SmartObject& command) {
   sync_primitives::AutoLock lock(commands_lock_ptr_);
-  CommandsMap::const_iterator it = commands_.find(cmd_id);
+
+  CommandsMap::const_iterator it = commands_.find(internal_id);
   if (commands_.end() == it) {
-    commands_[cmd_id] = new smart_objects::SmartObject(command);
+    commands_[internal_id] = new smart_objects::SmartObject(command);
+    LOG4CXX_DEBUG(logger_,
+                  "Command with internal number "
+                      << internal_id << " and id "
+                      << (*commands_[internal_id])[strings::cmd_id].asUInt()
+                      << " is added.");
   }
 }
 
-void DynamicApplicationDataImpl::RemoveCommand(uint32_t cmd_id) {
+void DynamicApplicationDataImpl::RemoveCommand(const uint32_t cmd_id) {
   sync_primitives::AutoLock lock(commands_lock_ptr_);
-  CommandsMap::iterator it = commands_.find(cmd_id);
-  if (commands_.end() != it) {
+
+  CommandIdComparator is_id_equal(strings::cmd_id, cmd_id);
+  CommandsMap::iterator it =
+      find_if(commands_.begin(), commands_.end(), is_id_equal);
+
+  if (it != commands_.end()) {
     delete it->second;
+    LOG4CXX_DEBUG(logger_,
+                  "Command with internal number " << (it->first) << " and id "
+                                                  << cmd_id << " is removed.");
     commands_.erase(it);
+
+    return;
   }
+  LOG4CXX_WARN(
+      logger_,
+      "Command with id " << cmd_id << " is not found. Removal skipped.");
 }
 
 smart_objects::SmartObject* DynamicApplicationDataImpl::FindCommand(
-    uint32_t cmd_id) {
+    const uint32_t cmd_id) {
   sync_primitives::AutoLock lock(commands_lock_ptr_);
-  CommandsMap::const_iterator it = commands_.find(cmd_id);
+
+  CommandIdComparator is_id_equal(strings::cmd_id, cmd_id);
+  CommandsMap::const_iterator it =
+      find_if(commands_.begin(), commands_.end(), is_id_equal);
+
   if (it != commands_.end()) {
+    LOG4CXX_DEBUG(logger_,
+                  "Command with internal number " << (it->first) << " and id "
+                                                  << cmd_id << " is found.");
     return it->second;
   }
 
@@ -556,6 +868,33 @@ bool DynamicApplicationDataImpl::IsSubMenuNameAlreadyExist(
   return false;
 }
 
+DataAccessor<WindowParamsMap>
+DynamicApplicationDataImpl::window_optional_params_map() const {
+  return DataAccessor<WindowParamsMap>(window_params_map_,
+                                       window_params_map_lock_ptr_);
+}
+
+void DynamicApplicationDataImpl::SetWindowInfo(
+    const WindowID window_id, const smart_objects::SmartObject& window_info) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto it = window_params_map_.find(window_id);
+  if (window_params_map_.end() == it) {
+    window_params_map_[window_id] =
+        std::make_shared<smart_objects::SmartObject>(window_info);
+  }
+}
+
+DisplayCapabilitiesBuilder&
+DynamicApplicationDataImpl::display_capabilities_builder() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return display_capabilities_builder_;
+}
+
+void DynamicApplicationDataImpl::RemoveWindowInfo(const WindowID window_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  window_params_map_.erase(window_id);
+}
+
 void DynamicApplicationDataImpl::AddChoiceSet(
     uint32_t choice_set_id, const smart_objects::SmartObject& choice_set) {
   sync_primitives::AutoLock lock(choice_set_map_lock_ptr_);
diff --git a/src/components/application_manager/src/application_impl.cc b/src/components/application_manager/src/application_impl.cc
index 3b2f51f26c..11d038fee2 100644
--- a/src/components/application_manager/src/application_impl.cc
+++ b/src/components/application_manager/src/application_impl.cc
@@ -113,6 +113,7 @@ ApplicationImpl::ApplicationImpl(
     , video_streaming_suspended_(true)
     , audio_streaming_suspended_(true)
     , is_app_allowed_(true)
+    , is_app_data_resumption_allowed_(false)
     , has_been_activated_(false)
     , tts_properties_in_none_(false)
     , tts_properties_in_full_(false)
@@ -131,7 +132,7 @@ ApplicationImpl::ApplicationImpl(
           protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_3)
     , is_voice_communication_application_(false)
     , is_resuming_(false)
-    , deferred_resumption_hmi_level_(mobile_api::HMILevel::eType::INVALID_ENUM)
+    , deferred_resumption_hmi_level_(mobile_api::HMILevel::INVALID_ENUM)
     , is_hash_changed_during_suspend_(false)
     , video_stream_retry_number_(0)
     , audio_stream_retry_number_(0)
@@ -143,6 +144,7 @@ ApplicationImpl::ApplicationImpl(
           "AudioStreamSuspend",
           new ::timer::TimerTaskImpl<ApplicationImpl>(
               this, &ApplicationImpl::OnAudioStreamSuspend))
+    , hybrid_app_preference_(mobile_api::HybridAppPreference::INVALID_ENUM)
     , vi_lock_ptr_(std::make_shared<sync_primitives::Lock>())
     , button_lock_ptr_(std::make_shared<sync_primitives::Lock>())
     , application_manager_(application_manager) {
@@ -187,7 +189,8 @@ void ApplicationImpl::CloseActiveMessage() {
 }
 
 bool ApplicationImpl::IsFullscreen() const {
-  return mobile_api::HMILevel::HMI_FULL == hmi_level();
+  return mobile_api::HMILevel::HMI_FULL ==
+         hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
 }
 
 bool ApplicationImpl::is_audio() const {
@@ -265,19 +268,21 @@ bool ApplicationImpl::IsVideoApplication() const {
   return is_video_app;
 }
 
-void ApplicationImpl::SetRegularState(HmiStatePtr state) {
+void ApplicationImpl::SetRegularState(const WindowID window_id,
+                                      HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
-  state_.AddState(state);
+  state_.AddState(window_id, state);
 }
 
-void ApplicationImpl::RemovePostponedState() {
+void ApplicationImpl::RemovePostponedState(const WindowID window_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  state_.RemoveState(HmiState::STATE_ID_POSTPONED);
+  state_.RemoveState(window_id, HmiState::STATE_ID_POSTPONED);
 }
 
-void ApplicationImpl::SetPostponedState(HmiStatePtr state) {
+void ApplicationImpl::SetPostponedState(const WindowID window_id,
+                                        HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
-  state_.AddState(state);
+  state_.AddState(window_id, state);
 }
 
 void ApplicationImpl::set_mobile_projection_enabled(bool option) {
@@ -297,22 +302,56 @@ struct StateIDComparator {
   }
 };
 
-void ApplicationImpl::AddHMIState(HmiStatePtr state) {
+void ApplicationImpl::AddHMIState(const WindowID window_id, HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
-  state_.AddState(state);
+  state_.AddState(window_id, state);
 }
 
-void ApplicationImpl::RemoveHMIState(HmiState::StateID state_id) {
+void ApplicationImpl::RemoveHMIState(const WindowID window_id,
+                                     HmiState::StateID state_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  state_.RemoveState(state_id);
+  state_.RemoveState(window_id, state_id);
 }
 
-const HmiStatePtr ApplicationImpl::CurrentHmiState() const {
-  return state_.GetState(HmiState::STATE_ID_CURRENT);
+const HmiStatePtr ApplicationImpl::CurrentHmiState(
+    const WindowID window_id) const {
+  return state_.GetState(window_id, HmiState::STATE_ID_CURRENT);
 }
 
-const HmiStatePtr ApplicationImpl::RegularHmiState() const {
-  return state_.GetState(HmiState::STATE_ID_REGULAR);
+const HmiStatePtr ApplicationImpl::RegularHmiState(
+    const WindowID window_id) const {
+  return state_.GetState(window_id, HmiState::STATE_ID_REGULAR);
+}
+
+WindowNames ApplicationImpl::GetWindowNames() const {
+  LOG4CXX_DEBUG(logger_,
+                "Collecting window names for application " << app_id());
+
+  WindowNames window_names;
+  std::string stringified_window_names;
+
+  sync_primitives::AutoLock auto_lock(window_params_map_lock_ptr_);
+  for (const auto& window_info_item : window_params_map_) {
+    const auto window_name =
+        (*window_info_item.second)[strings::window_name].asString();
+    window_names.push_back(window_name);
+    stringified_window_names +=
+        (stringified_window_names.empty() ? "" : ",") + window_name;
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Existing window names: [" + stringified_window_names + "]");
+  return window_names;
+}
+
+WindowIds ApplicationImpl::GetWindowIds() const {
+  LOG4CXX_DEBUG(logger_, "Collecting window IDs for application " << app_id());
+  return state_.GetWindowIds();
+}
+
+bool ApplicationImpl::WindowIdExists(const WindowID window_id) const {
+  const WindowIds window_ids = GetWindowIds();
+  return helpers::in_range(window_ids, window_id);
 }
 
 bool ApplicationImpl::IsAllowedToChangeAudioSource() const {
@@ -322,8 +361,9 @@ bool ApplicationImpl::IsAllowedToChangeAudioSource() const {
   return false;
 }
 
-const HmiStatePtr ApplicationImpl::PostponedHmiState() const {
-  return state_.GetState(HmiState::STATE_ID_POSTPONED);
+const HmiStatePtr ApplicationImpl::PostponedHmiState(
+    const WindowID window_id) const {
+  return state_.GetState(window_id, HmiState::STATE_ID_POSTPONED);
 }
 
 const smart_objects::SmartObject* ApplicationImpl::active_message() const {
@@ -354,9 +394,10 @@ bool ApplicationImpl::is_media_application() const {
   return is_media_;
 }
 
-const mobile_api::HMILevel::eType ApplicationImpl::hmi_level() const {
+const mobile_api::HMILevel::eType ApplicationImpl::hmi_level(
+    const WindowID window_id) const {
   using namespace mobile_apis;
-  const HmiStatePtr hmi_state = CurrentHmiState();
+  const HmiStatePtr hmi_state = CurrentHmiState(window_id);
   return hmi_state ? hmi_state->hmi_level() : HMILevel::INVALID_ENUM;
 }
 
@@ -380,9 +421,10 @@ const uint32_t ApplicationImpl::list_files_in_none_count() const {
   return list_files_in_none_count_;
 }
 
-const mobile_api::SystemContext::eType ApplicationImpl::system_context() const {
+const mobile_api::SystemContext::eType ApplicationImpl::system_context(
+    const WindowID window_id) const {
   using namespace mobile_apis;
-  const HmiStatePtr hmi_state = CurrentHmiState();
+  const HmiStatePtr hmi_state = CurrentHmiState(window_id);
   return hmi_state ? hmi_state->system_context() : SystemContext::INVALID_ENUM;
   ;
 }
@@ -589,11 +631,12 @@ void ApplicationImpl::SuspendStreaming(
     sync_primitives::AutoLock lock(audio_streaming_suspended_lock_);
     audio_streaming_suspended_ = true;
   }
-  MessageHelper::SendOnDataStreaming(service_type, false, application_manager_);
+  application_manager_.ProcessOnDataStreamingNotification(
+      service_type, app_id(), false);
 }
 
 void ApplicationImpl::WakeUpStreaming(
-    protocol_handler::ServiceType service_type) {
+    protocol_handler::ServiceType service_type, uint32_t timer_len) {
   using namespace protocol_handler;
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -602,25 +645,31 @@ void ApplicationImpl::WakeUpStreaming(
   sync_primitives::AutoLock lock(streaming_stop_lock_);
 
   if (ServiceType::kMobileNav == service_type) {
-    sync_primitives::AutoLock lock(video_streaming_suspended_lock_);
-    if (video_streaming_suspended_) {
-      application_manager_.OnAppStreaming(app_id(), service_type, true);
-      MessageHelper::SendOnDataStreaming(
-          ServiceType::kMobileNav, true, application_manager_);
-      video_streaming_suspended_ = false;
+    {  // reduce the range of video_streaming_suspended_lock_
+      sync_primitives::AutoLock lock(video_streaming_suspended_lock_);
+      if (video_streaming_suspended_) {
+        application_manager_.OnAppStreaming(app_id(), service_type, true);
+        application_manager_.ProcessOnDataStreamingNotification(
+            service_type, app_id(), true);
+        video_streaming_suspended_ = false;
+      }
     }
-    video_stream_suspend_timer_.Start(video_stream_suspend_timeout_,
-                                      timer::kPeriodic);
+    video_stream_suspend_timer_.Start(
+        timer_len == 0 ? video_stream_suspend_timeout_ : timer_len,
+        timer::kPeriodic);
   } else if (ServiceType::kAudio == service_type) {
-    sync_primitives::AutoLock lock(audio_streaming_suspended_lock_);
-    if (audio_streaming_suspended_) {
-      application_manager_.OnAppStreaming(app_id(), service_type, true);
-      MessageHelper::SendOnDataStreaming(
-          ServiceType::kAudio, true, application_manager_);
-      audio_streaming_suspended_ = false;
+    {  // reduce the range of audio_streaming_suspended_lock_
+      sync_primitives::AutoLock lock(audio_streaming_suspended_lock_);
+      if (audio_streaming_suspended_) {
+        application_manager_.OnAppStreaming(app_id(), service_type, true);
+        application_manager_.ProcessOnDataStreamingNotification(
+            service_type, app_id(), true);
+        audio_streaming_suspended_ = false;
+      }
     }
-    audio_stream_suspend_timer_.Start(audio_stream_suspend_timeout_,
-                                      timer::kPeriodic);
+    audio_stream_suspend_timer_.Start(
+        timer_len == 0 ? audio_stream_suspend_timeout_ : timer_len,
+        timer::kPeriodic);
   }
 }
 
@@ -680,6 +729,14 @@ void ApplicationImpl::set_app_allowed(const bool allowed) {
   is_app_allowed_ = allowed;
 }
 
+bool ApplicationImpl::is_app_data_resumption_allowed() const {
+  return is_app_data_resumption_allowed_;
+}
+
+void ApplicationImpl::set_app_data_resumption_allowance(const bool allowed) {
+  is_app_data_resumption_allowed_ = allowed;
+}
+
 void ApplicationImpl::set_secondary_device(
     connection_handler::DeviceHandle secondary_device) {
   secondary_device_id_ = secondary_device;
@@ -930,8 +987,10 @@ bool ApplicationImpl::is_application_data_changed() const {
   return is_application_data_changed_;
 }
 
-void ApplicationImpl::SetInitialState(HmiStatePtr state) {
-  state_.InitState(state);
+void ApplicationImpl::SetInitialState(const WindowID window_id,
+                                      const std::string& window_name,
+                                      HmiStatePtr state) {
+  state_.InitState(window_id, window_name, state);
 }
 
 void ApplicationImpl::set_is_application_data_changed(
@@ -1074,21 +1133,58 @@ void ApplicationImpl::SubscribeToSoftButtons(
       cmd_softbuttonid_[cmd_id] = softbuttons_id;
     }
   } else {
-    cmd_softbuttonid_[cmd_id] = softbuttons_id;
+    auto& soft_button_ids = cmd_softbuttonid_[cmd_id];
+    for (auto& softbutton_item : softbuttons_id) {
+      soft_button_ids.insert(softbutton_item);
+    }
   }
 }
 
+struct FindSoftButtonId {
+  uint32_t soft_button_id_;
+
+  FindSoftButtonId(const uint32_t soft_button_id)
+      : soft_button_id_(soft_button_id) {}
+
+  bool operator()(const std::pair<uint32_t, WindowID>& element) {
+    return soft_button_id_ == element.first;
+  }
+};
+
 bool ApplicationImpl::IsSubscribedToSoftButton(const uint32_t softbutton_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(cmd_softbuttonid_lock_);
   CommandSoftButtonID::iterator it = cmd_softbuttonid_.begin();
   for (; it != cmd_softbuttonid_.end(); ++it) {
-    if ((it->second).find(softbutton_id) != (it->second).end()) {
+    const auto& soft_button_ids = (*it).second;
+    FindSoftButtonId finder(softbutton_id);
+    const auto find_res =
+        std::find_if(soft_button_ids.begin(), soft_button_ids.end(), finder);
+    if ((soft_button_ids.end() != find_res)) {
       return true;
     }
   }
   return false;
 }
 
+WindowID ApplicationImpl::GetSoftButtonWindowID(const uint32_t softbutton_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  sync_primitives::AutoLock lock(cmd_softbuttonid_lock_);
+  CommandSoftButtonID::iterator it = cmd_softbuttonid_.begin();
+  for (; it != cmd_softbuttonid_.end(); ++it) {
+    const auto& soft_button_ids = (*it).second;
+    FindSoftButtonId finder(softbutton_id);
+    const auto find_res =
+        std::find_if(soft_button_ids.begin(), soft_button_ids.end(), finder);
+    if ((soft_button_ids.end() != find_res)) {
+      return find_res->second;
+    }
+  }
+
+  return mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
 void ApplicationImpl::UnsubscribeFromSoftButtons(int32_t cmd_id) {
   sync_primitives::AutoLock lock(cmd_softbuttonid_lock_);
   CommandSoftButtonID::iterator it = cmd_softbuttonid_.find(cmd_id);
@@ -1098,8 +1194,9 @@ void ApplicationImpl::UnsubscribeFromSoftButtons(int32_t cmd_id) {
 }
 
 void ApplicationImpl::set_system_context(
+    const WindowID window_id,
     const mobile_api::SystemContext::eType& system_context) {
-  const HmiStatePtr hmi_state = CurrentHmiState();
+  HmiStatePtr hmi_state = CurrentHmiState(window_id);
   hmi_state->set_system_context(system_context);
 }
 
@@ -1112,13 +1209,20 @@ void ApplicationImpl::set_audio_streaming_state(
                  " for non-media application to different from NOT_AUDIBLE");
     return;
   }
-  CurrentHmiState()->set_audio_streaming_state(state);
+
+  // According to proposal SDL-0216 audio streaming state should
+  // be applied for all windows to keep consistency
+  HmiStates hmi_states = state_.GetStates(HmiState::STATE_ID_CURRENT);
+  for (const auto& hmi_state : hmi_states) {
+    hmi_state->set_audio_streaming_state(state);
+  }
 }
 
 void ApplicationImpl::set_hmi_level(
+    const WindowID window_id,
     const mobile_api::HMILevel::eType& new_hmi_level) {
   using namespace mobile_apis;
-  const HMILevel::eType current_hmi_level = hmi_level();
+  const HMILevel::eType current_hmi_level = hmi_level(window_id);
   if (HMILevel::HMI_NONE != current_hmi_level &&
       HMILevel::HMI_NONE == new_hmi_level) {
     put_file_in_none_count_ = 0;
@@ -1127,7 +1231,8 @@ void ApplicationImpl::set_hmi_level(
   }
   ApplicationSharedPtr app = application_manager_.application(app_id());
   DCHECK_OR_RETURN_VOID(app)
-  application_manager_.state_controller().SetRegularState(app, new_hmi_level);
+  application_manager_.state_controller().SetRegularState(
+      app, window_id, new_hmi_level);
   LOG4CXX_INFO(logger_, "hmi_level = " << new_hmi_level);
   usage_report_.RecordHmiStateChanged(new_hmi_level);
 }
@@ -1216,6 +1321,15 @@ void ApplicationImpl::set_cloud_app_certificate(
   certificate_ = certificate;
 }
 
+void ApplicationImpl::set_user_location(
+    const smart_objects::SmartObject& user_location) {
+  user_location_ = user_location;
+}
+
+const smart_objects::SmartObject& ApplicationImpl::get_user_location() const {
+  return user_location_;
+}
+
 void ApplicationImpl::PushMobileMessage(
     smart_objects::SmartObjectSPtr mobile_message) {
   sync_primitives::AutoLock lock(mobile_message_lock_);
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index 317ad2933f..009052bc72 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -53,6 +53,7 @@
 #include "application_manager/policies/policy_handler.h"
 #include "application_manager/resumption/resume_ctrl_impl.h"
 #include "application_manager/rpc_handler_impl.h"
+#include "application_manager/rpc_protection_manager_impl.h"
 #include "application_manager/rpc_service_impl.h"
 #include "connection_handler/connection_handler_impl.h"
 #include "formatters/CFormatterJsonSDLRPCv1.h"
@@ -65,6 +66,7 @@
 #include <time.h>
 #include <boost/filesystem.hpp>
 #include "application_manager/application_impl.h"
+#include "encryption/hashing.h"
 #include "interfaces/HMI_API_schema.h"
 #include "media_manager/media_manager.h"
 #include "policy/usage_statistics/counter.h"
@@ -101,7 +103,9 @@ DeviceTypes devicesType = {
     std::make_pair(std::string("CARPLAY_WIRELESS_IOS"),
                    hmi_apis::Common_TransportType::WIFI),
     std::make_pair(std::string("CLOUD_WEBSOCKET"),
-                   hmi_apis::Common_TransportType::CLOUD_WEBSOCKET)};
+                   hmi_apis::Common_TransportType::CLOUD_WEBSOCKET),
+    std::make_pair(std::string("WEBENGINE_WEBSOCKET"),
+                   hmi_apis::Common_TransportType::WEBENGINE_WEBSOCKET)};
 }
 
 /**
@@ -121,17 +125,26 @@ bool device_id_comparator(const std::string& device_id,
 }
 
 /**
- * @brief policy_app_id_comparator is predicate to compare policy application
- * ids
- * @param policy_app_id Policy id of application
- * @param app Application pointer
- * @return True if policy id of application matches to policy id passed
+ * @brief PolicyAppIdComparator is struct predicate to compare policy
+ * application ids & device
+ * @param device_handle of application
+ * @param id of application
+ * @return True if policy id & device_handle of application matches to policy id
+ * & device_handle passed
  */
-bool policy_app_id_comparator(const std::string& policy_app_id,
-                              ApplicationSharedPtr app) {
-  DCHECK_OR_RETURN(app, false);
-  return app->policy_app_id() == policy_app_id;
-}
+struct PolicyAppIdComparator {
+  PolicyAppIdComparator(const connection_handler::DeviceHandle& device_handle,
+                        const std::string& policy_app_id)
+      : device_handle_(device_handle), policy_app_id_(policy_app_id) {}
+  bool operator()(const ApplicationSharedPtr app) const {
+    return app && app->device() == device_handle_ &&
+           app->policy_app_id() == policy_app_id_;
+  }
+
+ private:
+  const connection_handler::DeviceHandle& device_handle_;
+  const std::string& policy_app_id_;
+};
 
 uint32_t ApplicationManagerImpl::mobile_corelation_id_ = 0;
 uint32_t ApplicationManagerImpl::corelation_id_ = 0;
@@ -149,6 +162,7 @@ ApplicationManagerImpl::ApplicationManagerImpl(
     , applications_list_lock_ptr_(
           std::make_shared<sync_primitives::RecursiveLock>())
     , apps_to_register_list_lock_ptr_(std::make_shared<sync_primitives::Lock>())
+    , reregister_wait_list_lock_ptr_(std::make_shared<sync_primitives::Lock>())
     , audio_pass_thru_active_(false)
     , audio_pass_thru_app_id_(0)
     , driver_distraction_state_(hmi_apis::Common_DriverDistractionState::DD_OFF)
@@ -180,8 +194,12 @@ ApplicationManagerImpl::ApplicationManagerImpl(
           "AM TTSGLPRTimer",
           new TimerTaskImpl<ApplicationManagerImpl>(
               this, &ApplicationManagerImpl::OnTimerSendTTSGlobalProperties))
+    , clear_pool_timer_("ClearPoolTimer",
+                        new TimerTaskImpl<ApplicationManagerImpl>(
+                            this, &ApplicationManagerImpl::ClearTimerPool))
     , is_low_voltage_(false)
     , apps_size_(0)
+    , registered_during_timer_execution_(false)
     , is_stopping_(false) {
   std::srand(std::time(nullptr));
   AddPolicyObserver(this);
@@ -190,21 +208,23 @@ ApplicationManagerImpl::ApplicationManagerImpl(
                              {TYPE_SYSTEM, "System"},
                              {TYPE_ICONS, "Icons"}};
 
-  sync_primitives::AutoLock lock(timer_pool_lock_);
-  TimerSPtr clearing_timer(std::make_shared<timer::Timer>(
-      "ClearTimerPoolTimer",
-      new TimerTaskImpl<ApplicationManagerImpl>(
-          this, &ApplicationManagerImpl::ClearTimerPool)));
   const uint32_t timeout_ms = 10000u;
-  clearing_timer->Start(timeout_ms, timer::kSingleShot);
-  timer_pool_.push_back(clearing_timer);
-  rpc_handler_.reset(new rpc_handler::RPCHandlerImpl(*this));
+  clear_pool_timer_.Start(timeout_ms, timer::kPeriodic);
+
+  rpc_handler_.reset(new rpc_handler::RPCHandlerImpl(
+      *this, hmi_so_factory(), mobile_so_factory()));
   commands_holder_.reset(new CommandHolderImpl(*this));
+  std::shared_ptr<RPCProtectionManager> rpc_protection_manager =
+      std::make_shared<RPCProtectionManagerImpl>(*policy_handler_);
+  policy_handler_->add_listener(rpc_protection_manager.get());
   rpc_service_.reset(new rpc_service::RPCServiceImpl(*this,
                                                      request_ctrl_,
                                                      protocol_handler_,
                                                      hmi_handler_,
-                                                     *commands_holder_));
+                                                     *commands_holder_,
+                                                     rpc_protection_manager,
+                                                     hmi_so_factory(),
+                                                     mobile_so_factory()));
 }
 
 ApplicationManagerImpl::~ApplicationManagerImpl() {
@@ -227,10 +247,21 @@ ApplicationManagerImpl::~ApplicationManagerImpl() {
   LOG4CXX_DEBUG(logger_, "Destroying Policy Handler");
   RemovePolicyObserver(this);
 
-  sync_primitives::AutoLock lock(timer_pool_lock_);
-  timer_pool_.clear();
+  {
+    sync_primitives::AutoLock lock(close_app_timer_pool_lock_);
+    close_app_timer_pool_.clear();
+  }
+
+  {
+    sync_primitives::AutoLock lock(end_stream_timer_pool_lock_);
+    end_stream_timer_pool_.clear();
+  }
+
+  {
+    sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+    navi_app_to_stop_.clear();
+  }
 
-  navi_app_to_stop_.clear();
   navi_app_to_end_stream_.clear();
 
   secondary_transport_devices_cache_.clear();
@@ -249,6 +280,13 @@ ApplicationManagerImpl::pending_applications() const {
   return accessor;
 }
 
+DataAccessor<ReregisterWaitList>
+ApplicationManagerImpl::reregister_applications() const {
+  DataAccessor<ReregisterWaitList> accessor(reregister_wait_list_,
+                                            reregister_wait_list_lock_ptr_);
+  return accessor;
+}
+
 ApplicationSharedPtr ApplicationManagerImpl::application(
     uint32_t app_id) const {
   AppIdPredicate finder(app_id);
@@ -270,6 +308,13 @@ ApplicationSharedPtr ApplicationManagerImpl::application_by_policy_id(
   return FindApp(accessor, finder);
 }
 
+ApplicationSharedPtr ApplicationManagerImpl::pending_application_by_policy_id(
+    const std::string& policy_app_id) const {
+  PolicyAppIdPredicate finder(policy_app_id);
+  DataAccessor<AppsWaitRegistrationSet> accessor = pending_applications();
+  return FindPendingApp(accessor, finder);
+}
+
 ApplicationSharedPtr ApplicationManagerImpl::application_by_name(
     const std::string& app_name) const {
   AppNamePredicate finder(app_name);
@@ -277,11 +322,12 @@ ApplicationSharedPtr ApplicationManagerImpl::application_by_name(
   return FindApp(accessor, finder);
 }
 
-ApplicationSharedPtr ApplicationManagerImpl::pending_application_by_policy_id(
+ApplicationSharedPtr
+ApplicationManagerImpl::reregister_application_by_policy_id(
     const std::string& policy_app_id) const {
   PolicyAppIdPredicate finder(policy_app_id);
-  DataAccessor<AppsWaitRegistrationSet> accessor = pending_applications();
-  return FindPendingApp(accessor, finder);
+  DataAccessor<ReregisterWaitList> accessor = reregister_applications();
+  return FindReregisterApp(accessor, finder);
 }
 
 bool ActiveAppPredicate(const ApplicationSharedPtr app) {
@@ -294,8 +340,24 @@ ApplicationSharedPtr ApplicationManagerImpl::active_application() const {
   return FindApp(accessor, ActiveAppPredicate);
 }
 
+bool FullOrLimitedAppPredicate(const ApplicationSharedPtr app) {
+  return app ? app->IsFullscreen() ||
+                   app->hmi_level(
+                       mobile_api::PredefinedWindows::DEFAULT_WINDOW) ==
+                       mobile_api::HMILevel::HMI_LIMITED
+             : false;
+}
+
+ApplicationSharedPtr ApplicationManagerImpl::get_full_or_limited_application()
+    const {
+  DataAccessor<ApplicationSet> accessor = applications();
+  return FindApp(accessor, FullOrLimitedAppPredicate);
+}
+
 bool LimitedAppPredicate(const ApplicationSharedPtr app) {
-  return app ? app->hmi_level() == mobile_api::HMILevel::HMI_LIMITED : false;
+  return app ? app->hmi_level(mobile_api::PredefinedWindows::DEFAULT_WINDOW) ==
+                   mobile_api::HMILevel::HMI_LIMITED
+             : false;
 }
 
 ApplicationSharedPtr ApplicationManagerImpl::get_limited_media_application()
@@ -306,7 +368,8 @@ ApplicationSharedPtr ApplicationManagerImpl::get_limited_media_application()
 
 bool LimitedNaviAppPredicate(const ApplicationSharedPtr app) {
   return app ? (app->is_navi() &&
-                app->hmi_level() == mobile_api::HMILevel::HMI_LIMITED)
+                app->hmi_level(mobile_api::PredefinedWindows::DEFAULT_WINDOW) ==
+                    mobile_api::HMILevel::HMI_LIMITED)
              : false;
 }
 
@@ -318,7 +381,8 @@ ApplicationSharedPtr ApplicationManagerImpl::get_limited_navi_application()
 
 bool LimitedVoiceAppPredicate(const ApplicationSharedPtr app) {
   return app ? (app->is_voice_communication_supported() &&
-                app->hmi_level() == mobile_api::HMILevel::HMI_LIMITED)
+                app->hmi_level(mobile_api::PredefinedWindows::DEFAULT_WINDOW) ==
+                    mobile_api::HMILevel::HMI_LIMITED)
              : false;
 }
 
@@ -340,7 +404,8 @@ ApplicationManagerImpl::applications_with_navi() {
 
 bool LimitedMobileProjectionPredicate(const ApplicationSharedPtr app) {
   return app ? (app->mobile_projection_enabled() &&
-                app->hmi_level() == mobile_api::HMILevel::HMI_LIMITED)
+                app->hmi_level(mobile_api::PredefinedWindows::DEFAULT_WINDOW) ==
+                    mobile_api::HMILevel::HMI_LIMITED)
              : false;
 }
 
@@ -368,6 +433,13 @@ ApplicationManagerImpl::applications_by_button(uint32_t button) {
   return FindAllApps(accessor, finder);
 }
 
+std::vector<ApplicationSharedPtr> ApplicationManagerImpl::applications_by_name(
+    const std::string& app_name) const {
+  AppNamePredicate finder(app_name);
+  DataAccessor<ApplicationSet> accessor = applications();
+  return FindAllApps(accessor, finder);
+}
+
 struct IsApplication {
   IsApplication(connection_handler::DeviceHandle device_handle,
                 const std::string& policy_app_id)
@@ -381,16 +453,12 @@ struct IsApplication {
   connection_handler::DeviceHandle device_handle_;
   const std::string& policy_app_id_;
 };
-void ApplicationManagerImpl::IviInfoUpdated(
-    mobile_apis::VehicleDataType::eType vehicle_info, int value) {
+void ApplicationManagerImpl::IviInfoUpdated(const std::string& vehicle_info,
+                                            int value) {
   // Notify Policy Manager if available about info it's interested in,
   // i.e. odometer etc
-  switch (vehicle_info) {
-    case mobile_apis::VehicleDataType::VEHICLEDATA_ODOMETER:
-      GetPolicyHandler().KmsChanged(value);
-      break;
-    default:
-      break;
+  if (strings::odometer == vehicle_info) {
+    GetPolicyHandler().KmsChanged(value);
   }
 }
 
@@ -400,12 +468,6 @@ void ApplicationManagerImpl::OnApplicationRegistered(ApplicationSharedPtr app) {
   sync_primitives::AutoLock lock(applications_list_lock_ptr_);
   const mobile_apis::HMILevel::eType default_level = GetDefaultHmiLevel(app);
   state_ctrl_.OnApplicationRegistered(app, default_level);
-
-  std::function<void(plugin_manager::RPCPlugin&)> on_app_registered =
-      [app](plugin_manager::RPCPlugin& plugin) {
-        plugin.OnApplicationEvent(plugin_manager::kApplicationRegistered, app);
-      };
-  plugin_manager_->ForEachPlugin(on_app_registered);
 }
 
 void ApplicationManagerImpl::OnApplicationSwitched(ApplicationSharedPtr app) {
@@ -565,12 +627,16 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
 
   HmiStatePtr initial_state =
       CreateRegularState(std::shared_ptr<Application>(application),
+                         mobile_apis::WindowType::MAIN,
                          mobile_apis::HMILevel::INVALID_ENUM,
                          mobile_apis::AudioStreamingState::INVALID_ENUM,
                          mobile_apis::VideoStreamingState::INVALID_ENUM,
                          mobile_api::SystemContext::SYSCTXT_MAIN);
 
-  application->SetInitialState(initial_state);
+  application->SetInitialState(
+      mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+      std::string(),  // should not be tracked for main window
+      initial_state);
 
   application->set_folder_name(policy_app_id + "_" +
                                application->mac_address());
@@ -691,14 +757,7 @@ ApplicationSharedPtr ApplicationManagerImpl::RegisterApplication(
   // Timer will be started after hmi level resumption.
   resume_controller().OnAppRegistrationStart(policy_app_id, device_mac);
 
-  // Add application to registered app list and set appropriate mark.
-  // Lock has to be released before adding app to policy DB to avoid possible
-  // deadlock with simultaneous PTU processing
-  applications_list_lock_ptr_->Acquire();
-  application->MarkRegistered();
-  applications_.insert(application);
-  apps_size_ = applications_.size();
-  applications_list_lock_ptr_->Release();
+  AddAppToRegisteredAppList(application);
 
   // Update cloud app information, in case any pending apps are unable to be
   // registered due to a mobile app taking precedence
@@ -726,18 +785,15 @@ bool ApplicationManagerImpl::ActivateApplication(ApplicationSharedPtr app) {
 
   LOG4CXX_DEBUG(logger_, "Activating application with id:" << app->app_id());
 
-  // remove from resumption if app was activated by user
+  // Remove from resumption if app was activated by user
   resume_controller().OnAppActivated(app);
+
   // Activate any app services published by the app
   GetAppServiceManager().OnAppActivated(app);
-  const HMILevel::eType hmi_level = HMILevel::HMI_FULL;
-  const AudioStreamingState::eType audio_state =
-      app->IsAudioApplication() ? AudioStreamingState::AUDIBLE
-                                : AudioStreamingState::NOT_AUDIBLE;
-  const VideoStreamingState::eType video_state =
-      app->IsVideoApplication() ? VideoStreamingState::STREAMABLE
-                                : VideoStreamingState::NOT_STREAMABLE;
-  state_ctrl_.SetRegularState(app, hmi_level, audio_state, video_state, false);
+
+  // Activate main window in state controller
+  state_ctrl_.ActivateDefaultWindow(app);
+
   return true;
 }
 
@@ -792,6 +848,11 @@ void ApplicationManagerImpl::ConnectToDevice(const std::string& device_mac) {
 void ApplicationManagerImpl::OnHMIStartedCooperation() {
   LOG4CXX_AUTO_TRACE(logger_);
   hmi_cooperating_ = true;
+
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  connection_handler_->CreateWebEngineDevice();
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+
   MessageHelper::SendGetSystemInfoRequest(*this);
 
   std::shared_ptr<smart_objects::SmartObject> is_vr_ready(
@@ -837,6 +898,8 @@ void ApplicationManagerImpl::OnHMIStartedCooperation() {
   resume_controller().ResetLaunchTime();
 
   RefreshCloudAppInformation();
+
+  policy_handler_->TriggerPTUOnStartupIfRequired();
 }
 
 std::string ApplicationManagerImpl::PolicyIDByIconUrl(const std::string url) {
@@ -898,20 +961,9 @@ void ApplicationManagerImpl::DisconnectCloudApp(ApplicationSharedPtr app) {
   LOG4CXX_TRACE(logger_, "Cloud app support is disabled. Exiting function");
   return;
 #else
-  std::string endpoint;
-  std::string certificate;
-  std::string auth_token;
-  std::string cloud_transport_type;
-  std::string hybrid_app_preference;
-  bool enabled = true;
   std::string policy_app_id = app->policy_app_id();
-  GetPolicyHandler().GetCloudAppParameters(policy_app_id,
-                                           enabled,
-                                           endpoint,
-                                           certificate,
-                                           auth_token,
-                                           cloud_transport_type,
-                                           hybrid_app_preference);
+  policy::AppProperties app_properties;
+  GetPolicyHandler().GetAppProperties(policy_app_id, app_properties);
   if (app->IsRegistered() && app->is_cloud_app()) {
     LOG4CXX_DEBUG(logger_, "Disabled app is registered, unregistering now");
     GetRPCService().ManageMobileCommand(
@@ -926,12 +978,12 @@ void ApplicationManagerImpl::DisconnectCloudApp(ApplicationSharedPtr app) {
   connection_handler().RemoveCloudAppDevice(app->device());
 
   transport_manager::transport_adapter::CloudAppProperties properties{
-      endpoint,
-      certificate,
-      enabled,
-      auth_token,
-      cloud_transport_type,
-      hybrid_app_preference};
+      app_properties.endpoint,
+      app_properties.certificate,
+      app_properties.enabled,
+      app_properties.auth_token,
+      app_properties.transport_type,
+      app_properties.hybrid_app_preference};
   // Create device in pending state
   LOG4CXX_DEBUG(logger_, "Re-adding the cloud app device");
   connection_handler().AddCloudAppDevice(policy_app_id, properties);
@@ -951,12 +1003,6 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() {
   GetPolicyHandler().GetEnabledCloudApps(enabled_apps);
   std::vector<std::string>::iterator enabled_it = enabled_apps.begin();
   std::vector<std::string>::iterator enabled_end = enabled_apps.end();
-  std::string endpoint;
-  std::string certificate;
-  std::string auth_token;
-  std::string cloud_transport_type;
-  std::string hybrid_app_preference_str;
-  bool enabled = true;
 
   // Store old device map and clear the current map
   pending_device_map_lock_ptr_->Acquire();
@@ -964,20 +1010,20 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() {
   std::map<std::string, std::string> old_device_map = pending_device_map_;
   pending_device_map_ = std::map<std::string, std::string>();
   // Create a device for each newly enabled cloud app
+  policy::AppProperties app_properties;
   for (; enabled_it != enabled_end; ++enabled_it) {
-    GetPolicyHandler().GetCloudAppParameters(*enabled_it,
-                                             enabled,
-                                             endpoint,
-                                             certificate,
-                                             auth_token,
-                                             cloud_transport_type,
-                                             hybrid_app_preference_str);
+    GetPolicyHandler().GetAppProperties(*enabled_it, app_properties);
+
+    if (app_properties.endpoint.empty()) {
+      continue;
+    }
 
     mobile_apis::HybridAppPreference::eType hybrid_app_preference =
         mobile_apis::HybridAppPreference::INVALID_ENUM;
     smart_objects::EnumConversionHelper<
         mobile_apis::HybridAppPreference::eType>::
-        StringToEnum(hybrid_app_preference_str, &hybrid_app_preference);
+        StringToEnum(app_properties.hybrid_app_preference,
+                     &hybrid_app_preference);
 
     auto policy_id = *enabled_it;
     policy::StringArray nicknames;
@@ -990,33 +1036,41 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() {
     } else if (mobile_apis::HybridAppPreference::MOBILE ==
                hybrid_app_preference) {
       auto nickname_it = nicknames.begin();
+      bool duplicate_found = false;
       for (; nickname_it != nicknames.end(); ++nickname_it) {
-        auto app = application_by_name(*nickname_it);
-        if (app.use_count() != 0) {
-          LOG4CXX_ERROR(
-              logger_,
-              "Mobile app already registered for cloud app: " << *nickname_it);
-          continue;
+        auto apps = applications_by_name(*nickname_it);
+        for (auto app : apps) {
+          if (app.use_count() != 0 && !app->is_cloud_app()) {
+            LOG4CXX_ERROR(logger_,
+                          "Mobile app already registered for cloud app: "
+                              << *nickname_it);
+            duplicate_found = true;
+            break;
+          }
         }
       }
+
+      if (duplicate_found) {
+        continue;
+      }
     }
 
-    pending_device_map_.insert(
-        std::pair<std::string, std::string>(endpoint, policy_id));
+    pending_device_map_.insert(std::pair<std::string, std::string>(
+        app_properties.endpoint, policy_id));
     // Determine which endpoints were disabled by erasing all enabled apps from
     // the old device list
-    auto old_device_it = old_device_map.find(endpoint);
+    auto old_device_it = old_device_map.find(app_properties.endpoint);
     if (old_device_it != old_device_map.end()) {
       old_device_map.erase(old_device_it);
     }
 
     transport_manager::transport_adapter::CloudAppProperties properties{
-        endpoint,
-        certificate,
-        enabled,
-        auth_token,
-        cloud_transport_type,
-        hybrid_app_preference_str};
+        app_properties.endpoint,
+        app_properties.certificate,
+        app_properties.enabled,
+        app_properties.auth_token,
+        app_properties.transport_type,
+        app_properties.hybrid_app_preference};
 
     // If the device was disconnected, this will reinitialize the device
     connection_handler().AddCloudAppDevice(policy_id, properties);
@@ -1038,7 +1092,7 @@ void ApplicationManagerImpl::RefreshCloudAppInformation() {
     const std::string app_icon_dir(settings_.app_icons_folder());
     const std::string full_icon_path(app_icon_dir + "/" + policy_id);
     if (!file_system::FileExists(full_icon_path)) {
-      AppIconInfo icon_info(endpoint, false);
+      AppIconInfo icon_info(app_properties.endpoint, false);
       LOG4CXX_DEBUG(
           logger_,
           "Inserting cloud app into icon map: " << app_icon_map_.size());
@@ -1102,12 +1156,6 @@ void ApplicationManagerImpl::CreatePendingApplication(
     connection_handler::DeviceHandle device_id) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  std::string endpoint;
-  std::string certificate;
-  std::string auth_token;
-  std::string cloud_transport_type;
-  std::string hybrid_app_preference_str;
-  bool enabled = true;
   std::string name = device_info.name();
   pending_device_map_lock_ptr_->Acquire();
   auto it = pending_device_map_.find(name);
@@ -1151,34 +1199,29 @@ void ApplicationManagerImpl::CreatePendingApplication(
   if (file_system::FileExists(full_icon_path)) {
     application->set_app_icon_path(full_icon_path);
   }
-
-  GetPolicyHandler().GetCloudAppParameters(policy_app_id,
-                                           enabled,
-                                           endpoint,
-                                           certificate,
-                                           auth_token,
-                                           cloud_transport_type,
-                                           hybrid_app_preference_str);
+  policy::AppProperties app_properties;
+  GetPolicyHandler().GetAppProperties(policy_app_id, app_properties);
 
   mobile_apis::HybridAppPreference::eType hybrid_app_preference_enum;
 
-  bool convert_result = smart_objects::EnumConversionHelper<
+  const bool convert_result = smart_objects::EnumConversionHelper<
       mobile_apis::HybridAppPreference::eType>::
-      StringToEnum(hybrid_app_preference_str, &hybrid_app_preference_enum);
+      StringToEnum(app_properties.hybrid_app_preference,
+                   &hybrid_app_preference_enum);
 
-  if (!hybrid_app_preference_str.empty() && !convert_result) {
-    LOG4CXX_ERROR(
-        logger_,
-        "Could not convert string to enum: " << hybrid_app_preference_str);
+  if (!app_properties.hybrid_app_preference.empty() && !convert_result) {
+    LOG4CXX_ERROR(logger_,
+                  "Could not convert string to enum: "
+                      << app_properties.hybrid_app_preference);
     return;
   }
 
   application->set_hmi_application_id(GenerateNewHMIAppID());
-  application->set_cloud_app_endpoint(endpoint);
-  application->set_auth_token(auth_token);
-  application->set_cloud_app_transport_type(cloud_transport_type);
+  application->set_cloud_app_endpoint(app_properties.endpoint);
+  application->set_auth_token(app_properties.auth_token);
+  application->set_cloud_app_transport_type(app_properties.transport_type);
   application->set_hybrid_app_preference(hybrid_app_preference_enum);
-  application->set_cloud_app_certificate(certificate);
+  application->set_cloud_app_certificate(app_properties.certificate);
 
   sync_primitives::AutoLock lock(apps_to_register_list_lock_ptr_);
   LOG4CXX_DEBUG(logger_,
@@ -1190,6 +1233,106 @@ void ApplicationManagerImpl::CreatePendingApplication(
   SendUpdateAppList();
 }
 
+void ApplicationManagerImpl::RemovePendingApplication(
+    const std::string& policy_app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(apps_to_register_list_lock_ptr_);
+  PolicyAppIdPredicate finder(policy_app_id);
+  auto app_it =
+      std::find_if(apps_to_register_.begin(), apps_to_register_.end(), finder);
+
+  if (apps_to_register_.end() == app_it) {
+    LOG4CXX_WARN(
+        logger_,
+        "Unable to find app to remove (" << policy_app_id << "), skipping");
+    return;
+  }
+
+  apps_to_register_.erase(app_it);
+  LOG4CXX_DEBUG(logger_,
+                "Remove " << policy_app_id
+                          << " from apps_to_register_. new size = "
+                          << apps_to_register_.size());
+}
+
+void ApplicationManagerImpl::CreatePendingLocalApplication(
+    const std::string& policy_app_id) {
+  policy::StringArray nicknames;
+  policy::StringArray app_hmi_types;
+
+  GetPolicyHandler().GetInitialAppData(
+      policy_app_id, &nicknames, &app_hmi_types);
+
+  if (nicknames.empty()) {
+    LOG4CXX_ERROR(logger_,
+                  "Cloud/Web App " << policy_app_id << "missing nickname");
+    return;
+  }
+
+  const std::string display_name = nicknames[0];
+
+  const auto web_engine_device = connection_handler_->GetWebEngineDeviceInfo();
+
+  ApplicationSharedPtr application(
+      new ApplicationImpl(0,
+                          policy_app_id,
+                          web_engine_device.mac_address(),
+                          web_engine_device.device_handle(),
+                          custom_str::CustomString(display_name),
+                          GetPolicyHandler().GetStatisticManager(),
+                          *this));
+
+  const std::string app_icon_dir(settings_.app_icons_folder());
+  const std::string full_icon_path(app_icon_dir + "/" + policy_app_id);
+  if (file_system::FileExists(full_icon_path)) {
+    application->set_app_icon_path(full_icon_path);
+  }
+  policy::AppProperties app_properties;
+  GetPolicyHandler().GetAppProperties(policy_app_id, app_properties);
+
+  mobile_apis::HybridAppPreference::eType hybrid_app_preference_enum;
+  const bool convert_result = smart_objects::EnumConversionHelper<
+      mobile_apis::HybridAppPreference::eType>::
+      StringToEnum(app_properties.hybrid_app_preference,
+                   &hybrid_app_preference_enum);
+
+  if (!app_properties.hybrid_app_preference.empty() && !convert_result) {
+    LOG4CXX_ERROR(logger_,
+                  "Could not convert string to enum: "
+                      << app_properties.hybrid_app_preference);
+    return;
+  }
+
+  application->set_hmi_application_id(GenerateNewHMIAppID());
+  application->set_cloud_app_endpoint(app_properties.endpoint);
+  application->set_auth_token(app_properties.auth_token);
+  application->set_cloud_app_transport_type(app_properties.transport_type);
+  application->set_hybrid_app_preference(hybrid_app_preference_enum);
+  application->set_cloud_app_certificate(app_properties.certificate);
+
+  sync_primitives::AutoLock lock(apps_to_register_list_lock_ptr_);
+  apps_to_register_.insert(application);
+  LOG4CXX_DEBUG(logger_,
+                "Insert " << application->name().c_str()
+                          << " to apps_to_register_. new size = "
+                          << apps_to_register_.size());
+}
+
+void ApplicationManagerImpl::OnWebEngineDeviceCreated() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto enabled_local_apps = policy_handler_->GetEnabledLocalApps();
+
+  if (enabled_local_apps.empty()) {
+    LOG4CXX_DEBUG(logger_, "No enabled local apps present");
+    return;
+  }
+
+  for (auto policy_app_id : enabled_local_apps) {
+    CreatePendingLocalApplication(policy_app_id);
+  }
+  SendUpdateAppList();
+}
+
 void ApplicationManagerImpl::SetPendingApplicationState(
     const transport_manager::ConnectionUID connection_id,
     const transport_manager::DeviceInfo& device_info) {
@@ -1305,11 +1448,13 @@ void ApplicationManagerImpl::SetAllAppsAllowed(const bool allowed) {
 
 HmiStatePtr ApplicationManagerImpl::CreateRegularState(
     std::shared_ptr<Application> app,
-    mobile_apis::HMILevel::eType hmi_level,
-    mobile_apis::AudioStreamingState::eType audio_state,
-    mobile_apis::VideoStreamingState::eType video_state,
-    mobile_apis::SystemContext::eType system_context) const {
+    const mobile_apis::WindowType::eType window_type,
+    const mobile_apis::HMILevel::eType hmi_level,
+    const mobile_apis::AudioStreamingState::eType audio_state,
+    const mobile_apis::VideoStreamingState::eType video_state,
+    const mobile_apis::SystemContext::eType system_context) const {
   HmiStatePtr state(new HmiState(app, *this));
+  state->set_window_type(window_type);
   state->set_hmi_level(hmi_level);
   state->set_audio_streaming_state(audio_state);
   state->set_video_streaming_state(video_state);
@@ -1390,15 +1535,8 @@ ApplicationManagerImpl::AppsWaitingForRegistration() const {
 
 bool ApplicationManagerImpl::IsAppsQueriedFrom(
     const connection_handler::DeviceHandle handle) const {
-  sync_primitives::AutoLock lock(apps_to_register_list_lock_ptr_);
-  AppsWaitRegistrationSet::iterator it = apps_to_register_.begin();
-  AppsWaitRegistrationSet::const_iterator it_end = apps_to_register_.end();
-  for (; it != it_end; ++it) {
-    if (handle == (*it)->device()) {
-      return true;
-    }
-  }
-  return false;
+  sync_primitives::AutoLock lock(query_apps_devices_lock_);
+  return query_apps_devices_.find(handle) != query_apps_devices_.end();
 }
 
 StateController& ApplicationManagerImpl::state_controller() {
@@ -1490,6 +1628,13 @@ void ApplicationManagerImpl::OnFindNewApplicationsRequest() {
   GetPolicyHandler().OnAppsSearchStarted();
 }
 
+void ApplicationManagerImpl::OnQueryAppsRequest(
+    const connection_handler::DeviceHandle device) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(query_apps_devices_lock_);
+  query_apps_devices_.insert(device);
+}
+
 void ApplicationManagerImpl::SendUpdateAppList() {
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -1514,18 +1659,21 @@ void ApplicationManagerImpl::SendUpdateAppList() {
 void ApplicationManagerImpl::RemoveDevice(
     const connection_handler::DeviceHandle& device_handle) {
   LOG4CXX_DEBUG(logger_, "device_handle " << device_handle);
+  sync_primitives::AutoLock lock(query_apps_devices_lock_);
+  query_apps_devices_.erase(device_handle);
 }
 
 void ApplicationManagerImpl::OnDeviceSwitchingStart(
     const connection_handler::Device& device_from,
     const connection_handler::Device& device_to) {
   LOG4CXX_AUTO_TRACE(logger_);
+  ReregisterWaitList wait_list;
   {
     auto apps_data_accessor = applications();
 
     std::copy_if(apps_data_accessor.GetData().begin(),
                  apps_data_accessor.GetData().end(),
-                 std::back_inserter(reregister_wait_list_),
+                 std::back_inserter(wait_list),
                  std::bind1st(std::ptr_fun(&device_id_comparator),
                               device_from.mac_address()));
   }
@@ -1533,60 +1681,41 @@ void ApplicationManagerImpl::OnDeviceSwitchingStart(
   {
     // During sending of UpdateDeviceList this lock is acquired also so making
     // it scoped
-    sync_primitives::AutoLock lock(reregister_wait_list_lock_);
-    for (auto i = reregister_wait_list_.begin();
-         reregister_wait_list_.end() != i;
-         ++i) {
-      auto app = *i;
-      request_ctrl_.terminateAppRequests(app->app_id());
-      resume_ctrl_->SaveApplication(app);
-    }
+    sync_primitives::AutoLock lock(reregister_wait_list_lock_ptr_);
+    std::copy(wait_list.begin(),
+              wait_list.end(),
+              std::back_inserter(reregister_wait_list_));
   }
 
-  policy_handler_->OnDeviceSwitching(device_from.mac_address(),
-                                     device_to.mac_address());
-
-  connection_handler::DeviceMap device_list;
-  device_list.insert(std::make_pair(device_to.device_handle(), device_to));
-
-  smart_objects::SmartObjectSPtr msg_params =
-      MessageHelper::CreateDeviceListSO(device_list, GetPolicyHandler(), *this);
-  if (!msg_params) {
-    LOG4CXX_ERROR(logger_, "Can't create UpdateDeviceList notification");
-    return;
+  for (const auto& app : wait_list) {
+    request_ctrl_.terminateAppRequests(app->app_id());
+    resume_ctrl_->SaveApplication(app);
   }
 
-  auto update_list = std::make_shared<smart_objects::SmartObject>();
-  smart_objects::SmartObject& so_to_send = *update_list;
-  so_to_send[jhs::S_PARAMS][jhs::S_FUNCTION_ID] =
-      hmi_apis::FunctionID::BasicCommunication_UpdateDeviceList;
-  so_to_send[jhs::S_PARAMS][jhs::S_MESSAGE_TYPE] =
-      hmi_apis::messageType::request;
-  so_to_send[jhs::S_PARAMS][jhs::S_PROTOCOL_VERSION] = 2;
-  so_to_send[jhs::S_PARAMS][jhs::S_PROTOCOL_TYPE] = 1;
-  so_to_send[jhs::S_PARAMS][jhs::S_CORRELATION_ID] = GetNextHMICorrelationID();
-  so_to_send[jhs::S_MSG_PARAMS] = *msg_params;
-  rpc_service_->ManageHMICommand(update_list);
+  policy_handler_->OnDeviceSwitching(device_from.mac_address(),
+                                     device_to.mac_address());
 }
 
 void ApplicationManagerImpl::OnDeviceSwitchingFinish(
     const std::string& device_uid) {
   LOG4CXX_AUTO_TRACE(logger_);
   UNUSED(device_uid);
-  sync_primitives::AutoLock lock(reregister_wait_list_lock_);
+
+  ReregisterWaitList wait_list;
+  {
+    sync_primitives::AutoLock lock(reregister_wait_list_lock_ptr_);
+    wait_list.swap(reregister_wait_list_);
+  }
 
   const bool unexpected_disonnect = true;
   const bool is_resuming = true;
-  for (auto app_it = reregister_wait_list_.begin();
-       app_it != reregister_wait_list_.end();
-       ++app_it) {
-    auto app = *app_it;
+
+  for (const auto& app : wait_list) {
     UnregisterApplication(app->app_id(),
                           mobile_apis::Result::INVALID_ENUM,
                           is_resuming,
                           unexpected_disonnect);
   }
-  reregister_wait_list_.clear();
 }
 
 void ApplicationManagerImpl::SwitchApplication(ApplicationSharedPtr app,
@@ -1631,7 +1760,8 @@ mobile_apis::HMILevel::eType ApplicationManagerImpl::GetDefaultHmiLevel(
   if (GetPolicyHandler().PolicyEnabled()) {
     const std::string policy_app_id = application->policy_app_id();
     std::string default_hmi_string = "";
-    if (GetPolicyHandler().GetDefaultHmi(policy_app_id, &default_hmi_string)) {
+    if (GetPolicyHandler().GetDefaultHmi(
+            application->mac_address(), policy_app_id, &default_hmi_string)) {
       if ("BACKGROUND" == default_hmi_string) {
         default_hmi = HMILevel::HMI_BACKGROUND;
       } else if ("FULL" == default_hmi_string) {
@@ -1751,7 +1881,7 @@ bool ApplicationManagerImpl::StartNaviService(
   using namespace protocol_handler;
   LOG4CXX_AUTO_TRACE(logger_);
 
-  if (HMILevelAllowsStreaming(app_id, service_type)) {
+  if (HMIStateAllowsStreaming(app_id, service_type)) {
     {
       sync_primitives::AutoLock lock(navi_service_status_lock_);
 
@@ -1769,6 +1899,25 @@ bool ApplicationManagerImpl::StartNaviService(
       }
     }
 
+    {
+      /* Fix: For NaviApp1 Switch to NaviApp2, App1's Endcallback() arrives
+       later than App2's Startcallback(). Cause streaming issue on HMI.
+      */
+      sync_primitives::AutoLock lock(applications_list_lock_ptr_);
+      for (auto app : applications_) {
+        if (!app || (!app->is_navi() && !app->mobile_projection_enabled())) {
+          LOG4CXX_DEBUG(logger_,
+                        "Continue, Not Navi App Id: " << app->app_id());
+          continue;
+        }
+        LOG4CXX_DEBUG(logger_,
+                      "Abort Stream Service of other NaviAppId: "
+                          << app->app_id()
+                          << " Service_type: " << service_type);
+        StopNaviService(app->app_id(), service_type);
+      }
+    }
+
     if (service_type == ServiceType::kMobileNav) {
       smart_objects::SmartObject converted_params(smart_objects::SmartType_Map);
       ConvertVideoParamsToSO(converted_params, params);
@@ -1839,10 +1988,30 @@ void ApplicationManagerImpl::OnStreamingConfigured(
       // started audio service
       service_type == ServiceType::kMobileNav ? it->second.first = true
                                               : it->second.second = true;
+
+      {
+        sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+        for (size_t i = 0; i < navi_app_to_stop_.size(); ++i) {
+          if (app_id == navi_app_to_stop_[i]) {
+            sync_primitives::AutoLock lock(close_app_timer_pool_lock_);
+            close_app_timer_pool_.erase(close_app_timer_pool_.begin() + i);
+            navi_app_to_stop_.erase(navi_app_to_stop_.begin() + i);
+            break;
+          }
+        }
+      }
     }
 
     application(app_id)->StartStreaming(service_type);
     connection_handler().NotifyServiceStartedResult(app_id, true, empty);
+
+    // Fix: For wifi Secondary
+    // Should erase appid from deque of ForbidStreaming() push in the last time
+    std::deque<uint32_t>::const_iterator iter = std::find(
+        navi_app_to_end_stream_.begin(), navi_app_to_end_stream_.end(), app_id);
+    if (navi_app_to_end_stream_.end() != iter) {
+      navi_app_to_end_stream_.erase(iter);
+    }
   } else {
     std::vector<std::string> converted_params =
         ConvertRejectedParamList(rejected_params);
@@ -1863,13 +2032,46 @@ void ApplicationManagerImpl::StopNaviService(
     if (navi_service_status_.end() == it) {
       LOG4CXX_WARN(logger_,
                    "No Information about navi service " << service_type);
+      // Fix: Need return for Not navi service at now
+      return;
     } else {
+      // Fix: Repeated tests are not executed after they have stopped for Navi
+      if (false == it->second.first &&
+          ServiceType::kMobileNav == service_type) {
+        LOG4CXX_DEBUG(logger_, "appId: " << app_id << "Navi had stopped");
+        return;
+      }
+
+      // Fix: Repeated tests are not executed after they have stopped for Audio
+      if (false == it->second.second && ServiceType::kAudio == service_type) {
+        LOG4CXX_DEBUG(logger_, "appId: " << app_id << "Audio had stopped");
+        return;
+      }
       // Fill NaviServices map. Set false to first value of pair if
       // we've stopped video service or to second value if we've
       // stopped audio service
+      LOG4CXX_DEBUG(logger_,
+                    "appId: " << app_id << " service_type: " << service_type
+                              << " to stopped");
       service_type == ServiceType::kMobileNav ? it->second.first = false
                                               : it->second.second = false;
     }
+    // Fix: For wifi Secondary
+    // undisposed data active the VPMService restart again,
+    // because Not set Allowstream flag
+    ApplicationSharedPtr app = application(app_id);
+    if (!app || (!app->is_navi() && !app->mobile_projection_enabled())) {
+      LOG4CXX_ERROR(logger_, "Navi/Projection application not found");
+      return;
+    }
+    if (service_type == ServiceType::kMobileNav) {
+      app->set_video_streaming_allowed(false);
+    }
+    if (service_type == ServiceType::kAudio) {
+      app->set_audio_streaming_allowed(false);
+    }
+    //  push_back for judge in ForbidStreaming(),
+    StartEndStreamTimer(app_id);
   }
 
   ApplicationSharedPtr app = application(app_id);
@@ -1894,7 +2096,7 @@ void ApplicationManagerImpl::OnServiceStartedCallback(
       "ServiceType = " << type << ". Session = " << std::hex << session_key);
   std::vector<std::string> empty;
 
-  if (type == kRpc) {
+  if (kRpc == type) {
     LOG4CXX_DEBUG(logger_, "RPC service is about to be started.");
     connection_handler().NotifyServiceStartedResult(session_key, true, empty);
     return;
@@ -1921,6 +2123,7 @@ void ApplicationManagerImpl::OnServiceStartedCallback(
   } else {
     LOG4CXX_WARN(logger_, "Refuse unknown service");
   }
+
   connection_handler().NotifyServiceStartedResult(session_key, false, empty);
 }
 
@@ -1943,7 +2146,7 @@ void ApplicationManagerImpl::OnServiceEndedCallback(
     return;
   }
 
-  if (IsAppInReconnectMode(app->policy_app_id())) {
+  if (IsAppInReconnectMode(app->device(), app->policy_app_id())) {
     LOG4CXX_DEBUG(logger_,
                   "Application is in reconnection list and won't be closed.");
     return;
@@ -2003,6 +2206,79 @@ void ApplicationManagerImpl::OnServiceEndedCallback(
   }
 }
 
+void ApplicationManagerImpl::ProcessServiceStatusUpdate(
+    const uint32_t connection_key,
+    hmi_apis::Common_ServiceType::eType service_type,
+    hmi_apis::Common_ServiceEvent::eType service_event,
+    utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
+        service_update_reason) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  LOG4CXX_DEBUG(logger_,
+                "Processing status update with connection key: "
+                    << connection_key << " service type: " << service_type
+                    << " service_event " << service_event
+                    << " service_update_reason " << service_update_reason);
+
+  const auto app = application(connection_key);
+
+  const uint32_t app_id = app ? app->app_id() : 0u;
+
+  auto reason = service_update_reason
+                    ? *service_update_reason
+                    : hmi_apis::Common_ServiceStatusUpdateReason::INVALID_ENUM;
+
+  auto notification = MessageHelper::CreateOnServiceUpdateNotification(
+      service_type, service_event, reason, app_id);
+
+  rpc_service_->ManageHMICommand(notification);
+
+  if (hmi_apis::Common_ServiceEvent::REQUEST_REJECTED == service_event &&
+      HandleRejectedServiceStatus(app, service_type)) {
+    state_ctrl_.SetRegularState(app,
+                                mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+                                mobile_apis::HMILevel::HMI_NONE,
+                                true);
+  }
+}
+
+bool ApplicationManagerImpl::HandleRejectedServiceStatus(
+    ApplicationSharedPtr app,
+    const hmi_apis::Common_ServiceType::eType service_type) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!app) {
+    LOG4CXX_WARN(logger_, "Received invalid app");
+    return false;
+  }
+
+  switch (service_type) {
+    case hmi_apis::Common_ServiceType::VIDEO:
+    case hmi_apis::Common_ServiceType::AUDIO: {
+      {
+        sync_primitives::AutoLock lock(navi_service_status_lock_);
+        auto app_services = navi_service_status_.find(app->app_id());
+        if (navi_service_status_.end() != app_services) {
+          navi_service_status_.erase(app_services);
+        }
+      }
+      LOG4CXX_DEBUG(logger_,
+                    "The start of service"
+                        << service_type << " for appID: " << app
+                        << " is failed. Service info has been removed");
+      return true;
+    }
+    case hmi_apis::Common_ServiceType::RPC: {
+      connection_handler().SendEndService(app->app_id(),
+                                          protocol_handler::ServiceType::kRpc);
+      LOG4CXX_DEBUG(logger_, "RPC service for appID: " << app << " is stopped");
+      return true;
+    }
+    default:
+      LOG4CXX_DEBUG(logger_, "Unknown service type: " << service_type);
+      return false;
+  }
+}
+
 void ApplicationManagerImpl::OnSecondaryTransportStartedCallback(
     const connection_handler::DeviceHandle device_handle,
     const int32_t session_key) {
@@ -2095,7 +2371,12 @@ bool ApplicationManagerImpl::OnHandshakeDone(
   using namespace helpers;
 
   ApplicationSharedPtr app = application(connection_key);
-  DCHECK_OR_RETURN(app, false);
+  if (!app) {
+    LOG4CXX_WARN(logger_,
+                 "Application for connection key: " << connection_key
+                                                    << " was not found");
+    return false;
+  }
   if (Compare<SSLContext::HandshakeResult, EQ, ONE>(
           result,
           SSLContext::Handshake_Result_CertExpired,
@@ -2107,8 +2388,14 @@ bool ApplicationManagerImpl::OnHandshakeDone(
   }
   return false;
 }
+#ifdef ENABLE_SECURITY
+bool ApplicationManagerImpl::OnPTUFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return false;
+}
+#endif  // ENABLE_SECURITY
 
-bool ApplicationManagerImpl::OnHandshakeFailed() {
+bool ApplicationManagerImpl::OnGetSystemTimeFailed() {
   LOG4CXX_AUTO_TRACE(logger_);
   return false;
 }
@@ -2192,11 +2479,21 @@ void ApplicationManagerImpl::RemoveHMIFakeParameters(
   (*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID] = mobile_function_id;
 }
 
-bool ApplicationManagerImpl::Init(resumption::LastState& last_state,
-                                  media_manager::MediaManager* media_manager) {
+bool ApplicationManagerImpl::Init(resumption::LastState&,
+                                  media_manager::MediaManager*) {
+  return false;
+}
+
+bool ApplicationManagerImpl::Init(
+    resumption::LastStateWrapperPtr last_state_wrapper,
+    media_manager::MediaManager* media_manager) {
   LOG4CXX_TRACE(logger_, "Init application manager");
-  plugin_manager_.reset(new plugin_manager::RPCPluginManagerImpl(
-      *this, *rpc_service_, *hmi_capabilities_, *policy_handler_));
+  plugin_manager_.reset(
+      new plugin_manager::RPCPluginManagerImpl(*this,
+                                               *rpc_service_,
+                                               *hmi_capabilities_,
+                                               *policy_handler_,
+                                               last_state_wrapper));
   if (!plugin_manager_->LoadPlugins(get_settings().plugins_folder())) {
     LOG4CXX_ERROR(logger_, "Plugins are not loaded");
     return false;
@@ -2206,11 +2503,11 @@ bool ApplicationManagerImpl::Init(resumption::LastState& last_state,
       !IsReadWriteAllowed(app_storage_folder, TYPE_STORAGE)) {
     return false;
   }
-  if (!resume_controller().Init(last_state)) {
+  if (!resume_controller().Init(last_state_wrapper)) {
     LOG4CXX_ERROR(logger_, "Problem with initialization of resume controller");
     return false;
   }
-  hmi_capabilities_->Init(&last_state);
+  hmi_capabilities_->Init(last_state_wrapper);
 
   if (!(file_system::IsWritingAllowed(app_storage_folder) &&
         file_system::IsReadingAllowed(app_storage_folder))) {
@@ -2252,13 +2549,20 @@ bool ApplicationManagerImpl::Init(resumption::LastState& last_state,
     app_launch_dto_.reset(new app_launch::AppLaunchDataDB(settings_));
   } else {
     app_launch_dto_.reset(
-        new app_launch::AppLaunchDataJson(settings_, last_state));
+        new app_launch::AppLaunchDataJson(settings_, last_state_wrapper));
   }
   app_launch_ctrl_.reset(new app_launch::AppLaunchCtrlImpl(
       *app_launch_dto_.get(), *this, settings_));
 
   app_service_manager_.reset(
-      new application_manager::AppServiceManager(*this, last_state));
+      new application_manager::AppServiceManager(*this, last_state_wrapper));
+
+  auto on_app_policy_updated = [](plugin_manager::RPCPlugin& plugin) {
+    plugin.OnPolicyEvent(plugin_manager::kApplicationPolicyUpdated);
+  };
+
+  plugin_manager_->ForEachPlugin(on_app_policy_updated);
+
   return true;
 }
 
@@ -2269,8 +2573,12 @@ bool ApplicationManagerImpl::Stop() {
   stopping_application_mng_lock_.Release();
   application_list_update_timer_.Stop();
   try {
-    SetUnregisterAllApplicationsReason(
-        mobile_api::AppInterfaceUnregisteredReason::IGNITION_OFF);
+    if (unregister_reason_ ==
+        mobile_api::AppInterfaceUnregisteredReason::INVALID_ENUM) {
+      SetUnregisterAllApplicationsReason(
+          mobile_api::AppInterfaceUnregisteredReason::IGNITION_OFF);
+    }
+
     UnregisterAllApplications();
   } catch (...) {
     LOG4CXX_ERROR(logger_,
@@ -2282,6 +2590,8 @@ bool ApplicationManagerImpl::Stop() {
   LOG4CXX_DEBUG(logger_, "Unloading policy library.");
   GetPolicyHandler().UnloadPolicyLibrary();
 
+  rpc_service_->Stop();
+
   return true;
 }
 
@@ -2490,8 +2800,24 @@ void ApplicationManagerImpl::CreateApplications(SmartArray& obj_array,
     }
 
     const std::string policy_app_id(app_data[json::appId].asString());
-    ApplicationSharedPtr registered_app =
-        application_by_policy_id(policy_app_id);
+
+    connection_handler::DeviceHandle device_handle;
+    if (-1 == connection_handler().get_session_observer().GetDataOnSessionKey(
+                  connection_key, nullptr, nullptr, &device_handle)) {
+      LOG4CXX_ERROR(logger_,
+                    "Failed to create application: no connection info.");
+      continue;
+    }
+
+    std::string device_id;
+    if (-1 == connection_handler().get_session_observer().GetDataOnDeviceID(
+                  device_handle, nullptr, nullptr, &device_id)) {
+      LOG4CXX_ERROR(logger_,
+                    "Failed to create application: no connection info.");
+      continue;
+    }
+
+    ApplicationSharedPtr registered_app = application(device_id, policy_app_id);
     if (registered_app) {
       LOG4CXX_DEBUG(logger_,
                     "Application with the same id: "
@@ -2530,22 +2856,9 @@ void ApplicationManagerImpl::CreateApplications(SmartArray& obj_array,
     const std::string app_icon_dir(settings_.app_icons_folder());
     const std::string full_icon_path(app_icon_dir + "/" + policy_app_id);
 
-    connection_handler::DeviceHandle device_id = 0;
-
-    if (-1 == connection_handler().get_session_observer().GetDataOnSessionKey(
-                  connection_key, NULL, NULL, &device_id)) {
-      LOG4CXX_ERROR(logger_,
-                    "Failed to create application: no connection info.");
-      continue;
-    }
-
-    std::string device_mac;
-    connection_handler().get_session_observer().GetDataOnDeviceID(
-        device_id, NULL, NULL, &device_mac, NULL);
-
     const uint32_t hmi_app_id =
-        resume_controller().IsApplicationSaved(policy_app_id, device_mac)
-            ? resume_controller().GetHMIApplicationID(policy_app_id, device_mac)
+        resume_controller().IsApplicationSaved(policy_app_id, device_id)
+            ? resume_controller().GetHMIApplicationID(policy_app_id, device_id)
             : GenerateNewHMIAppID();
 
     // AppId = 0 because this is query_app(provided by hmi for download, but not
@@ -2553,8 +2866,8 @@ void ApplicationManagerImpl::CreateApplications(SmartArray& obj_array,
     ApplicationSharedPtr app(
         new ApplicationImpl(0,
                             policy_app_id,
-                            device_mac,
                             device_id,
+                            device_handle,
                             appName,
                             GetPolicyHandler().GetStatisticManager(),
                             *this));
@@ -2866,18 +3179,24 @@ void ApplicationManagerImpl::UnregisterAllApplications() {
 
 void ApplicationManagerImpl::RemoveAppsWaitingForRegistration(
     const connection_handler::DeviceHandle handle) {
+  LOG4CXX_AUTO_TRACE(logger_);
   DevicePredicate device_finder(handle);
   apps_to_register_list_lock_ptr_->Acquire();
-  AppsWaitRegistrationSet::iterator it_app = std::find_if(
-      apps_to_register_.begin(), apps_to_register_.end(), device_finder);
-
-  while (apps_to_register_.end() != it_app) {
-    LOG4CXX_DEBUG(
-        logger_,
-        "Waiting app: " << (*it_app)->name().c_str() << " is removed.");
-    apps_to_register_.erase(it_app);
-    it_app = std::find_if(
-        apps_to_register_.begin(), apps_to_register_.end(), device_finder);
+  std::vector<ApplicationSharedPtr> apps_to_remove;
+  std::copy_if(apps_to_register_.begin(),
+               apps_to_register_.end(),
+               std::back_inserter(apps_to_remove),
+               device_finder);
+
+  const auto enabled_local_apps = policy_handler_->GetEnabledLocalApps();
+  for (auto app : apps_to_remove) {
+    const bool is_app_enabled =
+        helpers::in_range(enabled_local_apps, app->policy_app_id());
+    if (!is_app_enabled) {
+      LOG4CXX_DEBUG(logger_,
+                    "Waiting app: " << app->name().c_str() << " is removed.");
+      apps_to_register_.erase(app);
+    }
   }
 
   apps_to_register_list_lock_ptr_->Release();
@@ -2893,20 +3212,17 @@ void ApplicationManagerImpl::UnregisterApplication(
                             << "; is_resuming = " << is_resuming
                             << "; is_unexpected_disconnect = "
                             << is_unexpected_disconnect);
-  size_t subscribed_for_way_points_app_count = 0;
 
   GetAppServiceManager().UnpublishServices(app_id);
 
-  // SDL sends UnsubscribeWayPoints only for last application
-  {
-    sync_primitives::AutoLock lock(subscribed_way_points_apps_lock_);
-    subscribed_for_way_points_app_count =
-        subscribed_way_points_apps_list_.size();
-  }
-  if (1 == subscribed_for_way_points_app_count) {
-    LOG4CXX_ERROR(logger_, "Send UnsubscribeWayPoints");
-    MessageHelper::SendUnsubscribedWayPoints(*this);
+  if (IsAppSubscribedForWayPoints(app_id)) {
+    UnsubscribeAppFromWayPoints(app_id);
+    if (!IsAnyAppSubscribedForWayPoints()) {
+      LOG4CXX_ERROR(logger_, "Send UnsubscribeWayPoints");
+      MessageHelper::SendUnsubscribedWayPoints(*this);
+    }
   }
+  EndNaviServices(app_id);
 
   {
     sync_primitives::AutoLock lock(navi_service_status_lock_);
@@ -2994,16 +3310,24 @@ void ApplicationManagerImpl::UnregisterApplication(
             "There is no more SDL4 apps with device handle: " << handle);
 
         RemoveAppsWaitingForRegistration(handle);
-        RefreshCloudAppInformation();
-        SendUpdateAppList();
-      } else if (app_to_remove->is_cloud_app()) {
-        RefreshCloudAppInformation();
-        SendUpdateAppList();
       }
     }
-  }
 
-  commands_holder_->Clear(app_to_remove);
+    MessageHelper::SendOnAppUnregNotificationToHMI(
+        app_to_remove, is_unexpected_disconnect, *this);
+    commands_holder_->Clear(app_to_remove);
+
+    const auto enabled_local_apps = policy_handler_->GetEnabledLocalApps();
+    if (helpers::in_range(enabled_local_apps, app_to_remove->policy_app_id())) {
+      LOG4CXX_DEBUG(logger_,
+                    "Enabled local app has been unregistered. Re-create "
+                    "pending application");
+      CreatePendingLocalApplication(app_to_remove->policy_app_id());
+    }
+
+    RefreshCloudAppInformation();
+    SendUpdateAppList();
+  }
 
   if (EndAudioPassThru(app_id)) {
     // May be better to put this code in MessageHelper?
@@ -3015,11 +3339,13 @@ void ApplicationManagerImpl::UnregisterApplication(
         plugin.OnApplicationEvent(plugin_manager::kApplicationUnregistered,
                                   app_to_remove);
       };
-  plugin_manager_->ForEachPlugin(on_app_unregistered);
 
-  MessageHelper::SendOnAppUnregNotificationToHMI(
-      app_to_remove, is_unexpected_disconnect, *this);
+  plugin_manager_->ForEachPlugin(on_app_unregistered);
   request_ctrl_.terminateAppRequests(app_id);
+
+  if (applications_.empty()) {
+    policy_handler_->StopRetrySequence();
+  }
   return;
 }
 
@@ -3030,6 +3356,7 @@ void ApplicationManagerImpl::OnAppUnauthorized(const uint32_t& app_id) {
 
 mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions(
     const ApplicationSharedPtr app,
+    const WindowID window_id,
     const std::string& function_id,
     const RPCParams& rpc_params,
     CommandParametersPermissions* params_permissions) {
@@ -3042,7 +3369,8 @@ mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions(
 
   DCHECK(app);
   policy::CheckPermissionResult result;
-  GetPolicyHandler().CheckPermissions(app, function_id, rpc_params, result);
+  GetPolicyHandler().CheckPermissions(
+      app, window_id, function_id, rpc_params, result);
 
   if (NULL != params_permissions) {
     params_permissions->allowed_params = result.list_of_allowed_params;
@@ -3050,7 +3378,9 @@ mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions(
     params_permissions->undefined_params = result.list_of_undefined_params;
   }
 
-  if (app->hmi_level() == mobile_apis::HMILevel::HMI_NONE &&
+  // Record statistics for default window only
+  if (app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW) ==
+          mobile_apis::HMILevel::HMI_NONE &&
       function_id != MessageHelper::StringifiedFunctionID(
                          mobile_apis::FunctionID::UnregisterAppInterfaceID)) {
     if (result.hmi_level_permitted != policy::kRpcAllowed) {
@@ -3061,7 +3391,8 @@ mobile_apis::Result::eType ApplicationManagerImpl::CheckPolicyPermissions(
 #ifdef ENABLE_LOG
   const std::string log_msg =
       "Application: " + app->policy_app_id() + ", RPC: " + function_id +
-      ", HMI status: " + MessageHelper::StringifiedHMILevel(app->hmi_level());
+      ", window_id: " + std::to_string(window_id) + ", HMI status: " +
+      MessageHelper::StringifiedHMILevel(app->hmi_level(window_id));
 #endif  // ENABLE_LOG
   if (result.hmi_level_permitted != policy::kRpcAllowed) {
     LOG4CXX_WARN(logger_, "Request is blocked by policies. " << log_msg);
@@ -3105,10 +3436,10 @@ bool ApplicationManagerImpl::IsLowVoltage() const {
 
 void ApplicationManagerImpl::OnWakeUp() {
   LOG4CXX_AUTO_TRACE(logger_);
-  is_low_voltage_ = false;
   resume_ctrl_->SaveWakeUpTime();
   resume_ctrl_->StartSavePersistentDataTimer();
   request_ctrl_.OnWakeUp();
+  is_low_voltage_ = false;
 }
 
 std::string ApplicationManagerImpl::GetHashedAppID(
@@ -3123,10 +3454,12 @@ std::string ApplicationManagerImpl::GetHashedAppID(
   return mobile_app_id + device_name;
 }
 
-bool ApplicationManagerImpl::HMILevelAllowsStreaming(
+bool ApplicationManagerImpl::HMIStateAllowsStreaming(
     uint32_t app_id, protocol_handler::ServiceType service_type) const {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace mobile_apis::HMILevel;
+  using namespace mobile_apis::PredefinedWindows;
+  using namespace mobile_apis::VideoStreamingState;
   using namespace helpers;
 
   ApplicationSharedPtr app = application(app_id);
@@ -3134,7 +3467,15 @@ bool ApplicationManagerImpl::HMILevelAllowsStreaming(
     LOG4CXX_WARN(logger_, "An application is not registered.");
     return false;
   }
-  return Compare<eType, EQ, ONE>(app->hmi_level(), HMI_FULL, HMI_LIMITED);
+
+  const auto hmi_state = app->CurrentHmiState(DEFAULT_WINDOW);
+  const bool allow_streaming_by_hmi_level =
+      Compare<mobile_apis::HMILevel::eType, EQ, ONE>(
+          hmi_state->hmi_level(), HMI_FULL, HMI_LIMITED);
+  const bool allow_streaming_by_streaming_state =
+      hmi_state->video_streaming_state() == STREAMABLE;
+
+  return allow_streaming_by_hmi_level && allow_streaming_by_streaming_state;
 }
 
 bool ApplicationManagerImpl::CanAppStream(
@@ -3157,7 +3498,7 @@ bool ApplicationManagerImpl::CanAppStream(
     LOG4CXX_WARN(logger_, "Unsupported service_type " << service_type);
   }
 
-  return HMILevelAllowsStreaming(app_id, service_type) && is_allowed;
+  return HMIStateAllowsStreaming(app_id, service_type) && is_allowed;
 }
 
 void ApplicationManagerImpl::ForbidStreaming(uint32_t app_id) {
@@ -3174,16 +3515,70 @@ void ApplicationManagerImpl::ForbidStreaming(uint32_t app_id) {
     return;
   }
 
-  if (navi_app_to_stop_.end() != std::find(navi_app_to_stop_.begin(),
-                                           navi_app_to_stop_.end(),
-                                           app_id) ||
-      navi_app_to_end_stream_.end() !=
-          std::find(navi_app_to_end_stream_.begin(),
-                    navi_app_to_end_stream_.end(),
-                    app_id)) {
+  {
+    sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+    if (navi_app_to_stop_.end() != std::find(navi_app_to_stop_.begin(),
+                                             navi_app_to_stop_.end(),
+                                             app_id) ||
+        navi_app_to_end_stream_.end() !=
+            std::find(navi_app_to_end_stream_.begin(),
+                      navi_app_to_end_stream_.end(),
+                      app_id)) {
+      return;
+    }
+  }
+
+  bool unregister = false;
+  {
+    sync_primitives::AutoLock lock(navi_service_status_lock_);
+
+    NaviServiceStatusMap::iterator it = navi_service_status_.find(app_id);
+    if (navi_service_status_.end() == it ||
+        (!it->second.first && !it->second.second)) {
+      unregister = true;
+    }
+  }
+  if (unregister) {
+    rpc_service_->ManageMobileCommand(
+        MessageHelper::GetOnAppInterfaceUnregisteredNotificationToMobile(
+            app_id, PROTOCOL_VIOLATION),
+        commands::Command::SOURCE_SDL);
+    UnregisterApplication(app_id, ABORTED);
+    return;
+  }
+  EndNaviServices(app_id);
+}
+
+void ApplicationManagerImpl::ForbidStreaming(
+    uint32_t app_id, protocol_handler::ServiceType service_type) {
+  using namespace mobile_apis::AppInterfaceUnregisteredReason;
+  using namespace mobile_apis::Result;
+  using namespace protocol_handler;
+
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  ApplicationSharedPtr app = application(app_id);
+  if (!app || (!app->is_navi() && !app->mobile_projection_enabled())) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "There is no navi or projection application with id: " << app_id);
     return;
   }
 
+  {
+    sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+
+    if (navi_app_to_stop_.end() != std::find(navi_app_to_stop_.begin(),
+                                             navi_app_to_stop_.end(),
+                                             app_id) ||
+        navi_app_to_end_stream_.end() !=
+            std::find(navi_app_to_end_stream_.begin(),
+                      navi_app_to_end_stream_.end(),
+                      app_id)) {
+      return;
+    }
+  }
+
   bool unregister = false;
   {
     sync_primitives::AutoLock lock(navi_service_status_lock_);
@@ -3202,6 +3597,18 @@ void ApplicationManagerImpl::ForbidStreaming(uint32_t app_id) {
     UnregisterApplication(app_id, ABORTED);
     return;
   }
+
+  if (ServiceType::kMobileNav == service_type &&
+      app->video_streaming_allowed()) {
+    LOG4CXX_DEBUG(logger_, "Video streaming is still allowed");
+    return;
+  }
+
+  if (ServiceType::kAudio == service_type && app->audio_streaming_allowed()) {
+    LOG4CXX_DEBUG(logger_, "Audio streaming is still allowed");
+    return;
+  }
+
   EndNaviServices(app_id);
 }
 
@@ -3264,9 +3671,13 @@ void ApplicationManagerImpl::EndNaviServices(uint32_t app_id) {
       connection_handler().SendEndService(app_id, ServiceType::kAudio);
       app->StopStreamingForce(ServiceType::kAudio);
     }
+
     DisallowStreaming(app_id);
 
-    navi_app_to_stop_.push_back(app_id);
+    {
+      sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+      navi_app_to_stop_.push_back(app_id);
+    }
 
     TimerSPtr close_timer(std::make_shared<timer::Timer>(
         "CloseNaviAppTimer",
@@ -3274,15 +3685,14 @@ void ApplicationManagerImpl::EndNaviServices(uint32_t app_id) {
             this, &ApplicationManagerImpl::CloseNaviApp)));
     close_timer->Start(navi_close_app_timeout_, timer::kSingleShot);
 
-    sync_primitives::AutoLock lock(timer_pool_lock_);
-    timer_pool_.push_back(close_timer);
+    sync_primitives::AutoLock lock(close_app_timer_pool_lock_);
+    close_app_timer_pool_.push_back(close_timer);
   }
 }
 
-void ApplicationManagerImpl::OnHMILevelChanged(
-    uint32_t app_id,
-    mobile_apis::HMILevel::eType from,
-    mobile_apis::HMILevel::eType to) {
+void ApplicationManagerImpl::OnHMIStateChanged(const uint32_t app_id,
+                                               const HmiStatePtr from,
+                                               const HmiStatePtr to) {
   LOG4CXX_AUTO_TRACE(logger_);
   ProcessPostponedMessages(app_id);
   ProcessApp(app_id, from, to);
@@ -3303,9 +3713,11 @@ void ApplicationManagerImpl::ProcessPostponedMessages(const uint32_t app_id) {
     const std::string function_id = MessageHelper::StringifiedFunctionID(
         static_cast<mobile_apis::FunctionID::eType>(
             (*message)[strings::params][strings::function_id].asUInt()));
+    const WindowID window_id = MessageHelper::ExtractWindowIdFromSmartObject(
+        (*message)[strings::msg_params]);
     const RPCParams params;
     const mobile_apis::Result::eType check_result =
-        CheckPolicyPermissions(app, function_id, params);
+        CheckPolicyPermissions(app, window_id, function_id, params);
     if (mobile_api::Result::SUCCESS == check_result) {
       rpc_service_->ManageMobileCommand(message, commands::Command::SOURCE_SDL);
     } else {
@@ -3315,109 +3727,169 @@ void ApplicationManagerImpl::ProcessPostponedMessages(const uint32_t app_id) {
   std::for_each(messages.begin(), messages.end(), push_allowed_messages);
 }
 
+void ApplicationManagerImpl::ProcessOnDataStreamingNotification(
+    const protocol_handler::ServiceType service_type,
+    const uint32_t app_id,
+    const bool streaming_data_available) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  bool should_send_notification = false;
+
+  {
+    sync_primitives::AutoLock lock(streaming_services_lock_);
+    auto& active_services = streaming_application_services_[service_type];
+    should_send_notification = active_services.empty();
+    if (streaming_data_available) {
+      active_services.insert(app_id);
+      LOG4CXX_DEBUG(logger_,
+                    "Streaming session with id "
+                        << app_id << " for service "
+                        << static_cast<uint32_t>(service_type)
+                        << " was added. Currently streaming sessions count: "
+                        << active_services.size());
+    } else {
+      active_services.erase(app_id);
+      should_send_notification =
+          !should_send_notification && active_services.empty();
+
+      LOG4CXX_DEBUG(logger_,
+                    "Streaming session with id "
+                        << app_id << " for service "
+                        << static_cast<uint32_t>(service_type)
+                        << " was removed. Currently streaming sessions count: "
+                        << active_services.size());
+    }
+  }
+
+  if (should_send_notification) {
+    MessageHelper::SendOnDataStreaming(
+        service_type, streaming_data_available, *this);
+  }
+}
+
 void ApplicationManagerImpl::ProcessApp(const uint32_t app_id,
-                                        const mobile_apis::HMILevel::eType from,
-                                        const mobile_apis::HMILevel::eType to) {
+                                        const HmiStatePtr from,
+                                        const HmiStatePtr to) {
   using namespace mobile_apis::HMILevel;
+  using namespace mobile_apis::VideoStreamingState;
   using namespace helpers;
 
-  if (from == to) {
-    LOG4CXX_TRACE(logger_, "HMILevel from = to");
-    return;
-  }
-
   ApplicationSharedPtr app = application(app_id);
   if (!app || (!app->is_navi() && !app->mobile_projection_enabled())) {
     LOG4CXX_ERROR(logger_, "Navi/Projection application not found");
     return;
   }
 
-  if (to == HMI_FULL || to == HMI_LIMITED) {
-    LOG4CXX_TRACE(logger_, "HMILevel to FULL or LIMITED");
-    if (from == HMI_BACKGROUND) {
-      LOG4CXX_TRACE(logger_, "HMILevel from BACKGROUND");
-      AllowStreaming(app_id);
-    }
-  } else if (to == HMI_BACKGROUND) {
-    LOG4CXX_TRACE(logger_, "HMILevel to BACKGROUND");
-    if (from == HMI_FULL || from == HMI_LIMITED) {
-      LOG4CXX_TRACE(logger_, "HMILevel from FULL or LIMITED");
-      navi_app_to_end_stream_.push_back(app_id);
-      TimerSPtr end_stream_timer(std::make_shared<timer::Timer>(
-          "AppShouldFinishStreaming",
-          new TimerTaskImpl<ApplicationManagerImpl>(
-              this, &ApplicationManagerImpl::EndNaviStreaming)));
-      end_stream_timer->Start(navi_end_stream_timeout_, timer::kPeriodic);
+  const auto hmi_level_from = from->hmi_level();
+  const auto hmi_level_to = to->hmi_level();
+  const auto streaming_state_from = from->video_streaming_state();
+  const auto streaming_state_to = to->video_streaming_state();
 
-      sync_primitives::AutoLock lock(timer_pool_lock_);
-      timer_pool_.push_back(end_stream_timer);
-    }
-  } else if (to == HMI_NONE) {
-    LOG4CXX_TRACE(logger_, "HMILevel to NONE");
-    if (from == HMI_FULL || from == HMI_LIMITED || from == HMI_BACKGROUND) {
-      EndNaviServices(app_id);
-    }
+  if (hmi_level_from == hmi_level_to &&
+      streaming_state_from == streaming_state_to) {
+    LOG4CXX_TRACE(logger_, "HMILevel && streaming state were not changed");
+    return;
   }
-}
 
-void ApplicationManagerImpl::SendHMIStatusNotification(
-    const std::shared_ptr<Application> app) {
-  LOG4CXX_AUTO_TRACE(logger_);
-  DCHECK_OR_RETURN_VOID(app);
-  smart_objects::SmartObjectSPtr notification =
-      std::make_shared<smart_objects::SmartObject>();
-  smart_objects::SmartObject& message = *notification;
-
-  message[strings::params][strings::function_id] =
-      static_cast<int32_t>(mobile_api::FunctionID::OnHMIStatusID);
-
-  message[strings::params][strings::message_type] =
-      static_cast<int32_t>(application_manager::MessageType::kNotification);
+  auto full_or_limited_hmi_level = [](mobile_apis::HMILevel::eType hmi_level) {
+    return Compare<mobile_apis::HMILevel::eType, EQ, ONE>(
+        hmi_level, HMI_FULL, HMI_LIMITED);
+  };
 
-  message[strings::params][strings::connection_key] =
-      static_cast<int32_t>(app->app_id());
+  const bool allow_streaming_by_streaming_state =
+      NOT_STREAMABLE == streaming_state_from &&
+      STREAMABLE == streaming_state_to;
+  const bool allow_streaming_by_hmi_level =
+      HMI_BACKGROUND == hmi_level_from &&
+      full_or_limited_hmi_level(hmi_level_to) &&
+      STREAMABLE == streaming_state_to;
+  if (allow_streaming_by_streaming_state || allow_streaming_by_hmi_level) {
+    LOG4CXX_TRACE(logger_,
+                  "Allow streaming by streaming state: "
+                      << std::boolalpha << allow_streaming_by_streaming_state
+                      << "; by hmi level: " << std::boolalpha
+                      << allow_streaming_by_hmi_level);
+    AllowStreaming(app_id);
+    return;
+  }
 
-  message[strings::msg_params][strings::hmi_level] =
-      static_cast<int32_t>(app->hmi_level());
+  const bool end_streaming_by_streaming_state =
+      STREAMABLE == streaming_state_from &&
+      NOT_STREAMABLE == streaming_state_to &&
+      full_or_limited_hmi_level(hmi_level_to);
+  const bool start_timer_by_hmi_level =
+      full_or_limited_hmi_level(hmi_level_from) &&
+      HMI_BACKGROUND == hmi_level_to;
+  if (end_streaming_by_streaming_state || start_timer_by_hmi_level) {
+    LOG4CXX_TRACE(logger_,
+                  "Start EndStream timer by streaming state: "
+                      << std::boolalpha << end_streaming_by_streaming_state
+                      << "; by hmi level: " << std::boolalpha
+                      << start_timer_by_hmi_level);
+    StartEndStreamTimer(app_id);
+    return;
+  }
 
-  message[strings::msg_params][strings::audio_streaming_state] =
-      static_cast<int32_t>(app->audio_streaming_state());
+  const bool end_streaming_by_hmi_level =
+      full_or_limited_hmi_level(hmi_level_from) && HMI_NONE == hmi_level_to;
+  if (end_streaming_by_hmi_level) {
+    LOG4CXX_TRACE(logger_,
+                  "End streaming services by hmi level: "
+                      << std::boolalpha << end_streaming_by_hmi_level);
+    EndNaviServices(app_id);
+    return;
+  }
 
-  message[strings::msg_params][strings::video_streaming_state] =
-      static_cast<int32_t>(app->video_streaming_state());
+  LOG4CXX_TRACE(logger_, "No actions required for app " << app_id);
+}
 
-  message[strings::msg_params][strings::system_context] =
-      static_cast<int32_t>(app->system_context());
+void ApplicationManagerImpl::StartEndStreamTimer(const uint32_t app_id) {
+  LOG4CXX_DEBUG(logger_, "Start end stream timer for app " << app_id);
+  navi_app_to_end_stream_.push_back(app_id);
+  TimerSPtr end_stream_timer(std::make_shared<timer::Timer>(
+      "DisallowAppStreamTimer",
+      new TimerTaskImpl<ApplicationManagerImpl>(
+          this, &ApplicationManagerImpl::EndNaviStreaming)));
+  end_stream_timer->Start(navi_end_stream_timeout_, timer::kSingleShot);
 
-  rpc_service_->ManageMobileCommand(notification,
-                                    commands::Command::SOURCE_SDL);
+  sync_primitives::AutoLock lock(end_stream_timer_pool_lock_);
+  end_stream_timer_pool_.push_back(end_stream_timer);
 }
 
 void ApplicationManagerImpl::ClearTimerPool() {
   LOG4CXX_AUTO_TRACE(logger_);
+  {
+    sync_primitives::AutoLock lock(close_app_timer_pool_lock_);
 
-  std::vector<TimerSPtr> new_timer_pool;
-
-  sync_primitives::AutoLock lock(timer_pool_lock_);
-  new_timer_pool.push_back(timer_pool_[0]);
-
-  for (size_t i = 1; i < timer_pool_.size(); ++i) {
-    if (timer_pool_[i]->is_running()) {
-      new_timer_pool.push_back(timer_pool_[i]);
-    }
+    close_app_timer_pool_.erase(
+        std::remove_if(close_app_timer_pool_.begin(),
+                       close_app_timer_pool_.end(),
+                       [](TimerSPtr timer) { return !timer->is_running(); }),
+        close_app_timer_pool_.end());
   }
 
-  timer_pool_.swap(new_timer_pool);
-  new_timer_pool.clear();
+  {
+    sync_primitives::AutoLock lock(end_stream_timer_pool_lock_);
+    end_stream_timer_pool_.erase(
+        std::remove_if(end_stream_timer_pool_.begin(),
+                       end_stream_timer_pool_.end(),
+                       [](TimerSPtr timer) { return !timer->is_running(); }),
+        end_stream_timer_pool_.end());
+  }
 }
 
 void ApplicationManagerImpl::CloseNaviApp() {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace mobile_apis::AppInterfaceUnregisteredReason;
   using namespace mobile_apis::Result;
-  DCHECK_OR_RETURN_VOID(!navi_app_to_stop_.empty());
-  uint32_t app_id = navi_app_to_stop_.front();
-  navi_app_to_stop_.pop_front();
+  uint32_t app_id;
+
+  {
+    sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+    DCHECK_OR_RETURN_VOID(!navi_app_to_stop_.empty());
+    app_id = navi_app_to_stop_.front();
+    navi_app_to_stop_.pop_front();
+  }
 
   bool unregister = false;
   {
@@ -3427,6 +3899,7 @@ void ApplicationManagerImpl::CloseNaviApp() {
     if (navi_service_status_.end() != it) {
       if (it->second.first || it->second.second) {
         unregister = true;
+        navi_service_status_.erase(it);
       }
     }
   }
@@ -3450,9 +3923,13 @@ void ApplicationManagerImpl::EndNaviStreaming() {
     const uint32_t app_id = navi_app_to_end_stream_.front();
     navi_app_to_end_stream_.pop_front();
 
-    if (navi_app_to_stop_.end() ==
-        std::find(navi_app_to_stop_.begin(), navi_app_to_stop_.end(), app_id)) {
-      DisallowStreaming(app_id);
+    {
+      sync_primitives::AutoLock lock(navi_app_to_stop_lock_);
+      if (navi_app_to_stop_.end() == std::find(navi_app_to_stop_.begin(),
+                                               navi_app_to_stop_.end(),
+                                               app_id)) {
+        DisallowStreaming(app_id);
+      }
     }
   }
 }
@@ -3514,14 +3991,14 @@ bool ApplicationManagerImpl::IsApplicationForbidden(
 }
 
 bool ApplicationManagerImpl::IsAppInReconnectMode(
+    const connection_handler::DeviceHandle& device_id,
     const std::string& policy_app_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock lock(reregister_wait_list_lock_);
+  sync_primitives::AutoLock lock(reregister_wait_list_lock_ptr_);
   return reregister_wait_list_.end() !=
          std::find_if(reregister_wait_list_.begin(),
                       reregister_wait_list_.end(),
-                      std::bind1st(std::ptr_fun(&policy_app_id_comparator),
-                                   policy_app_id));
+                      PolicyAppIdComparator(device_id, policy_app_id));
 }
 
 policy::DeviceConsent ApplicationManagerImpl::GetUserConsentForDevice(
@@ -3611,11 +4088,17 @@ bool ApplicationManagerImpl::IsHMICooperating() const {
 
 void ApplicationManagerImpl::OnApplicationListUpdateTimer() {
   LOG4CXX_DEBUG(logger_, "Application list update timer finished");
+  const bool is_new_app_registered = registered_during_timer_execution_;
+  registered_during_timer_execution_ = false;
 
   apps_to_register_list_lock_ptr_->Acquire();
   const bool trigger_ptu = apps_size_ != applications_.size();
   apps_to_register_list_lock_ptr_->Release();
-  SendUpdateAppList();
+
+  if (is_new_app_registered) {
+    SendUpdateAppList();
+  }
+
   GetPolicyHandler().OnAppsSearchCompleted(trigger_ptu);
 }
 
@@ -3823,13 +4306,18 @@ void ApplicationManagerImpl::OnUpdateHMIAppType(
       if (flag_diffirence_app_hmi_type) {
         (*it)->set_app_types(transform_app_hmi_types);
         (*it)->ChangeSupportingAppHMIType();
-        if ((*it)->hmi_level() == mobile_api::HMILevel::HMI_BACKGROUND) {
+        const mobile_apis::HMILevel::eType app_hmi_level =
+            (*it)->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
+        if (app_hmi_level == mobile_api::HMILevel::HMI_BACKGROUND) {
           MessageHelper::SendUIChangeRegistrationRequestToHMI(*it, *this);
-        } else if (((*it)->hmi_level() == mobile_api::HMILevel::HMI_FULL) ||
-                   ((*it)->hmi_level() == mobile_api::HMILevel::HMI_LIMITED)) {
+        } else if ((app_hmi_level == mobile_api::HMILevel::HMI_FULL) ||
+                   (app_hmi_level == mobile_api::HMILevel::HMI_LIMITED)) {
           MessageHelper::SendUIChangeRegistrationRequestToHMI(*it, *this);
           state_controller().SetRegularState(
-              *it, mobile_apis::HMILevel::HMI_BACKGROUND, true);
+              *it,
+              mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+              mobile_apis::HMILevel::HMI_BACKGROUND,
+              true);
         }
       }
     }
@@ -3845,11 +4333,11 @@ void ApplicationManagerImpl::EraseAppFromReconnectionList(
   }
 
   const auto policy_app_id = app->policy_app_id();
-  sync_primitives::AutoLock lock(reregister_wait_list_lock_);
-  auto app_it = std::find_if(
-      reregister_wait_list_.begin(),
-      reregister_wait_list_.end(),
-      std::bind1st(std::ptr_fun(&policy_app_id_comparator), policy_app_id));
+  sync_primitives::AutoLock lock(reregister_wait_list_lock_ptr_);
+  auto app_it =
+      std::find_if(reregister_wait_list_.begin(),
+                   reregister_wait_list_.end(),
+                   PolicyAppIdComparator(app->device(), policy_app_id));
   if (reregister_wait_list_.end() != app_it) {
     reregister_wait_list_.erase(app_it);
   }
@@ -3881,6 +4369,7 @@ void ApplicationManagerImpl::ProcessReconnection(
 void ApplicationManagerImpl::OnPTUFinished(const bool ptu_result) {
   LOG4CXX_AUTO_TRACE(logger_);
   if (!ptu_result) {
+    protocol_handler_->ProcessFailedPTU();
     return;
   }
 
@@ -3899,6 +4388,25 @@ void ApplicationManagerImpl::OnPTUFinished(const bool ptu_result) {
   plugin_manager_->ForEachPlugin(on_app_policy_updated);
 }
 
+#if defined(EXTERNAL_PROPRIETARY_MODE) && defined(ENABLE_SECURITY)
+void ApplicationManagerImpl::OnCertDecryptFinished(const bool decrypt_result) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!decrypt_result) {
+    protocol_handler_->ProcessFailedCertDecrypt();
+  }
+}
+
+bool ApplicationManagerImpl::OnCertDecryptFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return false;
+}
+#endif
+
+void ApplicationManagerImpl::OnPTUTimeoutExceeded() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  protocol_handler_->ProcessFailedPTU();
+}
+
 void ApplicationManagerImpl::SendDriverDistractionState(
     ApplicationSharedPtr application) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -3951,7 +4459,10 @@ void ApplicationManagerImpl::SendDriverDistractionState(
   const std::string function_id = MessageHelper::StringifiedFunctionID(
       mobile_api::FunctionID::OnDriverDistractionID);
   const mobile_apis::Result::eType check_result =
-      CheckPolicyPermissions(application, function_id, params);
+      CheckPolicyPermissions(application,
+                             mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+                             function_id,
+                             params);
   if (mobile_api::Result::SUCCESS == check_result) {
     rpc_service_->ManageMobileCommand(create_notification(),
                                       commands::Command::SOURCE_SDL);
@@ -4032,6 +4543,34 @@ ApplicationManagerImpl::SupportedSDLVersion() const {
       get_settings().max_supported_protocol_version());
 }
 
+void ApplicationManagerImpl::AddAppToRegisteredAppList(
+    const ApplicationSharedPtr application) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK_OR_RETURN_VOID(application);
+  sync_primitives::AutoLock lock(applications_list_lock_ptr_);
+
+  // Add application to registered app list and set appropriate mark.
+  application->MarkRegistered();
+  applications_.insert(application);
+  LOG4CXX_DEBUG(
+      logger_,
+      "App with app_id: " << application->app_id()
+                          << " has been added to registered applications list");
+  if (application_list_update_timer_.is_running() &&
+      !registered_during_timer_execution_) {
+    GetPolicyHandler().OnAddedNewApplicationToAppList(
+        application->app_id(), application->policy_app_id());
+    registered_during_timer_execution_ = true;
+  }
+  apps_size_ = static_cast<uint32_t>(applications_.size());
+}
+
+void ApplicationManagerImpl::ApplyFunctorForEachPlugin(
+    std::function<void(plugin_manager::RPCPlugin&)> functor) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  plugin_manager_->ForEachPlugin(functor);
+}
+
 event_engine::EventDispatcher& ApplicationManagerImpl::event_dispatcher() {
   return event_dispatcher_;
 }
@@ -4092,39 +4631,62 @@ void ApplicationManagerImpl::ClearTTSGlobalPropertiesList() {
 }
 
 bool ApplicationManagerImpl::IsAppSubscribedForWayPoints(
-    ApplicationSharedPtr app) const {
+    uint32_t app_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(subscribed_way_points_apps_lock_);
   LOG4CXX_DEBUG(logger_,
                 "There are applications subscribed: "
                     << subscribed_way_points_apps_list_.size());
-  if (subscribed_way_points_apps_list_.find(app->app_id()) ==
+  if (subscribed_way_points_apps_list_.find(app_id) ==
       subscribed_way_points_apps_list_.end()) {
     return false;
   }
   return true;
 }
 
-void ApplicationManagerImpl::SubscribeAppForWayPoints(
-    ApplicationSharedPtr app) {
+bool ApplicationManagerImpl::IsAppSubscribedForWayPoints(
+    ApplicationSharedPtr app) const {
+  return IsAppSubscribedForWayPoints(app->app_id());
+}
+
+void ApplicationManagerImpl::SubscribeAppForWayPoints(uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(subscribed_way_points_apps_lock_);
-  LOG4CXX_DEBUG(logger_, "Subscribing " << app->app_id());
-  subscribed_way_points_apps_list_.insert(app->app_id());
+  LOG4CXX_DEBUG(logger_, "Subscribing " << app_id);
+  subscribed_way_points_apps_list_.insert(app_id);
   LOG4CXX_DEBUG(logger_,
                 "There are applications subscribed: "
                     << subscribed_way_points_apps_list_.size());
+  if (way_points_data_) {
+    smart_objects::SmartObjectSPtr way_point_notification_ =
+        std::make_shared<smart_objects::SmartObject>(*way_points_data_);
+    (*way_point_notification_)[strings::params][strings::connection_key] =
+        app_id;
+    GetRPCService().SendMessageToMobile(way_point_notification_);
+  }
 }
 
-void ApplicationManagerImpl::UnsubscribeAppFromWayPoints(
+void ApplicationManagerImpl::SubscribeAppForWayPoints(
     ApplicationSharedPtr app) {
+  SubscribeAppForWayPoints(app->app_id());
+}
+
+void ApplicationManagerImpl::UnsubscribeAppFromWayPoints(uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(subscribed_way_points_apps_lock_);
-  LOG4CXX_DEBUG(logger_, "Unsubscribing " << app->app_id());
-  subscribed_way_points_apps_list_.erase(app->app_id());
+  LOG4CXX_DEBUG(logger_, "Unsubscribing " << app_id);
+  subscribed_way_points_apps_list_.erase(app_id);
   LOG4CXX_DEBUG(logger_,
                 "There are applications subscribed: "
                     << subscribed_way_points_apps_list_.size());
+  if (subscribed_way_points_apps_list_.empty()) {
+    way_points_data_.reset();
+  }
+}
+
+void ApplicationManagerImpl::UnsubscribeAppFromWayPoints(
+    ApplicationSharedPtr app) {
+  UnsubscribeAppFromWayPoints(app->app_id());
 }
 
 bool ApplicationManagerImpl::IsAnyAppSubscribedForWayPoints() const {
@@ -4136,6 +4698,12 @@ bool ApplicationManagerImpl::IsAnyAppSubscribedForWayPoints() const {
   return !subscribed_way_points_apps_list_.empty();
 }
 
+void ApplicationManagerImpl::SaveWayPointsMessage(
+    std::shared_ptr<smart_objects::SmartObject> way_points_message) {
+  sync_primitives::AutoLock lock(subscribed_way_points_apps_lock_);
+  way_points_data_ = way_points_message;
+}
+
 const std::set<uint32_t> ApplicationManagerImpl::GetAppsSubscribedForWayPoints()
     const {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -4242,16 +4810,11 @@ bool ApplicationManagerImpl::IsSOStructValid(
     const smart_objects::SmartObject& display_capabilities) {
   smart_objects::SmartObject display_capabilities_so = display_capabilities;
   if (hmi_so_factory().AttachSchema(struct_id, display_capabilities_so)) {
-    if (display_capabilities_so.isValid()) {
-      return true;
-    } else {
-      return false;
-    }
-  } else {
-    LOG4CXX_ERROR(logger_, "Could not find struct id: " << struct_id);
-    return false;
+    return display_capabilities_so.isValid();
   }
-  return true;
+
+  LOG4CXX_ERROR(logger_, "Could not find struct id: " << struct_id);
+  return false;
 }
 
 #ifdef BUILD_TESTS
@@ -4334,10 +4897,19 @@ void ApplicationManagerImpl::ChangeAppsHMILevel(
     LOG4CXX_ERROR(logger_, "There is no app with id: " << app_id);
     return;
   }
-  const mobile_apis::HMILevel::eType old_level = app->hmi_level();
-  if (old_level != level) {
-    app->set_hmi_level(level);
-    OnHMILevelChanged(app_id, old_level, level);
+
+  const auto old_hmi_state =
+      app->CurrentHmiState(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
+  if (old_hmi_state->hmi_level() != level) {
+    app->set_hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW, level);
+    const auto new_hmi_state =
+        CreateRegularState(app,
+                           mobile_apis::WindowType::MAIN,
+                           level,
+                           old_hmi_state->audio_streaming_state(),
+                           old_hmi_state->video_streaming_state(),
+                           old_hmi_state->system_context());
+    OnHMIStateChanged(app_id, old_hmi_state, new_hmi_state);
   } else {
     LOG4CXX_WARN(logger_, "Redundant changing HMI level: " << level);
   }
diff --git a/src/components/application_manager/src/application_state.cc b/src/components/application_manager/src/application_state.cc
index 2b02e9b658..6ed784424a 100644
--- a/src/components/application_manager/src/application_state.cc
+++ b/src/components/application_manager/src/application_state.cc
@@ -31,7 +31,10 @@
  */
 
 #include "application_manager/application_state.h"
+
 #include <algorithm>
+#include <string>
+
 #include "utils/logger.h"
 #include "utils/macro.h"
 
@@ -53,193 +56,293 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager")
 
 ApplicationState::ApplicationState() {}
 
-void ApplicationState::InitState(HmiStatePtr state) {
+void ApplicationState::InitState(const WindowID window_id,
+                                 const std::string& window_name,
+                                 HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  hmi_states_.clear();
-  hmi_states_.push_back(state);
+  LOG4CXX_DEBUG(logger_,
+                "Initing state " << state << " for window " << window_id
+                                 << " with name " << window_name);
+  {
+    sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+    HmiStates& states = hmi_states_map_[window_id];
+    states.push_back(state);
+  }
 }
 
-void ApplicationState::AddState(HmiStatePtr state) {
+void ApplicationState::AddState(const WindowID window_id, HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
   switch (state->state_id()) {
     case HmiState::StateID::STATE_ID_REGULAR:
-      SetRegularState(state);
+      SetRegularState(window_id, state);
       return;
     case HmiState::StateID::STATE_ID_POSTPONED:
-      SetPostponedState(state);
+      SetPostponedState(window_id, state);
       return;
     case HmiState::StateID::STATE_ID_CURRENT:
-      LOG4CXX_ERROR(logger_, "State of type '" << state << "' can't be added.");
+      LOG4CXX_ERROR(logger_,
+                    "State of type '" << state << "' can't be added for window "
+                                      << window_id);
       return;
     default:
-      AddHMIState(state);
+      AddHMIState(window_id, state);
       break;
   }
 
   return;
 }
 
-void ApplicationState::RemoveState(HmiState::StateID state) {
+void ApplicationState::RemoveState(const WindowID window_id,
+                                   HmiState::StateID state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
   switch (state) {
     case HmiState::StateID::STATE_ID_CURRENT:
     case HmiState::StateID::STATE_ID_REGULAR:
-      LOG4CXX_ERROR(logger_,
-                    "State of type '" << state << "'can't be removed.");
+      if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW == window_id) {
+        LOG4CXX_ERROR(logger_,
+                      "State of type '" << state
+                                        << "' can't be removed for window "
+                                        << window_id);
+        return;
+      }
+
+      RemoveWindowHMIStates(window_id);
       break;
     case HmiState::StateID::STATE_ID_POSTPONED:
-      RemovePostponedState();
+      RemovePostponedState(window_id);
       break;
     default:
-      RemoveHMIState(state);
+      RemoveHMIState(window_id, state);
       break;
   }
 }
 
-HmiStatePtr ApplicationState::GetState(HmiState::StateID state_id) const {
+HmiStatePtr ApplicationState::GetState(const WindowID window_id,
+                                       HmiState::StateID state_id) const {
   switch (state_id) {
     case HmiState::StateID::STATE_ID_REGULAR:
-      LOG4CXX_DEBUG(logger_, "Getting regular state.");
-      return RegularHmiState();
+      LOG4CXX_DEBUG(logger_, "Getting regular state for window " << window_id);
+      return RegularHmiState(window_id);
     case HmiState::StateID::STATE_ID_POSTPONED:
-      LOG4CXX_DEBUG(logger_, "Getting postponed state.");
-      return PostponedHmiState();
+      LOG4CXX_DEBUG(logger_,
+                    "Getting postponed state for window " << window_id);
+      return PostponedHmiState(window_id);
     default:
-      LOG4CXX_DEBUG(logger_, "Getting current state.");
-      return CurrentHmiState();
+      LOG4CXX_DEBUG(logger_, "Getting current state for window " << window_id);
+      return CurrentHmiState(window_id);
+  }
+}
+
+HmiStates ApplicationState::GetStates(const HmiState::StateID state_id) const {
+  LOG4CXX_DEBUG(logger_, "Collecting all states of type " << state_id);
+
+  HmiStates hmi_states;
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  for (const auto& hmi_state_pair : hmi_states_map_) {
+    hmi_states.push_back(GetState(hmi_state_pair.first, state_id));
   }
+
+  return hmi_states;
 }
 
-void ApplicationState::AddHMIState(HmiStatePtr state) {
+WindowIds ApplicationState::GetWindowIds() const {
+  LOG4CXX_DEBUG(logger_, "Collecting available window ID's");
+
+  WindowIds window_ids;
+  std::string stringified_window_ids;
+
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  for (const auto& hmi_state_pair : hmi_states_map_) {
+    window_ids.push_back(hmi_state_pair.first);
+    stringified_window_ids += (stringified_window_ids.empty() ? "" : ", ") +
+                              std::to_string(hmi_state_pair.first);
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Existing window IDs: [" + stringified_window_ids + "]");
+  return window_ids;
+}
+
+void ApplicationState::AddHMIState(const WindowID window_id,
+                                   HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  HmiStates::iterator it = std::find_if(hmi_states_.begin(),
-                                        hmi_states_.end(),
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  HmiStates& hmi_states = hmi_states_map_[window_id];
+  HmiStates::iterator it = std::find_if(hmi_states.begin(),
+                                        hmi_states.end(),
                                         StateIDComparator(state->state_id()));
-  if (hmi_states_.end() != it) {
-    LOG4CXX_WARN(
-        logger_,
-        "Hmi state with ID "
-            << state->state_id()
-            << "has been already applied to this application. Ignoring");
+  if (hmi_states.end() != it) {
+    LOG4CXX_WARN(logger_,
+                 "Hmi state with ID " << state->state_id()
+                                      << "has been already applied for window "
+                                      << window_id
+                                      << " of this application. Ignoring");
     return;
   }
 
-  hmi_states_.push_back(state);
+  hmi_states.push_back(state);
 }
 
-void ApplicationState::RemoveHMIState(HmiState::StateID state_id) {
+void ApplicationState::RemoveHMIState(const WindowID window_id,
+                                      HmiState::StateID state_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  HmiStates& hmi_states = hmi_states_map_[window_id];
   HmiStates::iterator it = std::find_if(
-      hmi_states_.begin(), hmi_states_.end(), StateIDComparator(state_id));
-  if (it == hmi_states_.end()) {
-    LOG4CXX_ERROR(logger_, "Unsuccesful remove HmiState: " << state_id);
+      hmi_states.begin(), hmi_states.end(), StateIDComparator(state_id));
+  if (hmi_states.end() == it) {
+    LOG4CXX_ERROR(logger_,
+                  "Unsuccesful remove HmiState: " << state_id << " for window "
+                                                  << window_id);
     return;
   }
 
   // unable to remove regular state
-  DCHECK_OR_RETURN_VOID(it != hmi_states_.begin());
+  DCHECK_OR_RETURN_VOID(hmi_states.begin() != it);
   HmiStates::iterator next = it;
   HmiStates::iterator prev = it;
   next++;
   prev--;
-  if (next != hmi_states_.end()) {
+
+  if (next != hmi_states.end()) {
     HmiStatePtr next_state = *next;
     HmiStatePtr prev_state = *prev;
     next_state->set_parent(prev_state);
   }
-  hmi_states_.erase(it);
+
+  hmi_states.erase(it);
 }
 
-void ApplicationState::RemovePostponedState() {
+void ApplicationState::RemoveWindowHMIStates(const WindowID window_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  DCHECK_OR_RETURN_VOID(!hmi_states_.empty());
+  DCHECK_OR_RETURN_VOID(mobile_apis::PredefinedWindows::DEFAULT_WINDOW !=
+                        window_id);
+
+  LOG4CXX_DEBUG(logger_,
+                "Removing HMI states for window with id #" << window_id);
+  {
+    sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+    hmi_states_map_.erase(window_id);
+  }
+}
+
+void ApplicationState::RemovePostponedState(const WindowID window_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  HmiStates& hmi_states = hmi_states_map_[window_id];
+  DCHECK_OR_RETURN_VOID(!hmi_states.empty());
 
   StateIDComparator finder(HmiState::StateID::STATE_ID_POSTPONED);
 
   HmiStates::iterator postponed_state =
-      std::find_if(hmi_states_.begin(), hmi_states_.end(), finder);
+      std::find_if(hmi_states.begin(), hmi_states.end(), finder);
 
-  if (hmi_states_.end() == postponed_state) {
-    LOG4CXX_ERROR(logger_, "No postponed state is set for app.");
+  if (hmi_states.end() == postponed_state) {
+    LOG4CXX_ERROR(logger_,
+                  "No postponed state is set for window " << window_id);
     return;
   }
-  hmi_states_.erase(postponed_state);
+
+  hmi_states.erase(postponed_state);
 }
 
-void ApplicationState::SetRegularState(HmiStatePtr state) {
+void ApplicationState::SetRegularState(const WindowID window_id,
+                                       HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
   DCHECK_OR_RETURN_VOID(state->state_id() ==
                         HmiState::StateID::STATE_ID_REGULAR);
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  DCHECK_OR_RETURN_VOID(!hmi_states_.empty());
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  HmiStates& hmi_states = hmi_states_map_[window_id];
+  DCHECK_OR_RETURN_VOID(!hmi_states.empty());
 
-  HmiStatePtr front_state = hmi_states_.front();
+  HmiStatePtr front_state = hmi_states.front();
   HmiState::StateID front_state_id = front_state->state_id();
   if (HmiState::StateID::STATE_ID_POSTPONED == front_state_id) {
     // Drop postponed state
-    hmi_states_.erase(hmi_states_.begin());
+    hmi_states.erase(hmi_states.begin());
   }
 
   // Drop regular state
-  hmi_states_.erase(hmi_states_.begin());
+  hmi_states.erase(hmi_states.begin());
 
-  if (!hmi_states_.empty()) {
-    HmiStatePtr front_state = hmi_states_.front();
+  if (!hmi_states.empty()) {
+    HmiStatePtr front_state = hmi_states.front();
     front_state->set_parent(state);
   }
-  hmi_states_.insert(hmi_states_.begin(), state);
+
+  // Insert new regular state
+  hmi_states.insert(hmi_states.begin(), state);
   if (HmiState::StateID::STATE_ID_POSTPONED == front_state_id) {
-    hmi_states_.insert(hmi_states_.begin(), front_state);
+    // Restore postponed state if it was before
+    hmi_states.insert(hmi_states.begin(), front_state);
   }
 }
 
-void ApplicationState::SetPostponedState(HmiStatePtr state) {
+void ApplicationState::SetPostponedState(const WindowID window_id,
+                                         HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
   DCHECK_OR_RETURN_VOID(state->state_id() ==
                         HmiState::StateID::STATE_ID_POSTPONED);
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  DCHECK_OR_RETURN_VOID(!hmi_states_.empty());
-  HmiStatePtr front_state = hmi_states_.front();
+
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  HmiStates& hmi_states = hmi_states_map_[window_id];
+  DCHECK_OR_RETURN_VOID(!hmi_states.empty());
+  HmiStatePtr front_state = hmi_states.front();
   if (front_state->state_id() == HmiState::StateID::STATE_ID_POSTPONED) {
-    hmi_states_.erase(hmi_states_.begin());
+    hmi_states.erase(hmi_states.begin());
   }
-  hmi_states_.insert(hmi_states_.begin(), state);
+
+  hmi_states.insert(hmi_states.begin(), state);
 }
 
-HmiStatePtr ApplicationState::CurrentHmiState() const {
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  DCHECK_OR_RETURN(!hmi_states_.empty(), HmiStatePtr());
-  HmiStatePtr back_state = hmi_states_.back();
+HmiStatePtr ApplicationState::CurrentHmiState(const WindowID window_id) const {
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  auto it_states = hmi_states_map_.find(window_id);
+  DCHECK_OR_RETURN(it_states != hmi_states_map_.end(), HmiStatePtr());
+
+  const HmiStates& hmi_states = it_states->second;
+  DCHECK_OR_RETURN(!hmi_states.empty(), HmiStatePtr());
+
+  HmiStatePtr back_state = hmi_states.back();
   DCHECK_OR_RETURN(
       back_state->state_id() != HmiState::StateID::STATE_ID_POSTPONED,
       HmiStatePtr());
+
   return back_state;
 }
 
-HmiStatePtr ApplicationState::RegularHmiState() const {
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  DCHECK_OR_RETURN(!hmi_states_.empty(), HmiStatePtr());
-  HmiStates::const_iterator front_itr = hmi_states_.begin();
+HmiStatePtr ApplicationState::RegularHmiState(const WindowID window_id) const {
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  auto it_states = hmi_states_map_.find(window_id);
+  DCHECK_OR_RETURN(it_states != hmi_states_map_.end(), HmiStatePtr());
+
+  const HmiStates& hmi_states = it_states->second;
+  DCHECK_OR_RETURN(!hmi_states.empty(), HmiStatePtr());
+
+  HmiStates::const_iterator front_itr = hmi_states.begin();
   if ((*front_itr)->state_id() == HmiState::StateID::STATE_ID_POSTPONED) {
     ++front_itr;
   }
+
   return *front_itr;
 }
 
-HmiStatePtr ApplicationState::PostponedHmiState() const {
-  sync_primitives::AutoLock auto_lock(hmi_states_lock_);
-  DCHECK_OR_RETURN(!hmi_states_.empty(), HmiStatePtr());
-  HmiStatePtr front_state = hmi_states_.front();
+HmiStatePtr ApplicationState::PostponedHmiState(
+    const WindowID window_id) const {
+  sync_primitives::AutoLock auto_lock(hmi_states_map_lock_);
+  auto it_states = hmi_states_map_.find(window_id);
+  DCHECK_OR_RETURN(it_states != hmi_states_map_.end(), HmiStatePtr());
+
+  const HmiStates& hmi_states = it_states->second;
+  DCHECK_OR_RETURN(!hmi_states.empty(), HmiStatePtr());
+
+  HmiStatePtr front_state = hmi_states.front();
   return front_state->state_id() == HmiState::StateID::STATE_ID_POSTPONED
              ? front_state
              : HmiStatePtr();
diff --git a/src/components/application_manager/src/command_holder_impl.cc b/src/components/application_manager/src/command_holder_impl.cc
index 87ac50ebd7..1c336ac64f 100644
--- a/src/components/application_manager/src/command_holder_impl.cc
+++ b/src/components/application_manager/src/command_holder_impl.cc
@@ -43,20 +43,23 @@ CommandHolderImpl::CommandHolderImpl(ApplicationManager& app_manager)
 void CommandHolderImpl::Suspend(
     ApplicationSharedPtr application,
     CommandType type,
+    commands::Command::CommandSource source,
     std::shared_ptr<smart_objects::SmartObject> command) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(application);
   LOG4CXX_DEBUG(logger_,
                 "Suspending command(s) for application: "
                     << application->policy_app_id());
-  sync_primitives::AutoLock lock(commands_lock_);
 
+  AppCommandInfo info = {command, source};
+
+  sync_primitives::AutoLock lock(commands_lock_);
   if (CommandType::kHmiCommand == type) {
-    app_hmi_commands_[application].push_back(command);
+    app_hmi_commands_[application].push_back(info);
     LOG4CXX_DEBUG(logger_,
                   "Suspended HMI command(s): " << app_hmi_commands_.size());
   } else {
-    app_mobile_commands_[application].push_back(command);
+    app_mobile_commands_[application].push_back(info);
     LOG4CXX_DEBUG(
         logger_,
         "Suspended mobile command(s): " << app_mobile_commands_.size());
@@ -113,8 +116,10 @@ void CommandHolderImpl::ResumeHmiCommand(ApplicationSharedPtr application) {
                 "Resuming HMI command(s): " << app_hmi_commands_.size());
 
   for (auto cmd : app_commands->second) {
-    (*cmd)[strings::msg_params][strings::app_id] = application->hmi_app_id();
-    app_manager_.GetRPCService().ManageHMICommand(cmd);
+    (*cmd.command_ptr_)[strings::msg_params][strings::app_id] =
+        application->hmi_app_id();
+    app_manager_.GetRPCService().ManageHMICommand(cmd.command_ptr_,
+                                                  cmd.command_source_);
   }
 
   app_hmi_commands_.erase(app_commands);
@@ -132,9 +137,10 @@ void CommandHolderImpl::ResumeMobileCommand(ApplicationSharedPtr application) {
                 "Resuming mobile command(s): " << app_mobile_commands_.size());
 
   for (auto cmd : app_commands->second) {
-    (*cmd)[strings::params][strings::connection_key] = application->app_id();
-    app_manager_.GetRPCService().ManageMobileCommand(
-        cmd, commands::Command::CommandSource::SOURCE_MOBILE);
+    (*cmd.command_ptr_)[strings::params][strings::connection_key] =
+        application->app_id();
+    app_manager_.GetRPCService().ManageMobileCommand(cmd.command_ptr_,
+                                                     cmd.command_source_);
   }
 
   app_mobile_commands_.erase(app_commands);
diff --git a/src/components/application_manager/src/commands/command_impl.cc b/src/components/application_manager/src/commands/command_impl.cc
index 521a44890f..3872ae45ab 100644
--- a/src/components/application_manager/src/commands/command_impl.cc
+++ b/src/components/application_manager/src/commands/command_impl.cc
@@ -1,4 +1,4 @@
-/*
+/*
  Copyright (c) 2014, Ford Motor Company
  All rights reserved.
 
@@ -31,8 +31,10 @@
  */
 
 #include "application_manager/commands/command_impl.h"
+
 #include "application_manager/application_impl.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/message_helper.h"
 
 namespace application_manager {
 
@@ -96,10 +98,27 @@ int32_t CommandImpl::function_id() const {
   return (*message_)[strings::params][strings::function_id].asInt();
 }
 
+WindowID CommandImpl::window_id() const {
+  if ((*message_).keyExists(strings::msg_params)) {
+    if ((*message_)[strings::msg_params].keyExists(strings::window_id)) {
+      return (*message_)[strings::msg_params][strings::window_id].asInt();
+    }
+  }
+  return mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
 uint32_t CommandImpl::connection_key() const {
   return (*message_)[strings::params][strings::connection_key].asUInt();
 }
 
+void CommandImpl::set_warning_info(const std::string info) {
+  warning_info_ = info;
+}
+
+std::string CommandImpl::warning_info() const {
+  return warning_info_;
+}
+
 void CommandImpl::onTimeOut() {}
 
 bool CommandImpl::AllowedToTerminate() {
@@ -110,6 +129,111 @@ void CommandImpl::SetAllowedToTerminate(const bool allowed) {
   allowed_to_terminate_ = allowed;
 }
 
+bool CommandImpl::CheckAllowedParameters(const Command::CommandSource source) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const ApplicationSharedPtr app =
+      application_manager_.application(connection_key());
+  if (!app) {
+    LOG4CXX_ERROR(logger_,
+                  "There is no registered application with "
+                  "connection key '"
+                      << connection_key() << "'");
+    return false;
+  }
+
+  RPCParams params;
+
+  const smart_objects::SmartObject& s_map = (*message_)[strings::msg_params];
+  smart_objects::SmartMap::const_iterator iter = s_map.map_begin();
+  smart_objects::SmartMap::const_iterator iter_end = s_map.map_end();
+
+  for (; iter != iter_end; ++iter) {
+    LOG4CXX_DEBUG(logger_, "Request's param: " << iter->first);
+    params.insert(iter->first);
+  }
+
+  mobile_apis::Result::eType check_result =
+      mobile_apis::Result::eType::INVALID_ID;
+  const auto current_window_id = window_id();
+  if (app->WindowIdExists(current_window_id)) {
+    check_result = application_manager_.CheckPolicyPermissions(
+        app,
+        current_window_id,
+        MessageHelper::StringifiedFunctionID(
+            static_cast<mobile_api::FunctionID::eType>(function_id())),
+        params,
+        &parameters_permissions_);
+  }
+
+  // Check, if RPC is allowed by policy
+  if (mobile_apis::Result::SUCCESS != check_result) {
+    mobile_apis::messageType::eType message_type =
+        static_cast<mobile_apis::messageType::eType>(
+            (*message_)[strings::params][strings::message_type].asInt());
+    if (message_type == mobile_apis::messageType::request &&
+        source == Command::CommandSource::SOURCE_MOBILE) {
+      smart_objects::SmartObjectSPtr response =
+          MessageHelper::CreateBlockedByPoliciesResponse(
+              static_cast<mobile_api::FunctionID::eType>(function_id()),
+              check_result,
+              correlation_id(),
+              app->app_id());
+      rpc_service_.SendMessageToMobile(response);
+    }
+
+    return false;
+  }
+
+  // If no parameters specified in policy table, no restriction will be
+  // applied for parameters
+  if (parameters_permissions_.allowed_params.empty() &&
+      parameters_permissions_.disallowed_params.empty() &&
+      parameters_permissions_.undefined_params.empty()) {
+    return true;
+  }
+
+  RemoveDisallowedParameters();
+
+  return true;
+}
+
+void CommandImpl::RemoveDisallowedParameters() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  smart_objects::SmartObject& params = (*message_)[strings::msg_params];
+
+  for (const auto& key : params.enumerate()) {
+    if (parameters_permissions_.disallowed_params.end() !=
+        parameters_permissions_.disallowed_params.find(key)) {
+      // Remove from request all disallowed parameters
+      params.erase(key);
+      removed_parameters_permissions_.disallowed_params.insert(key);
+      LOG4CXX_INFO(logger_,
+                   "Following parameter is disallowed by user: " << key);
+    }
+
+    else if (removed_parameters_permissions_.undefined_params.end() !=
+             removed_parameters_permissions_.undefined_params.find(key)) {
+      // Remove from request all undefined yet parameters
+      params.erase(key);
+      removed_parameters_permissions_.undefined_params.insert(key);
+      LOG4CXX_INFO(logger_,
+                   "Following parameter is disallowed by policy: " << key);
+    }
+
+    else if (parameters_permissions_.allowed_params.end() ==
+             parameters_permissions_.allowed_params.find(key)) {
+      // Remove from request all parameters missed in allowed
+      params.erase(key);
+      removed_parameters_permissions_.undefined_params.insert(key);
+      LOG4CXX_INFO(logger_,
+                   "Following parameter is not found among allowed parameters '"
+                       << key << "' and will be treated as disallowed.");
+    }
+  }
+}
+
 bool CommandImpl::ReplaceMobileWithHMIAppId(
     ns_smart_device_link::ns_smart_objects::SmartObject& message) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -200,5 +324,38 @@ bool CommandImpl::ReplaceHMIWithMobileAppId(
   return true;
 }
 
+uint32_t CommandImpl::CalcCommandInternalConsecutiveNumber(
+    ApplicationConstSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const DataAccessor<CommandsMap> accessor = app->commands_map();
+  const CommandsMap& commands = accessor.GetData();
+
+  uint32_t last_command_number = 0u;
+  if (!commands.empty()) {
+    last_command_number = commands.rbegin()->first;
+  }
+
+  return last_command_number + 1;
+}
+
+bool CommandImpl::CheckSyntax(const std::string& str,
+                              bool allow_empty_line) const {
+  if (std::string::npos != str.find_first_of("\t\n")) {
+    LOG4CXX_ERROR(logger_, "CheckSyntax failed! :" << str);
+    return false;
+  }
+  if (std::string::npos != str.find("\\n") ||
+      std::string::npos != str.find("\\t")) {
+    LOG4CXX_ERROR(logger_, "CheckSyntax failed! :" << str);
+    return false;
+  }
+  if (!allow_empty_line) {
+    if ((std::string::npos == str.find_first_not_of(' '))) {
+      return false;
+    }
+  }
+  return true;
+}
+
 }  // namespace commands
 }  // namespace application_manager
diff --git a/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc b/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc
index bd4fa58c8f..46c1c87699 100644
--- a/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc
+++ b/src/components/application_manager/src/commands/command_notification_from_mobile_impl.cc
@@ -57,6 +57,10 @@ bool CommandNotificationFromMobileImpl::Init() {
   return true;
 }
 
+bool CommandNotificationFromMobileImpl::CheckPermissions() {
+  return CheckAllowedParameters(Command::CommandSource::SOURCE_MOBILE);
+}
+
 bool CommandNotificationFromMobileImpl::CleanUp() {
   return true;
 }
diff --git a/src/components/application_manager/src/commands/command_request_impl.cc b/src/components/application_manager/src/commands/command_request_impl.cc
index f67fde22a0..3f279679a3 100644
--- a/src/components/application_manager/src/commands/command_request_impl.cc
+++ b/src/components/application_manager/src/commands/command_request_impl.cc
@@ -112,7 +112,8 @@ const std::string CreateInfoForUnsupportedResult(
   }
 }
 
-bool CheckResultCode(const ResponseInfo& first, const ResponseInfo& second) {
+bool CommandRequestImpl::CheckResult(const ResponseInfo& first,
+                                     const ResponseInfo& second) const {
   if (first.is_ok && second.is_unsupported_resource) {
     return true;
   }
@@ -144,19 +145,21 @@ struct DisallowedParamsInserter {
       : response_(response), code_(code) {}
 
   bool operator()(const std::string& param) {
-    const VehicleData& vehicle_data =
-        application_manager::MessageHelper::vehicle_data();
-    VehicleData::const_iterator it = vehicle_data.find(param);
-    if (vehicle_data.end() != it) {
-      smart_objects::SmartObjectSPtr disallowed_param =
-          std::make_shared<smart_objects::SmartObject>(
-              smart_objects::SmartType_Map);
-      (*disallowed_param)[strings::data_type] = (*it).second;
-      (*disallowed_param)[strings::result_code] = code_;
-      response_[strings::msg_params][param.c_str()] = *disallowed_param;
-      return true;
-    }
-    return false;
+    smart_objects::SmartObjectSPtr disallowed_param =
+        std::make_shared<smart_objects::SmartObject>(
+            smart_objects::SmartType_Map);
+
+    auto rpc_spec_vehicle_data = MessageHelper::vehicle_data();
+    auto vehicle_data = rpc_spec_vehicle_data.find(param);
+    auto vehicle_data_type =
+        vehicle_data == rpc_spec_vehicle_data.end()
+            ? mobile_apis::VehicleDataType::VEHICLEDATA_OEM_CUSTOM_DATA
+            : vehicle_data->second;
+
+    (*disallowed_param)[strings::data_type] = vehicle_data_type;
+    (*disallowed_param)[strings::result_code] = code_;
+    response_[strings::msg_params][param.c_str()] = *disallowed_param;
+    return true;
   }
 
  private:
@@ -186,13 +189,7 @@ ResponseInfo::ResponseInfo(const hmi_apis::Common_Result::eType result,
   interface_state =
       application_manager.hmi_interfaces().GetInterfaceState(hmi_interface);
 
-  is_ok = Compare<hmi_apis::Common_Result::eType, EQ, ONE>(
-      result_code,
-      hmi_apis::Common_Result::SUCCESS,
-      hmi_apis::Common_Result::WARNINGS,
-      hmi_apis::Common_Result::WRONG_LANGUAGE,
-      hmi_apis::Common_Result::RETRY,
-      hmi_apis::Common_Result::SAVED);
+  is_ok = CommandRequestImpl::IsHMIResultSuccess(result_code);
 
   is_not_used = hmi_apis::Common_Result::INVALID_ENUM == result_code;
 
@@ -225,7 +222,7 @@ bool CommandRequestImpl::Init() {
 }
 
 bool CommandRequestImpl::CheckPermissions() {
-  return CheckAllowedParameters();
+  return CheckAllowedParameters(Command::CommandSource::SOURCE_MOBILE);
 }
 
 bool CommandRequestImpl::CleanUp() {
@@ -301,14 +298,14 @@ void CommandRequestImpl::SendResponse(
     response[strings::msg_params] = *response_params;
   }
 
-  if (info) {
+  if (info && *info != '\0') {
     response[strings::msg_params][strings::info] = std::string(info);
   }
 
   // Add disallowed parameters and info from request back to response with
-  // appropriate
-  // reasons (VehicleData result codes)
-  if (result_code != mobile_apis::Result::APPLICATION_NOT_REGISTERED) {
+  // appropriate reasons (VehicleData result codes)
+  if (result_code != mobile_apis::Result::APPLICATION_NOT_REGISTERED &&
+      result_code != mobile_apis::Result::INVALID_DATA) {
     const mobile_apis::FunctionID::eType& id =
         static_cast<mobile_apis::FunctionID::eType>(function_id());
     if ((id == mobile_apis::FunctionID::SubscribeVehicleDataID) ||
@@ -321,32 +318,23 @@ void CommandRequestImpl::SendResponse(
   }
 
   response[strings::msg_params][strings::success] = success;
-  response[strings::msg_params][strings::result_code] = result_code;
+  if ((result_code == mobile_apis::Result::SUCCESS ||
+       result_code == mobile_apis::Result::WARNINGS) &&
+      !warning_info().empty()) {
+    response[strings::msg_params][strings::info] =
+        (info && *info != '\0') ? std::string(info) + "\n" + warning_info()
+                                : warning_info();
+    response[strings::msg_params][strings::result_code] =
+        mobile_apis::Result::WARNINGS;
+  } else {
+    response[strings::msg_params][strings::result_code] = result_code;
+  }
 
   is_success_result_ = success;
 
   rpc_service_.ManageMobileCommand(result, SOURCE_SDL);
 }
 
-bool CommandRequestImpl::CheckSyntax(const std::string& str,
-                                     bool allow_empty_line) {
-  if (std::string::npos != str.find_first_of("\t\n")) {
-    LOG4CXX_ERROR(logger_, "CheckSyntax failed! :" << str);
-    return false;
-  }
-  if (std::string::npos != str.find("\\n") ||
-      std::string::npos != str.find("\\t")) {
-    LOG4CXX_ERROR(logger_, "CheckSyntax failed! :" << str);
-    return false;
-  }
-  if (!allow_empty_line) {
-    if ((std::string::npos == str.find_first_not_of(' '))) {
-      return false;
-    }
-  }
-  return true;
-}
-
 smart_objects::SmartObject CreateUnsupportedResourceResponse(
     const hmi_apis::FunctionID::eType function_id,
     const uint32_t hmi_correlation_id,
@@ -694,7 +682,8 @@ mobile_apis::Result::eType CommandRequestImpl::GetMobileResultCode(
   return mobile_result;
 }
 
-bool CommandRequestImpl::CheckAllowedParameters() {
+bool CommandRequestImpl::CheckAllowedParameters(
+    const Command::CommandSource source) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   // RegisterAppInterface should always be allowed
@@ -703,59 +692,7 @@ bool CommandRequestImpl::CheckAllowedParameters() {
     return true;
   }
 
-  const ApplicationSharedPtr app =
-      application_manager_.application(connection_key());
-  if (!app) {
-    LOG4CXX_ERROR(logger_,
-                  "There is no registered application with "
-                  "connection key '"
-                      << connection_key() << "'");
-    return false;
-  }
-
-  RPCParams params;
-
-  const smart_objects::SmartObject& s_map = (*message_)[strings::msg_params];
-  smart_objects::SmartMap::const_iterator iter = s_map.map_begin();
-  smart_objects::SmartMap::const_iterator iter_end = s_map.map_end();
-
-  for (; iter != iter_end; ++iter) {
-    LOG4CXX_DEBUG(logger_, "Request's param: " << iter->first);
-    params.insert(iter->first);
-  }
-
-  mobile_apis::Result::eType check_result =
-      application_manager_.CheckPolicyPermissions(
-          app,
-          MessageHelper::StringifiedFunctionID(
-              static_cast<mobile_api::FunctionID::eType>(function_id())),
-          params,
-          &parameters_permissions_);
-
-  // Check, if RPC is allowed by policy
-  if (mobile_apis::Result::SUCCESS != check_result) {
-    smart_objects::SmartObjectSPtr response =
-        MessageHelper::CreateBlockedByPoliciesResponse(
-            static_cast<mobile_api::FunctionID::eType>(function_id()),
-            check_result,
-            correlation_id(),
-            app->app_id());
-
-    rpc_service_.SendMessageToMobile(response);
-    return false;
-  }
-
-  // If no parameters specified in policy table, no restriction will be
-  // applied for parameters
-  if (parameters_permissions_.allowed_params.empty() &&
-      parameters_permissions_.disallowed_params.empty() &&
-      parameters_permissions_.undefined_params.empty()) {
-    return true;
-  }
-
-  RemoveDisallowedParameters();
-
-  return true;
+  return CommandImpl::CheckAllowedParameters(source);
 }
 
 bool CommandRequestImpl::CheckHMICapabilities(
@@ -770,16 +707,14 @@ bool CommandRequestImpl::CheckHMICapabilities(
     return false;
   }
 
-  const SmartObject* button_capabilities_so =
-      hmi_capabilities_.button_capabilities();
-  if (!button_capabilities_so) {
+  auto button_capabilities = hmi_capabilities_.button_capabilities();
+  if (!button_capabilities) {
     LOG4CXX_ERROR(logger_, "Invalid button capabilities object");
     return false;
   }
 
-  const SmartObject& button_capabilities = *button_capabilities_so;
-  for (size_t i = 0; i < button_capabilities.length(); ++i) {
-    const SmartObject& capabilities = button_capabilities[i];
+  for (size_t i = 0; i < button_capabilities->length(); ++i) {
+    const SmartObject& capabilities = (*button_capabilities)[i];
     const ButtonName::eType current_button = static_cast<ButtonName::eType>(
         capabilities.getElement(hmi_response::button_name).asInt());
     if (current_button == button) {
@@ -794,64 +729,7 @@ bool CommandRequestImpl::CheckHMICapabilities(
   return false;
 }
 
-void CommandRequestImpl::RemoveDisallowedParameters() {
-  LOG4CXX_AUTO_TRACE(logger_);
-
-  smart_objects::SmartObject& params = (*message_)[strings::msg_params];
-
-  // Remove from request all disallowed parameters
-  RPCParams::const_iterator it_disallowed =
-      parameters_permissions_.disallowed_params.begin();
-  RPCParams::const_iterator it_disallowed_end =
-      parameters_permissions_.disallowed_params.end();
-  for (; it_disallowed != it_disallowed_end; ++it_disallowed) {
-    if (params.keyExists(*it_disallowed)) {
-      const std::string key = *it_disallowed;
-      params.erase(key);
-      removed_parameters_permissions_.disallowed_params.insert(key);
-      LOG4CXX_INFO(logger_,
-                   "Following parameter is disallowed by user: " << key);
-    }
-  }
-
-  // Remove from request all undefined yet parameters
-  RPCParams::const_iterator it_undefined =
-      parameters_permissions_.undefined_params.begin();
-  RPCParams::const_iterator it_undefined_end =
-      parameters_permissions_.undefined_params.end();
-  for (; it_undefined != it_undefined_end; ++it_undefined) {
-    if (params.keyExists(*it_undefined)) {
-      const std::string key = *it_undefined;
-      params.erase(key);
-      removed_parameters_permissions_.undefined_params.insert(key);
-      LOG4CXX_INFO(logger_,
-                   "Following parameter is disallowed by policy: " << key);
-    }
-  }
-
-  // Remove from request all parameters missed in allowed
-  const VehicleData& vehicle_data =
-      application_manager::MessageHelper::vehicle_data();
-
-  VehicleData::const_iterator it_vehicle_data = vehicle_data.begin();
-  VehicleData::const_iterator it_vehicle_data_end = vehicle_data.end();
-  for (; it_vehicle_data != it_vehicle_data_end; ++it_vehicle_data) {
-    const std::string key = it_vehicle_data->first;
-    if (params.keyExists(key) &&
-        parameters_permissions_.allowed_params.end() ==
-            std::find(parameters_permissions_.allowed_params.begin(),
-                      parameters_permissions_.allowed_params.end(),
-                      key)) {
-      params.erase(key);
-      removed_parameters_permissions_.undefined_params.insert(key);
-      LOG4CXX_INFO(logger_,
-                   "Following parameter is not found among allowed parameters '"
-                       << key << "' and will be treated as disallowed.");
-    }
-  }
-}
-
-void CommandRequestImpl::AddDissalowedParameterToInfoString(
+void CommandRequestImpl::AddDisallowedParameterToInfoString(
     std::string& info, const std::string& param) const {
   // prepare disallowed params enumeration for response info string
   if (info.empty()) {
@@ -868,12 +746,12 @@ void CommandRequestImpl::AddDisallowedParametersToInfo(
   RPCParams::const_iterator it =
       removed_parameters_permissions_.disallowed_params.begin();
   for (; it != removed_parameters_permissions_.disallowed_params.end(); ++it) {
-    AddDissalowedParameterToInfoString(info, (*it));
+    AddDisallowedParameterToInfoString(info, (*it));
   }
 
   it = removed_parameters_permissions_.undefined_params.begin();
   for (; it != removed_parameters_permissions_.undefined_params.end(); ++it) {
-    AddDissalowedParameterToInfoString(info, (*it));
+    AddDisallowedParameterToInfoString(info, (*it));
   }
 
   if (!info.empty()) {
@@ -910,7 +788,7 @@ bool CommandRequestImpl::HasDisallowedParams() const {
 }
 
 bool CommandRequestImpl::IsMobileResultSuccess(
-    mobile_apis::Result::eType result_code) const {
+    const mobile_apis::Result::eType result_code) {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace helpers;
   return Compare<mobile_apis::Result::eType, EQ, ONE>(
@@ -919,21 +797,29 @@ bool CommandRequestImpl::IsMobileResultSuccess(
       mobile_apis::Result::WARNINGS,
       mobile_apis::Result::WRONG_LANGUAGE,
       mobile_apis::Result::RETRY,
-      mobile_apis::Result::SAVED);
+      mobile_apis::Result::SAVED,
+      mobile_apis::Result::TRUNCATED_DATA);
+}
+
+bool CommandRequestImpl::IsHMIResultSuccess(
+    const hmi_apis::Common_Result::eType result_code) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace helpers;
+  return Compare<hmi_apis::Common_Result::eType, EQ, ONE>(
+      result_code,
+      hmi_apis::Common_Result::SUCCESS,
+      hmi_apis::Common_Result::WARNINGS,
+      hmi_apis::Common_Result::WRONG_LANGUAGE,
+      hmi_apis::Common_Result::RETRY,
+      hmi_apis::Common_Result::SAVED,
+      hmi_apis::Common_Result::TRUNCATED_DATA);
 }
 
 bool CommandRequestImpl::PrepareResultForMobileResponse(
     hmi_apis::Common_Result::eType result_code,
     HmiInterfaces::InterfaceID interface) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  using namespace helpers;
-  if (Compare<hmi_apis::Common_Result::eType, EQ, ONE>(
-          result_code,
-          hmi_apis::Common_Result::SUCCESS,
-          hmi_apis::Common_Result::WARNINGS,
-          hmi_apis::Common_Result::WRONG_LANGUAGE,
-          hmi_apis::Common_Result::RETRY,
-          hmi_apis::Common_Result::SAVED)) {
+  if (IsHMIResultSuccess(result_code)) {
     return true;
   }
 
@@ -949,8 +835,8 @@ bool CommandRequestImpl::PrepareResultForMobileResponse(
 bool CommandRequestImpl::PrepareResultForMobileResponse(
     ResponseInfo& out_first, ResponseInfo& out_second) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  bool result = CheckResultCode(out_first, out_second) ||
-                CheckResultCode(out_second, out_first);
+  bool result =
+      CheckResult(out_first, out_second) || CheckResult(out_second, out_first);
   return result;
 }
 
diff --git a/src/components/application_manager/src/commands/command_request_to_mobile.cc b/src/components/application_manager/src/commands/command_request_to_mobile.cc
index e1ed06e887..add58c9973 100644
--- a/src/components/application_manager/src/commands/command_request_to_mobile.cc
+++ b/src/components/application_manager/src/commands/command_request_to_mobile.cc
@@ -55,6 +55,10 @@ bool CommandRequestToMobile::Init() {
   return true;
 }
 
+bool CommandRequestToMobile::CheckPermissions() {
+  return CheckAllowedParameters(Command::CommandSource::SOURCE_SDL);
+}
+
 bool CommandRequestToMobile::CleanUp() {
   return true;
 }
diff --git a/src/components/application_manager/src/commands/command_response_from_mobile.cc b/src/components/application_manager/src/commands/command_response_from_mobile.cc
index dfed65b134..1e31ca8ff5 100644
--- a/src/components/application_manager/src/commands/command_response_from_mobile.cc
+++ b/src/components/application_manager/src/commands/command_response_from_mobile.cc
@@ -56,6 +56,10 @@ bool CommandResponseFromMobile::Init() {
   return true;
 }
 
+bool CommandResponseFromMobile::CheckPermissions() {
+  return CheckAllowedParameters(Command::CommandSource::SOURCE_MOBILE);
+}
+
 bool CommandResponseFromMobile::CleanUp() {
   return true;
 }
diff --git a/src/components/application_manager/src/commands/request_from_hmi.cc b/src/components/application_manager/src/commands/request_from_hmi.cc
index 873d9a844f..eb9d914f00 100644
--- a/src/components/application_manager/src/commands/request_from_hmi.cc
+++ b/src/components/application_manager/src/commands/request_from_hmi.cc
@@ -90,13 +90,26 @@ void RequestFromHMI::SendResponse(
   FillCommonParametersOfSO(*message, correlation_id, function_id);
   (*message)[strings::params][strings::message_type] = MessageType::kResponse;
   (*message)[strings::params][hmi_response::code] = result_code;
-  (*message)[strings::msg_params][strings::success] = success;
-  (*message)[strings::msg_params][strings::result_code] = result_code;
 
   if (response_params) {
     (*message)[strings::msg_params] = *response_params;
   }
 
+  (*message)[strings::msg_params][strings::success] = success;
+  if ((result_code == hmi_apis::Common_Result::SUCCESS ||
+       result_code == hmi_apis::Common_Result::WARNINGS) &&
+      !warning_info().empty()) {
+    bool has_info = (*message)[strings::params].keyExists(strings::error_msg);
+    (*message)[strings::params][strings::error_msg] =
+        has_info ? (*message)[strings::params][strings::error_msg].asString() +
+                       "\n" + warning_info()
+                 : warning_info();
+    (*message)[strings::msg_params][strings::result_code] =
+        mobile_apis::Result::WARNINGS;
+  } else {
+    (*message)[strings::msg_params][strings::result_code] = result_code;
+  }
+
   rpc_service_.ManageHMICommand(message, source);
 }
 
@@ -199,7 +212,7 @@ void RequestFromHMI::SendProviderRequest(
   if (hmi_destination) {
     LOG4CXX_DEBUG(logger_, "Sending Request to HMI Provider");
     application_manager_.IncreaseForwardedRequestTimeout(
-        application_manager::request_controller::RequestInfo::HmiConnectoinKey,
+        application_manager::request_controller::RequestInfo::HmiConnectionKey,
         correlation_id());
     SendHMIRequest(hmi_function_id, &(*msg)[strings::msg_params], use_events);
     return;
@@ -217,7 +230,7 @@ void RequestFromHMI::SendProviderRequest(
 
   LOG4CXX_DEBUG(logger_, "Sending Request to Mobile Provider");
   application_manager_.IncreaseForwardedRequestTimeout(
-      application_manager::request_controller::RequestInfo::HmiConnectoinKey,
+      application_manager::request_controller::RequestInfo::HmiConnectionKey,
       correlation_id());
   SendMobileRequest(
       mobile_function_id, app, &(*msg)[strings::msg_params], use_events);
diff --git a/src/components/application_manager/src/display_capabilities_builder.cc b/src/components/application_manager/src/display_capabilities_builder.cc
new file mode 100644
index 0000000000..8234128280
--- /dev/null
+++ b/src/components/application_manager/src/display_capabilities_builder.cc
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "application_manager/display_capabilities_builder.h"
+#include "application_manager/message_helper.h"
+#include "application_manager/smart_object_keys.h"
+namespace application_manager {
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "DisplayCapabilitiesBuilder")
+
+const WindowID kDefaultWindowID = 0;
+
+DisplayCapabilitiesBuilder::DisplayCapabilitiesBuilder(Application& application)
+    : owner_(application) {
+  LOG4CXX_AUTO_TRACE(logger_);
+}
+
+void DisplayCapabilitiesBuilder::InitBuilder(
+    DisplayCapabilitiesBuilder::ResumeCallback resume_callback,
+    const smart_objects::SmartObject& windows_info) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(display_capabilities_lock_);
+  resume_callback_ = resume_callback;
+  window_ids_to_resume_.insert(kDefaultWindowID);
+  for (size_t i = 0; i < windows_info.length(); ++i) {
+    auto window_id = windows_info[i][strings::window_id].asInt();
+    LOG4CXX_DEBUG(logger_,
+                  "Inserting " << window_id << " to waiting container");
+    window_ids_to_resume_.insert(window_id);
+  }
+}
+
+void DisplayCapabilitiesBuilder::UpdateDisplayCapabilities(
+    const smart_objects::SmartObject& incoming_display_capabilities) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace smart_objects;
+  sync_primitives::AutoLock lock(display_capabilities_lock_);
+
+  if (!display_capabilities_) {
+    display_capabilities_ = std::make_shared<SmartObject>(SmartType_Array);
+  }
+
+  // As per v6.0, only single display is supported
+  auto cur_window_caps =
+      (*display_capabilities_)[0][strings::window_capabilities];
+
+  const auto& inc_window_caps =
+      incoming_display_capabilities[0][strings::window_capabilities];
+
+  for (size_t i = 0; i < inc_window_caps.length(); ++i) {
+    const WindowID window_id =
+        inc_window_caps[i].keyExists(strings::window_id)
+            ? inc_window_caps[i][strings::window_id].asInt()
+            : kDefaultWindowID;
+    if (window_ids_to_resume_.end() != window_ids_to_resume_.find(window_id)) {
+      cur_window_caps[cur_window_caps.length()] = inc_window_caps[i];
+      LOG4CXX_DEBUG(logger_, "Stop waiting for: " << window_id);
+      window_ids_to_resume_.erase(window_id);
+    }
+  }
+
+  *display_capabilities_ = incoming_display_capabilities;
+  (*display_capabilities_)[0][strings::window_capabilities] = cur_window_caps;
+
+  if (window_ids_to_resume_.empty()) {
+    LOG4CXX_TRACE(logger_, "Invoking resume callback");
+    resume_callback_(owner_, *display_capabilities_);
+    display_capabilities_.reset();
+  }
+}  // namespace application_manager
+
+const smart_objects::SmartObjectSPtr
+DisplayCapabilitiesBuilder::display_capabilities() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return display_capabilities_;
+}
+
+void DisplayCapabilitiesBuilder::ResetDisplayCapabilities() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(display_capabilities_lock_);
+  display_capabilities_.reset();
+}
+
+void DisplayCapabilitiesBuilder::StopWaitingForWindow(
+    const WindowID window_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(display_capabilities_lock_);
+  LOG4CXX_DEBUG(logger_,
+                "Window id " << window_id << " will be erased due to failure");
+  window_ids_to_resume_.erase(window_id);
+  if (window_ids_to_resume_.empty()) {
+    LOG4CXX_TRACE(logger_,
+                  window_id << " was the last window pending resumption. "
+                               "Invoking resume callback");
+    resume_callback_(owner_, *display_capabilities_);
+    display_capabilities_.reset();
+  }
+}
+}  // namespace application_manager
diff --git a/src/components/application_manager/src/event_engine/event_observer.cc b/src/components/application_manager/src/event_engine/event_observer.cc
index fc252d3125..e17203f2f2 100644
--- a/src/components/application_manager/src/event_engine/event_observer.cc
+++ b/src/components/application_manager/src/event_engine/event_observer.cc
@@ -57,10 +57,6 @@ void EventObserver::unsubscribe_from_event(const Event::EventID& event_id) {
   event_dispatcher_.remove_observer(event_id, *this);
 }
 
-void EventObserver::unsubscribe_from_all_events() {
-  event_dispatcher_.remove_observer(*this);
-}
-
 void EventObserver::unsubscribe_from_all_hmi_events() {
   event_dispatcher_.remove_observer(*this);
 }
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc
index 4fce94df0f..b9e0d99dff 100644
--- a/src/components/application_manager/src/hmi_capabilities_impl.cc
+++ b/src/components/application_manager/src/hmi_capabilities_impl.cc
@@ -339,6 +339,8 @@ void InitCapabilities() {
   image_field_name_enum.insert(
       std::make_pair(std::string("locationImage"),
                      hmi_apis::Common_ImageFieldName::locationImage));
+  image_field_name_enum.insert(std::make_pair(
+      std::string("alertIcon"), hmi_apis::Common_ImageFieldName::alertIcon));
 
   file_type_enum.insert(std::make_pair(std::string("GRAPHIC_BMP"),
                                        hmi_apis::Common_FileType::GRAPHIC_BMP));
@@ -377,6 +379,8 @@ void InitCapabilities() {
       std::make_pair(std::string("MFD5"), hmi_apis::Common_DisplayType::MFD5));
   display_type_enum.insert(std::make_pair(
       std::string("GEN3_8_INCH"), hmi_apis::Common_DisplayType::GEN3_8_INCH));
+  display_type_enum.insert(std::make_pair(
+      std::string("SDL_GENERIC"), hmi_apis::Common_DisplayType::SDL_GENERIC));
 
   character_set_enum.insert(std::make_pair(
       std::string("TYPE2SET"), hmi_apis::Common_CharacterSet::TYPE2SET));
@@ -446,7 +450,11 @@ HMICapabilitiesImpl::HMICapabilitiesImpl(ApplicationManager& app_mngr)
     , phone_capability_(NULL)
     , video_streaming_capability_(NULL)
     , rc_capability_(NULL)
+<<<<<<< HEAD
     , driver_distraction_capability_(NULL)
+=======
+    , seat_location_capability_(NULL)
+>>>>>>> origin/develop
     , app_mngr_(app_mngr)
     , hmi_language_handler_(app_mngr) {
   InitCapabilities();
@@ -461,20 +469,9 @@ HMICapabilitiesImpl::HMICapabilitiesImpl(ApplicationManager& app_mngr)
 }
 
 HMICapabilitiesImpl::~HMICapabilitiesImpl() {
-  delete vehicle_type_;
   delete ui_supported_languages_;
   delete tts_supported_languages_;
   delete vr_supported_languages_;
-  delete display_capabilities_;
-  delete hmi_zone_capabilities_;
-  delete soft_buttons_capabilities_;
-  delete button_capabilities_;
-  delete preset_bank_capabilities_;
-  delete vr_capabilities_;
-  delete speech_capabilities_;
-  delete audio_pass_thru_capabilities_;
-  delete pcm_stream_capabilities_;
-  delete prerecorded_speech_;
   delete navigation_capability_;
   delete phone_capability_;
   delete video_streaming_capability_;
@@ -482,13 +479,14 @@ HMICapabilitiesImpl::~HMICapabilitiesImpl() {
 }
 
 bool HMICapabilitiesImpl::VerifyImageType(const int32_t image_type) const {
-  if (!display_capabilities_) {
+  auto capabilities = display_capabilities();
+  if (!capabilities) {
     return false;
   }
 
-  if (display_capabilities_->keyExists(hmi_response::image_capabilities)) {
+  if (capabilities->keyExists(hmi_response::image_capabilities)) {
     const smart_objects::SmartObject& image_caps =
-        display_capabilities_->getElement(hmi_response::image_capabilities);
+        capabilities->getElement(hmi_response::image_capabilities);
     for (uint32_t i = 0; i < image_caps.length(); ++i) {
       if (image_caps.getElement(i).asInt() == image_type) {
         return true;
@@ -602,98 +600,87 @@ void HMICapabilitiesImpl::set_display_capabilities(
   if (app_mngr_.IsSOStructValid(
           hmi_apis::StructIdentifiers::Common_DisplayCapabilities,
           display_capabilities)) {
-    if (display_capabilities_) {
-      delete display_capabilities_;
-    }
-    display_capabilities_ =
-        new smart_objects::SmartObject(display_capabilities);
+    smart_objects::SmartObjectSPtr new_value =
+        std::make_shared<smart_objects::SmartObject>(display_capabilities);
+    display_capabilities_.swap(new_value);
   }
 }
 
+void HMICapabilitiesImpl::set_system_display_capabilities(
+    const smart_objects::SmartObject& display_capabilities) {
+  system_display_capabilities_.reset(
+      new smart_objects::SmartObject(display_capabilities));
+}
+
 void HMICapabilitiesImpl::set_hmi_zone_capabilities(
     const smart_objects::SmartObject& hmi_zone_capabilities) {
-  if (hmi_zone_capabilities_) {
-    delete hmi_zone_capabilities_;
-  }
-  hmi_zone_capabilities_ =
-      new smart_objects::SmartObject(hmi_zone_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(hmi_zone_capabilities);
+  hmi_zone_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_soft_button_capabilities(
     const smart_objects::SmartObject& soft_button_capabilities) {
-  if (soft_buttons_capabilities_) {
-    delete soft_buttons_capabilities_;
-  }
-  soft_buttons_capabilities_ =
-      new smart_objects::SmartObject(soft_button_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(soft_button_capabilities);
+  soft_buttons_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_button_capabilities(
     const smart_objects::SmartObject& button_capabilities) {
-  if (button_capabilities_) {
-    delete button_capabilities_;
-  }
-  button_capabilities_ = new smart_objects::SmartObject(button_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(button_capabilities);
+  button_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_vr_capabilities(
     const smart_objects::SmartObject& vr_capabilities) {
-  if (vr_capabilities_) {
-    delete vr_capabilities_;
-  }
-  vr_capabilities_ = new smart_objects::SmartObject(vr_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(vr_capabilities);
+  vr_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_speech_capabilities(
     const smart_objects::SmartObject& speech_capabilities) {
-  if (speech_capabilities_) {
-    delete speech_capabilities_;
-  }
-  speech_capabilities_ = new smart_objects::SmartObject(speech_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(speech_capabilities);
+  speech_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_audio_pass_thru_capabilities(
     const smart_objects::SmartObject& audio_pass_thru_capabilities) {
-  if (audio_pass_thru_capabilities_) {
-    delete audio_pass_thru_capabilities_;
-  }
-  audio_pass_thru_capabilities_ =
-      new smart_objects::SmartObject(audio_pass_thru_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(
+          audio_pass_thru_capabilities);
+  audio_pass_thru_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_pcm_stream_capabilities(
     const smart_objects::SmartObject& pcm_stream_capabilities) {
-  if (pcm_stream_capabilities_) {
-    delete pcm_stream_capabilities_;
-  }
-  pcm_stream_capabilities_ =
-      new smart_objects::SmartObject(pcm_stream_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(pcm_stream_capabilities);
+  pcm_stream_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_preset_bank_capabilities(
     const smart_objects::SmartObject& preset_bank_capabilities) {
-  if (preset_bank_capabilities_) {
-    delete preset_bank_capabilities_;
-  }
-  preset_bank_capabilities_ =
-      new smart_objects::SmartObject(preset_bank_capabilities);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(preset_bank_capabilities);
+  preset_bank_capabilities_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_vehicle_type(
     const smart_objects::SmartObject& vehicle_type) {
-  if (vehicle_type_) {
-    delete vehicle_type_;
-  }
-  vehicle_type_ = new smart_objects::SmartObject(vehicle_type);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(vehicle_type);
+  vehicle_type_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_prerecorded_speech(
     const smart_objects::SmartObject& prerecorded_speech) {
-  if (prerecorded_speech_) {
-    delete prerecorded_speech_;
-    prerecorded_speech_ = NULL;
-  }
-  prerecorded_speech_ = new smart_objects::SmartObject(prerecorded_speech);
+  smart_objects::SmartObjectSPtr new_value =
+      std::make_shared<smart_objects::SmartObject>(prerecorded_speech);
+  prerecorded_speech_.swap(new_value);
 }
 
 void HMICapabilitiesImpl::set_navigation_supported(const bool supported) {
@@ -750,6 +737,7 @@ void HMICapabilitiesImpl::set_rc_capability(
   rc_capability_ = new smart_objects::SmartObject(rc_capability);
 }
 
+<<<<<<< HEAD
 void HMICapabilitiesImpl::set_driver_distraction_capability(
     const smart_objects::SmartObject& driver_distraction_capability) {
   if (driver_distraction_capability_) {
@@ -761,6 +749,20 @@ void HMICapabilitiesImpl::set_driver_distraction_capability(
 
 void HMICapabilitiesImpl::Init(resumption::LastState* last_state) {
   hmi_language_handler_.Init(last_state);
+=======
+void HMICapabilitiesImpl::set_seat_location_capability(
+    const smart_objects::SmartObject& seat_location_capability) {
+  if (seat_location_capability_) {
+    delete seat_location_capability_;
+  }
+  seat_location_capability_ =
+      new smart_objects::SmartObject(seat_location_capability);
+}
+
+void HMICapabilitiesImpl::Init(
+    resumption::LastStateWrapperPtr last_state_wrapper) {
+  hmi_language_handler_.Init(last_state_wrapper);
+>>>>>>> origin/develop
   if (false == load_capabilities_from_file()) {
     LOG4CXX_ERROR(logger_, "file hmi_capabilities.json was not loaded");
   } else {
@@ -770,6 +772,8 @@ void HMICapabilitiesImpl::Init(resumption::LastState* last_state) {
       ui_language_, vr_language_, tts_language_);
 }
 
+void HMICapabilitiesImpl::Init(resumption::LastState*) {}
+
 bool HMICapabilitiesImpl::is_ui_cooperating() const {
   return is_ui_cooperating_;
 }
@@ -809,46 +813,52 @@ const smart_objects::SmartObject* HMICapabilitiesImpl::tts_supported_languages()
   return tts_supported_languages_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::display_capabilities()
+const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::display_capabilities()
     const {
   return display_capabilities_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::hmi_zone_capabilities()
-    const {
+const smart_objects::SmartObjectSPtr
+HMICapabilitiesImpl::system_display_capabilities() const {
+  return system_display_capabilities_;
+}
+
+const smart_objects::SmartObjectSPtr
+HMICapabilitiesImpl::hmi_zone_capabilities() const {
   return hmi_zone_capabilities_;
 }
 
-const smart_objects::SmartObject*
+const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::soft_button_capabilities() const {
   return soft_buttons_capabilities_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::button_capabilities()
+const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::button_capabilities()
     const {
   return button_capabilities_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::speech_capabilities()
+const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::speech_capabilities()
     const {
   return speech_capabilities_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::vr_capabilities() const {
+const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::vr_capabilities()
+    const {
   return vr_capabilities_;
 }
 
-const smart_objects::SmartObject*
+const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::audio_pass_thru_capabilities() const {
   return audio_pass_thru_capabilities_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::pcm_stream_capabilities()
-    const {
+const smart_objects::SmartObjectSPtr
+HMICapabilitiesImpl::pcm_stream_capabilities() const {
   return pcm_stream_capabilities_;
 }
 
-const smart_objects::SmartObject*
+const smart_objects::SmartObjectSPtr
 HMICapabilitiesImpl::preset_bank_capabilities() const {
   return preset_bank_capabilities_;
 }
@@ -857,11 +867,11 @@ bool HMICapabilitiesImpl::attenuated_supported() const {
   return attenuated_supported_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::vehicle_type() const {
+const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::vehicle_type() const {
   return vehicle_type_;
 }
 
-const smart_objects::SmartObject* HMICapabilitiesImpl::prerecorded_speech()
+const smart_objects::SmartObjectSPtr HMICapabilitiesImpl::prerecorded_speech()
     const {
   return prerecorded_speech_;
 }
@@ -906,8 +916,13 @@ const smart_objects::SmartObject* HMICapabilitiesImpl::rc_capability() const {
 }
 
 const smart_objects::SmartObject*
+<<<<<<< HEAD
 HMICapabilitiesImpl::driver_distraction_capability() const {
   return driver_distraction_capability_;
+=======
+HMICapabilitiesImpl::seat_location_capability() const {
+  return seat_location_capability_;
+>>>>>>> origin/develop
 }
 
 bool HMICapabilitiesImpl::load_capabilities_from_file() {
@@ -923,11 +938,17 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
   }
 
   try {
-    Json::Reader reader_;
+    Json::CharReaderBuilder reader_builder;
+    const std::unique_ptr<Json::CharReader> reader_(
+        reader_builder.newCharReader());
+    JSONCPP_STRING err;
     Json::Value root_json;
+    const size_t json_len = json_string.length();
 
-    bool result = reader_.parse(json_string, root_json, false);
+    const bool result = reader_->parse(
+        json_string.c_str(), json_string.c_str() + json_len, &root_json, &err);
     if (!result) {
+      LOG4CXX_DEBUG(logger_, "Json parsing fails: " << err);
       return false;
     }
     // UI
@@ -1091,27 +1112,16 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
       if (check_existing_json_member(ui, "audioPassThruCapabilities")) {
         Json::Value audio_capabilities =
             ui.get("audioPassThruCapabilities", "");
-        smart_objects::SmartObject audio_capabilities_so =
-            smart_objects::SmartObject(smart_objects::SmartType_Array);
-        audio_capabilities_so =
-            smart_objects::SmartObject(smart_objects::SmartType_Map);
-        if (check_existing_json_member(audio_capabilities, "samplingRate")) {
-          audio_capabilities_so["samplingRate"] =
-              sampling_rate_enum
-                  .find(audio_capabilities.get("samplingRate", "").asString())
-                  ->second;
-        }
-        if (check_existing_json_member(audio_capabilities, "bitsPerSample")) {
-          audio_capabilities_so["bitsPerSample"] =
-              bit_per_sample_enum
-                  .find(audio_capabilities.get("bitsPerSample", "").asString())
-                  ->second;
-        }
-        if (check_existing_json_member(audio_capabilities, "audioType")) {
-          audio_capabilities_so["audioType"] =
-              audio_type_enum
-                  .find(audio_capabilities.get("audioType", "").asString())
-                  ->second;
+        smart_objects::SmartObject audio_capabilities_so(
+            smart_objects::SmartType_Array);
+        if (audio_capabilities.type() == Json::arrayValue) {
+          for (uint32_t i = 0; i < audio_capabilities.size(); i++) {
+            convert_audio_capability_to_obj(audio_capabilities[i],
+                                            audio_capabilities_so[i]);
+          }
+        } else if (audio_capabilities.type() == Json::objectValue) {
+          convert_audio_capability_to_obj(audio_capabilities,
+                                          audio_capabilities_so[0]);
         }
         set_audio_pass_thru_capabilities(audio_capabilities_so);
       }
@@ -1120,26 +1130,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
         Json::Value pcm_capabilities = ui.get("pcmStreamCapabilities", "");
         smart_objects::SmartObject pcm_capabilities_so =
             smart_objects::SmartObject(smart_objects::SmartType_Map);
-
-        if (check_existing_json_member(pcm_capabilities, "samplingRate")) {
-          pcm_capabilities_so["samplingRate"] =
-              sampling_rate_enum
-                  .find(pcm_capabilities.get("samplingRate", "").asString())
-                  ->second;
-        }
-        if (check_existing_json_member(pcm_capabilities, "bitsPerSample")) {
-          pcm_capabilities_so["bitsPerSample"] =
-              bit_per_sample_enum
-                  .find(pcm_capabilities.get("bitsPerSample", "").asString())
-                  ->second;
-        }
-        if (check_existing_json_member(pcm_capabilities, "audioType")) {
-          pcm_capabilities_so["audioType"] =
-              audio_type_enum
-                  .find(pcm_capabilities.get("audioType", "").asString())
-                  ->second;
-        }
-
+        convert_audio_capability_to_obj(pcm_capabilities, pcm_capabilities_so);
         set_pcm_stream_capabilities(pcm_capabilities_so);
       }
 
@@ -1160,6 +1151,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
             soft_button_capabilities, soft_button_capabilities_so);
         set_soft_button_capabilities(soft_button_capabilities_so);
       }
+
       if (check_existing_json_member(ui, "systemCapabilities")) {
         Json::Value system_capabilities = ui.get("systemCapabilities", "");
         if (check_existing_json_member(system_capabilities,
@@ -1263,6 +1255,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
           }
         }
         if (check_existing_json_member(system_capabilities,
+<<<<<<< HEAD
                                        "driverDistractionCapability")) {
           Json::Value driver_distraction_capability =
               system_capabilities.get("driverDistractionCapability", "");
@@ -1273,6 +1266,15 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() {
           if (!driver_distraction_capability_so.empty()) {
             set_driver_distraction_supported(true);
           }
+=======
+                                       "seatLocationCapability")) {
+          Json::Value seat_location_capability =
+              system_capabilities.get("seatLocationCapability", "");
+          smart_objects::SmartObject seat_location_capability_so;
+          formatters::CFormatterJsonBase::jsonValueToObj(
+              seat_location_capability, seat_location_capability_so);
+          set_seat_location_capability(seat_location_capability_so);
+>>>>>>> origin/develop
         }
       }
     }  // UI end
@@ -1408,6 +1410,27 @@ void HMICapabilitiesImpl::convert_json_languages_to_obj(
   }
 }
 
+void HMICapabilitiesImpl::convert_audio_capability_to_obj(
+    const Json::Value& capability,
+    smart_objects::SmartObject& output_so) const {
+  if (check_existing_json_member(capability, "samplingRate")) {
+    output_so[strings::sampling_rate] =
+        sampling_rate_enum.find(capability.get("samplingRate", "").asString())
+            ->second;
+  }
+  if (check_existing_json_member(capability, "bitsPerSample")) {
+    output_so[strings::bits_per_sample] =
+        bit_per_sample_enum
+            .find(capability.get("bitsPerSample", "").asString())
+            ->second;
+  }
+  if (check_existing_json_member(capability, "audioType")) {
+    output_so[strings::audio_type] =
+        audio_type_enum.find(capability.get("audioType", "").asString())
+            ->second;
+  }
+}
+
 HMILanguageHandler& HMICapabilitiesImpl::get_hmi_language_handler() {
   return hmi_language_handler_;
 }
diff --git a/src/components/application_manager/src/hmi_interfaces_impl.cc b/src/components/application_manager/src/hmi_interfaces_impl.cc
index 59ae8e88d8..0c33ea4b11 100644
--- a/src/components/application_manager/src/hmi_interfaces_impl.cc
+++ b/src/components/application_manager/src/hmi_interfaces_impl.cc
@@ -103,6 +103,8 @@ generate_function_to_interface_convert_map() {
       HmiInterfaces::HMI_INTERFACE_BasicCommunication;
   convert_map[BasicCommunication_OnEventChanged] =
       HmiInterfaces::HMI_INTERFACE_BasicCommunication;
+  convert_map[BasicCommunication_OnServiceUpdate] =
+      HmiInterfaces::HMI_INTERFACE_BasicCommunication;
   convert_map[BasicCommunication_GetFilePath] =
       HmiInterfaces::HMI_INTERFACE_BasicCommunication;
   convert_map[BasicCommunication_CloseApplication] =
@@ -138,12 +140,15 @@ generate_function_to_interface_convert_map() {
   convert_map[UI_AddSubMenu] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_DeleteSubMenu] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_ShowAppMenu] = HmiInterfaces::HMI_INTERFACE_UI;
+  convert_map[UI_CreateWindow] = HmiInterfaces::HMI_INTERFACE_UI;
+  convert_map[UI_DeleteWindow] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_PerformInteraction] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_SetMediaClockTimer] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_SetGlobalProperties] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_OnCommand] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_OnSystemContext] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_GetCapabilities] = HmiInterfaces::HMI_INTERFACE_UI;
+  convert_map[UI_CancelInteraction] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_ChangeRegistration] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_OnLanguageChange] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_GetSupportedLanguages] = HmiInterfaces::HMI_INTERFACE_UI;
@@ -151,7 +156,6 @@ generate_function_to_interface_convert_map() {
   convert_map[UI_OnDriverDistraction] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_SetAppIcon] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_SetDisplayLayout] = HmiInterfaces::HMI_INTERFACE_UI;
-  convert_map[UI_ShowCustomForm] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_OnKeyboardInput] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_OnTouchEvent] = HmiInterfaces::HMI_INTERFACE_UI;
   convert_map[UI_Slider] = HmiInterfaces::HMI_INTERFACE_UI;
@@ -222,7 +226,6 @@ generate_function_to_interface_convert_map() {
   convert_map[SDL_OnStatusUpdate] = HmiInterfaces::HMI_INTERFACE_SDL;
   convert_map[SDL_OnSystemError] = HmiInterfaces::HMI_INTERFACE_SDL;
   convert_map[SDL_AddStatisticsInfo] = HmiInterfaces::HMI_INTERFACE_SDL;
-  convert_map[SDL_GetURLS] = HmiInterfaces::HMI_INTERFACE_SDL;
   convert_map[RC_IsReady] = HmiInterfaces::HMI_INTERFACE_RC;
   convert_map[RC_GetCapabilities] = HmiInterfaces::HMI_INTERFACE_RC;
   convert_map[Buttons_ButtonPress] = HmiInterfaces::HMI_INTERFACE_RC;
@@ -232,6 +235,7 @@ generate_function_to_interface_convert_map() {
       HmiInterfaces::HMI_INTERFACE_RC;
   convert_map[RC_OnInteriorVehicleData] = HmiInterfaces::HMI_INTERFACE_RC;
   convert_map[RC_OnRemoteControlSettings] = HmiInterfaces::HMI_INTERFACE_RC;
+  convert_map[RC_SetGlobalProperties] = HmiInterfaces::HMI_INTERFACE_RC;
   convert_map[AppService_PublishAppService] =
       HmiInterfaces::HMI_INTERFACE_AppService;
   convert_map[AppService_UnpublishAppService] =
diff --git a/src/components/application_manager/src/hmi_language_handler.cc b/src/components/application_manager/src/hmi_language_handler.cc
index e206633ae2..46231c4596 100644
--- a/src/components/application_manager/src/hmi_language_handler.cc
+++ b/src/components/application_manager/src/hmi_language_handler.cc
@@ -35,7 +35,7 @@
 #include "application_manager/hmi_capabilities.h"
 #include "application_manager/message_helper.h"
 #include "application_manager/rpc_service.h"
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 #include "smart_objects/smart_object.h"
 #include "utils/helpers.h"
 
@@ -81,9 +81,10 @@ void HMILanguageHandler::set_language_for(
   LOG4CXX_DEBUG(
       logger_,
       "Setting language " << language << " for interface " << interface);
-  Json::Value& dictionary = last_state_->get_dictionary();
-  dictionary[LanguagesKey][key] = language;
-  return;
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  dictionary[LanguagesKey][key] = static_cast<int32_t>(language);
+  accessor.GetMutableData().set_dictionary(dictionary);
 }
 
 hmi_apis::Common_Language::eType HMILanguageHandler::get_language_for(
@@ -107,7 +108,8 @@ hmi_apis::Common_Language::eType HMILanguageHandler::get_language_for(
       return Common_Language::INVALID_ENUM;
   }
 
-  const Json::Value& dictionary = last_state_->get_dictionary();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   if (dictionary.isMember(LanguagesKey)) {
     if (dictionary[LanguagesKey].isMember(key)) {
       Common_Language::eType language = static_cast<Common_Language::eType>(
@@ -342,8 +344,8 @@ void HMILanguageHandler::CheckApplication(const Apps::value_type app) {
   }
 }
 
-void HMILanguageHandler::Init(resumption::LastState* value) {
-  last_state_ = value;
+void HMILanguageHandler::Init(resumption::LastStateWrapperPtr value) {
+  last_state_wrapper_ = value;
   persisted_ui_language_ = get_language_for(INTERFACE_UI);
   persisted_vr_language_ = get_language_for(INTERFACE_VR);
   persisted_tts_language_ = get_language_for(INTERFACE_TTS);
diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc
index 77880eddc0..844d0254cf 100644
--- a/src/components/application_manager/src/hmi_state.cc
+++ b/src/components/application_manager/src/hmi_state.cc
@@ -48,6 +48,7 @@ HmiState::HmiState(std::shared_ptr<Application> app,
     : hmi_app_id_(app->hmi_app_id())
     , state_id_(state_id)
     , app_mngr_(app_mngr)
+    , window_type_(mobile_apis::WindowType::INVALID_ENUM)
     , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM)
     , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM)
     , video_streaming_state_(mobile_apis::VideoStreamingState::INVALID_ENUM)
@@ -60,6 +61,7 @@ HmiState::HmiState(std::shared_ptr<Application> app,
     : hmi_app_id_(app->hmi_app_id())
     , state_id_(STATE_ID_REGULAR)
     , app_mngr_(app_mngr)
+    , window_type_(mobile_apis::WindowType::INVALID_ENUM)
     , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM)
     , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM)
     , video_streaming_state_(mobile_apis::VideoStreamingState::INVALID_ENUM)
@@ -96,6 +98,15 @@ bool HmiState::is_mobile_projection_app() const {
   return app ? app->mobile_projection_enabled() : false;
 }
 
+mobile_apis::WindowType::eType HmiState::window_type() const {
+  return window_type_;
+}
+
+void HmiState::set_window_type(
+    const mobile_apis::WindowType::eType window_type) {
+  window_type_ = window_type;
+}
+
 mobile_apis::AudioStreamingState::eType VRHmiState::audio_streaming_state()
     const {
   using namespace mobile_apis;
@@ -173,17 +184,25 @@ PhoneCallHmiState::PhoneCallHmiState(std::shared_ptr<Application> app,
 mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const {
   using namespace helpers;
   using namespace mobile_apis;
+
+  if (WindowType::WIDGET == window_type()) {
+    return parent()->hmi_level();
+  }
+
   if (Compare<HMILevel::eType, EQ, ONE>(parent()->hmi_level(),
                                         HMILevel::HMI_BACKGROUND,
                                         HMILevel::HMI_NONE)) {
     return parent()->hmi_level();
   }
+
   if (is_navi_app() || is_mobile_projection_app()) {
     return HMILevel::HMI_LIMITED;
   }
+
   if (!is_media_app()) {
     return parent()->hmi_level();
   }
+
   return HMILevel::HMI_BACKGROUND;
 }
 
@@ -198,6 +217,11 @@ DeactivateHMI::DeactivateHMI(std::shared_ptr<Application> app,
 mobile_apis::HMILevel::eType DeactivateHMI::hmi_level() const {
   using namespace helpers;
   using namespace mobile_apis;
+
+  if (WindowType::WIDGET == window_type()) {
+    return parent()->hmi_level();
+  }
+
   if (Compare<HMILevel::eType, EQ, ONE>(parent()->hmi_level(),
                                         HMILevel::HMI_BACKGROUND,
                                         HMILevel::HMI_NONE)) {
@@ -215,14 +239,19 @@ AudioSource::AudioSource(std::shared_ptr<Application> app,
 }
 
 mobile_apis::HMILevel::eType AudioSource::hmi_level() const {
+  using namespace mobile_apis;
+
+  if (WindowType::WIDGET == window_type()) {
+    return parent()->hmi_level();
+  }
+
   // Checking for NONE  is necessary to avoid issue during
   // calculation of HMI level during setting default HMI level
-  if (keep_context_ ||
-      mobile_apis::HMILevel::HMI_NONE == parent()->hmi_level()) {
+  if (keep_context_ || HMILevel::HMI_NONE == parent()->hmi_level()) {
     return parent()->hmi_level();
   }
 
-  return mobile_apis::HMILevel::HMI_BACKGROUND;
+  return HMILevel::HMI_BACKGROUND;
 }
 
 EmbeddedNavi::EmbeddedNavi(std::shared_ptr<Application> app,
@@ -232,11 +261,17 @@ EmbeddedNavi::EmbeddedNavi(std::shared_ptr<Application> app,
 mobile_apis::HMILevel::eType EmbeddedNavi::hmi_level() const {
   using namespace mobile_apis;
   using namespace helpers;
+
+  if (WindowType::WIDGET == window_type()) {
+    return parent()->hmi_level();
+  }
+
   if (Compare<HMILevel::eType, EQ, ONE>(parent()->hmi_level(),
                                         HMILevel::HMI_BACKGROUND,
                                         HMILevel::HMI_NONE)) {
     return parent()->hmi_level();
   }
+
   return HMILevel::HMI_BACKGROUND;
 }
 
@@ -278,7 +313,8 @@ std::ostream& operator<<(std::ostream& os, const HmiState& src) {
   } else {
     os << "(none)";
   }
-  os << ", hmi app id:" << src.hmi_app_id_ << ", state:" << src.state_id()
+  os << ", hmi app id:" << src.hmi_app_id_
+     << ", window_type:" << src.window_type_ << ", state:" << src.state_id()
      << ", hmi_level:" << src.hmi_level()
      << ", audio:" << src.audio_streaming_state()
      << ", video:" << src.video_streaming_state()
diff --git a/src/components/application_manager/src/message.cc b/src/components/application_manager/src/message.cc
index 2ec5891ae3..b75428780d 100644
--- a/src/components/application_manager/src/message.cc
+++ b/src/components/application_manager/src/message.cc
@@ -64,8 +64,8 @@ Message::Message(protocol_handler::MessagePriority priority)
     , binary_data_(NULL)
     , data_size_(0)
     , payload_size_(0)
-    , version_(
-          protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_UNKNOWN) {}
+    , version_(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_UNKNOWN)
+    , is_message_encrypted_(false) {}
 
 Message::Message(const Message& message)
     : function_id_(0)
@@ -76,8 +76,8 @@ Message::Message(const Message& message)
     , binary_data_(NULL)
     , data_size_(0)
     , payload_size_(0)
-    , version_(
-          protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_UNKNOWN) {
+    , version_(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_UNKNOWN)
+    , is_message_encrypted_(false) {
   *this = message;
 }
 
@@ -142,6 +142,10 @@ int32_t Message::connection_key() const {
   return connection_key_;
 }
 
+bool Message::is_message_encrypted() const {
+  return is_message_encrypted_;
+}
+
 MessageType Message::type() const {
   return type_;
 }
@@ -228,6 +232,10 @@ void Message::set_payload_size(size_t payload_size) {
   payload_size_ = payload_size;
 }
 
+void Message::set_message_encryption(const bool protection) {
+  is_message_encrypted_ = protection;
+}
+
 bool Message::is_sufficient_version(
     protocol_handler::MajorProtocolVersion minVersion,
     protocol_handler::MajorProtocolVersion version) {
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index fc1a85a2bb..7d65c224de 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -221,6 +221,9 @@ std::pair<std::string, mobile_apis::VehicleDataType::eType>
         std::make_pair(
             strings::cluster_mode_status,
             mobile_apis::VehicleDataType::VEHICLEDATA_CLUSTERMODESTATUS),
+        std::make_pair(
+            strings::cluster_modes,
+            mobile_apis::VehicleDataType::VEHICLEDATA_CLUSTERMODESTATUS),
         std::make_pair(strings::my_key,
                        mobile_apis::VehicleDataType::VEHICLEDATA_MYKEY),
         /*
@@ -357,6 +360,33 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateMessageForHMI(
   return message;
 }
 
+smart_objects::SmartObjectSPtr
+MessageHelper::CreateDisplayCapabilityUpdateToMobile(
+    const smart_objects::SmartObject& display_capabilities, Application& app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto message = std::make_shared<smart_objects::SmartObject>(
+      smart_objects::SmartType_Map);
+
+  (*message)[strings::params][strings::message_type] =
+      MessageType::kNotification;
+  (*message)[strings::params][strings::function_id] =
+      mobile_apis::FunctionID::OnSystemCapabilityUpdatedID;
+  (*message)[strings::params][strings::connection_key] = app.app_id();
+  (*message)[strings::params][strings::protocol_type] =
+      commands::CommandImpl::mobile_protocol_type_;
+  (*message)[strings::params][strings::protocol_version] =
+      commands::CommandImpl::protocol_version_;
+
+  smart_objects::SmartObject system_capability(smart_objects::SmartType_Map);
+  system_capability[strings::system_capability_type] =
+      static_cast<int32_t>(mobile_apis::SystemCapabilityType::DISPLAYS);
+  system_capability[strings::display_capabilities] = display_capabilities;
+  (*message)[strings::msg_params][strings::system_capability] =
+      system_capability;
+
+  return message;
+}
+
 void MessageHelper::BroadcastCapabilityUpdate(
     smart_objects::SmartObject& msg_params, ApplicationManager& app_mngr) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -378,7 +408,8 @@ void MessageHelper::BroadcastCapabilityUpdate(
       hmi_apis::FunctionID::BasicCommunication_OnSystemCapabilityUpdated;
   smart_objects::SmartObjectSPtr hmi_notification =
       std::make_shared<smart_objects::SmartObject>(message);
-  app_mngr.GetRPCService().ManageHMICommand(hmi_notification);
+  app_mngr.GetRPCService().ManageHMICommand(
+      hmi_notification, commands::Command::CommandSource::SOURCE_SDL_TO_HMI);
 }
 
 smart_objects::SmartObject MessageHelper::CreateAppServiceCapabilities(
@@ -771,7 +802,8 @@ hmi_apis::Common_Result::eType MessageHelper::MobileToHMIResult(
 }
 
 void MessageHelper::SendHMIStatusNotification(
-    const Application& application_impl,
+    ApplicationSharedPtr application,
+    const WindowID window_id,
     ApplicationManager& application_manager) {
   LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObjectSPtr notification =
@@ -789,16 +821,21 @@ void MessageHelper::SendHMIStatusNotification(
       static_cast<int32_t>(application_manager::MessageType::kNotification);
 
   message[strings::params][strings::connection_key] =
-      static_cast<int32_t>(application_impl.app_id());
+      static_cast<int32_t>(application->app_id());
+
+  message[strings::msg_params][strings::window_id] = window_id;
 
   message[strings::msg_params][strings::hmi_level] =
-      static_cast<int32_t>(application_impl.hmi_level());
+      static_cast<int32_t>(application->hmi_level(window_id));
 
   message[strings::msg_params][strings::audio_streaming_state] =
-      static_cast<int32_t>(application_impl.audio_streaming_state());
+      static_cast<int32_t>(application->audio_streaming_state());
+
+  message[strings::msg_params][strings::video_streaming_state] =
+      static_cast<int32_t>(application->video_streaming_state());
 
   message[strings::msg_params][strings::system_context] =
-      static_cast<int32_t>(application_impl.system_context());
+      static_cast<int32_t>(application->system_context(window_id));
 
   application_manager.GetRPCService().ManageMobileCommand(
       notification, commands::Command::SOURCE_SDL);
@@ -1279,9 +1316,18 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateAppVrHelp(
     return NULL;
   }
   smart_objects::SmartObject& vr_help = *result;
-  vr_help[strings::vr_help_title] = app->name();
+  const smart_objects::SmartObject* vr_help_title = app->vr_help_title();
+  if (vr_help_title) {
+    vr_help[strings::vr_help_title] = vr_help_title->asString();
+  }
 
   int32_t index = 0;
+
+  smart_objects::SmartObject so_vr_help(smart_objects::SmartType_Map);
+  so_vr_help[strings::position] = index + 1;
+  so_vr_help[strings::text] = app->name();
+  vr_help[strings::vr_help][index++] = so_vr_help;
+
   if (app->vr_synonyms()) {
     smart_objects::SmartObject item(smart_objects::SmartType_Map);
     item[strings::text] = (*(app->vr_synonyms())).getElement(0);
@@ -1397,7 +1443,13 @@ smart_objects::SmartObjectList MessageHelper::CreateAddCommandRequestToHMI(
 
       smart_objects::SmartObject msg_params =
           smart_objects::SmartObject(smart_objects::SmartType_Map);
-      msg_params[strings::cmd_id] = i->first;
+
+      if ((*i->second).keyExists(strings::cmd_id)) {
+        msg_params[strings::cmd_id] = (*i->second)[strings::cmd_id].asUInt();
+      } else {
+        LOG4CXX_ERROR(logger_, "Command ID is missing.");
+        continue;
+      }
       msg_params[strings::menu_params] = (*i->second)[strings::menu_params];
       msg_params[strings::app_id] = app->app_id();
 
@@ -1412,8 +1464,9 @@ smart_objects::SmartObjectList MessageHelper::CreateAddCommandRequestToHMI(
     }
 
     // VR Interface
-    if ((*i->second).keyExists(strings::vr_commands)) {
-      SendAddVRCommandToHMI(i->first,
+    if ((*i->second).keyExists(strings::vr_commands) &&
+        (*i->second).keyExists(strings::cmd_id)) {
+      SendAddVRCommandToHMI((*i->second)[strings::cmd_id].asUInt(),
                             (*i->second)[strings::vr_commands],
                             app->app_id(),
                             app_mngr);
@@ -1557,6 +1610,67 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateAddVRCommandToHMI(
   return vr_command;
 }
 
+smart_objects::SmartObjectSPtr MessageHelper::CreateUICreateWindowRequestToHMI(
+    ApplicationSharedPtr application,
+    ApplicationManager& app_mngr,
+    const smart_objects::SmartObject& window_info) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto ui_request = CreateMessageForHMI(hmi_apis::messageType::request,
+                                        app_mngr.GetNextHMICorrelationID());
+
+  (*ui_request)[strings::params][strings::function_id] =
+      static_cast<int>(hmi_apis::FunctionID::UI_CreateWindow);
+
+  (*ui_request)[strings::correlation_id] =
+      (*ui_request)[strings::params][strings::correlation_id];
+  (*ui_request)[strings::function_id] =
+      (*ui_request)[strings::params][strings::function_id];
+
+  smart_objects::SmartObject msg_params(
+      smart_objects::SmartObject(smart_objects::SmartType_Map));
+
+  msg_params[strings::window_id] = window_info[strings::window_id].asInt();
+  msg_params[strings::window_type] = window_info[strings::window_type].asInt();
+  msg_params[strings::window_name] =
+      window_info[strings::window_name].asString();
+
+  if (window_info.keyExists(strings::associated_service_type)) {
+    msg_params[strings::associated_service_type] =
+        window_info[strings::associated_service_type].asString();
+  }
+  if (window_info.keyExists(strings::duplicate_updates_from_window_id)) {
+    msg_params[strings::duplicate_updates_from_window_id] =
+        window_info[strings::duplicate_updates_from_window_id].asInt();
+  }
+
+  msg_params[strings::app_id] = application->hmi_app_id();
+
+  (*ui_request)[strings::msg_params] = msg_params;
+
+  return ui_request;
+}
+
+smart_objects::SmartObjectList MessageHelper::CreateUICreateWindowRequestsToHMI(
+    application_manager::ApplicationSharedPtr application,
+    ApplicationManager& app_mngr,
+    const smart_objects::SmartObject& windows_info) {
+  smart_objects::SmartObjectList requests;
+  DCHECK_OR_RETURN(application, requests);
+
+  for (size_t i = 0; i < windows_info.length(); ++i) {
+    const auto& info = windows_info[i];
+
+    const auto ui_request =
+        CreateUICreateWindowRequestToHMI(application, app_mngr, info);
+
+    DCHECK_OR_RETURN(ui_request, requests);
+
+    requests.push_back(ui_request);
+  }
+
+  return requests;
+}
+
 bool MessageHelper::CreateDeviceInfo(
     connection_handler::DeviceHandle device_handle,
     const protocol_handler::SessionObserver& session_observer,
@@ -1609,8 +1723,8 @@ bool MessageHelper::CreateHMIApplicationStruct(
   const smart_objects::SmartObject* app_types = app->app_types();
   const smart_objects::SmartObject* ngn_media_screen_name =
       app->ngn_media_screen_name();
-  const smart_objects::SmartObject* day_color_scheme = app->day_color_scheme();
-  const smart_objects::SmartObject* night_color_scheme =
+  const smart_objects::SmartObject day_color_scheme = app->day_color_scheme();
+  const smart_objects::SmartObject night_color_scheme =
       app->night_color_scheme();
 
   message = smart_objects::SmartObject(smart_objects::SmartType_Map);
@@ -1648,7 +1762,8 @@ bool MessageHelper::CreateHMIApplicationStruct(
   const policy::RequestType::State app_request_types_state =
       policy_handler.GetAppRequestTypeState(policy_app_id);
   if (policy::RequestType::State::AVAILABLE == app_request_types_state) {
-    const auto request_types = policy_handler.GetAppRequestTypes(policy_app_id);
+    const auto request_types =
+        policy_handler.GetAppRequestTypes(app->device(), policy_app_id);
     message[strings::request_type] =
         SmartObject(smart_objects::SmartType_Array);
     smart_objects::SmartObject& request_types_array =
@@ -1685,12 +1800,12 @@ bool MessageHelper::CreateHMIApplicationStruct(
         SmartObject(smart_objects::SmartType_Array);
   }
 
-  if (day_color_scheme) {
-    message[strings::day_color_scheme] = *day_color_scheme;
+  if (day_color_scheme.getType() == smart_objects::SmartType_Map) {
+    message[strings::day_color_scheme] = day_color_scheme;
   }
 
-  if (night_color_scheme) {
-    message[strings::night_color_scheme] = *night_color_scheme;
+  if (night_color_scheme.getType() == smart_objects::SmartType_Map) {
+    message[strings::night_color_scheme] = night_color_scheme;
   }
 
   message[strings::device_info] =
@@ -1711,8 +1826,10 @@ bool MessageHelper::CreateHMIApplicationStruct(
                      &secondary_device_info);
   }
 
-  message[strings::is_cloud_application] = app->is_cloud_app();
-  if (app->is_cloud_app()) {
+  const bool is_cloud_app = app->is_cloud_app();
+  message[strings::is_cloud_application] = is_cloud_app;
+
+  if (is_cloud_app) {
     message[strings::cloud_connection_status] =
         app_mngr.GetCloudAppConnectionStatus(app);
   }
@@ -1800,6 +1917,57 @@ void MessageHelper::SendOnAppUnregNotificationToHMI(
   app_mngr.GetRPCService().ManageHMICommand(notification);
 }
 
+smart_objects::SmartObjectSPtr
+MessageHelper::CreateOnAppPropertiesChangeNotification(
+    const std::string& policy_app_id, ApplicationManager& app_mngr) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  smart_objects::SmartObjectSPtr notification =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Map);
+
+  smart_objects::SmartObject& message = *notification;
+  message[strings::params][strings::function_id] =
+      hmi_apis::FunctionID::BasicCommunication_OnAppPropertiesChange;
+  message[strings::params][strings::message_type] = MessageType::kNotification;
+
+  policy::AppProperties app_properties;
+  app_mngr.GetPolicyHandler().GetAppProperties(policy_app_id, app_properties);
+
+  policy::StringArray nicknames;
+  policy::StringArray app_hmi_types;
+
+  app_mngr.GetPolicyHandler().GetInitialAppData(
+      policy_app_id, &nicknames, &app_hmi_types);
+
+  smart_objects::SmartObject properties(smart_objects::SmartType_Map);
+  properties[strings::policy_app_id] = policy_app_id;
+  properties[strings::enabled] = app_properties.enabled;
+
+  smart_objects::SmartObject nicknames_array(smart_objects::SmartType_Array);
+  size_t i = 0;
+  for (const auto& nickname : nicknames) {
+    nicknames_array[i++] = nickname;
+  }
+  properties[strings::nicknames] = nicknames_array;
+
+  if (!app_properties.auth_token.empty()) {
+    properties[strings::auth_token] = app_properties.auth_token;
+  }
+  if (!app_properties.transport_type.empty()) {
+    properties[strings::transport_type] = app_properties.transport_type;
+  }
+  if (!app_properties.hybrid_app_preference.empty()) {
+    properties[strings::hybrid_app_preference] =
+        app_properties.hybrid_app_preference;
+  }
+  if (!app_properties.endpoint.empty()) {
+    properties[strings::endpoint] = app_properties.endpoint;
+  }
+
+  message[strings::msg_params][strings::properties] = properties;
+  return notification;
+}
+
 smart_objects::SmartObjectSPtr MessageHelper::GetBCActivateAppRequestToHMI(
     ApplicationConstSharedPtr app,
     const policy::PolicyHandlerInterface& policy_handler,
@@ -2141,6 +2309,34 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateNegativeResponse(
   return std::make_shared<smart_objects::SmartObject>(response_data);
 }
 
+smart_objects::SmartObjectSPtr MessageHelper::CreateOnServiceUpdateNotification(
+    const hmi_apis::Common_ServiceType::eType service_type,
+    const hmi_apis::Common_ServiceEvent::eType service_event,
+    const hmi_apis::Common_ServiceStatusUpdateReason::eType
+        service_update_reason,
+    const uint32_t app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto notification = MessageHelper::CreateHMINotification(
+      hmi_apis::FunctionID::BasicCommunication_OnServiceUpdate);
+
+  (*notification)[strings::msg_params][hmi_notification::service_type] =
+      service_type;
+  (*notification)[strings::msg_params][hmi_notification::service_event] =
+      service_event;
+
+  if (0 != app_id) {
+    (*notification)[strings::msg_params][strings::app_id] = app_id;
+  }
+
+  if (hmi_apis::Common_ServiceStatusUpdateReason::INVALID_ENUM !=
+      service_update_reason) {
+    (*notification)[strings::msg_params][hmi_notification::reason] =
+        service_update_reason;
+  }
+
+  return notification;
+}
+
 void MessageHelper::SendNaviSetVideoConfig(
     int32_t app_id,
     ApplicationManager& app_mngr,
@@ -2333,28 +2529,56 @@ bool MessageHelper::SendUnsubscribedWayPoints(ApplicationManager& app_mngr) {
 
 void MessageHelper::SendPolicySnapshotNotification(
     uint32_t connection_key,
-    const std::vector<uint8_t>& policy_data,
+    const std::string& snapshot_file_path,
     const std::string& url,
     ApplicationManager& app_mngr) {
+  LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject content(smart_objects::SmartType_Map);
+  const auto request_type =
+#if defined(PROPRIETARY_MODE) || defined(EXTERNAL_PROPRIETARY_MODE)
+      mobile_apis::RequestType::PROPRIETARY;
+#else
+      mobile_apis::RequestType::HTTP;
+#endif  // PROPRIETARY || EXTERNAL_PROPRIETARY_MODE
+
+  content[strings::msg_params][strings::request_type] = request_type;
 
   if (!url.empty()) {
-    content[strings::msg_params][strings::url] =
-        url;  // Doesn't work with mobile_notification::syncp_url ("URL")
+    content[strings::msg_params][strings::url] = url;
   } else {
     LOG4CXX_WARN(logger_, "No service URLs");
   }
 
-  content[strings::params][strings::binary_data] =
-      smart_objects::SmartObject(policy_data);
+  content[strings::msg_params][strings::file_name] = snapshot_file_path;
+
+  SendSystemRequestNotification(connection_key, content, app_mngr);
+}
+
+void MessageHelper::SendPolicySnapshotNotification(
+    uint32_t connection_key,
+    const std::vector<uint8_t>& policy_data,
+    const std::string& url,
+    ApplicationManager& app_mngr) {
+  smart_objects::SmartObject content(smart_objects::SmartType_Map);
+  const auto request_type =
 #if defined(PROPRIETARY_MODE) || defined(EXTERNAL_PROPRIETARY_MODE)
-  content[strings::msg_params][strings::request_type] =
       mobile_apis::RequestType::PROPRIETARY;
 #else
-  content[strings::msg_params][strings::request_type] =
       mobile_apis::RequestType::HTTP;
 #endif  // PROPRIETARY || EXTERNAL_PROPRIETARY_MODE
 
+  content[strings::msg_params][strings::request_type] = request_type;
+
+  if (!url.empty()) {
+    content[strings::msg_params][strings::url] =
+        url;  // Doesn't work with mobile_notification::syncp_url ("URL")
+  } else {
+    LOG4CXX_WARN(logger_, "No service URLs");
+  }
+
+  content[strings::params][strings::binary_data] =
+      smart_objects::SmartObject(policy_data);
+
   SendSystemRequestNotification(connection_key, content, app_mngr);
 }
 
@@ -2435,7 +2659,8 @@ void MessageHelper::SendQueryApps(const uint32_t connection_key,
 void MessageHelper::SendOnPermissionsChangeNotification(
     uint32_t connection_key,
     const policy::Permissions& permissions,
-    ApplicationManager& app_mngr) {
+    ApplicationManager& app_mngr,
+    const policy::EncryptionRequired encryprion_required) {
   LOG4CXX_AUTO_TRACE(logger_);
   smart_objects::SmartObject content(smart_objects::SmartType_Map);
 
@@ -2452,8 +2677,10 @@ void MessageHelper::SendOnPermissionsChangeNotification(
   content[strings::msg_params] =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
 
-  // content[strings::msg_params][strings::app_id] = connection_key;
-
+  if (encryprion_required.is_initialized()) {
+    content[strings::msg_params][strings::require_encryption] =
+        static_cast<bool>(*encryprion_required);
+  }
   content[strings::msg_params]["permissionItem"] =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
 
@@ -2463,6 +2690,41 @@ void MessageHelper::SendOnPermissionsChangeNotification(
   policy::Permissions::const_iterator it_permissions = permissions.begin();
   policy::Permissions::const_iterator it_permissions_end = permissions.end();
 
+  using policy::EncryptionRequired;
+  auto permission_item_encryption_flag_state =
+      [](const EncryptionRequired& app_flag,
+         const EncryptionRequired& groups_flag) -> EncryptionRequired {
+    enum EncryptionFlagState { TRUE, FALSE, MISSING };
+    auto enum_from_optional_bool = [](const EncryptionRequired& flag) {
+      if (!flag.is_initialized()) {
+        return MISSING;
+      }
+      return *flag ? TRUE : FALSE;
+    };
+
+    typedef std::pair<EncryptionFlagState, EncryptionFlagState>
+        EnctyptionStatePair;
+    typedef std::map<EnctyptionStatePair, EncryptionRequired>
+        PermissionItemEncryptionTable;
+    static PermissionItemEncryptionTable encryption_state_table = {
+        {{TRUE, TRUE}, EncryptionRequired(true)},
+        {{TRUE, FALSE}, EncryptionRequired()},
+        {{TRUE, MISSING}, EncryptionRequired()},
+        {{FALSE, TRUE}, EncryptionRequired()},
+        {{FALSE, FALSE}, EncryptionRequired()},
+        {{FALSE, MISSING}, EncryptionRequired()},
+        {{MISSING, TRUE}, EncryptionRequired(true)},
+        {{MISSING, FALSE}, EncryptionRequired()},
+        {{MISSING, MISSING}, EncryptionRequired()},
+    };
+    const auto app_flag_state = enum_from_optional_bool(app_flag);
+    const auto groups_flag_state = enum_from_optional_bool(groups_flag);
+    auto it = encryption_state_table.find(
+        EnctyptionStatePair(app_flag_state, groups_flag_state));
+    DCHECK_OR_RETURN(it != encryption_state_table.end(), EncryptionRequired());
+    return it->second;
+  };
+
   for (size_t index_pi = 0; it_permissions != it_permissions_end;
        ++it_permissions, ++index_pi) {
     permissions_item_array[index_pi] =
@@ -2471,9 +2733,14 @@ void MessageHelper::SendOnPermissionsChangeNotification(
     smart_objects::SmartObject& permission_item =
         permissions_item_array[index_pi];
 
-    // Filling the rpcName of PermissionItem
     permission_item["rpcName"] = (*it_permissions).first;
     const policy::RpcPermissions& rpc_permissions = (*it_permissions).second;
+    auto item_require_encryption = permission_item_encryption_flag_state(
+        encryprion_required, rpc_permissions.require_encryption);
+    if (item_require_encryption.is_initialized()) {
+      const bool require_encryption = *item_require_encryption;
+      permission_item[strings::require_encryption] = require_encryption;
+    }
 
     // Creating SO for hmiPermissions
     permission_item["hmiPermissions"] =
@@ -3013,17 +3280,32 @@ mobile_apis::Result::eType MessageHelper::ProcessSoftButtons(
 void MessageHelper::SubscribeApplicationToSoftButton(
     smart_objects::SmartObject& message_params,
     ApplicationSharedPtr app,
-    int32_t function_id) {
+    int32_t function_id,
+    const WindowID window_id) {
   SoftButtonID softbuttons_id;
   smart_objects::SmartObject& soft_buttons =
       message_params[strings::soft_buttons];
   unsigned int length = soft_buttons.length();
   for (unsigned int i = 0; i < length; ++i) {
-    softbuttons_id.insert(soft_buttons[i][strings::soft_button_id].asUInt());
+    const auto button_id = std::make_pair(
+        soft_buttons[i][strings::soft_button_id].asUInt(), window_id);
+    softbuttons_id.insert(button_id);
   }
   app->SubscribeToSoftButtons(function_id, softbuttons_id);
 }
 
+void MessageHelper::SubscribeApplicationToSoftButton(
+    smart_objects::SmartObject& message_params,
+    ApplicationSharedPtr app,
+    int32_t function_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  SubscribeApplicationToSoftButton(
+      message_params,
+      app,
+      function_id,
+      mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
+}
+
 bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
 #ifdef DEBUG
   Json::Value tmp;
@@ -3034,4 +3316,14 @@ bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
   return true;
 }
 
+WindowID MessageHelper::ExtractWindowIdFromSmartObject(
+    const smart_objects::SmartObject& s_map) {
+  if (smart_objects::SmartType_Map == s_map.getType()) {
+    if (s_map.keyExists(strings::window_id)) {
+      return s_map[strings::window_id].asInt();
+    }
+  }
+  return mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}
+
 }  //  namespace application_manager
diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc
index 4c4cb251fc..d3e7c782f7 100644
--- a/src/components/application_manager/src/mobile_message_handler.cc
+++ b/src/components/application_manager/src/mobile_message_handler.cc
@@ -195,6 +195,7 @@ MobileMessageHandler::HandleIncomingMessageProtocolV2(
           message->protocol_version()));
   outgoing_message->set_data_size(message->data_size());
   outgoing_message->set_payload_size(message->payload_size());
+  outgoing_message->set_message_encryption(message->protection_flag());
 
   if (!payload.data.empty()) {
     const BinaryData binary_payload_data(payload.data);
@@ -220,7 +221,8 @@ MobileMessageHandler::HandleOutgoingMessageProtocolV1(
       new protocol_handler::RawMessage(message->connection_key(),
                                        1,
                                        &raw_message[0],
-                                       message_string.length() + 1);
+                                       message_string.length() + 1,
+                                       false);
 
   return result;
 }
@@ -298,6 +300,7 @@ MobileMessageHandler::HandleOutgoingMessageProtocolV2(
                                        message->protocol_version(),
                                        &data_for_sending[0],
                                        data_for_sending_size,
+                                       false,
                                        type);
 
   return msg_to_protocol_handler;
diff --git a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc
index ad313c638f..9214a30513 100644
--- a/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc
+++ b/src/components/application_manager/src/plugin_manager/rpc_plugin_manager_impl.cc
@@ -1,6 +1,6 @@
-#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h"
 #include <dlfcn.h>
 
+#include "application_manager/plugin_manager/rpc_plugin_manager_impl.h"
 #include "utils/file_system.h"
 
 namespace application_manager {
@@ -12,11 +12,13 @@ RPCPluginManagerImpl::RPCPluginManagerImpl(
     ApplicationManager& app_manager,
     rpc_service::RPCService& rpc_service,
     HMICapabilities& hmi_capabilities,
-    policy::PolicyHandlerInterface& policy_handler)
+    policy::PolicyHandlerInterface& policy_handler,
+    resumption::LastStateWrapperPtr last_state)
     : app_manager_(app_manager)
     , rpc_service_(rpc_service)
     , hmi_capabilities_(hmi_capabilities)
-    , policy_handler_(policy_handler) {}
+    , policy_handler_(policy_handler)
+    , last_state_(last_state) {}
 
 bool IsLibraryFile(const std::string& file_path) {
   size_t pos = file_path.find_last_of(".");
@@ -29,10 +31,23 @@ bool IsLibraryFile(const std::string& file_path) {
   return true;
 }
 
-RPCPluginPtr LoadPlugin(const std::string& full_plugin_path) {
+template <typename T>
+T GetFuncFromLib(void* dl_handle, const std::string& function_name) {
+  T exported_func =
+      reinterpret_cast<T>(dlsym(dl_handle, function_name.c_str()));
+  char* error_string = dlerror();
+  if (nullptr != error_string) {
+    LOG4CXX_ERROR(logger_, "Failed to export symbols : " << error_string);
+    return nullptr;
+  }
+  return exported_func;
+}
+
+RPCPluginManagerImpl::RPCPluginPtr RPCPluginManagerImpl::LoadPlugin(
+    const std::string& full_plugin_path) const {
   if (!IsLibraryFile(full_plugin_path)) {
     LOG4CXX_DEBUG(logger_, "Skip loading " << full_plugin_path);
-    return RPCPluginPtr();
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
   }
 
   void* plugin_dll = dlopen(full_plugin_path.c_str(), RTLD_LAZY);
@@ -40,21 +55,33 @@ RPCPluginPtr LoadPlugin(const std::string& full_plugin_path) {
     LOG4CXX_ERROR(
         logger_,
         "Failed to open dll " << full_plugin_path << " : " << dlerror());
-    return RPCPluginPtr();
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
   }
 
   typedef RPCPlugin* (*Create)();
-  Create create_plugin = reinterpret_cast<Create>(dlsym(plugin_dll, "Create"));
-  char* error_string = dlerror();
-  if (nullptr != error_string) {
-    LOG4CXX_ERROR(logger_,
-                  "Failed to export dll's " << full_plugin_path
-                                            << " symbols : " << error_string);
+  Create create_plugin = GetFuncFromLib<Create>(plugin_dll, "Create");
+  if (!create_plugin) {
+    LOG4CXX_ERROR(logger_, "No Create function in " << full_plugin_path);
+    dlclose(plugin_dll);
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
+  }
+
+  typedef void (*Delete)(RPCPlugin*);
+  Delete delete_plugin = GetFuncFromLib<Delete>(plugin_dll, "Delete");
+  if (!delete_plugin) {
+    LOG4CXX_ERROR(logger_, "No Delete function in " << full_plugin_path);
     dlclose(plugin_dll);
-    return RPCPluginPtr();
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
   }
+
+  auto plugin_destroyer = [delete_plugin, plugin_dll](RPCPlugin* plugin) {
+    LOG4CXX_DEBUG(logger_, "Delete plugin " << plugin->PluginName());
+    delete_plugin(plugin);
+    dlclose(plugin_dll);
+    return RPCPluginPtr(nullptr, [](RPCPlugin*) {});
+  };
   RPCPlugin* plugin = create_plugin();
-  return RPCPluginPtr(plugin);
+  return RPCPluginPtr(plugin, plugin_destroyer);
 }
 
 uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) {
@@ -69,8 +96,11 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) {
     LOG4CXX_DEBUG(
         logger_,
         "Loaded " << plugin->PluginName() << " plugin from " << full_name);
-    if (plugin->Init(
-            app_manager_, rpc_service_, hmi_capabilities_, policy_handler_)) {
+    if (plugin->Init(app_manager_,
+                     rpc_service_,
+                     hmi_capabilities_,
+                     policy_handler_,
+                     last_state_)) {
       loaded_plugins_.push_back(std::move(plugin));
     } else {
       LOG4CXX_ERROR(logger_,
@@ -82,10 +112,6 @@ uint32_t RPCPluginManagerImpl::LoadPlugins(const std::string& plugins_path) {
   return loaded_plugins_.size();
 }
 
-std::vector<RPCPluginPtr>& RPCPluginManagerImpl::GetPlugins() {
-  return loaded_plugins_;
-}
-
 utils::Optional<RPCPlugin> RPCPluginManagerImpl::FindPluginToProcess(
     const int32_t function_id,
     const commands::Command::CommandSource message_source) {
diff --git a/src/components/application_manager/src/policies/policy_event_observer.cc b/src/components/application_manager/src/policies/policy_event_observer.cc
index afe909fee4..7ca4d7b5b8 100644
--- a/src/components/application_manager/src/policies/policy_event_observer.cc
+++ b/src/components/application_manager/src/policies/policy_event_observer.cc
@@ -70,11 +70,6 @@ void PolicyEventObserver::on_event(const event_engine::Event& event) {
       unsubscribe_from_event(hmi_apis::FunctionID::VehicleInfo_GetVehicleData);
       break;
     }
-    case hmi_apis::FunctionID::BasicCommunication_OnReady: {
-      policy_handler_->OnSystemReady();
-      unsubscribe_from_event(hmi_apis::FunctionID::BasicCommunication_OnReady);
-      break;
-    }
     default: { break; }
   }
 }
diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc
index cac09bd5f3..85d6858b0d 100644
--- a/src/components/application_manager/src/policies/policy_handler.cc
+++ b/src/components/application_manager/src/policies/policy_handler.cc
@@ -58,6 +58,9 @@
 
 #include "policy/policy_manager.h"
 #include "utils/helpers.h"
+#ifdef EXTERNAL_PROPRIETARY_MODE
+#include "policy/ptu_retry_handler.h"
+#endif  // EXTERNAL_PROPRIETARY_MODE
 
 namespace policy {
 
@@ -126,7 +129,10 @@ struct HMILevelPredicate
       : level_(level) {}
 
   bool operator()(const ApplicationSharedPtr app) const {
-    return level_ == app->hmi_level() ? true : false;
+    return level_ == app->hmi_level(
+                         mobile_apis::PredefinedWindows::DEFAULT_WINDOW)
+               ? true
+               : false;
   }
 
  private:
@@ -135,7 +141,7 @@ struct HMILevelPredicate
 
 }  // namespace
 
-#define POLICY_LIB_CHECK(return_value)                                      \
+#define POLICY_LIB_CHECK_OR_RETURN(return_value)                            \
   {                                                                         \
     sync_primitives::AutoReadLock lock(policy_manager_lock_);               \
     if (!policy_manager_) {                                                 \
@@ -165,6 +171,7 @@ struct DeactivateApplication {
     if (device_id_ == app->device()) {
       state_ctrl_.SetRegularState(
           app,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
           mobile_apis::HMILevel::HMI_NONE,
           mobile_apis::AudioStreamingState::NOT_AUDIBLE,
           mobile_apis::VideoStreamingState::NOT_STREAMABLE,
@@ -291,14 +298,23 @@ const std::string PolicyHandler::kLibrary = "libPolicy.so";
 PolicyHandler::PolicyHandler(const PolicySettings& settings,
                              ApplicationManager& application_manager)
     : AsyncRunner("PolicyHandler async runner thread")
-    , dl_handle_(0)
     , last_activated_app_id_(0)
+#ifndef EXTERNAL_PROPRIETARY_MODE
+    , last_ptu_app_id_(0)
+#endif  // EXTERNAL_PROPRIETARY_MODE
     , statistic_manager_impl_(std::make_shared<StatisticManagerImpl>(this))
     , settings_(settings)
-    , application_manager_(application_manager) {}
+    , application_manager_(application_manager)
+    , last_registered_policy_app_id_(std::string()) {
+}
 
 PolicyHandler::~PolicyHandler() {}
 
+PolicyEncryptionFlagGetterInterfaceSPtr
+PolicyHandler::PolicyEncryptionFlagGetter() const {
+  return policy_manager_;
+}
+
 bool PolicyHandler::PolicyEnabled() const {
   return get_settings().enable_policy();
 }
@@ -313,36 +329,46 @@ bool PolicyHandler::LoadPolicyLibrary() {
     policy_manager_.reset();
     return false;
   }
-  dl_handle_ = dlopen(kLibrary.c_str(), RTLD_LAZY);
 
-  const char* error = dlerror();
-  if (!error) {
-    if (CreateManager()) {
-      policy_manager_->set_listener(this);
-      event_observer_ =
-          std::shared_ptr<PolicyEventObserver>(new PolicyEventObserver(
-              this, application_manager_.event_dispatcher()));
-    }
-  } else {
-    LOG4CXX_ERROR(logger_, error);
+  if (CreateManager()) {
+    policy_manager_->set_listener(this);
+    event_observer_ = std::shared_ptr<PolicyEventObserver>(
+        new PolicyEventObserver(this, application_manager_.event_dispatcher()));
   }
 
   return (policy_manager_.use_count() != 0);
 }
 
 bool PolicyHandler::CreateManager() {
+  void* policy_handle = dlopen(kLibrary.c_str(), RTLD_LAZY);
+  const char* error = dlerror();
+  if (!policy_handle) {
+    LOG4CXX_ERROR(
+        logger_,
+        (error == NULL ? "Unknown error in dlopen while loading policy table"
+                       : error));
+    return false;
+  }
+
   typedef PolicyManager* (*CreateManager)();
   typedef void (*DeleteManager)(PolicyManager*);
   CreateManager create_manager =
-      reinterpret_cast<CreateManager>(dlsym(dl_handle_, "CreateManager"));
+      reinterpret_cast<CreateManager>(dlsym(policy_handle, "CreateManager"));
   DeleteManager delete_manager =
-      reinterpret_cast<DeleteManager>(dlsym(dl_handle_, "DeleteManager"));
+      reinterpret_cast<DeleteManager>(dlsym(policy_handle, "DeleteManager"));
+  auto policy_destroyer = [delete_manager,
+                           policy_handle](PolicyManager* policy_manager) {
+    LOG4CXX_DEBUG(logger_, "Delete Policy Manager");
+    delete_manager(policy_manager);
+    dlclose(policy_handle);
+  };
   char* error_string = dlerror();
   if (NULL == error_string) {
     policy_manager_ =
-        std::shared_ptr<PolicyManager>(create_manager(), delete_manager);
+        std::shared_ptr<PolicyManager>(create_manager(), policy_destroyer);
   } else {
     LOG4CXX_WARN(logger_, error_string);
+    dlclose(policy_handle);
   }
   return (policy_manager_.use_count() != 0);
 }
@@ -353,22 +379,41 @@ const PolicySettings& PolicyHandler::get_settings() const {
 
 bool PolicyHandler::InitPolicyTable() {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
-  // Subscribing to notification for system readiness to be able to get system
-  // info necessary for policy table
-  event_observer_->subscribe_on_event(
-      hmi_apis::FunctionID::BasicCommunication_OnReady);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   std::string preloaded_file = get_settings().preloaded_pt_file();
   if (file_system::FileExists(preloaded_file)) {
-    return policy_manager_->InitPT(preloaded_file, &get_settings());
+    const bool pt_inited =
+        policy_manager_->InitPT(preloaded_file, &get_settings());
+    OnPTInited();
+    return pt_inited;
   }
   LOG4CXX_FATAL(logger_, "The file which contains preloaded PT is not exist");
   return false;
 }
 
+void PolicyHandler::OnPTInited() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  sync_primitives::AutoLock lock(listeners_lock_);
+
+  std::for_each(listeners_.begin(),
+                listeners_.end(),
+                std::mem_fun(&PolicyHandlerObserver::OnPTInited));
+}
+
+void PolicyHandler::StopRetrySequence() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_VOID();
+#ifndef EXTERNAL_PROPRIETARY_MODE
+  // Clear cached PTU app
+  last_ptu_app_id_ = 0;
+#endif  // EXTERNAL_PROPRIETARY_MODE
+  policy_manager_->StopRetrySequence();
+}
+
 bool PolicyHandler::ResetPolicyTable() {
   LOG4CXX_TRACE(logger_, "Reset policy table.");
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   std::string preloaded_file = get_settings().preloaded_pt_file();
   if (file_system::FileExists(preloaded_file)) {
     return policy_manager_->ResetPT(preloaded_file);
@@ -379,15 +424,45 @@ bool PolicyHandler::ResetPolicyTable() {
 
 bool PolicyHandler::ClearUserConsent() {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->ResetUserConsent();
 }
 
+#ifndef EXTERNAL_PROPRIETARY_MODE
+uint32_t PolicyHandler::ChoosePTUApplication(
+    const PTUIterationType iteration_type) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  // Return the previous app chosen if this is a retry for a PTU in progress
+  if (iteration_type == PTUIterationType::RetryIteration &&
+      last_ptu_app_id_ != 0) {
+    ApplicationSharedPtr app =
+        application_manager_.application(last_ptu_app_id_);
+    if (app && app->IsRegistered()) {
+      LOG4CXX_INFO(logger_, "Previously chosen application exists, returning");
+      return last_ptu_app_id_;
+    }
+  }
+
+  last_ptu_app_id_ = GetAppIdForSending();
+  return last_ptu_app_id_;
+}
+
+void PolicyHandler::CacheRetryInfo(const uint32_t app_id,
+                                   const std::string url,
+                                   const std::string snapshot_path) {
+  last_ptu_app_id_ = app_id;
+  retry_update_url_ = url;
+  policy_snapshot_path_ = snapshot_path;
+}
+#endif  // EXTERNAL_PROPRIETARY_MODE
+
 uint32_t PolicyHandler::GetAppIdForSending() const {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(0);
-  const ApplicationSet& accessor =
-      application_manager_.applications().GetData();
+  POLICY_LIB_CHECK_OR_RETURN(0);
+
+  // fix ApplicationSet access crash
+  const ApplicationSet accessor = application_manager_.applications().GetData();
 
   HMILevelPredicate has_none_level(mobile_api::HMILevel::HMI_NONE);
   Applications apps_without_none_level;
@@ -400,11 +475,10 @@ uint32_t PolicyHandler::GetAppIdForSending() const {
                 "Number of apps with different from NONE level: "
                     << apps_without_none_level.size());
 
-  uint32_t choosen_app_id =
-      ChooseRandomAppForPolicyUpdate(apps_without_none_level);
+  uint32_t app_id = ChooseRandomAppForPolicyUpdate(apps_without_none_level);
 
-  if (choosen_app_id) {
-    return choosen_app_id;
+  if (app_id) {
+    return app_id;
   }
 
   Applications apps_with_none_level;
@@ -417,10 +491,40 @@ uint32_t PolicyHandler::GetAppIdForSending() const {
       logger_,
       "Number of apps with NONE level: " << apps_with_none_level.size());
 
+  if (apps_with_none_level.empty()) {
+    LOG4CXX_WARN(logger_, "There is no registered application");
+    return 0;
+  }
+
   return ChooseRandomAppForPolicyUpdate(apps_with_none_level);
 }
 
+void PolicyHandler::PushAppIdToPTUQueue(const uint32_t app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_VOID();
+  sync_primitives::AutoLock lock(app_id_queue_lock_);
+  const auto result = applications_ptu_queue_.insert(app_id);
+  if (result.second) {
+    policy_manager_->UpdatePTUReadyAppsCount(applications_ptu_queue_.size());
+  }
+}
+
+void PolicyHandler::PopAppIdFromPTUQueue() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_VOID();
+  sync_primitives::AutoLock lock(app_id_queue_lock_);
+  if (applications_ptu_queue_.size() > 0) {
+    applications_ptu_queue_.erase(applications_ptu_queue_.begin());
+    policy_manager_->UpdatePTUReadyAppsCount(applications_ptu_queue_.size());
+  }
+}
+
 #ifdef EXTERNAL_PROPRIETARY_MODE
+PTURetryHandler& PolicyHandler::ptu_retry_handler() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return *policy_manager_;
+}
+
 void PolicyHandler::OnAppPermissionConsent(
     const uint32_t connection_key,
     const PermissionConsent& permissions,
@@ -440,6 +544,7 @@ void PolicyHandler::OnAppPermissionConsent(
 
 void PolicyHandler::OnDeviceConsentChanged(const std::string& device_id,
                                            const bool is_allowed) {
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
   connection_handler::DeviceHandle device_handle;
   if (!application_manager_.connection_handler().GetDeviceID(device_id,
@@ -470,21 +575,25 @@ void PolicyHandler::OnDeviceConsentChanged(const std::string& device_id,
         continue;
       }
 
-      policy_manager_->ReactOnUserDevConsentForApp(policy_app_id, is_allowed);
+      policy_manager_->ReactOnUserDevConsentForApp(
+          device_handle, policy_app_id, is_allowed);
 
-      policy_manager_->SendNotificationOnPermissionsUpdated(policy_app_id);
+      policy_manager_->SendNotificationOnPermissionsUpdated(device_id,
+                                                            policy_app_id);
     }
   }
 }
 
 void PolicyHandler::SendOnAppPermissionsChanged(
-    const AppPermissions& permissions, const std::string& policy_app_id) const {
+    const AppPermissions& permissions,
+    const std::string& device_id,
+    const std::string& policy_app_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(
       logger_,
       "PolicyHandler::SendOnAppPermissionsChanged for " << policy_app_id);
   ApplicationSharedPtr app =
-      application_manager_.application_by_policy_id(policy_app_id);
+      application_manager_.application(device_id, policy_app_id);
   if (app.use_count() == 0) {
     LOG4CXX_WARN(logger_, "No app found for policy app id = " << policy_app_id);
     return;
@@ -493,6 +602,15 @@ void PolicyHandler::SendOnAppPermissionsChanged(
       app->app_id(), permissions, application_manager_);
 }
 
+void PolicyHandler::SendOnAppPropertiesChangeNotification(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto notification =
+      MessageHelper::CreateOnAppPropertiesChangeNotification(
+          policy_app_id, application_manager_);
+  application_manager_.GetRPCService().ManageHMICommand(notification);
+}
+
 void PolicyHandler::OnPTExchangeNeeded() {
   LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
@@ -518,10 +636,11 @@ struct SmartObjectToInt {
 };
 
 StatusNotifier PolicyHandler::AddApplication(
+    const std::string& device_id,
     const std::string& application_id,
     const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) {
-  POLICY_LIB_CHECK(std::make_shared<utils::CallNothing>());
-  return policy_manager_->AddApplication(application_id, hmi_types);
+  POLICY_LIB_CHECK_OR_RETURN(std::make_shared<utils::CallNothing>());
+  return policy_manager_->AddApplication(device_id, application_id, hmi_types);
 }
 
 void PolicyHandler::AddDevice(const std::string& device_id,
@@ -573,13 +692,9 @@ void PolicyHandler::OnAppPermissionConsentInternal(
 #endif
     }
   } else if (!app_to_device_link_.empty()) {
-    sync_primitives::AutoLock lock(app_to_device_link_lock_);
-    std::map<std::string, std::string>::const_iterator it =
-        app_to_device_link_.begin();
-    for (; app_to_device_link_.end() != it; ++it) {
-      ApplicationSharedPtr app =
-          application_manager_.application_by_policy_id(it->second);
-
+    const ApplicationSet& accessor =
+        application_manager_.applications().GetData();
+    for (const auto& app : accessor) {
       // If list of apps sent to HMI for user consents is not the same as
       // current,
       // permissions should be set only for coincident to registered apps
@@ -590,19 +705,26 @@ void PolicyHandler::OnAppPermissionConsentInternal(
         continue;
       }
 
+      if (!app->IsRegistered()) {
+        LOG4CXX_DEBUG(logger_,
+                      "Application " << app->policy_app_id()
+                                     << " is not marked as registered.");
+        continue;
+      }
+
       DeviceParams device_params = GetDeviceParams(
           app->device(),
           application_manager_.connection_handler().get_session_observer());
 
-      if (device_params.device_mac_address != it->first) {
+      if (device_params.device_mac_address != app->mac_address()) {
         LOG4CXX_WARN(logger_,
                      "Device_id of application is changed."
                      "Permissions setting skipped.");
         continue;
       }
 
-      out_permissions.policy_app_id = it->second;
-      out_permissions.device_id = it->first;
+      out_permissions.policy_app_id = app->policy_app_id();
+      out_permissions.device_id = app->mac_address();
 #ifdef EXTERNAL_PROPRIETARY_MODE
       policy_manager_->SetUserConsentForApp(out_permissions, mode);
 #else
@@ -632,7 +754,7 @@ void policy::PolicyHandler::SetDaysAfterEpoch() {
 
 #ifdef ENABLE_SECURITY
 std::string PolicyHandler::RetrieveCertificate() const {
-  POLICY_LIB_CHECK(std::string(""));
+  POLICY_LIB_CHECK_OR_RETURN(std::string(""));
   return policy_manager_->RetrieveCertificate();
 }
 #endif  // ENABLE_SECURITY
@@ -660,6 +782,19 @@ void PolicyHandler::OnGetUserFriendlyMessage(
       result, correlation_id, application_manager_);
 }
 
+void PolicyHandler::OnSystemRequestReceived() const {
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  ptu_retry_handler().OnSystemRequestReceived();
+#endif
+  policy_manager_->ResetTimeout();
+}
+
+void PolicyHandler::TriggerPTUOnStartupIfRequired() {
+#ifdef PROPRIETARY_MODE
+  policy_manager_->TriggerPTUOnStartupIfRequired();
+#endif
+}
+
 void PolicyHandler::GetRegisteredLinks(
     std::map<std::string, std::string>& out_links) const {
   DataAccessor<ApplicationSet> accessor = application_manager_.applications();
@@ -673,7 +808,7 @@ void PolicyHandler::GetRegisteredLinks(
 std::vector<policy::FunctionalGroupPermission>
 PolicyHandler::CollectRegisteredAppsPermissions() {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(std::vector<policy::FunctionalGroupPermission>());
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<policy::FunctionalGroupPermission>());
   // If no specific app was passed, get permissions for all currently registered
   // applications
   sync_primitives::AutoLock lock(app_to_device_link_lock_);
@@ -694,9 +829,11 @@ PolicyHandler::CollectRegisteredAppsPermissions() {
 
 std::vector<FunctionalGroupPermission> PolicyHandler::CollectAppPermissions(
     const uint32_t connection_key) {
+  std::vector<FunctionalGroupPermission> group_permissions;
+  POLICY_LIB_CHECK_OR_RETURN(group_permissions);
+
   // Single app only
   ApplicationSharedPtr app = application_manager_.application(connection_key);
-  std::vector<FunctionalGroupPermission> group_permissions;
 
   if (NULL == app.get() || app.use_count() == 0) {
     LOG4CXX_WARN(logger_,
@@ -774,6 +911,7 @@ void PolicyHandler::LinkAppsToDevice() {
 bool PolicyHandler::IsAppSuitableForPolicyUpdate(
     const Applications::value_type value) const {
   LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_OR_RETURN(false);
 
   if (!value->IsRegistered()) {
     LOG4CXX_DEBUG(
@@ -852,10 +990,15 @@ void PolicyHandler::OnUpdateStatusChanged(const std::string& status) {
 }
 
 std::string PolicyHandler::OnCurrentDeviceIdUpdateRequired(
+    const transport_manager::DeviceHandle& device_handle,
     const std::string& policy_app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  ApplicationSharedPtr app =
-      application_manager_.application_by_policy_id(policy_app_id);
+  DeviceParams device_params = GetDeviceParams(
+      device_handle,
+      application_manager_.connection_handler().get_session_observer());
+
+  ApplicationSharedPtr app = application_manager_.application(
+      device_params.device_mac_address, policy_app_id);
 
   if (app.use_count() == 0) {
     LOG4CXX_WARN(logger_,
@@ -863,11 +1006,8 @@ std::string PolicyHandler::OnCurrentDeviceIdUpdateRequired(
                      << policy_app_id
                      << "' "
                         "not found within registered applications.");
-    return "";
+    return std::string();
   }
-  DeviceParams device_params = GetDeviceParams(
-      app->device(),
-      application_manager_.connection_handler().get_session_observer());
 
   return device_params.device_mac_address;
 }
@@ -886,12 +1026,6 @@ void PolicyHandler::OnGetSystemInfo(const std::string& ccpu_version,
   policy_manager_->SetSystemInfo(ccpu_version, wers_country_code, language);
 }
 
-void PolicyHandler::OnSystemInfoUpdateRequired() {
-  LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK_VOID();
-  MessageHelper::SendGetSystemInfoRequest(application_manager_);
-}
-
 void PolicyHandler::OnVIIsReady() {
   LOG4CXX_AUTO_TRACE(logger_);
   const uint32_t correlation_id =
@@ -925,14 +1059,14 @@ void PolicyHandler::OnVehicleDataUpdated(
 }
 
 void PolicyHandler::OnPendingPermissionChange(
-    const std::string& policy_app_id) {
+    const std::string& device_id, const std::string& policy_app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(
       logger_,
       "PolicyHandler::OnPendingPermissionChange for " << policy_app_id);
   POLICY_LIB_CHECK_VOID();
   ApplicationSharedPtr app =
-      application_manager_.application_by_policy_id(policy_app_id);
+      application_manager_.application(device_id, policy_app_id);
   if (app.use_count() == 0) {
     LOG4CXX_WARN(logger_,
                  "No app found for " << policy_app_id << " policy app id.");
@@ -940,7 +1074,7 @@ void PolicyHandler::OnPendingPermissionChange(
   }
 
   AppPermissions permissions =
-      policy_manager_->GetAppPermissionsChanges(policy_app_id);
+      policy_manager_->GetAppPermissionsChanges(device_id, policy_app_id);
 
   const uint32_t app_id = app->app_id();
 
@@ -949,6 +1083,7 @@ void PolicyHandler::OnPendingPermissionChange(
         app_id, permissions, application_manager_);
     application_manager_.state_controller().SetRegularState(
         app,
+        mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
         mobile_apis::HMILevel::HMI_NONE,
         mobile_apis::AudioStreamingState::NOT_AUDIBLE,
         mobile_apis::VideoStreamingState::NOT_STREAMABLE,
@@ -957,7 +1092,8 @@ void PolicyHandler::OnPendingPermissionChange(
     return;
   }
 
-  mobile_apis::HMILevel::eType app_hmi_level = app->hmi_level();
+  mobile_apis::HMILevel::eType app_hmi_level =
+      app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
 
   switch (app_hmi_level) {
     case mobile_apis::HMILevel::eType::HMI_FULL:
@@ -1006,10 +1142,16 @@ void PolicyHandler::OnPendingPermissionChange(
 
 bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
                                      const std::string& url) {
+  const uint32_t app_id = GetAppIdForSending();
+  return SendMessageToSDK(pt_string, url, app_id);
+}
+
+bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
+                                     const std::string& url,
+                                     const uint32_t app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
 
-  const uint32_t app_id = GetAppIdForSending();
   ApplicationSharedPtr app = application_manager_.application(app_id);
 
   if (!app) {
@@ -1044,17 +1186,27 @@ bool PolicyHandler::SendMessageToSDK(const BinaryMessage& pt_string,
 
 bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file,
                                           const BinaryMessage& pt_string) {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
+
+  const auto load_pt_result = policy_manager_->LoadPT(file, pt_string);
+
+  LOG4CXX_INFO(logger_, "Load policy table result code: " << load_pt_result);
+
+  const bool is_ptu_successful =
+      load_pt_result == PolicyManager::PtProcessingResult::kSuccess;
+  OnPTUFinished(is_ptu_successful);
 
-  bool ret = policy_manager_->LoadPT(file, pt_string);
-  LOG4CXX_INFO(logger_, "Policy table is saved: " << std::boolalpha << ret);
-  if (ret) {
+  if (is_ptu_successful) {
     LOG4CXX_INFO(logger_, "PTU was successful.");
     policy_manager_->CleanupUnpairedDevices();
-    int32_t correlation_id = application_manager_.GetNextHMICorrelationID();
-
     SetDaysAfterEpoch();
+    policy_manager_->OnPTUFinished(load_pt_result);
+#ifndef EXTERNAL_PROPRIETARY_MODE
+    // Clean up retry information
+    last_ptu_app_id_ = 0;
+#endif  // EXTERNAL_PROPRIETARY_MODE
 
+    uint32_t correlation_id = application_manager_.GetNextHMICorrelationID();
     event_observer_->subscribe_on_event(
         hmi_apis::FunctionID::VehicleInfo_GetVehicleData, correlation_id);
     std::vector<std::string> vehicle_data_args;
@@ -1063,9 +1215,10 @@ bool PolicyHandler::ReceiveMessageFromSDK(const std::string& file,
         correlation_id, vehicle_data_args, application_manager_);
   } else {
     LOG4CXX_WARN(logger_, "Exchange wasn't successful");
+    policy_manager_->OnPTUFinished(load_pt_result);
   }
-  OnPTUFinished(ret);
-  return ret;
+
+  return is_ptu_successful;
 }
 
 bool PolicyHandler::UnloadPolicyLibrary() {
@@ -1077,10 +1230,6 @@ bool PolicyHandler::UnloadPolicyLibrary() {
   if (policy_manager_) {
     policy_manager_.reset();
   }
-  if (dl_handle_) {
-    ret = (dlclose(dl_handle_) == 0);
-    dl_handle_ = 0;
-  }
   LOG4CXX_TRACE(logger_, "exit");
   return ret;
 }
@@ -1099,7 +1248,8 @@ struct SDLAlowedNotification {
     if (app->device() == device_id_) {
       std::string hmi_level;
       mobile_apis::HMILevel::eType default_mobile_hmi;
-      policy_manager_->GetDefaultHmi(app->policy_app_id(), &hmi_level);
+      policy_manager_->GetDefaultHmi(
+          app->mac_address(), app->policy_app_id(), &hmi_level);
       if ("BACKGROUND" == hmi_level) {
         default_mobile_hmi = mobile_apis::HMILevel::HMI_BACKGROUND;
       } else if ("FULL" == hmi_level) {
@@ -1111,7 +1261,11 @@ struct SDLAlowedNotification {
       } else {
         return;
       }
-      state_controller_.SetRegularState(app, default_mobile_hmi, true);
+      state_controller_.SetRegularState(
+          app,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+          default_mobile_hmi,
+          true);
     }
   }
 
@@ -1220,7 +1374,12 @@ void PolicyHandler::OnAllowSDLFunctionalityNotification(
                                     : VideoStreamingState::NOT_STREAMABLE;
 
       application_manager_.state_controller().SetRegularState(
-          app, mobile_apis::HMILevel::HMI_FULL, audio_state, video_state, true);
+          app,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+          mobile_apis::HMILevel::HMI_FULL,
+          audio_state,
+          video_state,
+          true);
       last_activated_app_id_ = 0;
     } else {
       DeactivateApplication deactivate_notification(
@@ -1256,7 +1415,8 @@ void PolicyHandler::OnActivateApp(uint32_t connection_key,
       permissions.isSDLAllowed = true;
     }
   } else {
-    permissions = policy_manager_->GetAppPermissionsChanges(policy_app_id);
+    permissions = policy_manager_->GetAppPermissionsChanges(app->mac_address(),
+                                                            policy_app_id);
 #ifdef EXTERNAL_PROPRIETARY_MODE
     UsageStatistics& usage = app->usage_report();
 
@@ -1327,24 +1487,26 @@ void PolicyHandler::PTExchangeAtUserRequest(uint32_t correlation_id) {
       update_status, correlation_id, application_manager_);
 }
 
-void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
+void PolicyHandler::OnPermissionsUpdated(const std::string& device_id,
+                                         const std::string& policy_app_id,
                                          const Permissions& permissions,
                                          const HMILevel& default_hmi) {
   LOG4CXX_AUTO_TRACE(logger_);
-  OnPermissionsUpdated(policy_app_id, permissions);
+  OnPermissionsUpdated(device_id, policy_app_id, permissions);
 
   ApplicationSharedPtr app =
-      application_manager_.application_by_policy_id(policy_app_id);
+      application_manager_.application(device_id, policy_app_id);
   if (app.use_count() == 0) {
     LOG4CXX_WARN(
         logger_,
-        "Connection_key not found for application_id:" << policy_app_id);
+        "Connection_key not found for application_id: " << policy_app_id);
     return;
   }
 
   // The application currently not running (i.e. in NONE) should change HMI
   // level to default
-  mobile_apis::HMILevel::eType current_hmi_level = app->hmi_level();
+  mobile_apis::HMILevel::eType current_hmi_level =
+      app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
   mobile_apis::HMILevel::eType hmi_level =
       MessageHelper::StringToHMILevel(default_hmi);
 
@@ -1367,10 +1529,16 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
 
       if (hmi_level == mobile_apis::HMILevel::HMI_FULL) {
         application_manager_.state_controller().SetRegularState(
-            app, hmi_level, true);
+            app,
+            mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            hmi_level,
+            true);
       } else {
         application_manager_.state_controller().SetRegularState(
-            app, hmi_level, false);
+            app,
+            mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            hmi_level,
+            false);
       }
       break;
     }
@@ -1383,27 +1551,40 @@ void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
   }
 }
 
-void PolicyHandler::OnPermissionsUpdated(const std::string& policy_app_id,
+void PolicyHandler::OnPermissionsUpdated(const std::string& device_id,
+                                         const std::string& policy_app_id,
                                          const Permissions& permissions) {
   LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_VOID();
+
   ApplicationSharedPtr app =
-      application_manager_.application_by_policy_id(policy_app_id);
+      application_manager_.application(device_id, policy_app_id);
   if (app.use_count() == 0) {
     LOG4CXX_WARN(
         logger_,
-        "Connection_key not found for application_id:" << policy_app_id);
+        "Connection_key not found for application_id: " << policy_app_id);
     return;
   }
 
+  const auto require_encryption =
+      policy_manager_->GetAppEncryptionRequired(policy_app_id);
+
   MessageHelper::SendOnPermissionsChangeNotification(
-      app->app_id(), permissions, application_manager_);
+      app->app_id(), permissions, application_manager_, require_encryption);
 
   LOG4CXX_DEBUG(logger_,
-                "Notification sent for application_id:"
+                "Notification sent for application_id: "
                     << policy_app_id << " and connection_key "
                     << app->app_id());
 }
 
+void PolicyHandler::OnPTUTimeOut() {
+  PopAppIdFromPTUQueue();
+#ifndef EXTERNAL_PROPRIETARY_MODE
+  application_manager_.protocol_handler().ProcessFailedPTU();
+#endif
+}
+
 bool PolicyHandler::SaveSnapshot(const BinaryMessage& pt_string,
                                  std::string& snap_path) {
   const std::string& policy_snapshot_file_name =
@@ -1439,55 +1620,114 @@ void PolicyHandler::OnSnapshotCreated(
   }
 }
 #else  // EXTERNAL_PROPRIETARY_MODE
-void PolicyHandler::OnSnapshotCreated(const BinaryMessage& pt_string) {
+void PolicyHandler::OnSnapshotCreated(const BinaryMessage& pt_string,
+                                      const PTUIterationType iteration_type) {
   LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
 #ifdef PROPRIETARY_MODE
-  std::string policy_snapshot_full_path;
-  if (!SaveSnapshot(pt_string, policy_snapshot_full_path)) {
-    LOG4CXX_ERROR(logger_, "Snapshot processing skipped.");
-    return;
+  if (PTUIterationType::RetryIteration == iteration_type) {
+    uint32_t app_id_for_sending = 0;
+    const std::string& url =
+        GetNextUpdateUrl(PTUIterationType::RetryIteration, app_id_for_sending);
+    if (0 != url.length() && !policy_snapshot_path_.empty()) {
+      MessageHelper::SendPolicySnapshotNotification(
+          app_id_for_sending, policy_snapshot_path_, url, application_manager_);
+    }
+  } else {
+    std::string policy_snapshot_full_path;
+    if (!SaveSnapshot(pt_string, policy_snapshot_full_path)) {
+      LOG4CXX_ERROR(logger_, "Snapshot processing skipped.");
+      return;
+    }
+
+    MessageHelper::SendPolicyUpdate(
+        policy_snapshot_full_path,
+        TimeoutExchangeSec(),
+        policy_manager_->RetrySequenceDelaysSeconds(),
+        application_manager_);
   }
-  MessageHelper::SendPolicyUpdate(policy_snapshot_full_path,
-                                  TimeoutExchangeSec(),
-                                  policy_manager_->RetrySequenceDelaysSeconds(),
-                                  application_manager_);
 #else   // PROPRIETARY_MODE
-  LOG4CXX_ERROR(logger_, "HTTP policy");
-  EndpointUrls urls;
-  policy_manager_->GetUpdateUrls("0x07", urls);
+  LOG4CXX_INFO(logger_, "HTTP policy");
 
-  if (urls.empty()) {
-    LOG4CXX_ERROR(logger_, "Service URLs are empty! NOT sending PT to mobile!");
-    return;
+  uint32_t app_id_for_sending = 0;
+  const std::string& url = GetNextUpdateUrl(iteration_type, app_id_for_sending);
+  if (0 != url.length()) {
+    SendMessageToSDK(pt_string, url, app_id_for_sending);
   }
+#endif  // PROPRIETARY_MODE
+}
 
-  AppIdURL app_url = policy_manager_->GetNextUpdateUrl(urls);
-  while (!IsUrlAppIdValid(app_url.first, urls)) {
-    app_url = policy_manager_->GetNextUpdateUrl(urls);
+std::string PolicyHandler::GetNextUpdateUrl(
+    const PTUIterationType iteration_type, uint32_t& app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_OR_RETURN(std::string());
+  app_id = ChoosePTUApplication(iteration_type);
+
+  if (0 == app_id) {
+    return std::string();
   }
-  const std::string& url = urls[app_url.first].url[app_url.second];
-  SendMessageToSDK(pt_string, url);
-#endif  // PROPRIETARY_MODE
-  // reset update required false
-  OnUpdateRequestSentToMobile();
+
+  // Use cached URL for retries if it was provided by the HMI
+  if (PTUIterationType::RetryIteration == iteration_type &&
+      !retry_update_url_.empty()) {
+    return retry_update_url_;
+  }
+
+  EndpointUrls endpoint_urls;
+  policy_manager_->GetUpdateUrls("0x07", endpoint_urls);
+
+  if (endpoint_urls.empty()) {
+    LOG4CXX_ERROR(logger_, "Service URLs are empty!");
+    return std::string();
+  }
+
+  auto get_ptu_app = [this](AppIdURL app_url, uint32_t& app_id) {
+    if (app_url.first == 0 && app_url.second == 0) {
+      // We've looped past the end of the list, choose new application
+      app_id = ChoosePTUApplication(PTUIterationType::DefaultIteration);
+      if (0 == app_id) {
+        return ApplicationSharedPtr();
+      }
+    }
+    return application_manager_.application(app_id);
+  };
+
+  AppIdURL app_url = policy_manager_->GetNextUpdateUrl(endpoint_urls);
+  ApplicationSharedPtr app = get_ptu_app(app_url, app_id);
+  if (!app) {
+    LOG4CXX_ERROR(logger_, "No available applications for PTU!");
+    return std::string();
+  }
+  EndpointData& data = endpoint_urls[app_url.first];
+  while (!IsUrlAppIdValid(app->policy_app_id(), data)) {
+    app_url = policy_manager_->GetNextUpdateUrl(endpoint_urls);
+    app = get_ptu_app(app_url, app_id);
+    if (!app) {
+      LOG4CXX_ERROR(logger_, "No available applications for PTU!");
+      return std::string();
+    }
+    data = endpoint_urls[app_url.first];
+  }
+  const std::string& url = data.url[app_url.second];
+  return url;
 }
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
 bool PolicyHandler::GetPriority(const std::string& policy_app_id,
                                 std::string* priority) const {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->GetPriority(policy_app_id, priority);
 }
 
 void PolicyHandler::CheckPermissions(
     const application_manager::ApplicationSharedPtr app,
+    const application_manager::WindowID window_id,
     const PTString& rpc,
     const RPCParams& rpc_params,
     CheckPermissionResult& result) {
   POLICY_LIB_CHECK_VOID();
   const std::string hmi_level =
-      MessageHelper::StringifiedHMILevel(app->hmi_level());
+      MessageHelper::StringifiedHMILevel(app->hmi_level(window_id));
   if (hmi_level.empty()) {
     LOG4CXX_WARN(logger_,
                  "HMI level for " << app->policy_app_id() << " is invalid, rpc "
@@ -1501,65 +1741,96 @@ void PolicyHandler::CheckPermissions(
                "Checking permissions for  " << app->policy_app_id() << " in "
                                             << hmi_level << " on device "
                                             << device_id << " rpc " << rpc);
-#ifdef EXTERNAL_PROPRIETARY_MODE
-  policy_manager_->CheckPermissions(
-      app->policy_app_id(), hmi_level, rpc, rpc_params, result);
-#else   // EXTERNAL_PROPRIETARY_MODE
   policy_manager_->CheckPermissions(
       device_id, app->policy_app_id(), hmi_level, rpc, rpc_params, result);
-#endif  // EXTERNAL_PROPRIETARY_MODE
 }
 
 uint32_t PolicyHandler::GetNotificationsNumber(
     const std::string& priority) const {
-  POLICY_LIB_CHECK(0);
+  POLICY_LIB_CHECK_OR_RETURN(0);
   return policy_manager_->GetNotificationsNumber(priority);
 }
 
 DeviceConsent PolicyHandler::GetUserConsentForDevice(
     const std::string& device_id) const {
-  POLICY_LIB_CHECK(kDeviceDisallowed);
+  POLICY_LIB_CHECK_OR_RETURN(kDeviceDisallowed);
   return policy_manager_->GetUserConsentForDevice(device_id);
 }
 
-bool PolicyHandler::GetDefaultHmi(const std::string& policy_app_id,
+Json::Value PolicyHandler::GetPolicyTableData() const {
+  POLICY_LIB_CHECK_OR_RETURN(Json::Value());
+  return policy_manager_->GetPolicyTableData();
+}
+
+bool PolicyHandler::GetDefaultHmi(const std::string& device_id,
+                                  const std::string& policy_app_id,
                                   std::string* default_hmi) const {
-  POLICY_LIB_CHECK(false);
-  return policy_manager_->GetDefaultHmi(policy_app_id, default_hmi);
+  POLICY_LIB_CHECK_OR_RETURN(false);
+  return policy_manager_->GetDefaultHmi(device_id, policy_app_id, default_hmi);
 }
 
 bool PolicyHandler::GetInitialAppData(const std::string& application_id,
                                       StringArray* nicknames,
                                       StringArray* app_hmi_types) {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->GetInitialAppData(
       application_id, nicknames, app_hmi_types);
 }
 
 void PolicyHandler::GetUpdateUrls(const std::string& service_type,
-                                  EndpointUrls& out_end_points) {
+                                  EndpointUrls& out_end_points) const {
   POLICY_LIB_CHECK_VOID();
   policy_manager_->GetUpdateUrls(service_type, out_end_points);
 }
 
 void PolicyHandler::GetUpdateUrls(const uint32_t service_type,
-                                  EndpointUrls& out_end_points) {
+                                  EndpointUrls& out_end_points) const {
   POLICY_LIB_CHECK_VOID();
   policy_manager_->GetUpdateUrls(service_type, out_end_points);
 }
 
-std::string PolicyHandler::GetLockScreenIconUrl() const {
-  POLICY_LIB_CHECK(std::string(""));
-  return policy_manager_->GetLockScreenIconUrl();
+std::string PolicyHandler::GetLockScreenIconUrl(
+    const std::string& policy_app_id) const {
+  const std::string default_url;
+  POLICY_LIB_CHECK_OR_RETURN(default_url);
+
+  EndpointUrls endpoints;
+  policy_manager_->GetUpdateUrls("lock_screen_icon_url", endpoints);
+
+  auto it_specific =
+      std::find_if(endpoints.begin(),
+                   endpoints.end(),
+                   [&policy_app_id](const EndpointData& endpoint) {
+                     return endpoint.app_id == policy_app_id;
+                   });
+
+  if (endpoints.end() != it_specific && !it_specific->url.empty()) {
+    LOG4CXX_DEBUG(logger_,
+                  "Specific app URL will be used for " << policy_app_id);
+    return it_specific->url.front();
+  }
+
+  auto it_default = std::find_if(
+      endpoints.begin(), endpoints.end(), [](const EndpointData& endpoint) {
+        return endpoint.app_id == kDefaultId;
+      });
+
+  if (endpoints.end() != it_default && !it_default->url.empty()) {
+    LOG4CXX_DEBUG(logger_, "Default URL will be used for " << policy_app_id);
+    return it_default->url.front();
+  }
+
+  LOG4CXX_ERROR(logger_, "Can't find URL for " << policy_app_id);
+  return std::string();
 }
 
 std::string PolicyHandler::GetIconUrl(const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(std::string(""));
+  POLICY_LIB_CHECK_OR_RETURN(std::string(""));
   return policy_manager_->GetIconUrl(policy_app_id);
 }
 
 uint32_t PolicyHandler::NextRetryTimeout() {
-  POLICY_LIB_CHECK(0);
+  POLICY_LIB_CHECK_OR_RETURN(0);
   LOG4CXX_AUTO_TRACE(logger_);
   return policy_manager_->NextRetryTimeout();
 }
@@ -1569,30 +1840,31 @@ uint32_t PolicyHandler::TimeoutExchangeSec() const {
 }
 
 uint32_t PolicyHandler::TimeoutExchangeMSec() const {
-  POLICY_LIB_CHECK(0);
+  POLICY_LIB_CHECK_OR_RETURN(0);
   return policy_manager_->TimeoutExchangeMSec();
 }
 
 void PolicyHandler::OnExceededTimeout() {
+  LOG4CXX_AUTO_TRACE(logger_);
   POLICY_LIB_CHECK_VOID();
-  policy_manager_->OnExceededTimeout();
-}
 
-void PolicyHandler::OnSystemReady() {
-  POLICY_LIB_CHECK_VOID();
-  policy_manager_->OnSystemReady();
+  std::for_each(listeners_.begin(),
+                listeners_.end(),
+                std::mem_fn(&PolicyHandlerObserver::OnPTUTimeoutExceeded));
+
+  policy_manager_->OnExceededTimeout();
 }
 
 const boost::optional<bool> PolicyHandler::LockScreenDismissalEnabledState()
     const {
-  POLICY_LIB_CHECK(boost::optional<bool>());
+  POLICY_LIB_CHECK_OR_RETURN(boost::optional<bool>());
   return policy_manager_->LockScreenDismissalEnabledState();
 }
 
 const boost::optional<std::string>
 PolicyHandler::LockScreenDismissalWarningMessage(
     const std::string& language) const {
-  POLICY_LIB_CHECK(boost::optional<std::string>());
+  POLICY_LIB_CHECK_OR_RETURN(boost::optional<std::string>());
   return policy_manager_->LockScreenDismissalWarningMessage(language);
 }
 
@@ -1662,7 +1934,7 @@ custom_str::CustomString PolicyHandler::GetAppName(
   if (app.use_count() == 0) {
     LOG4CXX_WARN(
         logger_,
-        "Connection_key not found for application_id:" << policy_app_id);
+        "Connection_key not found for application_id: " << policy_app_id);
     return custom_str::CustomString("");
   }
   return app->name();
@@ -1732,6 +2004,7 @@ void PolicyHandler::OnCertificateDecrypted(bool is_succeeded) {
 
   if (!is_succeeded) {
     LOG4CXX_ERROR(logger_, "Couldn't delete file " << file_name);
+    ProcessCertDecryptFailed();
     return;
   }
 
@@ -1754,6 +2027,18 @@ void PolicyHandler::OnCertificateDecrypted(bool is_succeeded) {
       std::bind2nd(std::mem_fun(&PolicyHandlerObserver::OnCertificateUpdated),
                    certificate_data));
 }
+
+void PolicyHandler::ProcessCertDecryptFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(listeners_lock_);
+
+  std::for_each(
+      listeners_.begin(),
+      listeners_.end(),
+      std::bind2nd(std::mem_fn(&PolicyHandlerObserver::OnCertDecryptFinished),
+                   false));
+}
+
 #else   // EXTERNAL_PROPRIETARY_MODE
 void PolicyHandler::OnCertificateUpdated(const std::string& certificate_data) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1781,6 +2066,8 @@ void PolicyHandler::OnPTUFinished(const bool ptu_result) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(listeners_lock_);
 
+  PopAppIdFromPTUQueue();
+
   std::for_each(
       listeners_.begin(),
       listeners_.end(),
@@ -1812,7 +2099,7 @@ void PolicyHandler::RemoveDevice(const std::string& device_id) {
 
 bool PolicyHandler::IsApplicationRevoked(const std::string& app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
 
   return policy_manager_->IsApplicationRevoked(app_id);
 }
@@ -1824,12 +2111,12 @@ void PolicyHandler::OnUpdateRequestSentToMobile() {
 }
 
 bool PolicyHandler::CheckKeepContext(const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->CanAppKeepContext(policy_app_id);
 }
 
 bool PolicyHandler::CheckStealFocus(const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->CanAppStealFocus(policy_app_id);
 }
 
@@ -1852,47 +2139,208 @@ bool PolicyHandler::CheckSystemAction(
   return false;
 }
 
+std::vector<std::string> PolicyHandler::GetApplicationPolicyIDs() const {
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<std::string>());
+  const auto all_policy_ids = policy_manager_->GetApplicationPolicyIDs();
+  std::vector<std::string> policy_app_ids;
+
+  std::copy_if(
+      all_policy_ids.begin(),
+      all_policy_ids.end(),
+      std::back_inserter(policy_app_ids),
+      [](std::string id) {
+        return helpers::Compare<std::string, helpers::NEQ, helpers::ALL>(
+            id, kDefaultId, kPreDataConsentId, kDeviceId);
+      });
+
+  return policy_app_ids;
+}
+
 void PolicyHandler::GetEnabledCloudApps(
     std::vector<std::string>& enabled_apps) const {
   POLICY_LIB_CHECK_VOID();
   policy_manager_->GetEnabledCloudApps(enabled_apps);
 }
 
-bool PolicyHandler::GetCloudAppParameters(
-    const std::string& policy_app_id,
-    bool& enabled,
-    std::string& endpoint,
-    std::string& certificate,
-    std::string& auth_token,
-    std::string& cloud_transport_type,
-    std::string& hybrid_app_preference) const {
-  POLICY_LIB_CHECK(false);
-  return policy_manager_->GetCloudAppParameters(policy_app_id,
-                                                enabled,
-                                                endpoint,
-                                                certificate,
-                                                auth_token,
-                                                cloud_transport_type,
-                                                hybrid_app_preference);
+bool PolicyHandler::GetAppProperties(const std::string& policy_app_id,
+                                     AppProperties& out_app_properties) const {
+  POLICY_LIB_CHECK_OR_RETURN(false);
+  return policy_manager_->GetAppProperties(policy_app_id, out_app_properties);
+}
+
+std::vector<std::string> PolicyHandler::GetEnabledLocalApps() const {
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<std::string>());
+  return policy_manager_->GetEnabledLocalApps();
 }
 
 const bool PolicyHandler::CheckCloudAppEnabled(
     const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(false);
-  bool enabled = false;
-  std::string endpoint;
-  std::string auth_token;
-  std::string certificate;
-  std::string cloud_transport_type;
-  std::string hybrid_app_preference;
-  policy_manager_->GetCloudAppParameters(policy_app_id,
-                                         enabled,
-                                         endpoint,
-                                         certificate,
-                                         auth_token,
-                                         cloud_transport_type,
-                                         hybrid_app_preference);
-  return enabled;
+  POLICY_LIB_CHECK_OR_RETURN(false);
+  AppProperties out_app_properties;
+  policy_manager_->GetAppProperties(policy_app_id, out_app_properties);
+  return out_app_properties.enabled;
+}
+
+PolicyHandler::AppPropertiesState PolicyHandler::GetAppPropertiesStatus(
+    const smart_objects::SmartObject& properties,
+    const std::string& app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  POLICY_LIB_CHECK_OR_RETURN(AppPropertiesState::NO_CHANGES);
+
+  AppProperties app_properties;
+  policy_manager_->GetAppProperties(app_id, app_properties);
+
+  policy::StringArray nicknames;
+  policy::StringArray app_hmi_types;
+  policy_manager_->GetInitialAppData(app_id, &nicknames, &app_hmi_types);
+
+  if (properties.keyExists(strings::enabled) &&
+      app_properties.enabled != properties[strings::enabled].asBool()) {
+    LOG4CXX_DEBUG(logger_,
+                  "\"enabled\" was changed from: "
+                      << app_properties.enabled
+                      << " to: " << properties[strings::enabled].asBool());
+    return AppPropertiesState::ENABLED_FLAG_SWITCH;
+  }
+  if (properties.keyExists(strings::auth_token) &&
+      app_properties.auth_token != properties[strings::auth_token].asString()) {
+    LOG4CXX_DEBUG(logger_,
+                  "\"auth_token\" was changed from: "
+                      << app_properties.auth_token
+                      << " to: " << properties[strings::auth_token].asString());
+    return AppPropertiesState::AUTH_TOKEN_CHANGED;
+  }
+  if (properties.keyExists(strings::transport_type) &&
+      app_properties.transport_type !=
+          properties[strings::transport_type].asString()) {
+    LOG4CXX_DEBUG(logger_,
+                  "\"transport_type\" was changed from: "
+                      << app_properties.transport_type << " to: "
+                      << properties[strings::transport_type].asString());
+    return AppPropertiesState::TRANSPORT_TYPE_CHANGED;
+  }
+
+  if (properties.keyExists(strings::cloud_transport_type) &&
+      app_properties.transport_type !=
+          properties[strings::cloud_transport_type].asString()) {
+    LOG4CXX_DEBUG(logger_,
+                  "\"transport_type\" was changed from: "
+                      << app_properties.transport_type << " to: "
+                      << properties[strings::cloud_transport_type].asString());
+    return AppPropertiesState::TRANSPORT_TYPE_CHANGED;
+  }
+
+  if (properties.keyExists(strings::endpoint) &&
+      app_properties.endpoint != properties[strings::endpoint].asString()) {
+    LOG4CXX_DEBUG(logger_,
+                  "\"endpoint\" was changed from: "
+                      << app_properties.endpoint
+                      << " to: " << properties[strings::endpoint].asString());
+    return AppPropertiesState::ENDPOINT_CHANGED;
+  }
+  if (properties.keyExists(strings::nicknames)) {
+    const smart_objects::SmartArray* nicknames_array =
+        properties[strings::nicknames].asArray();
+
+    if (nicknames_array->size() != nicknames.size()) {
+      return AppPropertiesState::NICKNAMES_CHANGED;
+    }
+
+    smart_objects::SmartArray::const_iterator it_begin =
+        nicknames_array->begin();
+    smart_objects::SmartArray::const_iterator it_end = nicknames_array->end();
+    for (; it_begin != it_end; ++it_begin) {
+      const auto result =
+          std::find(nicknames.begin(), nicknames.end(), (*it_begin).asString());
+      if (nicknames.end() == result) {
+        LOG4CXX_DEBUG(logger_,
+                      "\"nicknames\" were changed, new value: "
+                          << (*it_begin).asString());
+        return AppPropertiesState::NICKNAMES_CHANGED;
+      }
+    }
+  }
+  if (properties.keyExists(strings::hybrid_app_preference)) {
+    auto value = static_cast<mobile_apis::HybridAppPreference::eType>(
+        properties[strings::hybrid_app_preference].asUInt());
+    std::string hybrid_app_preference_str;
+    smart_objects::EnumConversionHelper<
+        mobile_apis::HybridAppPreference::eType>::
+        EnumToString(value, &hybrid_app_preference_str);
+    if (app_properties.hybrid_app_preference != hybrid_app_preference_str) {
+      LOG4CXX_DEBUG(
+          logger_,
+          "\"hybrid_app_preference\" was changed from: "
+              << app_properties.hybrid_app_preference << " to: "
+              << properties[strings::hybrid_app_preference].asString());
+      return AppPropertiesState::HYBRYD_APP_PROPERTIES_CHANGED;
+    }
+  }
+  return AppPropertiesState::NO_CHANGES;
+}
+
+bool PolicyHandler::IsNewApplication(const std::string& policy_app_id) const {
+  POLICY_LIB_CHECK_OR_RETURN(false);
+  return policy_manager_->IsNewApplication(policy_app_id);
+}
+
+void PolicyHandler::OnSetAppProperties(
+    const smart_objects::SmartObject& properties) {
+  POLICY_LIB_CHECK_VOID();
+
+  const auto policy_app_id(properties[strings::policy_app_id].asString());
+  policy_manager_->InitCloudApp(policy_app_id);
+
+  bool auth_token_update = false;
+  if (properties.keyExists(strings::enabled)) {
+    const bool enabled = properties[strings::enabled].asBool();
+    policy_manager_->SetCloudAppEnabled(policy_app_id, enabled);
+  }
+  if (properties.keyExists(strings::auth_token)) {
+    const std::string auth_token = properties[strings::auth_token].asString();
+    policy_manager_->SetAppAuthToken(policy_app_id, auth_token);
+    auth_token_update = true;
+  }
+  if (properties.keyExists(strings::transport_type)) {
+    policy_manager_->SetAppCloudTransportType(
+        policy_app_id, properties[strings::transport_type].asString());
+  }
+  if (properties.keyExists(strings::endpoint)) {
+    policy_manager_->SetAppEndpoint(policy_app_id,
+                                    properties[strings::endpoint].asString());
+  }
+  if (properties.keyExists(strings::nicknames)) {
+    StringArray nicknames;
+    const smart_objects::SmartObject& nicknames_array =
+        properties[strings::nicknames];
+    for (size_t i = 0; i < nicknames_array.length(); ++i) {
+      nicknames.push_back(nicknames_array[i].asString());
+    }
+    policy_manager_->SetAppNicknames(policy_app_id, nicknames);
+  }
+  if (properties.keyExists(strings::hybrid_app_preference)) {
+    std::string hybrid_app_preference;
+
+    auto value = static_cast<mobile_apis::HybridAppPreference::eType>(
+        properties[strings::hybrid_app_preference].asUInt());
+    smart_objects::EnumConversionHelper<
+        mobile_apis::HybridAppPreference::eType>::
+        EnumToString(value, &hybrid_app_preference);
+    policy_manager_->SetHybridAppPreference(policy_app_id,
+                                            hybrid_app_preference);
+  }
+
+  if (auth_token_update) {
+    AppProperties app_properties;
+    if (policy_manager_->GetAppProperties(policy_app_id, app_properties)) {
+      OnAuthTokenUpdated(policy_app_id, app_properties.auth_token);
+    }
+  }
+}
+
+void PolicyHandler::OnLocalAppAdded() {
+  POLICY_LIB_CHECK_VOID();
+  policy_manager_->OnLocalAppAdded();
 }
 
 void PolicyHandler::OnSetCloudAppProperties(
@@ -1955,9 +2403,8 @@ void PolicyHandler::OnSetCloudAppProperties(
   if (properties.keyExists(strings::hybrid_app_preference)) {
     std::string hybrid_app_preference;
 
-    mobile_apis::HybridAppPreference::eType value =
-        static_cast<mobile_apis::HybridAppPreference::eType>(
-            properties[strings::hybrid_app_preference].asUInt());
+    auto value = static_cast<mobile_apis::HybridAppPreference::eType>(
+        properties[strings::hybrid_app_preference].asUInt());
     smart_objects::EnumConversionHelper<
         mobile_apis::HybridAppPreference::eType>::
         EnumToString(value, &hybrid_app_preference);
@@ -1966,13 +2413,10 @@ void PolicyHandler::OnSetCloudAppProperties(
   }
 
   if (auth_token_update) {
-    bool enabled;
-    std::string end, cert, ctt, hap;
-    std::string auth_token;
+    AppProperties app_properties;
 
-    policy_manager_->GetCloudAppParameters(
-        policy_app_id, enabled, end, cert, auth_token, ctt, hap);
-    OnAuthTokenUpdated(policy_app_id, auth_token);
+    policy_manager_->GetAppProperties(policy_app_id, app_properties);
+    OnAuthTokenUpdated(policy_app_id, app_properties.auth_token);
   }
 }
 
@@ -2047,18 +2491,18 @@ bool PolicyHandler::CheckAppServiceParameters(
 bool PolicyHandler::UnknownRPCPassthroughAllowed(
     const std::string& policy_app_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->UnknownRPCPassthroughAllowed(policy_app_id);
 }
 
 uint32_t PolicyHandler::HeartBeatTimeout(const std::string& app_id) const {
-  POLICY_LIB_CHECK(0);
+  POLICY_LIB_CHECK_OR_RETURN(0);
   return policy_manager_->HeartBeatTimeout(app_id);
 }
 
 const std::string PolicyHandler::RemoteAppsUrl() const {
   const std::string default_url;
-  POLICY_LIB_CHECK(default_url);
+  POLICY_LIB_CHECK_OR_RETURN(default_url);
   EndpointUrls endpoints;
   policy_manager_->GetUpdateUrls("queryAppsUrl", endpoints);
   if (endpoints.empty() || endpoints[0].url.empty()) {
@@ -2069,39 +2513,51 @@ const std::string PolicyHandler::RemoteAppsUrl() const {
 }
 
 void PolicyHandler::OnAppsSearchStarted() {
-  POLICY_LIB_CHECK();
+  POLICY_LIB_CHECK_VOID();
   policy_manager_->OnAppsSearchStarted();
 }
 
 void PolicyHandler::OnAppsSearchCompleted(const bool trigger_ptu) {
-  POLICY_LIB_CHECK();
+  POLICY_LIB_CHECK_VOID();
   policy_manager_->OnAppsSearchCompleted(trigger_ptu);
 }
 
-void PolicyHandler::OnAppRegisteredOnMobile(const std::string& application_id) {
+void PolicyHandler::OnAddedNewApplicationToAppList(
+    const uint32_t new_app_id, const std::string& policy_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (policy_id == last_registered_policy_app_id_) {
+    return;
+  }
+  last_registered_policy_app_id_ = policy_id;
+  PushAppIdToPTUQueue(new_app_id);
+}
+
+void PolicyHandler::OnAppRegisteredOnMobile(const std::string& device_id,
+                                            const std::string& application_id) {
   POLICY_LIB_CHECK_VOID();
-  policy_manager_->OnAppRegisteredOnMobile(application_id);
+  policy_manager_->OnAppRegisteredOnMobile(device_id, application_id);
 }
 
 RequestType::State PolicyHandler::GetAppRequestTypeState(
     const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(RequestType::State::UNAVAILABLE);
+  POLICY_LIB_CHECK_OR_RETURN(RequestType::State::UNAVAILABLE);
   return policy_manager_->GetAppRequestTypesState(policy_app_id);
 }
 
 RequestSubType::State PolicyHandler::GetAppRequestSubTypeState(
     const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(RequestSubType::State::UNAVAILABLE);
+  POLICY_LIB_CHECK_OR_RETURN(RequestSubType::State::UNAVAILABLE);
   return policy_manager_->GetAppRequestSubTypesState(policy_app_id);
 }
 
 bool PolicyHandler::IsRequestTypeAllowed(
+    const transport_manager::DeviceHandle& device_id,
     const std::string& policy_app_id,
     mobile_apis::RequestType::eType type) const {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   using namespace mobile_apis;
 
-  std::string stringified_type = RequestTypeToString(type);
+  const std::string stringified_type = RequestTypeToString(type);
   if (stringified_type.empty()) {
     LOG4CXX_ERROR(logger_, "Unknown request type.");
     return false;
@@ -2124,7 +2580,11 @@ bool PolicyHandler::IsRequestTypeAllowed(
     case RequestType::State::AVAILABLE: {
       // If any of request types is available for current application - get them
       const auto request_types =
+#ifdef EXTERNAL_PROPRIETARY_MODE
+          policy_manager_->GetAppRequestTypes(device_id, policy_app_id);
+#else
           policy_manager_->GetAppRequestTypes(policy_app_id);
+#endif
       return helpers::in_range(request_types, stringified_type);
     }
     default:
@@ -2135,7 +2595,7 @@ bool PolicyHandler::IsRequestTypeAllowed(
 bool PolicyHandler::IsRequestSubTypeAllowed(
     const std::string& policy_app_id,
     const std::string& request_subtype) const {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   using namespace mobile_apis;
 
   if (request_subtype.empty()) {
@@ -2170,70 +2630,94 @@ bool PolicyHandler::IsRequestSubTypeAllowed(
 }
 
 const std::vector<std::string> PolicyHandler::GetAppRequestTypes(
+    const transport_manager::DeviceHandle& device_handle,
     const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(std::vector<std::string>());
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<std::string>());
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  return policy_manager_->GetAppRequestTypes(device_handle, policy_app_id);
+#else
   return policy_manager_->GetAppRequestTypes(policy_app_id);
+#endif
 }
 
 const std::vector<std::string> PolicyHandler::GetAppRequestSubTypes(
     const std::string& policy_app_id) const {
-  POLICY_LIB_CHECK(std::vector<std::string>());
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<std::string>());
   return policy_manager_->GetAppRequestSubTypes(policy_app_id);
 }
 
-const VehicleInfo policy::PolicyHandler::GetVehicleInfo() const {
-  POLICY_LIB_CHECK(VehicleInfo());
-  return policy_manager_->GetVehicleInfo();
+const std::vector<policy_table::VehicleDataItem>
+policy::PolicyHandler::GetVehicleDataItems() const {
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<policy_table::VehicleDataItem>());
+  return policy_manager_->GetVehicleDataItems();
+}
+
+std::vector<rpc::policy_table_interface_base::VehicleDataItem>
+policy::PolicyHandler::GetRemovedVehicleDataItems() const {
+  POLICY_LIB_CHECK_OR_RETURN(std::vector<policy_table::VehicleDataItem>());
+  return policy_manager_->GetRemovedVehicleDataItems();
 }
 
 #ifdef EXTERNAL_PROPRIETARY_MODE
 const MetaInfo PolicyHandler::GetMetaInfo() const {
-  POLICY_LIB_CHECK(MetaInfo());
+  POLICY_LIB_CHECK_OR_RETURN(MetaInfo());
   return policy_manager_->GetMetaInfo();
 }
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
 void PolicyHandler::Increment(usage_statistics::GlobalCounterId type) {
-  POLICY_LIB_CHECK();
+  POLICY_LIB_CHECK_VOID();
   policy_manager_->Increment(type);
 }
 
 void PolicyHandler::Increment(const std::string& app_id,
                               usage_statistics::AppCounterId type) {
-  POLICY_LIB_CHECK();
+  POLICY_LIB_CHECK_VOID();
   policy_manager_->Increment(app_id, type);
 }
 
 void PolicyHandler::Set(const std::string& app_id,
                         usage_statistics::AppInfoId type,
                         const std::string& value) {
-  POLICY_LIB_CHECK();
+  POLICY_LIB_CHECK_VOID();
   policy_manager_->Set(app_id, type, value);
 }
 
 void PolicyHandler::Add(const std::string& app_id,
                         usage_statistics::AppStopwatchId type,
                         int32_t timespan_seconds) {
-  POLICY_LIB_CHECK();
+  POLICY_LIB_CHECK_VOID();
   policy_manager_->Add(app_id, type, timespan_seconds);
 }
 
-bool PolicyHandler::IsUrlAppIdValid(const uint32_t app_idx,
-                                    const EndpointUrls& urls) const {
-  const EndpointData& app_data = urls[app_idx];
+bool PolicyHandler::IsUrlAppIdValid(const std::string app_id,
+                                    const EndpointData& app_data) const {
+  if (policy::kDefaultId == app_data.app_id) {
+    return true;
+  }
+
   const std::vector<std::string> app_urls = app_data.url;
-  const ApplicationSharedPtr app =
-      application_manager_.application_by_policy_id(app_data.app_id);
+  if (app_urls.empty() || app_id != app_data.app_id) {
+    return false;
+  }
 
-  const bool is_registered = (app && (app->IsRegistered()));
-  const bool is_default = (app_data.app_id == policy::kDefaultId);
-  const bool is_empty_urls = app_urls.empty();
+  const auto devices_ids = GetDevicesIds(app_id);
+  LOG4CXX_TRACE(
+      logger_,
+      "Count devices: " << devices_ids.size() << " for app_id: " << app_id);
+  for (const auto& device_id : devices_ids) {
+    const ApplicationSharedPtr app =
+        application_manager_.application(device_id, app_id);
+    if (app && (app->IsRegistered())) {
+      return true;
+    }
+  }
 
-  return ((is_registered && !is_empty_urls) || is_default);
+  return false;
 }
 
 std::vector<std::string> PolicyHandler::GetDevicesIds(
-    const std::string& policy_app_id) {
+    const std::string& policy_app_id) const {
   return application_manager_.devices(policy_app_id);
 }
 
@@ -2241,7 +2725,8 @@ void PolicyHandler::UpdateHMILevel(ApplicationSharedPtr app,
                                    mobile_apis::HMILevel::eType level) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
-  if (app->hmi_level() == mobile_apis::HMILevel::HMI_NONE) {
+  if (app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW) ==
+      mobile_apis::HMILevel::HMI_NONE) {
     // If default is FULL, send request to HMI. Notification to mobile will be
     // sent on response receiving.
     if (mobile_apis::HMILevel::HMI_FULL == level) {
@@ -2253,14 +2738,17 @@ void PolicyHandler::UpdateHMILevel(ApplicationSharedPtr app,
       // Set application hmi level
       application_manager_.ChangeAppsHMILevel(app->app_id(), level);
       // If hmi Level is full, it will be seted after ActivateApp response
-      MessageHelper::SendHMIStatusNotification(*app, application_manager_);
+      MessageHelper::SendHMIStatusNotification(
+          app,
+          mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+          application_manager_);
     }
   }
 }
 
 bool PolicyHandler::CheckModule(const PTString& app_id,
                                 const PTString& module) {
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->CheckModule(app_id, module);
 }
 
@@ -2296,17 +2784,21 @@ void PolicyHandler::OnUpdateHMIStatus(const std::string& device_id,
                    << app->app_id() << " to default hmi level " << level);
   // Set application hmi level
   application_manager_.ChangeAppsHMILevel(app->app_id(), level);
-  MessageHelper::SendHMIStatusNotification(*app, application_manager_);
+  MessageHelper::SendHMIStatusNotification(
+      app,
+      mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+      application_manager_);
 }
 
 bool PolicyHandler::GetModuleTypes(const std::string& policy_app_id,
                                    std::vector<std::string>* modules) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   return policy_manager_->GetModuleTypes(policy_app_id, modules);
 }
 
 void PolicyHandler::SetDefaultHmiTypes(
+    const transport_manager::DeviceHandle& device_handle,
     const std::string& application_id,
     const smart_objects::SmartObject* app_types) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -2319,14 +2811,14 @@ void PolicyHandler::SetDefaultHmiTypes(
                    std::back_inserter(hmi_types),
                    SmartObjectToInt());
   }
-  policy_manager_->SetDefaultHmiTypes(application_id, hmi_types);
+  policy_manager_->SetDefaultHmiTypes(device_handle, application_id, hmi_types);
 }
 
 bool PolicyHandler::CheckHMIType(const std::string& application_id,
                                  mobile_apis::AppHMIType::eType hmi,
                                  const smart_objects::SmartObject* app_types) {
   LOG4CXX_AUTO_TRACE(logger_);
-  POLICY_LIB_CHECK(false);
+  POLICY_LIB_CHECK_OR_RETURN(false);
   std::vector<int> policy_hmi_types;
   bool ret = policy_manager_->GetHMITypes(application_id, &policy_hmi_types);
 
diff --git a/src/components/application_manager/src/request_controller.cc b/src/components/application_manager/src/request_controller.cc
index 93c45ed5dc..eaebaf4861 100644
--- a/src/components/application_manager/src/request_controller.cc
+++ b/src/components/application_manager/src/request_controller.cc
@@ -126,6 +126,12 @@ RequestController::TResult RequestController::CheckPosibilitytoAdd(
     return RequestController::TOO_MANY_REQUESTS;
   }
 
+  if (IsLowVoltage()) {
+    LOG4CXX_ERROR(logger_,
+                  "Impossible to add request due to Low Voltage is active");
+    return RequestController::INVALID_DATA;
+  }
+
   return SUCCESS;
 }
 
@@ -192,6 +198,13 @@ RequestController::TResult RequestController::addHMIRequest(
                   "Default timeout was set to 0."
                   "RequestController will not track timeout of this request.");
   }
+
+  if (IsLowVoltage()) {
+    LOG4CXX_ERROR(logger_,
+                  "Impossible to add request due to Low Voltage is active");
+    return RequestController::INVALID_DATA;
+  }
+
   waiting_for_response_.Add(request_info_ptr);
   LOG4CXX_DEBUG(logger_,
                 "Waiting for response count:" << waiting_for_response_.Size());
@@ -202,6 +215,11 @@ RequestController::TResult RequestController::addHMIRequest(
 
 void RequestController::addNotification(const RequestPtr ptr) {
   LOG4CXX_AUTO_TRACE(logger_);
+  if (IsLowVoltage()) {
+    LOG4CXX_ERROR(
+        logger_, "Impossible to add notification due to Low Voltage is active");
+    return;
+  }
   notification_list_.push_back(ptr);
 }
 
@@ -274,7 +292,7 @@ void RequestController::OnMobileResponse(const uint32_t mobile_correlation_id,
 void RequestController::OnHMIResponse(const uint32_t correlation_id,
                                       const int32_t function_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  TerminateRequest(correlation_id, RequestInfo::HmiConnectoinKey, function_id);
+  TerminateRequest(correlation_id, RequestInfo::HmiConnectionKey, function_id);
 }
 
 void RequestController::terminateWaitingForExecutionAppRequests(
@@ -321,7 +339,7 @@ void RequestController::terminateAppRequests(const uint32_t& app_id) {
 
 void RequestController::terminateAllHMIRequests() {
   LOG4CXX_AUTO_TRACE(logger_);
-  terminateWaitingForResponseAppRequests(RequestInfo::HmiConnectoinKey);
+  terminateWaitingForResponseAppRequests(RequestInfo::HmiConnectionKey);
 }
 
 void RequestController::terminateAllMobileRequests() {
@@ -430,7 +448,7 @@ void RequestController::TimeoutThread() {
     const uint32_t experied_app_id = probably_expired->app_id();
 
     probably_expired->request()->onTimeOut();
-    if (RequestInfo::HmiConnectoinKey == probably_expired->app_id()) {
+    if (RequestInfo::HmiConnectionKey == probably_expired->app_id()) {
       LOG4CXX_DEBUG(logger_,
                     "Erase HMI request: " << probably_expired->requestId());
       waiting_for_response_.RemoveRequest(probably_expired);
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc
index bbcda06b43..4f1e0a8f07 100644
--- a/src/components/application_manager/src/request_info.cc
+++ b/src/components/application_manager/src/request_info.cc
@@ -42,12 +42,12 @@ namespace request_controller {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "RequestController")
 
-uint32_t RequestInfo::HmiConnectoinKey = 0;
+uint32_t RequestInfo::HmiConnectionKey = 0;
 
 HMIRequestInfo::HMIRequestInfo(RequestPtr request, const uint64_t timeout_msec)
     : RequestInfo(request, HMIRequest, timeout_msec) {
   correlation_id_ = request_->correlation_id();
-  app_id_ = RequestInfo::HmiConnectoinKey;
+  app_id_ = RequestInfo::HmiConnectionKey;
 }
 
 HMIRequestInfo::HMIRequestInfo(RequestPtr request,
@@ -55,7 +55,7 @@ HMIRequestInfo::HMIRequestInfo(RequestPtr request,
                                const uint64_t timeout_msec)
     : RequestInfo(request, HMIRequest, start_time, timeout_msec) {
   correlation_id_ = request_->correlation_id();
-  app_id_ = RequestInfo::HmiConnectoinKey;
+  app_id_ = RequestInfo::HmiConnectionKey;
 }
 
 MobileRequestInfo::MobileRequestInfo(RequestPtr request,
@@ -252,7 +252,7 @@ uint32_t RequestInfoSet::RemoveByConnectionKey(uint32_t connection_key) {
 uint32_t RequestInfoSet::RemoveMobileRequests() {
   LOG4CXX_AUTO_TRACE(logger_);
   return RemoveRequests(AppIdCompararator(AppIdCompararator::NotEqual,
-                                          RequestInfo::HmiConnectoinKey));
+                                          RequestInfo::HmiConnectionKey));
 }
 
 const size_t RequestInfoSet::Size() {
diff --git a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
index fff1aefed3..2d5f1b6638 100644
--- a/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
+++ b/src/components/application_manager/src/resumption/resume_ctrl_impl.cc
@@ -30,6 +30,7 @@
  POSSIBILITY OF SUCH DAMAGE.
  */
 #include "application_manager/resumption/resume_ctrl_impl.h"
+#include "application_manager/display_capabilities_builder.h"
 
 #include <algorithm>
 #include <fstream>
@@ -90,7 +91,7 @@ bool ResumeCtrlImpl::get_resumption_active() const {
 }
 #endif  // BUILD_TESTS
 
-bool ResumeCtrlImpl::Init(resumption::LastState& last_state) {
+bool ResumeCtrlImpl::Init(resumption::LastStateWrapperPtr last_state_wrapper) {
   bool use_db = application_manager_.get_settings().use_db_for_resumption();
   if (use_db) {
     resumption_storage_.reset(
@@ -119,7 +120,7 @@ bool ResumeCtrlImpl::Init(resumption::LastState& last_state) {
     }
   } else {
     resumption_storage_.reset(
-        new ResumptionDataJson(last_state, application_manager_));
+        new ResumptionDataJson(last_state_wrapper, application_manager_));
     if (!resumption_storage_->Init()) {
       LOG4CXX_DEBUG(logger_, "Resumption storage initialisation failed");
       return false;
@@ -159,7 +160,13 @@ void ResumeCtrlImpl::SaveApplication(ApplicationSharedPtr application) {
 }
 
 void ResumeCtrlImpl::on_event(const event_engine::Event& event) {
-  LOG4CXX_DEBUG(logger_, "Event received" << event.id());
+  LOG4CXX_DEBUG(logger_, "Event received: " << event.id());
+
+  if (hmi_apis::FunctionID::UI_CreateWindow == event.id()) {
+    LOG4CXX_INFO(logger_, "Received UI_CreateWindow event");
+    const auto& response_message = event.smart_object();
+    RestoreWidgetsHMIState(response_message);
+  }
 }
 
 bool ResumeCtrlImpl::RestoreAppHMIState(ApplicationSharedPtr application) {
@@ -207,8 +214,20 @@ bool ResumeCtrlImpl::RestoreAppHMIState(ApplicationSharedPtr application) {
             "High-bandwidth transport not available, app will resume into : "
                 << saved_hmi_level);
       }
-
-      return SetAppHMIState(application, saved_hmi_level, true);
+      const bool app_exists_in_full_or_limited =
+          application_manager_.get_full_or_limited_application().use_count() !=
+          0;
+      const bool app_hmi_state_is_set =
+          SetAppHMIState(application, saved_hmi_level, true);
+      size_t restored_widgets = 0;
+      if (app_hmi_state_is_set &&
+          application->is_app_data_resumption_allowed()) {
+        restored_widgets = RestoreAppWidgets(application, saved_app);
+      }
+      if (0 == restored_widgets && app_exists_in_full_or_limited) {
+        LOG4CXX_DEBUG(logger_, "App exists in full or limited. Do not resume");
+        return false;
+      }
     } else {
       result = false;
       LOG4CXX_ERROR(logger_, "saved app data corrupted");
@@ -219,6 +238,89 @@ bool ResumeCtrlImpl::RestoreAppHMIState(ApplicationSharedPtr application) {
   return result;
 }
 
+void ResumeCtrlImpl::RestoreWidgetsHMIState(
+    const smart_objects::SmartObject& response_message) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto correlation_id =
+      response_message[strings::params][strings::correlation_id].asInt();
+  const auto& request = requests_msg_.find(correlation_id);
+  if (requests_msg_.end() == request) {
+    LOG4CXX_ERROR(logger_,
+                  "Request UI_CreateWindow for correlation id: "
+                      << correlation_id << " not found");
+    return;
+  }
+
+  const auto& msg_params = (*request->second)[strings::msg_params];
+  const auto hmi_app_id = msg_params[strings::app_id].asInt();
+  auto application = application_manager_.application_by_hmi_app(hmi_app_id);
+  if (!application) {
+    LOG4CXX_ERROR(logger_,
+                  "Application is not registered by hmi id: " << hmi_app_id);
+    requests_msg_.erase(request);
+    return;
+  }
+  const WindowID window_id = msg_params[strings::window_id].asInt();
+
+  const auto result_code = static_cast<hmi_apis::Common_Result::eType>(
+      response_message[strings::params][hmi_response::code].asInt());
+  if (hmi_apis::Common_Result::SUCCESS != result_code) {
+    LOG4CXX_ERROR(logger_,
+                  "UI_CreateWindow for correlation id: "
+                      << correlation_id
+                      << " failed with code: " << result_code);
+    requests_msg_.erase(request);
+    auto& builder = application->display_capabilities_builder();
+    builder.StopWaitingForWindow(window_id);
+    return;
+  }
+
+  smart_objects::SmartObject window_info(smart_objects::SmartType_Map);
+  auto fill_optional_param = [&window_info,
+                              &msg_params](const std::string& key) {
+    if (msg_params.keyExists(key)) {
+      window_info[key] = msg_params[key].asString();
+    }
+  };
+  fill_optional_param(strings::associated_service_type);
+  fill_optional_param(strings::duplicate_updates_from_window_id);
+
+  const auto window_name = msg_params[strings::window_name].asString();
+  window_info[strings::window_name] = window_name;
+  application->SetWindowInfo(window_id, window_info);
+
+  const auto window_type = static_cast<mobile_apis::WindowType::eType>(
+      msg_params[strings::window_type].asInt());
+  // State should be initialized with INVALID_ENUM value to let state controller
+  // trigger OnHmiStatus notifiation sending
+  auto initial_state = application_manager_.CreateRegularState(
+      application,
+      window_type,
+      mobile_apis::HMILevel::INVALID_ENUM,
+      mobile_apis::AudioStreamingState::INVALID_ENUM,
+      mobile_apis::VideoStreamingState::INVALID_ENUM,
+      mobile_api::SystemContext::INVALID_ENUM);
+  application->SetInitialState(window_id, window_name, initial_state);
+
+  // Default HMI level for all windows except the main one is always NONE
+  application_manager_.state_controller().OnAppWindowAdded(
+      application, window_id, window_type, mobile_apis::HMILevel::HMI_NONE);
+
+  requests_msg_.erase(request);
+}
+
+void ResumeCtrlImpl::ProcessSystemCapabilityUpdated(
+    Application& app, const smart_objects::SmartObject& display_capabilities) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto notification = MessageHelper::CreateDisplayCapabilityUpdateToMobile(
+      display_capabilities, app);
+
+  application_manager_.GetRPCService().ManageMobileCommand(
+      notification, commands::Command::SOURCE_SDL);
+  app.set_is_resuming(false);
+}
+
 bool ResumeCtrlImpl::SetupDefaultHMILevel(ApplicationSharedPtr application) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN(application, false);
@@ -252,7 +354,9 @@ void ResumeCtrlImpl::ApplicationResumptiOnTimer() {
       LOG4CXX_ERROR(logger_, "Invalid app_id = " << *it);
       continue;
     }
-    StartAppHmiStateResumption(app);
+    if (!StartAppHmiStateResumption(app)) {
+      app->set_is_resuming(false);
+    }
   }
   is_resumption_active_ = false;
   waiting_for_timer_.clear();
@@ -262,6 +366,7 @@ void ResumeCtrlImpl::ApplicationResumptiOnTimer() {
 void ResumeCtrlImpl::OnAppActivated(ApplicationSharedPtr application) {
   if (is_resumption_active_) {
     RemoveFromResumption(application->app_id());
+    application->set_is_resuming(false);
   }
 }
 
@@ -272,6 +377,10 @@ void ResumeCtrlImpl::RemoveFromResumption(uint32_t app_id) {
   queue_lock_.Release();
 }
 
+bool ResumeCtrlImpl::Init(LastState&) {
+  return false;
+}
+
 bool ResumeCtrlImpl::SetAppHMIState(
     ApplicationSharedPtr application,
     const mobile_apis::HMILevel::eType hmi_level,
@@ -291,15 +400,39 @@ bool ResumeCtrlImpl::SetAppHMIState(
     SetupDefaultHMILevel(application);
     return false;
   }
-  application->set_is_resuming(true);
-  application_manager_.state_controller().SetRegularState(application,
-                                                          hmi_level);
+
+  application_manager_.state_controller().SetRegularState(
+      application, mobile_apis::PredefinedWindows::DEFAULT_WINDOW, hmi_level);
   LOG4CXX_INFO(logger_,
                "Application with policy id " << application->policy_app_id()
                                              << " got HMI level " << hmi_level);
+
   return true;
 }
 
+size_t ResumeCtrlImpl::RestoreAppWidgets(
+    application_manager::ApplicationSharedPtr application,
+    const smart_objects::SmartObject& saved_app) {
+  using namespace mobile_apis;
+  LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK(application);
+  if (!saved_app.keyExists(strings::windows_info)) {
+    LOG4CXX_ERROR(logger_, "windows_info section does not exist");
+    return 0;
+  }
+  const auto& windows_info = saved_app[strings::windows_info];
+  auto request_list = MessageHelper::CreateUICreateWindowRequestsToHMI(
+      application, application_manager_, windows_info);
+
+  requests_msg_.clear();
+  for (auto& request : request_list) {
+    requests_msg_.insert(std::make_pair(
+        (*request)[strings::params][strings::correlation_id].asInt(), request));
+  }
+  ProcessHMIRequests(request_list);
+  return request_list.size();
+}
+
 bool ResumeCtrlImpl::IsHMIApplicationIdExist(uint32_t hmi_app_id) {
   LOG4CXX_DEBUG(logger_, "hmi_app_id :" << hmi_app_id);
   return resumption_storage_->IsHMIApplicationIdExist(hmi_app_id);
@@ -335,6 +468,7 @@ void ResumeCtrlImpl::OnSuspend() {
 
 void ResumeCtrlImpl::OnIgnitionOff() {
   LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK_OR_RETURN_VOID(resumption_storage_);
   if (!application_manager_.IsLowVoltage()) {
     resumption_storage_->IncrementIgnOffCount();
     resumption_storage_->ResetGlobalIgnOnCount();
@@ -399,6 +533,8 @@ bool ResumeCtrlImpl::StartResumption(ApplicationSharedPtr application,
                           << " hmi_app_id = " << application->hmi_app_id()
                           << " policy_id = " << application->policy_app_id()
                           << " received hash = " << hash);
+  application->set_is_resuming(true);
+
   if (!application->is_cloud_app()) {
     // Default HMI Level is already set before resumption in
     // ApplicationManager::OnApplicationRegistered, and handling low bandwidth
@@ -421,17 +557,18 @@ bool ResumeCtrlImpl::StartResumption(ApplicationSharedPtr application,
 
 bool ResumeCtrlImpl::StartResumptionOnlyHMILevel(
     ApplicationSharedPtr application) {
-  // sync_primitives::AutoLock lock(resumtion_lock_);
   LOG4CXX_AUTO_TRACE(logger_);
   if (!application) {
     LOG4CXX_WARN(logger_, "Application does not exist.");
     return false;
   }
+
+  application->set_is_resuming(true);
   LOG4CXX_DEBUG(logger_,
-                "HMI level resumption requested for application id "
-                    << application->app_id() << "with hmi_app_id "
-                    << application->hmi_app_id() << ", policy_app_id "
-                    << application->policy_app_id());
+                "HMI level resumption requested for application id: "
+                    << application->app_id()
+                    << " with hmi_app_id: " << application->hmi_app_id()
+                    << ", policy_app_id " << application->policy_app_id());
   if (!application->is_cloud_app()) {
     // Default HMI Level is already set before resumption in
     // ApplicationManager::OnApplicationRegistered, and handling low bandwidth
@@ -444,7 +581,6 @@ bool ResumeCtrlImpl::StartResumptionOnlyHMILevel(
   bool result = resumption_storage_->GetSavedApplication(
       application->policy_app_id(), device_mac, saved_app);
   if (result) {
-    // sync_primitives::AutoUnlock unlock(lock);
     AddToResumptionTimerQueue(application->app_id());
   }
   LOG4CXX_INFO(logger_, "StartResumptionOnlyHMILevel::Result = " << result);
@@ -473,18 +609,18 @@ void ResumeCtrlImpl::RetryResumption(const uint32_t app_id) {
   AddToResumptionTimerQueue(app_id);
 }
 
-void ResumeCtrlImpl::StartAppHmiStateResumption(
+bool ResumeCtrlImpl::StartAppHmiStateResumption(
     ApplicationSharedPtr application) {
   using namespace date_time;
   LOG4CXX_AUTO_TRACE(logger_);
-  DCHECK_OR_RETURN_VOID(application);
+  DCHECK_OR_RETURN(application, false);
   smart_objects::SmartObject saved_app;
   const std::string& device_mac = application->mac_address();
-  const bool result = resumption_storage_->GetSavedApplication(
+  const bool get_saved_app_result = resumption_storage_->GetSavedApplication(
       application->policy_app_id(), device_mac, saved_app);
-  if (!result) {
+  if (!get_saved_app_result) {
     LOG4CXX_ERROR(logger_, "Application was not saved");
-    return;
+    return false;
   }
 
   const bool is_hmi_level_applicable_to_resume =
@@ -492,33 +628,39 @@ void ResumeCtrlImpl::StartAppHmiStateResumption(
 
   if (!is_hmi_level_applicable_to_resume) {
     LOG4CXX_DEBUG(logger_, "No applicable HMI level found for resuming");
-    return;
+    return false;
   }
-
   const bool is_resume_allowed_by_low_voltage =
       CheckLowVoltageRestrictions(saved_app);
 
   const bool is_hmi_level_allowed_by_ign_cycle =
       CheckIgnCycleRestrictions(saved_app);
 
-  const bool restore_hmi_level_allowed =
-      is_resume_allowed_by_low_voltage && is_hmi_level_allowed_by_ign_cycle;
+  const bool is_app_revoked =
+      application_manager_.GetPolicyHandler().IsApplicationRevoked(
+          application->policy_app_id());
+
+  const bool restore_hmi_level_allowed = is_resume_allowed_by_low_voltage &&
+                                         is_hmi_level_allowed_by_ign_cycle &&
+                                         !is_app_revoked;
 
   if (restore_hmi_level_allowed) {
     LOG4CXX_INFO(logger_,
                  "Resume application " << application->policy_app_id());
-    RestoreAppHMIState(application);
+    const bool hmi_state_restore_result = RestoreAppHMIState(application);
     if (mobile_apis::HMILevel::eType::INVALID_ENUM !=
         application->deferred_resumption_hmi_level()) {
       // the application has not been fully resumed
-      return;
+      return false;
     }
     RemoveApplicationFromSaved(application);
+    return hmi_state_restore_result;
   } else {
     LOG4CXX_INFO(
         logger_,
         "Do not need to resume application " << application->policy_app_id());
   }
+  return true;
 }
 
 void ResumeCtrlImpl::ResetLaunchTime() {
@@ -561,9 +703,14 @@ bool ResumeCtrlImpl::CheckApplicationHash(ApplicationSharedPtr application,
                 "app_id : " << application->app_id() << " hash : " << hash);
   smart_objects::SmartObject saved_app;
   const std::string& device_mac = application->mac_address();
-  bool result = resumption_storage_->GetSavedApplication(
+  const bool get_app_result = resumption_storage_->GetSavedApplication(
       application->policy_app_id(), device_mac, saved_app);
-  return result ? saved_app[strings::hash_id].asString() == hash : false;
+  const bool check_result =
+      get_app_result ? saved_app[strings::hash_id].asString() == hash : false;
+  if (check_result) {
+    application->set_app_data_resumption_allowance(true);
+  }
+  return check_result;
 }
 
 void ResumeCtrlImpl::SaveDataOnTimer() {
@@ -584,6 +731,7 @@ void ResumeCtrlImpl::SaveDataOnTimer() {
 
 void ResumeCtrlImpl::FinalPersistData() {
   LOG4CXX_AUTO_TRACE(logger_);
+  DCHECK_OR_RETURN_VOID(resumption_storage_);
   StopSavePersistentDataTimer();
   SaveAllApplications();
   resumption_storage_->Persist();
@@ -628,6 +776,27 @@ bool ResumeCtrlImpl::RestoreApplicationData(ApplicationSharedPtr application) {
   return result;
 }
 
+void ResumeCtrlImpl::StartWaitingForDisplayCapabilitiesUpdate(
+    app_mngr::ApplicationSharedPtr application) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  smart_objects::SmartObject saved_app(smart_objects::SmartType_Map);
+  resumption_storage_->GetSavedApplication(
+      application->policy_app_id(), application->mac_address(), saved_app);
+  auto resume_callback =
+      [this](Application& app,
+             const smart_objects::SmartObject& display_capabilities) -> void {
+    LOG4CXX_AUTO_TRACE(logger_);
+    ProcessSystemCapabilityUpdated(app, display_capabilities);
+  };
+  auto& builder = application->display_capabilities_builder();
+
+  smart_objects::SmartObject windows_info(smart_objects::SmartType_Null);
+  if (saved_app.keyExists(strings::windows_info)) {
+    windows_info = saved_app[strings::windows_info];
+  }
+  builder.InitBuilder(resume_callback, windows_info);
+}
+
 void ResumeCtrlImpl::AddFiles(ApplicationSharedPtr application,
                               const smart_objects::SmartObject& saved_app) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -681,15 +850,19 @@ void ResumeCtrlImpl::AddCommands(ApplicationSharedPtr application,
   if (saved_app.keyExists(strings::application_commands)) {
     const smart_objects::SmartObject& app_commands =
         saved_app[strings::application_commands];
-    for (size_t i = 0; i < app_commands.length(); ++i) {
-      const smart_objects::SmartObject& command = app_commands[i];
+
+    for (size_t cmd_num = 0; cmd_num < app_commands.length(); ++cmd_num) {
+      const smart_objects::SmartObject& command = app_commands[cmd_num];
       const uint32_t cmd_id = command[strings::cmd_id].asUInt();
       const bool is_resumption = true;
-
-      application->AddCommand(cmd_id, command);
+      application->AddCommand(
+          commands::CommandImpl::CalcCommandInternalConsecutiveNumber(
+              application),
+          command);
       application->help_prompt_manager().OnVrCommandAdded(
           cmd_id, command, is_resumption);
     }
+
     ProcessHMIRequests(MessageHelper::CreateAddCommandRequestToHMI(
         application, application_manager_));
   } else {
@@ -1006,7 +1179,8 @@ bool ResumeCtrlImpl::ProcessHMIRequest(smart_objects::SmartObjectSPtr request,
         (*request)[strings::correlation_id].asInt();
     subscribe_on_event(function_id, hmi_correlation_id);
   }
-  if (!application_manager_.GetRPCService().ManageHMICommand(request)) {
+  if (!application_manager_.GetRPCService().ManageHMICommand(
+          request, commands::Command::SOURCE_SDL_TO_HMI)) {
     LOG4CXX_ERROR(logger_, "Unable to send request");
     return false;
   }
diff --git a/src/components/application_manager/src/resumption/resumption_data.cc b/src/components/application_manager/src/resumption/resumption_data.cc
index b4d39eccc1..9046fe35ad 100644
--- a/src/components/application_manager/src/resumption/resumption_data.cc
+++ b/src/components/application_manager/src/resumption/resumption_data.cc
@@ -198,6 +198,52 @@ smart_objects::SmartObject ResumptionData::GetApplicationFiles(
   return files;
 }
 
+smart_objects::SmartObject ResumptionData::GetApplicationWidgetsInfo(
+    app_mngr::ApplicationConstSharedPtr application) const {
+  using namespace app_mngr;
+  LOG4CXX_AUTO_TRACE(logger_);
+  smart_objects::SmartObject windows_info =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  DCHECK_OR_RETURN(application, windows_info);
+  const auto window_ids = application->GetWindowIds();
+  const auto& window_optional_params_map =
+      application->window_optional_params_map().GetData();
+  for (const auto& window_id : window_ids) {
+    const HmiStatePtr hmi_state = application->CurrentHmiState(window_id);
+    if (mobile_apis::WindowType::WIDGET != hmi_state->window_type()) {
+      continue;
+    }
+    auto info = CreateWindowInfoSO(
+        window_id, hmi_state->window_type(), window_optional_params_map);
+
+    windows_info[windows_info.length()] = info;
+  }
+  return windows_info;
+}
+
+smart_objects::SmartObject ResumptionData::CreateWindowInfoSO(
+    const app_mngr::WindowID window_id,
+    const mobile_apis::WindowType::eType window_type,
+    const app_mngr::WindowParamsMap& window_optional_params_map) const {
+  using namespace app_mngr;
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto window_info = smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  window_info[strings::window_id] = window_id;
+  window_info[strings::window_type] = window_type;
+
+  const auto& it_info = window_optional_params_map.find(window_id);
+  if (window_optional_params_map.end() != it_info) {
+    const auto keys = it_info->second->enumerate();
+
+    for (const auto& key : keys) {
+      window_info[key] = (*it_info->second)[key];
+    }
+  }
+
+  return window_info;
+}
+
 smart_objects::SmartObject ResumptionData::PointerToSmartObj(
     const smart_objects::SmartObject* ptr) const {
   LOG4CXX_AUTO_TRACE(logger_);
diff --git a/src/components/application_manager/src/resumption/resumption_data_db.cc b/src/components/application_manager/src/resumption/resumption_data_db.cc
index 02b7098414..9188a47bf9 100644
--- a/src/components/application_manager/src/resumption/resumption_data_db.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_db.cc
@@ -2731,7 +2731,8 @@ bool ResumptionDataDB::UpdateApplicationData(
   utils::dbms::SQLQuery query(db());
 
   const int64_t time_stamp = static_cast<int64_t>(time(NULL));
-  const mobile_apis::HMILevel::eType hmi_level = application->hmi_level();
+  const mobile_apis::HMILevel::eType hmi_level =
+      application->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
 
   if (!query.Prepare(kUpdateApplicationData)) {
     LOG4CXX_WARN(logger_,
@@ -2843,7 +2844,8 @@ ApplicationParams::ApplicationParams(app_mngr::ApplicationSharedPtr application)
     m_grammar_id = application->get_grammar_id();
     m_connection_key = application->app_id();
     m_hmi_app_id = application->hmi_app_id();
-    m_hmi_level = application->hmi_level();
+    m_hmi_level =
+        application->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
     m_is_media_application = application->IsAudioApplication();
     app_ptr = application;
   }
diff --git a/src/components/application_manager/src/resumption/resumption_data_json.cc b/src/components/application_manager/src/resumption/resumption_data_json.cc
index 591166c687..3623c18b90 100644
--- a/src/components/application_manager/src/resumption/resumption_data_json.cc
+++ b/src/components/application_manager/src/resumption/resumption_data_json.cc
@@ -46,9 +46,10 @@ namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
 CREATE_LOGGERPTR_GLOBAL(logger_, "Resumption")
 
 ResumptionDataJson::ResumptionDataJson(
-    LastState& last_state,
+    resumption::LastStateWrapperPtr last_state_wrapper,
     const application_manager::ApplicationManager& application_manager)
-    : ResumptionData(application_manager), last_state_(last_state) {}
+    : ResumptionData(application_manager)
+    , last_state_wrapper_(last_state_wrapper) {}
 
 void ResumptionDataJson::SaveApplication(
     app_mngr::ApplicationSharedPtr application) {
@@ -64,13 +65,16 @@ void ResumptionDataJson::SaveApplication(
   const uint32_t grammar_id = application->get_grammar_id();
   const uint32_t time_stamp = (uint32_t)time(NULL);
   const std::string device_mac = application->mac_address();
-  const mobile_apis::HMILevel::eType hmi_level = application->hmi_level();
+  const mobile_apis::HMILevel::eType hmi_level =
+      application->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
   const bool is_subscribed_for_way_points =
       application_manager_.IsAppSubscribedForWayPoints(application);
 
-  sync_primitives::AutoLock autolock(resumption_lock_);
   Json::Value tmp;
-  Json::Value& json_app = GetFromSavedOrAppend(policy_app_id, device_mac);
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& json_app =
+      GetFromSavedOrAppend(policy_app_id, device_mac, dictionary);
 
   json_app[strings::device_id] = device_mac;
   json_app[strings::app_id] = policy_app_id;
@@ -99,21 +103,27 @@ void ResumptionDataJson::SaveApplication(
   formatters::CFormatterJsonBase::objToJsonValue(
       GetApplicationFiles(application), tmp);
   json_app[strings::application_files] = tmp;
+  formatters::CFormatterJsonBase::objToJsonValue(
+      GetApplicationWidgetsInfo(application), tmp);
+  json_app[strings::windows_info] = tmp;
   json_app[strings::time_stamp] = time_stamp;
   json_app[strings::subscribed_for_way_points] = is_subscribed_for_way_points;
 
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_DEBUG(logger_, "SaveApplication : " << json_app.toStyledString());
 }
 
 bool ResumptionDataJson::IsHMIApplicationIdExist(uint32_t hmi_app_id) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-       it != GetSavedApplications().end();
-       ++it) {
-    if ((*it).isMember(strings::hmi_app_id)) {
-      if ((*it)[strings::hmi_app_id].asUInt() == hmi_app_id) {
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& saved_apps = GetSavedApplications(dictionary);
+
+  for (const auto& saved_app : saved_apps) {
+    if (saved_app.isMember(strings::hmi_app_id)) {
+      if (saved_app[strings::hmi_app_id].asUInt() == hmi_app_id) {
         return true;
       }
     }
@@ -125,7 +135,7 @@ uint32_t ResumptionDataJson::GetHMIApplicationID(
     const std::string& policy_app_id, const std::string& device_id) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   uint32_t hmi_app_id = 0;
 
   const int idx = GetObjectIndex(policy_app_id, device_id);
@@ -133,8 +143,9 @@ uint32_t ResumptionDataJson::GetHMIApplicationID(
     LOG4CXX_WARN(logger_, "Application not saved");
     return hmi_app_id;
   }
-
-  const Json::Value& json_app = GetSavedApplications()[idx];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& json_app = GetSavedApplications(dictionary)[idx];
   if (json_app.isMember(strings::app_id) &&
       json_app.isMember(strings::device_id)) {
     hmi_app_id = json_app[strings::hmi_app_id].asUInt();
@@ -146,47 +157,51 @@ uint32_t ResumptionDataJson::GetHMIApplicationID(
 void ResumptionDataJson::IncrementIgnOffCount() {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   Json::Value to_save = Json::arrayValue;
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-       it != GetSavedApplications().end();
-       ++it) {
-    if ((*it).isMember(strings::ign_off_count)) {
-      Json::Value& ign_off_count = (*it)[strings::ign_off_count];
+  Json::Value dictionary;
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  dictionary = accessor.GetData().dictionary();
+  Json::Value& saved_apps = GetSavedApplications(dictionary);
+  for (auto& json_app : saved_apps) {
+    if (json_app.isMember(strings::ign_off_count)) {
+      Json::Value& ign_off_count = json_app[strings::ign_off_count];
       const uint32_t counter_value = ign_off_count.asUInt();
       ign_off_count = counter_value + 1;
     } else {
       LOG4CXX_WARN(logger_, "Unknown key among saved applications");
-      Json::Value& ign_off_count = (*it)[strings::ign_off_count];
+      Json::Value& ign_off_count = json_app[strings::ign_off_count];
       ign_off_count = 1;
     }
-    to_save.append(*it);
+    to_save.append(json_app);
   }
-  SetSavedApplication(to_save);
-  SetLastIgnOffTime(time(NULL));
-  LOG4CXX_DEBUG(logger_, GetResumptionData().toStyledString());
+  SetSavedApplication(to_save, dictionary);
+  SetLastIgnOffTime(time(nullptr), dictionary);
+  accessor.GetMutableData().set_dictionary(dictionary);
+  LOG4CXX_DEBUG(logger_, GetResumptionData(dictionary).toStyledString());
 }
 
 void ResumptionDataJson::DecrementIgnOffCount() {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
 
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-       it != GetSavedApplications().end();
-       ++it) {
-    if ((*it).isMember(strings::ign_off_count)) {
-      const uint32_t ign_off_count = (*it)[strings::ign_off_count].asUInt();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& saved_apps = GetSavedApplications(dictionary);
+  for (auto& saved_app : saved_apps) {
+    if (saved_app.isMember(strings::ign_off_count)) {
+      const uint32_t ign_off_count = saved_app[strings::ign_off_count].asUInt();
       if (0 == ign_off_count) {
         LOG4CXX_WARN(logger_, "Application has not been suspended");
       } else {
-        (*it)[strings::ign_off_count] = ign_off_count - 1;
+        saved_app[strings::ign_off_count] = ign_off_count - 1;
       }
     } else {
       LOG4CXX_WARN(logger_, "Unknown key among saved applications");
-      (*it)[strings::ign_off_count] = 0;
+      saved_app[strings::ign_off_count] = 0;
     }
   }
+  accessor.GetMutableData().set_dictionary(dictionary);
 }
 
 bool ResumptionDataJson::GetHashId(const std::string& policy_app_id,
@@ -194,14 +209,16 @@ bool ResumptionDataJson::GetHashId(const std::string& policy_app_id,
                                    std::string& hash_id) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   const int idx = GetObjectIndex(policy_app_id, device_id);
   if (-1 == idx) {
     LOG4CXX_WARN(logger_, "Application not saved");
     return false;
   }
 
-  const Json::Value& json_app = GetSavedApplications()[idx];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& json_app = GetSavedApplications(dictionary)[idx];
   LOG4CXX_DEBUG(logger_,
                 "Saved_application_data: " << json_app.toStyledString());
   if (json_app.isMember(strings::hash_id) &&
@@ -219,12 +236,14 @@ bool ResumptionDataJson::GetSavedApplication(
     smart_objects::SmartObject& saved_app) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   const int idx = GetObjectIndex(policy_app_id, device_id);
   if (-1 == idx) {
     return false;
   }
-  const Json::Value& json_saved_app = GetSavedApplications()[idx];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& json_saved_app = GetSavedApplications(dictionary)[idx];
   formatters::CFormatterJsonBase::jsonValueToObj(json_saved_app, saved_app);
 
   return true;
@@ -234,46 +253,50 @@ bool ResumptionDataJson::RemoveApplicationFromSaved(
     const std::string& policy_app_id, const std::string& device_id) {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   bool result = false;
   std::vector<Json::Value> temp;
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-       it != GetSavedApplications().end();
-       ++it) {
-    if ((*it).isMember(strings::app_id) && (*it).isMember(strings::device_id)) {
-      const std::string& saved_policy_app_id =
-          (*it)[strings::app_id].asString();
-      const std::string& saved_device_id = (*it)[strings::device_id].asString();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& saved_apps = GetSavedApplications(dictionary);
+  for (auto& app : saved_apps) {
+    if (app.isMember(strings::app_id) && app.isMember(strings::device_id)) {
+      const std::string& saved_policy_app_id = app[strings::app_id].asString();
+      const std::string& saved_device_id = app[strings::device_id].asString();
       if (saved_policy_app_id == policy_app_id &&
           saved_device_id == device_id) {
         result = true;
       } else {
-        temp.push_back((*it));
+        temp.push_back(app);
       }
     }
   }
 
   if (false == result) {
     LOG4CXX_TRACE(logger_, "EXIT result: " << (result ? "true" : "false"));
+    accessor.GetMutableData().set_dictionary(dictionary);
     return result;
   }
 
-  GetSavedApplications().clear();
-  for (std::vector<Json::Value>::iterator it = temp.begin(); it != temp.end();
-       ++it) {
-    GetSavedApplications().append((*it));
+  GetSavedApplications(dictionary).clear();
+  for (auto& app : temp) {
+    GetSavedApplications(dictionary).append(app);
   }
   LOG4CXX_TRACE(logger_, "EXIT result: " << (result ? "true" : "false"));
+  accessor.GetMutableData().set_dictionary(dictionary);
   return result;
 }
 
 uint32_t ResumptionDataJson::GetIgnOffTime() const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& resumption = GetResumptionData();
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& resumption = GetResumptionData(dictionary);
   if (!resumption.isMember(strings::last_ign_off_time)) {
     resumption[strings::last_ign_off_time] = 0;
+    accessor.GetMutableData().set_dictionary(dictionary);
     LOG4CXX_WARN(logger_, "last_save_time section is missed");
   }
   return resumption[strings::last_ign_off_time].asUInt();
@@ -282,8 +305,10 @@ uint32_t ResumptionDataJson::GetIgnOffTime() const {
 uint32_t ResumptionDataJson::GetGlobalIgnOnCounter() const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& resumption = GetResumptionData();
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& resumption = GetResumptionData(dictionary);
   if (resumption.isMember(strings::global_ign_on_counter)) {
     const uint32_t global_ign_on_counter =
         resumption[strings::global_ign_on_counter].asUInt();
@@ -296,8 +321,10 @@ uint32_t ResumptionDataJson::GetGlobalIgnOnCounter() const {
 void ResumptionDataJson::IncrementGlobalIgnOnCounter() {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& resumption = GetResumptionData();
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& resumption = GetResumptionData(dictionary);
   if (resumption.isMember(strings::global_ign_on_counter)) {
     const uint32_t global_ign_on_counter =
         resumption[strings::global_ign_on_counter].asUInt();
@@ -311,64 +338,71 @@ void ResumptionDataJson::IncrementGlobalIgnOnCounter() {
   } else {
     resumption[strings::global_ign_on_counter] = 1;
   }
-  last_state().SaveStateToFileSystem();
+  accessor.GetMutableData().set_dictionary(dictionary);
+  accessor.GetMutableData().SaveToFileSystem();
 }
 
 void ResumptionDataJson::ResetGlobalIgnOnCount() {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& resumption = GetResumptionData();
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& resumption = GetResumptionData(dictionary);
 
   resumption[strings::global_ign_on_counter] = 0;
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_DEBUG(logger_, "Global IGN ON counter resetting");
 }
 
 ssize_t ResumptionDataJson::IsApplicationSaved(
     const std::string& policy_app_id, const std::string& device_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   return GetObjectIndex(policy_app_id, device_id);
 }
 
 Json::Value& ResumptionDataJson::GetFromSavedOrAppend(
-    const std::string& policy_app_id, const std::string& device_id) const {
+    const std::string& policy_app_id,
+    const std::string& device_id,
+    Json::Value& dictionary) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-       it != GetSavedApplications().end();
-       ++it) {
-    if (device_id == (*it)[strings::device_id].asString() &&
-        policy_app_id == (*it)[strings::app_id].asString()) {
-      return *it;
+
+  Json::Value& saved_apps = GetSavedApplications(dictionary);
+  for (auto& saved_app : saved_apps) {
+    if (device_id == saved_app[strings::device_id].asString() &&
+        policy_app_id == saved_app[strings::app_id].asString()) {
+      return saved_app;
     }
   }
 
-  return GetSavedApplications().append(Json::Value());
+  return GetSavedApplications(dictionary).append(Json::Value());
 }
 
 void ResumptionDataJson::GetDataForLoadResumeData(
     smart_objects::SmartObject& saved_data) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   smart_objects::SmartObject so_array_data(smart_objects::SmartType_Array);
   int i = 0;
-  for (Json::Value::iterator it = GetSavedApplications().begin();
-       it != GetSavedApplications().end();
-       ++it) {
-    if (((*it).isMember(strings::hmi_level)) &&
-        ((*it).isMember(strings::ign_off_count)) &&
-        ((*it).isMember(strings::time_stamp)) &&
-        ((*it).isMember(strings::app_id)) &&
-        ((*it).isMember(strings::device_id))) {
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& saved_apps = GetSavedApplications(dictionary);
+
+  for (auto& saved_app : saved_apps) {
+    if ((saved_app.isMember(strings::hmi_level)) &&
+        (saved_app.isMember(strings::ign_off_count)) &&
+        (saved_app.isMember(strings::time_stamp)) &&
+        (saved_app.isMember(strings::app_id)) &&
+        (saved_app.isMember(strings::device_id))) {
       smart_objects::SmartObject so(smart_objects::SmartType_Map);
-      so[strings::hmi_level] = (*it)[strings::hmi_level].asInt();
-      so[strings::ign_off_count] = (*it)[strings::ign_off_count].asInt();
-      so[strings::time_stamp] = (*it)[strings::time_stamp].asUInt();
-      so[strings::app_id] = (*it)[strings::app_id].asString();
-      so[strings::device_id] = (*it)[strings::device_id].asString();
+      so[strings::hmi_level] = saved_app[strings::hmi_level].asInt();
+      so[strings::ign_off_count] = saved_app[strings::ign_off_count].asInt();
+      so[strings::time_stamp] = saved_app[strings::time_stamp].asUInt();
+      so[strings::app_id] = saved_app[strings::app_id].asString();
+      so[strings::device_id] = saved_app[strings::device_id].asString();
       so_array_data[i++] = so;
     }
   }
@@ -393,14 +427,18 @@ void ResumptionDataJson::UpdateHmiLevel(
                      << policy_app_id << " device_id = " << device_id);
     return;
   }
-  GetSavedApplications()[idx][strings::hmi_level] = hmi_level;
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  GetSavedApplications(dictionary)[idx][strings::hmi_level] = hmi_level;
+  accessor.GetMutableData().set_dictionary(dictionary);
 }
 
-Json::Value& ResumptionDataJson::GetSavedApplications() const {
+Json::Value& ResumptionDataJson::GetSavedApplications(
+    Json::Value& dictionary) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& resumption = GetResumptionData();
+
+  Json::Value& resumption = GetResumptionData(dictionary);
   if (!resumption.isMember(strings::resume_app_list)) {
     resumption[strings::resume_app_list] = Json::Value(Json::arrayValue);
     LOG4CXX_WARN(logger_, "app_list section is missed");
@@ -413,11 +451,11 @@ Json::Value& ResumptionDataJson::GetSavedApplications() const {
   return resume_app_list;
 }
 
-Json::Value& ResumptionDataJson::GetResumptionData() const {
+Json::Value& ResumptionDataJson::GetResumptionData(
+    Json::Value& dictionary) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& dictionary = last_state().get_dictionary();
+
   if (!dictionary.isMember(strings::resumption)) {
     dictionary[strings::resumption] = Json::Value(Json::objectValue);
     LOG4CXX_WARN(logger_, "resumption section is missed");
@@ -434,8 +472,10 @@ ssize_t ResumptionDataJson::GetObjectIndex(const std::string& policy_app_id,
                                            const std::string& device_id) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  const Json::Value& apps = GetSavedApplications();
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& apps = GetSavedApplications(dictionary);
   const Json::ArrayIndex size = apps.size();
   Json::ArrayIndex idx = 0;
   for (; idx != size; ++idx) {
@@ -456,8 +496,10 @@ ssize_t ResumptionDataJson::GetObjectIndex(const std::string& policy_app_id,
 bool ResumptionDataJson::IsResumptionDataValid(uint32_t index) const {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  const Json::Value& json_app = GetSavedApplications()[index];
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& json_app = GetSavedApplications(dictionary)[index];
   if (!json_app.isMember(strings::app_id) ||
       !json_app.isMember(strings::ign_off_count) ||
       !json_app.isMember(strings::hmi_level) ||
@@ -477,19 +519,21 @@ bool ResumptionDataJson::IsResumptionDataValid(uint32_t index) const {
   return true;
 }
 
-void ResumptionDataJson::SetSavedApplication(Json::Value& apps_json) {
+void ResumptionDataJson::SetSavedApplication(Json::Value& apps_json,
+                                             Json::Value& dictionary) {
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& app_list = GetSavedApplications();
+
+  Json::Value& app_list = GetSavedApplications(dictionary);
   app_list = apps_json;
 }
 
-void ResumptionDataJson::SetLastIgnOffTime(time_t ign_off_time) {
+void ResumptionDataJson::SetLastIgnOffTime(time_t ign_off_time,
+                                           Json::Value& dictionary) {
   using namespace app_mngr;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoLock autolock(resumption_lock_);
+
   LOG4CXX_WARN(logger_, "ign_off_time = " << ign_off_time);
-  Json::Value& resumption = GetResumptionData();
+  Json::Value& resumption = GetResumptionData(dictionary);
   resumption[strings::last_ign_off_time] = static_cast<uint32_t>(ign_off_time);
 }
 
@@ -502,8 +546,11 @@ bool ResumptionDataJson::DropAppDataResumption(const std::string& device_id,
                                                const std::string& app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   using namespace app_mngr;
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  Json::Value& application = GetFromSavedOrAppend(app_id, device_id);
+
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
+  Json::Value& application =
+      GetFromSavedOrAppend(app_id, device_id, dictionary);
   if (application.isNull()) {
     LOG4CXX_DEBUG(logger_,
                   "Application " << app_id << " with device_id " << device_id
@@ -517,6 +564,7 @@ bool ResumptionDataJson::DropAppDataResumption(const std::string& device_id,
   application[strings::application_subscriptions].clear();
   application[strings::application_files].clear();
   application.removeMember(strings::grammar_id);
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_DEBUG(logger_,
                 "Resumption data for application "
                     << app_id << " with device_id " << device_id
@@ -525,10 +573,11 @@ bool ResumptionDataJson::DropAppDataResumption(const std::string& device_id,
 }
 
 void ResumptionDataJson::Persist() {
-  // We lock the resumption data because SaveStateToFileSystem accesses
-  // the same dictionary that we use here in ResumptionDataJson
-  sync_primitives::AutoLock autolock(resumption_lock_);
-  last_state().SaveStateToFileSystem();
+  last_state_wrapper_->get_accessor().GetMutableData().SaveToFileSystem();
+}
+
+LastState& ResumptionDataJson::last_state() const {
+  return last_state_wrapper_->get_accessor().GetMutableData();
 }
 
 }  // namespace resumption
diff --git a/src/components/application_manager/src/rpc_handler_impl.cc b/src/components/application_manager/src/rpc_handler_impl.cc
index 3fceaf573c..44a5af6f41 100644
--- a/src/components/application_manager/src/rpc_handler_impl.cc
+++ b/src/components/application_manager/src/rpc_handler_impl.cc
@@ -31,7 +31,6 @@
  */
 
 #include "application_manager/rpc_handler_impl.h"
-
 #include "application_manager/app_service_manager.h"
 #include "application_manager/plugin_manager/plugin_keys.h"
 
@@ -43,12 +42,14 @@ namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
 namespace jhs = ns_smart_device_link::ns_json_handler::strings;
 namespace plugin_names = application_manager::plugin_manager::plugin_names;
 
-RPCHandlerImpl::RPCHandlerImpl(ApplicationManager& app_manager)
+RPCHandlerImpl::RPCHandlerImpl(ApplicationManager& app_manager,
+                               hmi_apis::HMI_API& hmi_so_factory,
+                               mobile_apis::MOBILE_API& mobile_so_factory)
     : app_manager_(app_manager)
     , messages_from_mobile_("AM FromMobile", this)
     , messages_from_hmi_("AM FromHMI", this)
-    , hmi_so_factory_(hmi_apis::HMI_API())
-    , mobile_so_factory_(mobile_apis::MOBILE_API())
+    , hmi_so_factory_(hmi_so_factory)
+    , mobile_so_factory_(mobile_so_factory)
 #ifdef TELEMETRY_MONITOR
     , metric_observer_(NULL)
 #endif  // TELEMETRY_MONITOR
@@ -107,8 +108,12 @@ void RPCHandlerImpl::ProcessMessageFromMobile(
     allow_unknown_parameters = true;
   }
 
-  if (!ConvertMessageToSO(
-          *message, *so_from_mobile, allow_unknown_parameters, !rpc_passing)) {
+  std::string warning_info;
+  if (!ConvertMessageToSO(*message,
+                          *so_from_mobile,
+                          warning_info,
+                          allow_unknown_parameters,
+                          !rpc_passing)) {
     LOG4CXX_ERROR(logger_, "Cannot create smart object from message");
     return;
   }
@@ -130,7 +135,7 @@ void RPCHandlerImpl::ProcessMessageFromMobile(
                                              commands::Command::SOURCE_MOBILE,
                                              message_type)) {
       // Since PassThrough failed, refiltering the message
-      if (!ConvertMessageToSO(*message, *so_from_mobile)) {
+      if (!ConvertMessageToSO(*message, *so_from_mobile, warning_info)) {
         LOG4CXX_ERROR(logger_, "Cannot create smart object from message");
         return;
       }
@@ -142,7 +147,7 @@ void RPCHandlerImpl::ProcessMessageFromMobile(
 #endif  // TELEMETRY_MONITOR
 
   if (!app_manager_.GetRPCService().ManageMobileCommand(
-          so_from_mobile, commands::Command::SOURCE_MOBILE)) {
+          so_from_mobile, commands::Command::SOURCE_MOBILE, warning_info)) {
     LOG4CXX_ERROR(logger_, "Received command didn't run successfully");
   }
 #ifdef TELEMETRY_MONITOR
@@ -159,27 +164,25 @@ void RPCHandlerImpl::ProcessMessageFromHMI(
   smart_objects::SmartObjectSPtr smart_object =
       std::make_shared<smart_objects::SmartObject>();
   bool allow_unknown_parameters = false;
-  if (!smart_object) {
-    LOG4CXX_ERROR(logger_, "Null pointer");
-    return;
-  }
 
   smart_objects::SmartObject converted_result;
   formatters::FormatterJsonRpc::FromString<hmi_apis::FunctionID::eType,
                                            hmi_apis::messageType::eType>(
       message->json_message(), converted_result);
 
+  const auto function_id = static_cast<int32_t>(
+      converted_result[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
   if (app_manager_.GetRPCService().IsAppServiceRPC(
-          converted_result[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt(),
-          commands::Command::SOURCE_HMI)) {
+          function_id, commands::Command::SOURCE_HMI)) {
     LOG4CXX_DEBUG(
         logger_,
-        "Allowing unknown parameters for request function "
-            << converted_result[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
+        "Allowing unknown parameters for request function " << function_id);
     allow_unknown_parameters = true;
   }
 
-  if (!ConvertMessageToSO(*message, *smart_object, allow_unknown_parameters)) {
+  std::string warning_info;
+  if (!ConvertMessageToSO(
+          *message, *smart_object, warning_info, allow_unknown_parameters)) {
     if (application_manager::MessageType::kResponse ==
         (*smart_object)[strings::params][strings::message_type].asInt()) {
       (*smart_object).erase(strings::msg_params);
@@ -193,11 +196,18 @@ void RPCHandlerImpl::ProcessMessageFromHMI(
     }
   }
 
+  if (!warning_info.empty()) {
+    LOG4CXX_WARN(logger_,
+                 "Warning while parsing HMI message: " << warning_info);
+  }
+
   LOG4CXX_DEBUG(logger_, "Converted message, trying to create hmi command");
-  if (!app_manager_.GetRPCService().ManageHMICommand(smart_object)) {
+  if (!app_manager_.GetRPCService().ManageHMICommand(
+          smart_object, commands::Command::SOURCE_HMI, warning_info)) {
     LOG4CXX_ERROR(logger_, "Received command didn't run successfully");
   }
 }
+
 void RPCHandlerImpl::Handle(const impl::MessageFromMobile message) {
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -209,6 +219,10 @@ void RPCHandlerImpl::Handle(const impl::MessageFromMobile message) {
     LOG4CXX_INFO(logger_, "Application manager is stopping");
     return;
   }
+  if (app_manager_.IsLowVoltage()) {
+    LOG4CXX_ERROR(logger_, "Low Voltage is active.");
+    return;
+  }
 
   ProcessMessageFromMobile(message);
 }
@@ -220,6 +234,11 @@ void RPCHandlerImpl::Handle(const impl::MessageFromHmi message) {
     LOG4CXX_ERROR(logger_, "Null-pointer message received.");
     return;
   }
+  if (app_manager_.IsLowVoltage()) {
+    LOG4CXX_ERROR(logger_, "Low Voltage is active.");
+    return;
+  }
+
   ProcessMessageFromHMI(message);
 }
 
@@ -227,6 +246,11 @@ void RPCHandlerImpl::OnMessageReceived(
     const protocol_handler::RawMessagePtr message) {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  if (app_manager_.IsLowVoltage()) {
+    LOG4CXX_ERROR(logger_, "Low Voltage is active.");
+    return;
+  }
+
   if (!message) {
     LOG4CXX_ERROR(logger_, "Null-pointer message received.");
     NOTREACHED();
@@ -295,6 +319,7 @@ void RPCHandlerImpl::GetMessageVersion(
     if (sync_msg_version.keyExists(strings::patch_version)) {
       patch = sync_msg_version[strings::patch_version].asUInt();
     }
+
     utils::SemanticVersion temp_version(major, minor, patch);
     if (temp_version.isValid()) {
       message_version = (temp_version >= utils::rpc_version_5)
@@ -307,6 +332,7 @@ void RPCHandlerImpl::GetMessageVersion(
 bool RPCHandlerImpl::ConvertMessageToSO(
     const Message& message,
     ns_smart_device_link::ns_smart_objects::SmartObject& output,
+    std::string& out_warning_info,
     const bool allow_unknown_parameters,
     const bool validate_params) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -369,6 +395,9 @@ bool RPCHandlerImpl::ConvertMessageToSO(
                     "Convertion result for sdl object is true function_id "
                         << output[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
 
+      // Populate any warning info generated during the validation process
+      out_warning_info = rpc::PrettyFormat(report);
+
       output[strings::params][strings::connection_key] =
           message.connection_key();
       output[strings::params][strings::protocol_version] =
@@ -406,7 +435,7 @@ bool RPCHandlerImpl::ConvertMessageToSO(
                     "Convertion result: "
                         << result << " function id "
                         << output[jhs::S_PARAMS][jhs::S_FUNCTION_ID].asInt());
-      if (!hmi_so_factory().attachSchema(output, false)) {
+      if (!hmi_so_factory().attachSchema(output, true)) {
         LOG4CXX_WARN(logger_, "Failed to attach schema to object.");
         return false;
       }
@@ -415,17 +444,14 @@ bool RPCHandlerImpl::ConvertMessageToSO(
 
       utils::SemanticVersion empty_version;
       if (validate_params &&
-          output.validate(&report, empty_version, allow_unknown_parameters) !=
-              smart_objects::errors::OK) {
+          smart_objects::errors::OK !=
+              output.validate(
+                  &report, empty_version, allow_unknown_parameters)) {
         LOG4CXX_ERROR(
             logger_,
             "Incorrect parameter from HMI - " << rpc::PrettyFormat(report));
 
-        output.erase(strings::msg_params);
-        output[strings::params][hmi_response::code] =
-            hmi_apis::Common_Result::INVALID_DATA;
-        output[strings::msg_params][strings::info] = rpc::PrettyFormat(report);
-        return false;
+        return HandleWrongMessageType(output, report);
       }
       break;
     }
@@ -472,17 +498,59 @@ bool RPCHandlerImpl::ConvertMessageToSO(
                        << message.protocol_version() << ".");
       return false;
   }
+  output[strings::params][strings::protection] = message.is_message_encrypted();
 
   LOG4CXX_DEBUG(logger_, "Successfully parsed message into smart object");
   return true;
 }
 
+bool RPCHandlerImpl::HandleWrongMessageType(
+    smart_objects::SmartObject& output, rpc::ValidationReport report) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  switch (output[strings::params][strings::message_type].asInt()) {
+    case application_manager::MessageType::kNotification: {
+      LOG4CXX_ERROR(logger_, "Ignore wrong HMI notification");
+      return false;
+    }
+    case application_manager::MessageType::kRequest: {
+      LOG4CXX_ERROR(logger_, "Received invalid data on HMI request");
+      output.erase(strings::msg_params);
+      output[strings::params].erase(hmi_response::message);
+      output[strings::params][hmi_response::code] =
+          hmi_apis::Common_Result::INVALID_DATA;
+      output[strings::params][strings::message_type] =
+          MessageType::kErrorResponse;
+      output[strings::params][strings::error_msg] = rpc::PrettyFormat(report);
+      return true;
+    }
+    case application_manager::MessageType::kResponse: {
+      LOG4CXX_ERROR(logger_, "Received invalid data on HMI response");
+      break;
+    }
+    case application_manager::MessageType::kUnknownType: {
+      LOG4CXX_ERROR(logger_, "Received unknown type data on HMI");
+      break;
+    }
+    default: {
+      LOG4CXX_ERROR(logger_, "Received error response on HMI");
+      break;
+    }
+  }
+  output.erase(strings::msg_params);
+  output[strings::params].erase(hmi_response::message);
+  output[strings::params][hmi_response::code] =
+      hmi_apis::Common_Result::GENERIC_ERROR;
+  output[strings::msg_params][strings::info] =
+      std::string("Invalid message received from vehicle");
+  return true;
+}
+
 bool RPCHandlerImpl::ValidateRpcSO(smart_objects::SmartObject& message,
                                    utils::SemanticVersion& msg_version,
                                    rpc::ValidationReport& report_out,
                                    bool allow_unknown_parameters) {
   if (!mobile_so_factory().attachSchema(
-          message, !allow_unknown_parameters, msg_version) ||
+          message, !allow_unknown_parameters, msg_version, &report_out) ||
       message.validate(&report_out, msg_version, allow_unknown_parameters) !=
           smart_objects::errors::OK) {
     LOG4CXX_WARN(logger_, "Failed to parse string to smart object");
@@ -513,6 +581,7 @@ std::shared_ptr<Message> RPCHandlerImpl::ConvertRawMsgToMessage(
   } else {
     LOG4CXX_ERROR(logger_, "Received invalid message");
   }
+
   return outgoing_message;
 }
 
diff --git a/src/components/application_manager/src/rpc_passing_handler.cc b/src/components/application_manager/src/rpc_passing_handler.cc
index feb3bccc1f..7f72632bb1 100644
--- a/src/components/application_manager/src/rpc_passing_handler.cc
+++ b/src/components/application_manager/src/rpc_passing_handler.cc
@@ -40,6 +40,7 @@
 #include "application_manager/application_manager.h"
 #include "application_manager/commands/command_impl.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/rpc_handler.h"
 #include "application_manager/rpc_passing_handler.h"
 #include "application_manager/smart_object_keys.h"
@@ -108,9 +109,11 @@ bool RPCPassingHandler::ExtractRPCParams(
   }
 
   CommandParametersPermissions parameters_permissions;
+  const WindowID window_id =
+      MessageHelper::ExtractWindowIdFromSmartObject(s_map);
 
   mobile_apis::Result::eType check_result = app_manager_.CheckPolicyPermissions(
-      app, function_id_str, params, &parameters_permissions);
+      app, window_id, function_id_str, params, &parameters_permissions);
 
   // Check if RPC is allowed by policy (since we are allowing unknown params,
   // check should pass if only undefined parameters exist)
@@ -141,7 +144,7 @@ bool RPCPassingHandler::IsPassthroughAllowed(
           rpc_message[strings::params][strings::function_id].asInt());
   std::string function_id_str =
       MessageHelper::StringifiedFunctionID(function_id);
-  PolicyHandlerInterface& policy_handler = app_manager_.GetPolicyHandler();
+  auto& policy_handler = app_manager_.GetPolicyHandler();
 
   if (function_id_str.empty()) {
     // Unknown RPC, just do basic revoked and user consent checks
diff --git a/src/components/application_manager/src/rpc_protection_manager_impl.cc b/src/components/application_manager/src/rpc_protection_manager_impl.cc
new file mode 100644
index 0000000000..4afceb9e5b
--- /dev/null
+++ b/src/components/application_manager/src/rpc_protection_manager_impl.cc
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "application_manager/rpc_protection_manager_impl.h"
+#include "application_manager/application.h"
+#include "application_manager/message_helper.h"
+#include "utils/helpers.h"
+
+CREATE_LOGGERPTR_LOCAL(logger_, "RPCProtectionManagerImpl");
+
+namespace application_manager {
+
+namespace rpc_encryption_exceptions {
+std::vector<std::string> kExceptionRPCs = {"RegisterAppInterface",
+                                           "SystemRequest",
+                                           "OnPermissionsChange",
+                                           "OnSystemRequest",
+                                           "PutFile",
+                                           "OnHMIStatus"};
+}
+
+RPCProtectionManagerImpl::RPCProtectionManagerImpl(
+    policy::PolicyHandlerInterface& policy_handler)
+    : policy_handler_(policy_handler) {
+  LOG4CXX_AUTO_TRACE(logger_);
+}
+
+bool RPCProtectionManagerImpl::CheckPolicyEncryptionFlag(
+    const uint32_t function_id,
+    const ApplicationSharedPtr app,
+    const bool is_rpc_service_secure) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto& policy_encryption_flag_getter =
+      policy_handler_.PolicyEncryptionFlagGetter();
+  if (!policy_encryption_flag_getter) {
+    LOG4CXX_ERROR(logger_, "Policy Encryption Flag getter is not inited");
+    return false;
+  }
+  const std::string function_name =
+      policy_encryption_flag_getter->GetPolicyFunctionName(function_id);
+  LOG4CXX_DEBUG(logger_, "Function for check is " << function_name);
+
+  if (!is_rpc_service_secure && IsExceptionRPC(function_id)) {
+    LOG4CXX_WARN(logger_,
+                 "Exception RPC can be sent in an non secure service despite "
+                 "encryption required flag");
+    return false;
+  }
+
+  if (!app) {
+    LOG4CXX_WARN(logger_, "Received app nullptr");
+    return false;
+  }
+
+  const auto policy_app_id = app->policy_app_id();
+
+  return IsEncryptionRequiredByPolicy(policy_app_id, function_name);
+}
+
+bool RPCProtectionManagerImpl::IsEncryptionRequiredByPolicy(
+    const std::string& policy_app_id, const std::string& function_name) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  auto it = encrypted_rpcs_.find(policy_app_id);
+
+  if (encrypted_rpcs_.end() == it) {
+    LOG4CXX_WARN(
+        logger_,
+        "App specific policies for app: " << policy_app_id << " not found");
+    it = encrypted_rpcs_.find(policy_table::kDefaultApp);
+    return encrypted_rpcs_.end() != it
+               ? (*it).second.find(function_name) != (*it).second.end()
+               : false;
+  }
+
+  return (*it).second.find(function_name) != (*it).second.end();
+}
+
+bool RPCProtectionManagerImpl::IsInEncryptionNeededCache(
+    const uint32_t app_id, const uint32_t correlation_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_DEBUG(logger_, "correlation_id is " << correlation_id);
+
+  return encryption_needed_cache_.find(std::make_pair(
+             app_id, correlation_id)) != encryption_needed_cache_.end();
+}
+
+bool RPCProtectionManagerImpl::IsExceptionRPC(
+    const uint32_t function_id) const {
+  using namespace rpc_encryption_exceptions;
+  const std::string policy_fucntion_id = policy_table::EnumToJsonString(
+      static_cast<policy_table::FunctionID>(function_id));
+  return helpers::in_range(kExceptionRPCs, policy_fucntion_id);
+}
+
+void RPCProtectionManagerImpl::AddToEncryptionNeededCache(
+    const uint32_t app_id, const uint32_t correlation_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(message_needed_encryption_lock_);
+
+  LOG4CXX_DEBUG(logger_, "Adding rpc with correlation id: " << correlation_id);
+
+  encryption_needed_cache_.insert(std::make_pair(app_id, correlation_id));
+}
+
+void RPCProtectionManagerImpl::RemoveFromEncryptionNeededCache(
+    const uint32_t app_id, const uint32_t correlation_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(message_needed_encryption_lock_);
+
+  LOG4CXX_DEBUG(logger_,
+                "Removing rpc with correlation id: " << correlation_id);
+
+  encryption_needed_cache_.erase(std::make_pair(app_id, correlation_id));
+}
+
+void RPCProtectionManagerImpl::OnPTUFinished(const bool ptu_result) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(encrypted_rpcs_lock_);
+
+  if (ptu_result) {
+    LOG4CXX_TRACE(logger_,
+                  "PTU finished successfully, commencing internal encrypted "
+                  "RPC cache update");
+    encrypted_rpcs_.clear();
+    SaveEncryptedRPC();
+  } else {
+    LOG4CXX_WARN(logger_,
+                 "PTU was unsuccessful. Keeping internal RPC cache from "
+                 "current snapshot");
+  }
+}
+
+void RPCProtectionManagerImpl::SaveEncryptedRPC() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto policy_encryption_flag_getter =
+      policy_handler_.PolicyEncryptionFlagGetter();
+
+  const auto policy_policy_app_ids =
+      policy_encryption_flag_getter->GetApplicationPolicyIDs();
+
+  for (const auto& app : policy_policy_app_ids) {
+    LOG4CXX_DEBUG(logger_, "Processing app name: " << app);
+
+    encrypted_rpcs_[app] = GetEncryptedRPCsForApp(app);
+  }
+}
+
+void RPCProtectionManagerImpl::OnPTInited() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  encrypted_rpcs_.clear();
+
+  SaveEncryptedRPC();
+}
+
+RPCProtectionManagerImpl::FunctionNames
+RPCProtectionManagerImpl::GetEncryptedRPCsForApp(
+    const std::string& policy_app_id) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  FunctionNames encrypted_rpcs;
+
+  const auto policy_encryption_flag_getter =
+      policy_handler_.PolicyEncryptionFlagGetter();
+
+  if (!policy_encryption_flag_getter->AppNeedEncryption(policy_app_id)) {
+    return encrypted_rpcs;
+  }
+
+  const auto function_groups =
+      policy_encryption_flag_getter->GetFunctionalGroupsForApp(policy_app_id);
+
+  auto fill_encrypted_rpcs = [&encrypted_rpcs](
+                                 const std::string& function_name) {
+    LOG4CXX_DEBUG(logger_, "Adding required encryprion rpc: " << function_name);
+    encrypted_rpcs.insert(function_name);
+  };
+
+  for (const auto& function_group : function_groups) {
+    if (policy_encryption_flag_getter->FunctionGroupNeedEncryption(
+            function_group)) {
+      auto rpcs = policy_encryption_flag_getter->GetRPCsForFunctionGroup(
+          function_group);
+
+      std::for_each(rpcs.begin(), rpcs.end(), fill_encrypted_rpcs);
+    }
+  }
+
+  return encrypted_rpcs;
+}
+
+}  // namespace application_manager
diff --git a/src/components/application_manager/src/rpc_service_impl.cc b/src/components/application_manager/src/rpc_service_impl.cc
index b5cae1c126..c7959c2386 100644
--- a/src/components/application_manager/src/rpc_service_impl.cc
+++ b/src/components/application_manager/src/rpc_service_impl.cc
@@ -31,8 +31,11 @@
  */
 
 #include "application_manager/rpc_service_impl.h"
+#include "application_manager/rpc_protection_manager_impl.h"
 
 #include "application_manager/app_service_manager.h"
+#include "application_manager/command_factory.h"
+#include "application_manager/commands/command.h"
 #include "application_manager/plugin_manager/plugin_keys.h"
 
 namespace application_manager {
@@ -48,22 +51,77 @@ RPCServiceImpl::RPCServiceImpl(
     request_controller::RequestController& request_ctrl,
     protocol_handler::ProtocolHandler* protocol_handler,
     hmi_message_handler::HMIMessageHandler* hmi_handler,
-    CommandHolder& commands_holder)
+    CommandHolder& commands_holder,
+    RPCProtectionManagerSPtr rpc_protection_manager,
+    hmi_apis::HMI_API& hmi_so_factory,
+    mobile_apis::MOBILE_API& mobile_so_factory)
     : app_manager_(app_manager)
     , request_ctrl_(request_ctrl)
     , protocol_handler_(protocol_handler)
     , hmi_handler_(hmi_handler)
+    , rpc_protection_manager_(rpc_protection_manager)
     , commands_holder_(commands_holder)
     , messages_to_mobile_("AM ToMobile", this)
     , messages_to_hmi_("AM ToHMI", this)
-    , hmi_so_factory_(hmi_apis::HMI_API())
-    , mobile_so_factory_(mobile_apis::MOBILE_API()) {}
+    , hmi_so_factory_(hmi_so_factory)
+    , mobile_so_factory_(mobile_so_factory) {}
 
 RPCServiceImpl::~RPCServiceImpl() {}
 
+void RPCServiceImpl::Stop() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  messages_to_mobile_.Shutdown();
+  messages_to_hmi_.Shutdown();
+}
+
+EncryptionFlagCheckResult RPCServiceImpl::IsEncryptionRequired(
+    const smart_objects::SmartObject& message,
+    std::shared_ptr<Application> app,
+    const bool is_rpc_service_secure) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto function_id =
+      message[strings::params][strings::function_id].asUInt();
+  const auto correlation_id =
+      message[strings::params][strings::correlation_id].asUInt();
+
+  const auto message_type =
+      message[strings::params][strings::message_type].asUInt();
+  const bool policy_encryption_flag =
+      rpc_protection_manager_->CheckPolicyEncryptionFlag(
+          function_id, app, is_rpc_service_secure);
+  if (MessageType::kRequest == message_type) {
+    const bool message_protected =
+        message[strings::params][strings::protection].asBool();
+
+    if (!message_protected) {
+      return policy_encryption_flag
+                 ? EncryptionFlagCheckResult::kError_EncryptionNeeded
+                 : EncryptionFlagCheckResult::kSuccess_NotProtected;
+    }
+
+    //    request is encrypted, so we need to encrypt response regardless of
+    //    policy flag
+    const auto connection_key =
+        message[strings::params][strings::connection_key].asUInt();
+    rpc_protection_manager_->AddToEncryptionNeededCache(connection_key,
+                                                        correlation_id);
+    return EncryptionFlagCheckResult::kSuccess_Protected;
+  }
+  return policy_encryption_flag
+             ? EncryptionFlagCheckResult::kSuccess_Protected
+             : EncryptionFlagCheckResult::kSuccess_NotProtected;
+}
 bool RPCServiceImpl::ManageMobileCommand(
     const commands::MessageSharedPtr message,
     commands::Command::CommandSource source) {
+  return ManageMobileCommand(message, source, std::string());
+}
+
+bool RPCServiceImpl::ManageMobileCommand(
+    const commands::MessageSharedPtr message,
+    commands::Command::CommandSource source,
+    const std::string warning_info) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
@@ -82,9 +140,10 @@ bool RPCServiceImpl::ManageMobileCommand(
       (*message)[strings::params][strings::connection_key].asUInt());
 
   auto app_ptr = app_manager_.application(connection_key);
-  if (app_ptr && app_manager_.IsAppInReconnectMode(app_ptr->policy_app_id())) {
+  if (app_ptr && app_manager_.IsAppInReconnectMode(app_ptr->device(),
+                                                   app_ptr->policy_app_id())) {
     commands_holder_.Suspend(
-        app_ptr, CommandHolder::CommandType::kMobileCommand, message);
+        app_ptr, CommandHolder::CommandType::kMobileCommand, source, message);
     return true;
   }
   mobile_apis::FunctionID::eType function_id =
@@ -118,9 +177,21 @@ bool RPCServiceImpl::ManageMobileCommand(
       SendMessageToMobile(response);
       return false;
     }
-
-    // Message for "CheckPermission" must be with attached schema
-    mobile_so_factory().attachSchema(*message, false);
+#ifdef ENABLE_SECURITY
+    if (EncryptionFlagCheckResult::kError_EncryptionNeeded ==
+        IsEncryptionRequired(
+            *message,
+            app,
+            protocol_handler_->IsRPCServiceSecure(connection_key))) {
+      const auto response = MessageHelper::CreateNegativeResponse(
+          connection_key,
+          function_id,
+          correlation_id,
+          static_cast<int32_t>(mobile_apis::Result::ENCRYPTION_NEEDED));
+      SendMessageToMobile(response);
+      return false;
+    }
+#endif  // ENABLE_SECURITY
   }
 
   auto plugin =
@@ -141,7 +212,7 @@ bool RPCServiceImpl::ManageMobileCommand(
   int32_t message_type =
       (*message)[strings::params][strings::message_type].asInt();
   if (message_type == mobile_apis::messageType::response) {
-    if (command->Init()) {
+    if (command->Init() && command->CheckPermissions()) {
       command->Run();
       command->CleanUp();
     }
@@ -149,7 +220,7 @@ bool RPCServiceImpl::ManageMobileCommand(
   }
   if (message_type == mobile_apis::messageType::notification) {
     request_ctrl_.addNotification(command);
-    if (command->Init()) {
+    if (command->Init() && command->CheckPermissions()) {
       command->Run();
       if (command->CleanUp()) {
         request_ctrl_.removeNotification(command.get());
@@ -161,7 +232,7 @@ bool RPCServiceImpl::ManageMobileCommand(
 
   if (message_type == mobile_apis::messageType::request &&
       source == commands::Command::CommandSource::SOURCE_SDL) {
-    if (command->Init()) {
+    if (command->Init() && command->CheckPermissions()) {
       command->Run();
       command->CleanUp();
       return true;
@@ -172,15 +243,16 @@ bool RPCServiceImpl::ManageMobileCommand(
 
   if (message_type == mobile_apis::messageType::request &&
       source == commands::Command::CommandSource::SOURCE_MOBILE) {
-    // commands will be launched from requesr_ctrl
     mobile_apis::HMILevel::eType app_hmi_level =
         mobile_apis::HMILevel::INVALID_ENUM;
     if (app) {
-      app_hmi_level = app->hmi_level();
+      app_hmi_level =
+          app->hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW);
     }
 
-    // commands will be launched from request_ctrl
+    command->set_warning_info(warning_info);
 
+    // commands will be launched from request_ctrl
     const request_controller::RequestController::TResult result =
         request_ctrl_.addMobileRequest(command, app_hmi_level);
 
@@ -260,6 +332,12 @@ bool RPCServiceImpl::ManageMobileCommand(
 
 bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
                                       commands::Command::CommandSource source) {
+  return ManageHMICommand(message, source, std::string());
+}
+
+bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
+                                      commands::Command::CommandSource source,
+                                      const std::string warning_info) {
   LOG4CXX_AUTO_TRACE(logger_);
 
   if (!message) {
@@ -296,9 +374,10 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
         (*message)[strings::msg_params][strings::app_id].asUInt();
 
     auto app = app_manager_.application(static_cast<uint32_t>(connection_key));
-    if (app && app_manager_.IsAppInReconnectMode(app->policy_app_id())) {
+    if (app && app_manager_.IsAppInReconnectMode(app->device(),
+                                                 app->policy_app_id())) {
       commands_holder_.Suspend(
-          app, CommandHolder::CommandType::kHmiCommand, message);
+          app, CommandHolder::CommandType::kHmiCommand, source, message);
       return true;
     }
   }
@@ -308,6 +387,7 @@ bool RPCServiceImpl::ManageHMICommand(const commands::MessageSharedPtr message,
 
   if (kRequest == message_type) {
     LOG4CXX_DEBUG(logger_, "ManageHMICommand");
+    command->set_warning_info(warning_info);
     request_ctrl_.addHMIRequest(command);
   }
 
@@ -337,6 +417,7 @@ void RPCServiceImpl::Handle(const impl::MessageToHmi message) {
 }
 
 void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!protocol_handler_) {
     LOG4CXX_WARN(logger_,
                  "Protocol Handler is not set; cannot send message to mobile.");
@@ -361,7 +442,32 @@ void RPCServiceImpl::Handle(const impl::MessageToMobile message) {
     }
   }
 
-  protocol_handler_->SendMessageToMobileApp(rawMessage, is_final);
+  const auto correlation_id = message->correlation_id();
+  const auto app_id = message->connection_key();
+
+  const bool is_service_secure =
+      protocol_handler_->IsRPCServiceSecure(message->connection_key());
+
+  const bool needs_encryption =
+      MessageType::kNotification == message->type()
+          ? rpc_protection_manager_->CheckPolicyEncryptionFlag(
+                message->function_id(),
+                app_manager_.application(app_id),
+                is_service_secure)
+          : rpc_protection_manager_->IsInEncryptionNeededCache(app_id,
+                                                               correlation_id);
+
+  if (needs_encryption && !is_service_secure) {
+    LOG4CXX_WARN(logger_,
+                 "Unable to send rpc that requires encryption without secure "
+                 "rpc service");
+    return;
+  };
+
+  protocol_handler_->SendMessageToMobileApp(
+      rawMessage, needs_encryption, is_final);
+  rpc_protection_manager_->RemoveFromEncryptionNeededCache(app_id,
+                                                           correlation_id);
   LOG4CXX_INFO(logger_, "Message for mobile given away");
 
   if (close_session) {
@@ -415,11 +521,6 @@ void RPCServiceImpl::SendMessageToMobile(
     app->usage_report().RecordRejectionsSyncOutOfMemory();
   }
 
-  mobile_so_factory().attachSchema(*message, false);
-  LOG4CXX_DEBUG(
-      logger_,
-      "Attached schema to message, result if valid: " << message->isValid());
-
   // Messages to mobile are not yet prioritized so use default priority value
   std::shared_ptr<Message> message_to_send(
       new Message(protocol_handler::MessagePriority::kDefault));
@@ -446,6 +547,15 @@ void RPCServiceImpl::SendMessageToMobile(
                (*message)[jhs::S_PARAMS][jhs::S_MESSAGE_TYPE].asInt())) {
     allow_unknown_parameters = false;
   }
+
+  const auto api_function_id = static_cast<mobile_apis::FunctionID::eType>(
+      (*message)[strings::params][strings::function_id].asUInt());
+
+  mobile_so_factory().attachSchema(*message, false);
+  LOG4CXX_DEBUG(
+      logger_,
+      "Attached schema to message, result if valid: " << message->isValid());
+
   if (!ConvertSOtoMessage(
           (*message), (*message_to_send), allow_unknown_parameters)) {
     LOG4CXX_WARN(logger_, "Can't send msg to Mobile: failed to create string");
@@ -461,12 +571,11 @@ void RPCServiceImpl::SendMessageToMobile(
         msg_to_mobile[strings::params][strings::connection_key].asUInt(),
         msg_to_mobile[strings::params][strings::function_id].asInt());
   } else if (app) {
-    mobile_apis::FunctionID::eType function_id =
-        static_cast<mobile_apis::FunctionID::eType>(
-            (*message)[strings::params][strings::function_id].asUInt());
     RPCParams params;
 
     const smart_objects::SmartObject& s_map = (*message)[strings::msg_params];
+    const WindowID window_id =
+        MessageHelper::ExtractWindowIdFromSmartObject(s_map);
     if (smart_objects::SmartType_Map == s_map.getType()) {
       smart_objects::SmartMap::iterator iter = s_map.map_begin();
       smart_objects::SmartMap::iterator iter_end = s_map.map_end();
@@ -479,18 +588,19 @@ void RPCServiceImpl::SendMessageToMobile(
       }
     }
     const std::string string_functionID =
-        MessageHelper::StringifiedFunctionID(function_id);
+        MessageHelper::StringifiedFunctionID(api_function_id);
     const mobile_apis::Result::eType check_result =
-        app_manager_.CheckPolicyPermissions(app, string_functionID, params);
+        app_manager_.CheckPolicyPermissions(
+            app, window_id, string_functionID, params);
     if (mobile_apis::Result::SUCCESS != check_result) {
       LOG4CXX_WARN(logger_,
-                   "Function \"" << string_functionID << "\" (#" << function_id
+                   "Function \"" << string_functionID << "\" (#"
+                                 << api_function_id
                                  << ") not allowed by policy");
       return;
     }
 
-#ifdef EXTERNAL_PROPRIETARY_MODE
-    if (function_id == mobile_apis::FunctionID::OnSystemRequestID) {
+    if (api_function_id == mobile_apis::FunctionID::OnSystemRequestID) {
       mobile_apis::RequestType::eType request_type =
           static_cast<mobile_apis::RequestType::eType>(
               (*message)[strings::msg_params][strings::request_type].asUInt());
@@ -499,7 +609,6 @@ void RPCServiceImpl::SendMessageToMobile(
         app_manager_.GetPolicyHandler().OnUpdateRequestSentToMobile();
       }
     }
-#endif  // EXTERNAL_PROPRIETARY_MODE
   }
 
   if (message_to_send->binary_data()) {
@@ -514,7 +623,6 @@ void RPCServiceImpl::SendMessageToMobile(
 void RPCServiceImpl::SendMessageToHMI(
     const commands::MessageSharedPtr message) {
   LOG4CXX_AUTO_TRACE(logger_);
-
   if (!message) {
     LOG4CXX_WARN(logger_, "Null-pointer message received.");
     NOTREACHED();
@@ -555,7 +663,6 @@ void RPCServiceImpl::SendMessageToHMI(
                  "Cannot send message to HMI: failed to create string");
     return;
   }
-
   messages_to_hmi_.PostMessage(impl::MessageToHmi(message_to_send));
 }
 
@@ -707,6 +814,28 @@ bool RPCServiceImpl::ConvertSOtoMessage(
   return true;
 }
 
+void RPCServiceImpl::UpdateMobileRPCParams(
+    const mobile_apis::FunctionID::eType& function_id,
+    const mobile_apis::messageType::eType& message_type,
+    const std::map<std::string, SMember>& members) {
+  mobile_so_factory().ResetFunctionSchema(function_id, message_type);
+  for (const auto& item : members) {
+    mobile_so_factory().AddCustomMember(
+        function_id, message_type, item.first, item.second);
+  }
+}
+
+void RPCServiceImpl::UpdateHMIRPCParams(
+    const hmi_apis::FunctionID::eType& function_id,
+    const hmi_apis::messageType::eType& message_type,
+    const std::map<std::string, SMember>& members) {
+  hmi_so_factory().ResetFunctionSchema(function_id, message_type);
+  for (const auto& item : members) {
+    hmi_so_factory().AddCustomMember(
+        function_id, message_type, item.first, item.second);
+  }
+}
+
 hmi_apis::HMI_API& RPCServiceImpl::hmi_so_factory() {
   return hmi_so_factory_;
 }
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index 5a95523967..32342aba8a 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -5,6 +5,8 @@ namespace application_manager {
 namespace strings {
 
 const char* params = "params";
+const char* require_encryption = "requireEncryption";
+const char* protection = "protection";
 const char* message_type = "message_type";
 const char* correlation_id = "correlation_id";
 const char* function_id = "function_id";
@@ -20,6 +22,7 @@ const char* info = "info";
 const char* app_id = "appID";
 const char* full_app_id = "fullAppID";
 const char* bundle_id = "appBundleID";
+const char* window_id = "windowID";
 const char* app_info = "appInfo";
 const char* app_launch = "app_launch";
 const char* app_launch_list = "app_launch_list";
@@ -78,11 +81,14 @@ const char* menu_icon = "menuIcon";
 const char* keyboard_properties = "keyboardProperties";
 const char* vr_commands = "vrCommands";
 const char* position = "position";
+const char* user_location = "userLocation";
 const char* num_ticks = "numTicks";
 const char* slider_footer = "sliderFooter";
 const char* menu_id = "menuID";
 const char* parent_id = "parentID";
 const char* menu_name = "menuName";
+const char* menu_layout = "menuLayout";
+const char* menu_layouts_available = "menuLayoutsAvailable";
 const char* interaction_choice_set_id = "interactionChoiceSetID";
 const char* interaction_choice_set_id_list = "interactionChoiceSetIDList";
 const char* choice_set = "choiceSet";
@@ -98,6 +104,8 @@ const char* initial_prompt = "initialPrompt";
 const char* initial_text = "initialText";
 const char* duration = "duration";
 const char* progress_indicator = "progressIndicator";
+const char* func_id = "functionID";
+const char* cancel_id = "cancelID";
 const char* alert_type = "alertType";
 const char* alert_icon = "alertIcon";
 const char* play_tone = "playTone";
@@ -136,9 +144,17 @@ const char* activate_app_hmi_level = "level";
 const char* audio_streaming_state = "audioStreamingState";
 const char* video_streaming_state = "videoStreamingState";
 const char* system_context = "systemContext";
+const char* window_name = "windowName";
+const char* window_type = "type";
+const char* window_type_supported = "windowTypeSupported";
+const char* maximum_number_of_windows = "maximumNumberOfWindows";
+const char* window_capabilities = "windowCapabilities";
+const char* associated_service_type = "associatedServiceType";
+const char* duplicate_updates_from_window_id = "duplicateUpdatesFromWindowID";
 const char* speech_capabilities = "speechCapabilities";
 const char* vr_capabilities = "vrCapabilities";
 const char* audio_pass_thru_capabilities = "audioPassThruCapabilities";
+const char* audio_pass_thru_capabilities_list = "audioPassThruCapabilitiesList";
 const char* pcm_stream_capabilities = "pcmStreamCapabilities";
 const char* audio_pass_thru_icon = "audioPassThruIcon";
 const char* way_points = "wayPoints";
@@ -150,6 +166,7 @@ const char* phone_capability = "phoneCapability";
 const char* video_streaming_capability = "videoStreamingCapability";
 const char* driver_distraction_capability = "driverDistractionCapability";
 const char* rc_capability = "remoteControlCapability";
+const char* seat_location_capability = "seatLocationCapability";
 const char* app_services_capabilities = "appServicesCapabilities";
 const char* day_color_scheme = "dayColorScheme";
 const char* night_color_scheme = "nightColorScheme";
@@ -160,6 +177,8 @@ const char* red = "red";
 const char* green = "green";
 const char* blue = "blue";
 const char* display_layout = "displayLayout";
+const char* template_configuration = "templateConfiguration";
+const char* template_layout = "template";
 const char* icon_resumed = "iconResumed";
 const char* nicknames = "nicknames";
 const char* enabled = "enabled";
@@ -169,6 +188,11 @@ const char* hybrid_app_preference = "hybridAppPreference";
 const char* is_cloud_application = "isCloudApplication";
 const char* cloud_connection_status = "cloudConnectionStatus";
 const char* endpoint = "endpoint";
+const char* display_capabilities = "displayCapabilities";
+const char* policy_type = "policyType";
+const char* property = "property";
+const char* displays = "displays";
+const char* seat_location = "seatLocation";
 
 // PutFile
 const char* sync_file_name = "syncFileName";
@@ -258,6 +282,7 @@ const char* e_call_info = "eCallInfo";
 const char* airbag_status = "airbagStatus";
 const char* emergency_event = "emergencyEvent";
 const char* cluster_mode_status = "clusterModeStatus";
+const char* cluster_modes = "clusterModes";
 const char* my_key = "myKey";
 const char* help_prompt = "helpPrompt";
 const char* scroll_message_body = "scrollableMessageBody";
@@ -277,6 +302,7 @@ const char* sdl_version = "sdlVersion";
 const char* system_software_version = "systemSoftwareVersion";
 const char* priority = "priority";
 const char* engine_oil_life = "engineOilLife";
+const char* oem_custom_data_type = "oemCustomDataType";
 
 // app services
 const char* app_service_manifest = "appServiceManifest";
@@ -377,6 +403,8 @@ const char* delivery_mode = "deliveryMode";
 
 const char* audio_streaming_indicator = "audioStreamingIndicator";
 
+const char* windows_info = "windowsInfo";
+
 const char* const keyboard_properties_supported = "keyboardPropertiesSupported";
 const char* const language_supported = "languageSupported";
 const char* const keyboard_layout_supported = "keyboardLayoutSupported";
@@ -403,6 +431,9 @@ const char* const resolution_height = "resolutionHeight";
 const char* const max_bitrate = "maxBitrate";
 const char* const supported_formats = "supportedFormats";
 const char* const haptic_spatial_data_supported = "hapticSpatialDataSupported";
+const char* const diagonal_screen_size = "diagonalScreenSize";
+const char* const pixel_per_inch = "pixelPerInch";
+const char* const scale = "scale";
 const char* const haptic_rect_data = "hapticRectData";
 const char* const rect = "rect";
 const char* const x = "x";
@@ -552,6 +583,9 @@ const char* policyfile = "policyfile";
 const char* is_active = "isActive";
 const char* is_deactivated = "isDeactivated";
 const char* event_name = "eventName";
+const char* service_type = "serviceType";
+const char* service_event = "serviceEvent";
+const char* reason = "reason";
 }  // namespace hmi_notification
 
 }  // namespace application_manager
diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc
index 994c7b8b7f..b07a5bcc13 100644
--- a/src/components/application_manager/src/state_controller_impl.cc
+++ b/src/components/application_manager/src/state_controller_impl.cc
@@ -67,6 +67,7 @@ StateControllerImpl::StateControllerImpl(ApplicationManager& app_mngr)
 }
 
 void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
+                                          const WindowID window_id,
                                           HmiStatePtr state,
                                           const bool request_hmi_state_change) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -74,7 +75,8 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
   DCHECK_OR_RETURN_VOID(state);
   DCHECK_OR_RETURN_VOID(HmiState::STATE_ID_REGULAR == state->state_id());
 
-  LOG4CXX_DEBUG(logger_, "Set regular state " << *state);
+  LOG4CXX_DEBUG(logger_,
+                "Set window #" << window_id << " regular state " << *state);
 
   if (state->hmi_level() == mobile_apis::HMILevel::INVALID_ENUM ||
       state->audio_streaming_state() ==
@@ -93,9 +95,10 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
   HmiStatePtr resolved_state = ResolveHmiState(app, state);
   if (!resolved_state) {
     state->set_state_id(HmiState::STATE_ID_POSTPONED);
-    app->SetPostponedState(state);
+    app->SetPostponedState(window_id, state);
     return;
   }
+
   LOG4CXX_DEBUG(logger_, "Resolved state: " << *resolved_state);
   const hmi_apis::Common_HMILevel::eType hmi_level =
       static_cast<hmi_apis::Common_HMILevel::eType>(
@@ -117,18 +120,19 @@ void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
     LOG4CXX_ERROR(logger_, "Unable to send BC.ActivateApp");
     return;
   }
-  ApplyRegularState(app, resolved_state);
+  ApplyRegularState(app, window_id, resolved_state);
 }
 
 void StateControllerImpl::SetRegularState(
     ApplicationSharedPtr app,
+    const WindowID window_id,
     const mobile_apis::HMILevel::eType hmi_level,
     const mobile_apis::AudioStreamingState::eType audio_state,
     const mobile_apis::VideoStreamingState::eType video_state,
     const bool request_hmi_state_change) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
-  HmiStatePtr prev_regular = app->RegularHmiState();
+  HmiStatePtr prev_regular = app->RegularHmiState(window_id);
   DCHECK_OR_RETURN_VOID(prev_regular);
   HmiStatePtr hmi_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -137,16 +141,22 @@ void StateControllerImpl::SetRegularState(
   hmi_state->set_audio_streaming_state(audio_state);
   hmi_state->set_video_streaming_state(video_state);
   hmi_state->set_system_context(prev_regular->system_context());
-  SetRegularState(app, hmi_state, request_hmi_state_change);
+  hmi_state->set_window_type(prev_regular->window_type());
+  SetRegularState(app, window_id, hmi_state, request_hmi_state_change);
 }
 
 void StateControllerImpl::SetRegularState(
     ApplicationSharedPtr app,
+    const WindowID window_id,
     const mobile_apis::HMILevel::eType hmi_level,
     const bool request_hmi_state_change) {
   using namespace mobile_apis;
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
+
+  HmiStatePtr prev_regular = app->RegularHmiState(window_id);
+  DCHECK_OR_RETURN_VOID(prev_regular);
+
   const HmiStatePtr hmi_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
 
@@ -155,11 +165,13 @@ void StateControllerImpl::SetRegularState(
   hmi_state->set_audio_streaming_state(CalcAudioState(app, hmi_level));
   hmi_state->set_video_streaming_state(CalcVideoState(app, hmi_level));
   hmi_state->set_system_context(SystemContext::SYSCTXT_MAIN);
-  SetRegularState(app, hmi_state, request_hmi_state_change);
+  hmi_state->set_window_type(prev_regular->window_type());
+  SetRegularState(app, window_id, hmi_state, request_hmi_state_change);
 }
 
 void StateControllerImpl::SetRegularState(
     ApplicationSharedPtr app,
+    const WindowID window_id,
     const mobile_apis::HMILevel::eType hmi_level,
     const mobile_apis::AudioStreamingState::eType audio_state,
     const mobile_apis::VideoStreamingState::eType video_state,
@@ -167,21 +179,29 @@ void StateControllerImpl::SetRegularState(
     const bool request_hmi_state_change) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
+
+  HmiStatePtr prev_regular = app->RegularHmiState(window_id);
+  DCHECK_OR_RETURN_VOID(prev_regular);
+
   HmiStatePtr hmi_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
   DCHECK_OR_RETURN_VOID(hmi_state);
+
   hmi_state->set_hmi_level(hmi_level);
   hmi_state->set_audio_streaming_state(audio_state);
   hmi_state->set_video_streaming_state(video_state);
   hmi_state->set_system_context(system_context);
-  SetRegularState(app, hmi_state, request_hmi_state_change);
+  hmi_state->set_window_type(prev_regular->window_type());
+  SetRegularState(app, window_id, hmi_state, request_hmi_state_change);
 }
 
 void StateControllerImpl::SetRegularState(
-    ApplicationSharedPtr app, const mobile_apis::HMILevel::eType hmi_level) {
+    ApplicationSharedPtr app,
+    const WindowID window_id,
+    const mobile_apis::HMILevel::eType hmi_level) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
-  HmiStatePtr prev_state = app->RegularHmiState();
+  HmiStatePtr prev_state = app->RegularHmiState(window_id);
   HmiStatePtr hmi_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
   DCHECK_OR_RETURN_VOID(hmi_state);
@@ -191,15 +211,16 @@ void StateControllerImpl::SetRegularState(
   hmi_state->set_system_context(prev_state
                                     ? prev_state->system_context()
                                     : mobile_apis::SystemContext::SYSCTXT_MAIN);
-  SetRegularState(app, hmi_state);
+  SetRegularState(app, window_id, hmi_state);
 }
 
 void StateControllerImpl::SetRegularState(
     ApplicationSharedPtr app,
+    const WindowID window_id,
     const mobile_apis::SystemContext::eType system_context) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
-  HmiStatePtr prev_regular = app->RegularHmiState();
+  HmiStatePtr prev_regular = app->RegularHmiState(window_id);
   DCHECK_OR_RETURN_VOID(prev_regular);
   HmiStatePtr hmi_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -210,16 +231,18 @@ void StateControllerImpl::SetRegularState(
   hmi_state->set_video_streaming_state(
       CalcVideoState(app, prev_regular->hmi_level()));
   hmi_state->set_system_context(system_context);
-  SetRegularState(app, hmi_state, false);
+  hmi_state->set_window_type(prev_regular->window_type());
+  SetRegularState(app, window_id, hmi_state, false);
 }
 
 void StateControllerImpl::SetRegularState(
     ApplicationSharedPtr app,
+    const WindowID window_id,
     const mobile_apis::AudioStreamingState::eType audio_state,
     const mobile_apis::VideoStreamingState::eType video_state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
-  HmiStatePtr prev_state = app->RegularHmiState();
+  HmiStatePtr prev_state = app->RegularHmiState(window_id);
   DCHECK_OR_RETURN_VOID(prev_state);
   HmiStatePtr hmi_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -228,18 +251,23 @@ void StateControllerImpl::SetRegularState(
   hmi_state->set_audio_streaming_state(audio_state);
   hmi_state->set_video_streaming_state(video_state);
   hmi_state->set_system_context(prev_state->system_context());
-  SetRegularState(app, hmi_state, false);
+  hmi_state->set_window_type(prev_state->window_type());
+  SetRegularState(app, window_id, hmi_state, false);
 }
 
 void StateControllerImpl::SetRegularState(ApplicationSharedPtr app,
+                                          const WindowID window_id,
                                           HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
   DCHECK_OR_RETURN_VOID(state);
-  if (mobile_apis::HMILevel::HMI_FULL == state->hmi_level()) {
-    SetRegularState(app, state, true);
+
+  // SDL should send BC.ActivateApp for main window during resumption
+  if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW == window_id &&
+      mobile_apis::HMILevel::HMI_FULL == state->hmi_level()) {
+    SetRegularState(app, window_id, state, true);
   } else {
-    SetRegularState(app, state, false);
+    SetRegularState(app, window_id, state, false);
   }
 }
 
@@ -300,7 +328,8 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()(
     return;
   }
 
-  const HmiStatePtr state_to_resolve = app_to_resolve->RegularHmiState();
+  const HmiStatePtr state_to_resolve =
+      app_to_resolve->RegularHmiState(window_id_);
   DCHECK_OR_RETURN_VOID(state_to_resolve);
 
   // If applied HMI state is FULL:
@@ -384,22 +413,23 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()(
       std::make_tuple(
           result_hmi_level, result_audio_state, result_video_state)) {
     LOG4CXX_DEBUG(logger_,
-                  "Application "
-                      << app_to_resolve->app_id() << " will change state to: "
-                      << "HMI level " << to_resolve_hmi_level << " --> "
-                      << result_hmi_level << ", audio "
-                      << state_to_resolve->audio_streaming_state() << " --> "
-                      << result_audio_state << ", video "
-                      << state_to_resolve->video_streaming_state() << " --> "
-                      << result_video_state);
+                  "Application " << app_to_resolve->app_id() << " window "
+                                 << window_id_ << " will change state to: "
+                                 << "HMI level " << to_resolve_hmi_level
+                                 << " --> " << result_hmi_level << ", audio "
+                                 << state_to_resolve->audio_streaming_state()
+                                 << " --> " << result_audio_state << ", video "
+                                 << state_to_resolve->video_streaming_state()
+                                 << " --> " << result_video_state);
     state_ctrl_->SetupRegularHmiState(app_to_resolve,
+                                      window_id_,
                                       result_hmi_level,
                                       result_audio_state,
                                       result_video_state);
   } else {
     LOG4CXX_DEBUG(logger_,
-                  "Application " << app_to_resolve->app_id()
-                                 << " will NOT change HMI level");
+                  "Application " << app_to_resolve->app_id() << " window "
+                                 << window_id_ << " will NOT change HMI level");
   }
 }
 
@@ -413,6 +443,7 @@ HmiStatePtr StateControllerImpl::ResolveHmiState(ApplicationSharedPtr app,
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
   DCHECK_OR_RETURN(available_state, HmiStatePtr());
   available_state->set_hmi_level(state->hmi_level());
+  available_state->set_window_type(state->window_type());
   available_state->set_audio_streaming_state(state->audio_streaming_state());
   available_state->set_video_streaming_state(state->video_streaming_state());
   available_state->set_system_context(state->system_context());
@@ -570,12 +601,14 @@ bool StateControllerImpl::IsStateAvailableForResumption(
 }
 
 void StateControllerImpl::SetupRegularHmiState(ApplicationSharedPtr app,
+                                               const WindowID window_id,
                                                HmiStatePtr state) {
   using namespace mobile_apis;
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(state);
-  LOG4CXX_DEBUG(logger_, "Setup regular state: " << *state);
-  HmiStatePtr curr_state = app->CurrentHmiState();
+  LOG4CXX_DEBUG(logger_,
+                "Setup window #" << window_id << " regular state: " << *state);
+  HmiStatePtr curr_state = app->CurrentHmiState(window_id);
   HmiStatePtr old_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
   DCHECK_OR_RETURN_VOID(old_state);
@@ -583,28 +616,30 @@ void StateControllerImpl::SetupRegularHmiState(ApplicationSharedPtr app,
   old_state->set_audio_streaming_state(curr_state->audio_streaming_state());
   old_state->set_video_streaming_state(curr_state->video_streaming_state());
   old_state->set_system_context(curr_state->system_context());
-  app->SetRegularState(state);
+  old_state->set_window_type(curr_state->window_type());
+  app->SetRegularState(window_id, state);
 
-  if (HMILevel::HMI_LIMITED == state->hmi_level() && app->is_resuming()) {
+  if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW == window_id &&
+      HMILevel::HMI_LIMITED == state->hmi_level() && app->is_resuming()) {
     LOG4CXX_DEBUG(logger_,
                   "Resuming to LIMITED level. "
                       << "Send OnResumeAudioSource notification");
     MessageHelper::SendOnResumeAudioSourceToHMI(app->app_id(), app_mngr_);
   }
-  app->set_is_resuming(false);
 
-  HmiStatePtr new_state = app->CurrentHmiState();
-  OnStateChanged(app, old_state, new_state);
+  HmiStatePtr new_state = app->CurrentHmiState(window_id);
+  OnStateChanged(app, window_id, old_state, new_state);
 }
 
 void StateControllerImpl::SetupRegularHmiState(
     ApplicationSharedPtr app,
+    const WindowID window_id,
     const mobile_apis::HMILevel::eType hmi_level,
     const mobile_apis::AudioStreamingState::eType audio_state,
     const mobile_apis::VideoStreamingState::eType video_state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
-  HmiStatePtr prev_state = app->RegularHmiState();
+  HmiStatePtr prev_state = app->RegularHmiState(window_id);
   DCHECK_OR_RETURN_VOID(prev_state);
   HmiStatePtr new_state =
       CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
@@ -613,22 +648,64 @@ void StateControllerImpl::SetupRegularHmiState(
   new_state->set_audio_streaming_state(audio_state);
   new_state->set_video_streaming_state(video_state);
   new_state->set_system_context(prev_state->system_context());
-  SetupRegularHmiState(app, new_state);
+  new_state->set_window_type(prev_state->window_type());
+  SetupRegularHmiState(app, window_id, new_state);
 }
 
 void StateControllerImpl::ApplyRegularState(ApplicationSharedPtr app,
+                                            const WindowID window_id,
                                             HmiStatePtr state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
   DCHECK_OR_RETURN_VOID(state);
   DCHECK_OR_RETURN_VOID(state->state_id() == HmiState::STATE_ID_REGULAR);
   LOG4CXX_DEBUG(logger_,
-                "Applying to app " << app->app_id() << " state " << *state);
-  SetupRegularHmiState(app, state);
+                "Applying to app " << app->app_id() << " window #" << window_id
+                                   << " state " << *state);
+  SetupRegularHmiState(app, window_id, state);
+
+  if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW != window_id) {
+    LOG4CXX_DEBUG(logger_, "No need to resolve conflicts for a widget");
+    return;
+  }
+
   LOG4CXX_DEBUG(logger_,
                 "Resolving HMI level conflicts for app " << app->app_id());
-  ForEachApplication(HmiLevelConflictResolver(app, state, this));
+  ForEachApplication(HmiLevelConflictResolver(app, window_id, state, this));
+}
+
+void StateControllerImpl::UpdateAppWindowsStreamingState(
+    ApplicationSharedPtr app, HmiStatePtr state) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto window_ids = app->GetWindowIds();
+  for (auto window_id : window_ids) {
+    HmiStatePtr window_hmi_state = app->RegularHmiState(window_id);
+    LOG4CXX_DEBUG(
+        logger_, "State: " << *state << " window state: " << *window_hmi_state);
+    if (window_hmi_state->audio_streaming_state() !=
+            state->audio_streaming_state() ||
+        window_hmi_state->video_streaming_state() !=
+            state->video_streaming_state()) {
+      LOG4CXX_DEBUG(logger_,
+                    "Updating streaming state for window #" << window_id);
+
+      HmiStatePtr new_window_state =
+          CreateHmiState(app, HmiState::StateID::STATE_ID_REGULAR);
+      DCHECK_OR_RETURN_VOID(new_window_state);
+      new_window_state->set_hmi_level(window_hmi_state->hmi_level());
+      new_window_state->set_audio_streaming_state(
+          state->audio_streaming_state());
+      new_window_state->set_video_streaming_state(
+          state->video_streaming_state());
+      new_window_state->set_system_context(window_hmi_state->system_context());
+      new_window_state->set_window_type(window_hmi_state->window_type());
+      app->SetRegularState(window_id, new_window_state);
+
+      MessageHelper::SendHMIStatusNotification(app, window_id, app_mngr_);
+    }
+  }
 }
+
 void StateControllerImpl::on_event(const event_engine::MobileEvent& event) {}
 
 void StateControllerImpl::on_event(const event_engine::Event& event) {
@@ -731,26 +808,81 @@ void StateControllerImpl::on_event(const event_engine::Event& event) {
   }
 }
 
+void StateControllerImpl::ActivateDefaultWindow(ApplicationSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace mobile_apis;
+
+  const WindowID window_id = PredefinedWindows::DEFAULT_WINDOW;
+  const HMILevel::eType hmi_level = HMILevel::HMI_FULL;
+  const AudioStreamingState::eType audio_state =
+      app->IsAudioApplication() ? AudioStreamingState::AUDIBLE
+                                : AudioStreamingState::NOT_AUDIBLE;
+  const VideoStreamingState::eType video_state =
+      app->IsVideoApplication() ? VideoStreamingState::STREAMABLE
+                                : VideoStreamingState::NOT_STREAMABLE;
+
+  SetRegularState(app, window_id, hmi_level, audio_state, video_state, false);
+
+  // After main window activation, streaming state should be updated for another
+  // windows of the app
+  HmiStatePtr new_state =
+      app->RegularHmiState(PredefinedWindows::DEFAULT_WINDOW);
+  UpdateAppWindowsStreamingState(app, new_state);
+}
+
+void StateControllerImpl::ExitDefaultWindow(ApplicationSharedPtr app) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace mobile_apis;
+
+  const WindowID window_id = PredefinedWindows::DEFAULT_WINDOW;
+  const HMILevel::eType hmi_level = HMILevel::HMI_NONE;
+  const AudioStreamingState::eType audio_state =
+      AudioStreamingState::NOT_AUDIBLE;
+  const VideoStreamingState::eType video_state =
+      VideoStreamingState::NOT_STREAMABLE;
+
+  SetRegularState(app, window_id, hmi_level, audio_state, video_state, false);
+
+  // After main window exiting, streaming state should be updated for another
+  // windows of the app
+  HmiStatePtr new_state =
+      app->RegularHmiState(PredefinedWindows::DEFAULT_WINDOW);
+  UpdateAppWindowsStreamingState(app, new_state);
+}
+
 void StateControllerImpl::OnStateChanged(ApplicationSharedPtr app,
+                                         const WindowID window_id,
                                          HmiStatePtr old_state,
                                          HmiStatePtr new_state) {
   LOG4CXX_AUTO_TRACE(logger_);
   DCHECK_OR_RETURN_VOID(app);
   DCHECK_OR_RETURN_VOID(old_state);
   DCHECK_OR_RETURN_VOID(new_state);
-  LOG4CXX_DEBUG(logger_, "Old state: " << *old_state);
-  LOG4CXX_DEBUG(logger_, "New state: " << *new_state);
-  if (IsStateChanged(*old_state, *new_state)) {
-    app_mngr_.SendHMIStatusNotification(app);
-    if (new_state->hmi_level() == mobile_apis::HMILevel::HMI_NONE) {
-      app->ResetDataInNone();
-    }
-    app_mngr_.OnHMILevelChanged(
-        app->app_id(), old_state->hmi_level(), new_state->hmi_level());
-    app->usage_report().RecordHmiStateChanged(new_state->hmi_level());
-  } else {
-    LOG4CXX_ERROR(logger_, "State has NOT been changed.");
+  LOG4CXX_DEBUG(logger_,
+                "Window #" << window_id << " old state: " << *old_state);
+  LOG4CXX_DEBUG(logger_,
+                "Window #" << window_id << " new state: " << *new_state);
+
+  if (!IsStateChanged(*old_state, *new_state)) {
+    LOG4CXX_DEBUG(logger_, "State has NOT been changed.");
+    return;
+  }
+
+  MessageHelper::SendHMIStatusNotification(app, window_id, app_mngr_);
+
+  if (mobile_apis::PredefinedWindows::DEFAULT_WINDOW != window_id) {
+    LOG4CXX_DEBUG(logger_,
+                  "State was changed not for a main application window. No "
+                  "additional actions required");
+    return;
   }
+
+  if (new_state->hmi_level() == mobile_apis::HMILevel::HMI_NONE) {
+    app->ResetDataInNone();
+  }
+
+  app_mngr_.OnHMIStateChanged(app->app_id(), old_state, new_state);
+  app->usage_report().RecordHmiStateChanged(new_state->hmi_level());
 }
 
 bool StateControllerImpl::IsTempStateActive(HmiState::StateID id) const {
@@ -761,6 +893,20 @@ bool StateControllerImpl::IsTempStateActive(HmiState::StateID id) const {
 void StateControllerImpl::OnApplicationRegistered(
     ApplicationSharedPtr app,
     const mobile_apis::HMILevel::eType default_level) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  // After app registration HMI level should be set for DEFAUL_WINDOW only
+  OnAppWindowAdded(app,
+                   mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+                   mobile_apis::WindowType::MAIN,
+                   default_level);
+}
+
+void StateControllerImpl::OnAppWindowAdded(
+    ApplicationSharedPtr app,
+    const WindowID window_id,
+    const mobile_apis::WindowType::eType window_type,
+    const mobile_apis::HMILevel::eType default_level) {
   namespace HMILevel = mobile_apis::HMILevel;
   namespace AudioStreamingState = mobile_apis::AudioStreamingState;
   namespace SystemContext = mobile_apis::SystemContext;
@@ -774,9 +920,10 @@ void StateControllerImpl::OnApplicationRegistered(
       DCHECK_OR_RETURN_VOID(new_state);
       DCHECK_OR_RETURN_VOID(new_state->state_id() !=
                             HmiState::STATE_ID_REGULAR);
-      HmiStatePtr old_hmi_state = app->CurrentHmiState();
+      HmiStatePtr old_hmi_state = app->CurrentHmiState(window_id);
       new_state->set_parent(old_hmi_state);
-      app->AddHMIState(new_state);
+      new_state->set_window_type(old_hmi_state->window_type());
+      app->AddHMIState(window_id, new_state);
     }
   }
 
@@ -787,14 +934,15 @@ void StateControllerImpl::OnApplicationRegistered(
   default_state->set_audio_streaming_state(CalcAudioState(app, default_level));
   default_state->set_video_streaming_state(CalcVideoState(app, default_level));
   default_state->set_system_context(SystemContext::SYSCTXT_MAIN);
+  default_state->set_window_type(window_type);
 
-  HmiStatePtr initial_state = app->RegularHmiState();
+  HmiStatePtr initial_state = app->RegularHmiState(window_id);
 
-  app->SetRegularState(default_state);
+  app->SetRegularState(window_id, default_state);
 
-  HmiStatePtr new_state = app->CurrentHmiState();
+  HmiStatePtr new_state = app->CurrentHmiState(window_id);
 
-  OnStateChanged(app, initial_state, new_state);
+  OnStateChanged(app, window_id, initial_state, new_state);
 }
 
 int64_t StateControllerImpl::RequestHMIStateChange(
@@ -828,11 +976,16 @@ int64_t StateControllerImpl::RequestHMIStateChange(
 
 void StateControllerImpl::ApplyPostponedStateForApp(ApplicationSharedPtr app) {
   LOG4CXX_AUTO_TRACE(logger_);
-  HmiStatePtr state = app->PostponedHmiState();
-  if (state) {
-    app->RemovePostponedState();
-    state->set_state_id(HmiState::STATE_ID_REGULAR);
-    SetRegularState(app, state);
+  DCHECK_OR_RETURN_VOID(app);
+  const WindowIds window_ids = app->GetWindowIds();
+
+  for (const auto& window_id : window_ids) {
+    HmiStatePtr state = app->PostponedHmiState(window_id);
+    if (state) {
+      app->RemovePostponedState(window_id);
+      state->set_state_id(HmiState::STATE_ID_REGULAR);
+      SetRegularState(app, window_id, state);
+    }
   }
 }
 
@@ -860,16 +1013,19 @@ void StateControllerImpl::TempStateStopped(HmiState::StateID ID) {
       std::mem_fun(&StateControllerImpl::ApplyPostponedStateForApp), this));
 }
 
-void StateControllerImpl::DeactivateApp(ApplicationSharedPtr app) {
+void StateControllerImpl::DeactivateApp(ApplicationSharedPtr app,
+                                        const WindowID window_id) {
   using namespace mobile_apis;
   LOG4CXX_AUTO_TRACE(logger_);
 
   DCHECK_OR_RETURN_VOID(app);
-  const HmiStatePtr regular = app->RegularHmiState();
+  const HmiStatePtr regular = app->RegularHmiState(window_id);
   DCHECK_OR_RETURN_VOID(regular);
   HmiStatePtr new_regular = std::make_shared<HmiState>(*regular);
 
-  LOG4CXX_DEBUG(logger_, "Current HMI level: '" << app->hmi_level() << "'");
+  LOG4CXX_DEBUG(logger_,
+                "Window #" << window_id << " current HMI level: '"
+                           << app->hmi_level(window_id) << "'");
   const bool is_audio_app = app->IsAudioApplication();
   const bool is_video_app = app->IsVideoApplication();
 
@@ -895,7 +1051,7 @@ void StateControllerImpl::DeactivateApp(ApplicationSharedPtr app) {
     new_regular->set_video_streaming_state(VideoStreamingState::NOT_STREAMABLE);
   }
 
-  SetRegularState(app, new_regular, false);
+  SetRegularState(app, window_id, new_regular, false);
 }
 
 void StateControllerImpl::OnHMIResponse(
@@ -911,7 +1067,9 @@ void StateControllerImpl::OnHMIResponse(
   if (application && hmi_apis::Common_Result::SUCCESS == code) {
     HmiStatePtr pending_state = waiting_for_response_[application->app_id()];
     DCHECK_OR_RETURN_VOID(pending_state);
-    ApplyRegularState(application, pending_state);
+    ApplyRegularState(application,
+                      mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+                      pending_state);
   }
 }
 
@@ -927,7 +1085,33 @@ void StateControllerImpl::OnAppActivated(
     return;
   }
 
-  SetRegularState(app, HMILevel::HMI_FULL, true);
+  WindowID window_id = mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+  if (message[strings::msg_params].keyExists(strings::window_id)) {
+    window_id = message[strings::msg_params][strings::window_id].asInt();
+  }
+
+  const auto window_ids = app->GetWindowIds();
+  if (!helpers::in_range(window_ids, window_id)) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Application " << app_id << " does not contain window #" << window_id);
+    return;
+  }
+
+  if (PredefinedWindows::DEFAULT_WINDOW != window_id) {
+    const auto window_hmi_level = app->hmi_level(window_id);
+    const HMILevel::eType new_hmi_level = HMILevel::HMI_NONE == window_hmi_level
+                                              ? HMILevel::HMI_BACKGROUND
+                                              : HMILevel::HMI_FULL;
+    const AudioStreamingState::eType audio_state = app->audio_streaming_state();
+    const VideoStreamingState::eType video_state = app->video_streaming_state();
+
+    SetRegularState(
+        app, window_id, new_hmi_level, audio_state, video_state, false);
+    return;
+  }
+
+  SetRegularState(app, window_id, HMILevel::HMI_FULL, true);
 }
 
 void StateControllerImpl::OnAppDeactivated(
@@ -942,13 +1126,39 @@ void StateControllerImpl::OnAppDeactivated(
     return;
   }
 
-  if (HMILevel::HMI_FULL != app->hmi_level()) {
+  WindowID window_id = mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+  if (message[strings::msg_params].keyExists(strings::window_id)) {
+    window_id = message[strings::msg_params][strings::window_id].asInt();
+  }
+
+  const auto window_ids = app->GetWindowIds();
+  if (!helpers::in_range(window_ids, window_id)) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Application " << app_id << " does not contain window #" << window_id);
+    return;
+  }
+
+  const auto window_hmi_level = app->hmi_level(window_id);
+  if (PredefinedWindows::DEFAULT_WINDOW != window_id) {
+    const HMILevel::eType new_hmi_level = HMILevel::HMI_FULL == window_hmi_level
+                                              ? HMILevel::HMI_BACKGROUND
+                                              : HMILevel::HMI_NONE;
+    const AudioStreamingState::eType audio_state = app->audio_streaming_state();
+    const VideoStreamingState::eType video_state = app->video_streaming_state();
+
+    SetRegularState(
+        app, window_id, new_hmi_level, audio_state, video_state, false);
+    return;
+  }
+
+  if (HMILevel::HMI_FULL != window_hmi_level) {
     return;
   }
 
   // TODO(AOleynik): Need to delete DeactivateReason and modify OnAppDeactivated
   // when HMI will support that, otherwise won't be testable
-  DeactivateApp(app);
+  DeactivateApp(app, window_id);
 }
 
 void StateControllerImpl::OnVideoStreamingStarted(
diff --git a/src/components/application_manager/src/system_time/system_time_handler_impl.cc b/src/components/application_manager/src/system_time/system_time_handler_impl.cc
index f5d08a8ebf..deb92d5d81 100644
--- a/src/components/application_manager/src/system_time/system_time_handler_impl.cc
+++ b/src/components/application_manager/src/system_time/system_time_handler_impl.cc
@@ -82,6 +82,13 @@ void SystemTimeHandlerImpl::DoSubscribe(utils::SystemTimeListener* listener) {
   system_time_listener_ = listener;
 }
 
+void SystemTimeHandlerImpl::ResetPendingSystemTimeRequests() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  unsubscribe_from_event(
+      hmi_apis::FunctionID::BasicCommunication_GetSystemTime);
+  awaiting_get_system_time_ = false;
+}
+
 void SystemTimeHandlerImpl::DoUnsubscribe(utils::SystemTimeListener* listener) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(system_time_listener_lock_);
@@ -145,6 +152,14 @@ void SystemTimeHandlerImpl::ProcessSystemTimeResponse(
     const application_manager::event_engine::Event& event) {
   LOG4CXX_AUTO_TRACE(logger_);
   const smart_objects::SmartObject& message = event.smart_object();
+
+  const auto result = static_cast<hmi_apis::Common_Result::eType>(
+      message[strings::params][hmi_response::code].asInt());
+
+  if (hmi_apis::Common_Result::SUCCESS != result) {
+    system_time_listener_->OnSystemTimeFailed();
+  }
+
   const smart_objects::SmartObject& system_time_so =
       message[strings::msg_params][hmi_response::system_time];
 
diff --git a/src/components/application_manager/test/CMakeLists.txt b/src/components/application_manager/test/CMakeLists.txt
index ccec05a795..afc39b9fdd 100755
--- a/src/components/application_manager/test/CMakeLists.txt
+++ b/src/components/application_manager/test/CMakeLists.txt
@@ -46,6 +46,7 @@ include_directories(
   ${COMPONENTS_DIR}/security_manager/include/
   ${COMPONENTS_DIR}/application_manager/test/include/
   ${COMPONENTS_DIR}/application_manager/rpc_plugins/sdl_rpc_plugin/include/
+  ${COMPONENTS_DIR}/application_manager/rpc_plugins/vehicle_info_plugin/include/
   ${BSON_INCLUDE_DIRECTORY}
 )
 
@@ -68,6 +69,7 @@ set(testSources
   ${AM_TEST_DIR}/rpc_passing_handler_test.cc
   ${AM_TEST_DIR}/application_manager_impl_test.cc
   ${AM_TEST_DIR}/application_helper_test.cc
+  ${AM_TEST_DIR}/rpc_service_impl_test.cc
   ${AM_TEST_DIR}/command_holder_test.cc
 )
 
@@ -85,10 +87,13 @@ set (RequestController_SOURCES
   ${AM_TEST_DIR}/mock_message_helper.cc
 )
 
+set (RPCHandlerImplTest_SOURCES ${AM_TEST_DIR}/rpc_handler_impl_test.cc 
+                                ${AM_TEST_DIR}/mock_message_helper.cc)
+
 set(LIBRARIES
   Utils
   ApplicationManager
-  sdl_rpc_plugin
+  sdl_rpc_plugin_static
   jsoncpp
   Policy
   connectionHandler
@@ -143,6 +148,8 @@ create_test("help_prompt_manager_test" "${testSourcesHelpPromptManager}" "${LIBR
 
 create_test("request_controller_test" "${RequestController_SOURCES}" "${LIBRARIES}")
 
+create_test("rpc_handler_impl_test" "${RPCHandlerImplTest_SOURCES}" "${LIBRARIES}")
+
 set(ResumptionData_SOURCES
   ${AM_TEST_DIR}/resumption/resumption_data_test.cc
   ${AM_TEST_DIR}/resumption/resumption_data_db_test.cc
@@ -154,6 +161,7 @@ set(ResumptionData_SOURCES
 file(COPY hmi_capabilities.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY hmi_capabilities_sc1.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY hmi_capabilities_sc2.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY hmi_capabilities_old_apt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/resumption)
diff --git a/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc b/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc
index 12a375685e..f7bd636a66 100644
--- a/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc
+++ b/src/components/application_manager/test/app_launch/app_launch_data_json_test.cc
@@ -39,6 +39,7 @@
 #include "gtest/gtest.h"
 #include "json/json.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "smart_objects/smart_object.h"
 #include "utils/date_time.h"
 #include "utils/file_system.h"
@@ -66,8 +67,9 @@ class AppLaunchDataJsonTest : public ::testing::Test {
  private:
   virtual void SetUp() {
     ::file_system::DeleteFile(kAppStorageFile);
-    test_last_state_ = std::unique_ptr<resumption::LastState>(
-        new resumption::LastStateImpl(kAppStorageFolder, kAppInfoStorage));
+    last_state_wrapper_ = std::make_shared<resumption::LastStateWrapperImpl>(
+        std::make_shared<resumption::LastStateImpl>(kAppStorageFolder,
+                                                    kAppInfoStorage));
     ASSERT_TRUE(::file_system::CreateFile(kAppStorageFile));
 
     NiceMock<app_launch_test::MockAppLaunchSettings> mock_app_launch_settings_;
@@ -75,7 +77,7 @@ class AppLaunchDataJsonTest : public ::testing::Test {
         .WillByDefault(Return(15u));
 
     res_json_.reset(
-        new AppLaunchDataJson(mock_app_launch_settings_, *test_last_state_));
+        new AppLaunchDataJson(mock_app_launch_settings_, last_state_wrapper_));
   }
 
  public:
@@ -101,7 +103,7 @@ class AppLaunchDataJsonTest : public ::testing::Test {
   void GetApplicationData_EXPECT_FALSE(const ApplicationData& in_data);
   std::string AddCounter(const std::string& inp, int32_t val);
 
-  std::unique_ptr<resumption::LastState> test_last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   std::unique_ptr<AppLaunchDataJson> res_json_;
   void SetTimestamp(const ApplicationData& in_data,
                     date_time::TimeDuration& timestamp);
@@ -133,9 +135,11 @@ date_time::TimeDuration AppLaunchDataJsonTest::GetApplicationData_EXPECT_TRUE(
     const ApplicationData& in_data, ApplicationData& out_data) {
   uint32_t sizeBeforeGetting = res_json()->GetCurentNumberOfAppData();
 
+  Json::Value dictionary =
+      last_state_wrapper_->get_accessor().GetData().dictionary();
   int32_t index = NotFound;
   Json::Value& json_data_list =
-      res_json()->GetApplicationListAndIndex(in_data, index);
+      res_json()->GetApplicationListAndIndex(in_data, index, dictionary);
   EXPECT_FALSE(index == NotFound);
 
   uint32_t sizeAfterGetting = res_json()->GetCurentNumberOfAppData();
@@ -150,7 +154,8 @@ date_time::TimeDuration AppLaunchDataJsonTest::GetApplicationData_EXPECT_TRUE(
   // time stamp
   date_time::TimeDuration tmVal = date_time::seconds(
       json_data_list[index][am::strings::app_launch_last_session].asUInt64());
-
+  last_state_wrapper_->get_accessor().GetMutableData().set_dictionary(
+      dictionary);
   return tmVal;
 }
 
@@ -158,12 +163,15 @@ void AppLaunchDataJsonTest::GetApplicationData_EXPECT_FALSE(
     const ApplicationData& in_data) {
   uint32_t sizeBeforeGetting = res_json()->GetCurentNumberOfAppData();
 
+  Json::Value dictionary =
+      last_state_wrapper_->get_accessor().GetData().dictionary();
   int32_t index = NotFound;
-  res_json()->GetApplicationListAndIndex(in_data, index);
+  res_json()->GetApplicationListAndIndex(in_data, index, dictionary);
   EXPECT_TRUE(index == NotFound);
 
   uint32_t sizeAfterGetting = res_json()->GetCurentNumberOfAppData();
-
+  last_state_wrapper_->get_accessor().GetMutableData().set_dictionary(
+      dictionary);
   EXPECT_EQ(sizeBeforeGetting, sizeAfterGetting);
 }
 
@@ -172,8 +180,10 @@ void AppLaunchDataJsonTest::SetTimestamp(const ApplicationData& in_data,
   uint32_t sizeBeforeGetting = res_json()->GetCurentNumberOfAppData();
 
   int32_t index = NotFound;
+  Json::Value dictionary =
+      last_state_wrapper_->get_accessor().GetData().dictionary();
   Json::Value& json_data_list =
-      res_json()->GetApplicationListAndIndex(in_data, index);
+      res_json()->GetApplicationListAndIndex(in_data, index, dictionary);
   EXPECT_FALSE(index == NotFound);
 
   uint32_t sizeAfterGetting = res_json()->GetCurentNumberOfAppData();
@@ -184,6 +194,8 @@ void AppLaunchDataJsonTest::SetTimestamp(const ApplicationData& in_data,
   // time stamp
   json_data_list[index][am::strings::app_launch_last_session] =
       static_cast<Json::Value::UInt64>(date_time::getSecs(timestamp));
+  last_state_wrapper_->get_accessor().GetMutableData().set_dictionary(
+      dictionary);
 }
 
 std::string AppLaunchDataJsonTest::AddCounter(const std::string& inp,
diff --git a/src/components/application_manager/test/app_service_manager_test.cc b/src/components/application_manager/test/app_service_manager_test.cc
index daabdeedf4..c2e48c3eda 100644
--- a/src/components/application_manager/test/app_service_manager_test.cc
+++ b/src/components/application_manager/test/app_service_manager_test.cc
@@ -38,6 +38,7 @@
 #include "application_manager/mock_application_manager_settings.h"
 #include "application_manager/mock_message_helper.h"
 #include "application_manager/smart_object_keys.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "resumption/mock_last_state.h"
 #include "smart_objects/smart_object.h"
 
@@ -85,7 +86,10 @@ class AppServiceManagerTest : public testing::Test {
   AppServiceManagerTest()
       : mock_app_ptr_(new MockApplication)
       , mock_app_ptr2_(new MockApplication)
-      , app_service_manager_(mock_app_manager_, mock_last_state_)
+      , mock_last_state_(std::make_shared<resumption_test::MockLastState>())
+      , last_state_wrapper_(std::make_shared<resumption::LastStateWrapperImpl>(
+            mock_last_state_))
+      , app_service_manager_(mock_app_manager_, last_state_wrapper_)
       , mock_message_helper_(
             application_manager::MockMessageHelper::message_helper_mock()) {
     Mock::VerifyAndClearExpectations(mock_message_helper_);
@@ -105,7 +109,7 @@ class AppServiceManagerTest : public testing::Test {
         .WillByDefault(Return(kPolicyAppId));
     ON_CALL(*mock_app_ptr2_, policy_app_id())
         .WillByDefault(Return(kPolicyAppId2));
-    ON_CALL(mock_last_state_, get_dictionary()).WillByDefault(ReturnRef(dict_));
+    ON_CALL(*mock_last_state_, dictionary()).WillByDefault(Return(dict_));
     auto app_ptr = std::static_pointer_cast<am::Application>(mock_app_ptr_);
     auto app_ptr2 = std::static_pointer_cast<am::Application>(mock_app_ptr2_);
     ON_CALL(mock_app_manager_, application(kConnectionKey))
@@ -134,8 +138,7 @@ class AppServiceManagerTest : public testing::Test {
         GenerateMediaManifest(true, service_name);
 
     Json::Value empty_json;
-    EXPECT_CALL(mock_last_state_, get_dictionary())
-        .WillOnce(ReturnRef(empty_json));
+    EXPECT_CALL(*mock_last_state_, dictionary()).WillOnce(Return(empty_json));
 
     EXPECT_CALL(*mock_message_helper_,
                 BroadcastCapabilityUpdate(
@@ -201,7 +204,8 @@ class AppServiceManagerTest : public testing::Test {
   std::shared_ptr<MockApplication> mock_app_ptr_;
   std::shared_ptr<MockApplication> mock_app_ptr2_;
   MockApplicationManager mock_app_manager_;
-  resumption_test::MockLastState mock_last_state_;
+  std::shared_ptr<resumption_test::MockLastState> mock_last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   MockApplicationManagerSettings mock_settings_;
   application_manager::AppServiceManager app_service_manager_;
   application_manager::MockMessageHelper* mock_message_helper_;
@@ -211,8 +215,7 @@ TEST_F(AppServiceManagerTest, PublishAppService_Mobile_SUCCESS) {
   smart_objects::SmartObject manifest = GenerateMediaManifest(true);
 
   Json::Value empty_json;
-  EXPECT_CALL(mock_last_state_, get_dictionary())
-      .WillOnce(ReturnRef(empty_json));
+  EXPECT_CALL(*mock_last_state_, dictionary()).WillOnce(Return(empty_json));
 
   smart_objects::SmartObject syscap_update_published;
   EXPECT_CALL(
@@ -260,8 +263,7 @@ TEST_F(AppServiceManagerTest, PublishAppService_HMI_SUCCESS) {
   smart_objects::SmartObject manifest = GenerateMediaManifest(true);
 
   Json::Value empty_json;
-  EXPECT_CALL(mock_last_state_, get_dictionary())
-      .WillOnce(ReturnRef(empty_json));
+  EXPECT_CALL(*mock_last_state_, dictionary()).WillOnce(Return(empty_json));
 
   smart_objects::SmartObject syscap_update_published;
   EXPECT_CALL(
@@ -457,4 +459,4 @@ TEST_F(AppServiceManagerTest, GetActiveServices_OneService_SUCCESS) {
 
 }  // namespace application_manager_test
 }  // namespace components
-}  // namespace test
\ No newline at end of file
+}  // namespace test
diff --git a/src/components/application_manager/test/application_helper_test.cc b/src/components/application_manager/test/application_helper_test.cc
index d9d590a171..ec84acc697 100644
--- a/src/components/application_manager/test/application_helper_test.cc
+++ b/src/components/application_manager/test/application_helper_test.cc
@@ -52,6 +52,7 @@
 #include "utils/macro.h"
 
 #include "media_manager/mock_media_manager.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "test/resumption/mock_last_state.h"
 
 namespace {
@@ -118,7 +119,10 @@ class ApplicationHelperTest : public testing::Test {
     const std::string path_to_plagin = "";
     EXPECT_CALL(mock_application_manager_settings_, plugins_folder())
         .WillOnce(ReturnRef(path_to_plagin));
-    app_manager_impl_.Init(mock_last_state_, &mock_media_manager_);
+    mock_last_state_ = std::make_shared<MockLastState>();
+    last_state_wrapper_ =
+        std::make_shared<resumption::LastStateWrapperImpl>(mock_last_state_);
+    app_manager_impl_.Init(last_state_wrapper_, &mock_media_manager_);
 
     app_impl_ = std::make_shared<ApplicationImpl>(
         application_id,
@@ -136,7 +140,8 @@ class ApplicationHelperTest : public testing::Test {
 
   ApplicationManagerImpl app_manager_impl_;
   MockMediaManager mock_media_manager_;
-  MockLastState mock_last_state_;
+  std::shared_ptr<MockLastState> mock_last_state_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
   ApplicationSharedPtr app_impl_;
 };
 
diff --git a/src/components/application_manager/test/application_impl_test.cc b/src/components/application_manager/test/application_impl_test.cc
index 46d35bdbef..11578f19d6 100644
--- a/src/components/application_manager/test/application_impl_test.cc
+++ b/src/components/application_manager/test/application_impl_test.cc
@@ -69,7 +69,14 @@ using ::testing::Return;
 using ::testing::ReturnRef;
 using usage_statistics_test::MockStatisticsManager;
 
-typedef void (ApplicationImpl::*AddSet)(HmiStatePtr args);
+typedef void (ApplicationImpl::*AddSet)(const WindowID window_id,
+                                        HmiStatePtr args);
+
+namespace {
+const WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const std::string kDefaultWindowName = "DefaultName";
+}  // namespace
 
 class ApplicationImplTest : public ::testing::Test {
  protected:
@@ -106,7 +113,8 @@ class ApplicationImplTest : public ::testing::Test {
                             mock_application_manager_));
 
     HmiStatePtr initial_state = CreateTestHmiState();
-    app_impl->SetInitialState(initial_state);
+    app_impl->SetInitialState(
+        kDefaultWindowId, kDefaultWindowName, initial_state);
   }
 
   virtual void TearDown() OVERRIDE {
@@ -159,12 +167,12 @@ HmiStatePtr ApplicationImplTest::TestAddHmiState(HMILevel::eType hmi_lvl,
   test_lvl = hmi_lvl;
   state_id = id_state;
   HmiStatePtr state = CreateTestHmiState();
-  ((app_impl.get())->*hmi_action)(state);
+  ((app_impl.get())->*hmi_action)(kDefaultWindowId, state);
   return state;
 }
 
 void ApplicationImplTest::CheckCurrentHMIState() {
-  HmiStatePtr current_state = app_impl->CurrentHmiState();
+  HmiStatePtr current_state = app_impl->CurrentHmiState(kDefaultWindowId);
   EXPECT_EQ(test_lvl, current_state->hmi_level());
   EXPECT_EQ(state_id, current_state->state_id());
 }
@@ -207,7 +215,7 @@ TEST_F(ApplicationImplTest, AddStateAddRegularState_GetRegularState) {
                   HmiState::STATE_ID_VIDEO_STREAMING,
                   &ApplicationImpl::AddHMIState);
 
-  HmiStatePtr current_state = app_impl->RegularHmiState();
+  HmiStatePtr current_state = app_impl->RegularHmiState(kDefaultWindowId);
   EXPECT_EQ(HMILevel::HMI_FULL, current_state->hmi_level());
   EXPECT_EQ(HmiState::STATE_ID_REGULAR, current_state->state_id());
   EXPECT_EQ(app_id, app_impl->app_id());
@@ -228,8 +236,8 @@ TEST_F(ApplicationImplTest, AddStates_RemoveLastState) {
   CheckCurrentHMIState();
 
   // Remove last state
-  app_impl->RemoveHMIState(state3->state_id());
-  HmiStatePtr current_state = app_impl->CurrentHmiState();
+  app_impl->RemoveHMIState(kDefaultWindowId, state3->state_id());
+  HmiStatePtr current_state = app_impl->CurrentHmiState(kDefaultWindowId);
   EXPECT_EQ(state2, current_state);
   EXPECT_EQ(HMILevel::HMI_NONE, current_state->hmi_level());
   EXPECT_EQ(HmiState::STATE_ID_VIDEO_STREAMING, current_state->state_id());
@@ -249,8 +257,8 @@ TEST_F(ApplicationImplTest, AddStates_RemoveNotLastNotFirstState) {
   CheckCurrentHMIState();
 
   // Remove not last state
-  app_impl->RemoveHMIState(state2->state_id());
-  HmiStatePtr current_state = app_impl->CurrentHmiState();
+  app_impl->RemoveHMIState(kDefaultWindowId, state2->state_id());
+  HmiStatePtr current_state = app_impl->CurrentHmiState(kDefaultWindowId);
   EXPECT_EQ(state3, current_state);
   // HMI level is equal to parent hmi_level
   EXPECT_EQ(HMILevel::HMI_FULL, current_state->hmi_level());
@@ -272,8 +280,8 @@ TEST_F(ApplicationImplTest, AddStates_RemoveFirstState) {
   CheckCurrentHMIState();
 
   // Remove first added state
-  app_impl->RemoveHMIState(state1->state_id());
-  HmiStatePtr current_state = app_impl->CurrentHmiState();
+  app_impl->RemoveHMIState(kDefaultWindowId, state1->state_id());
+  HmiStatePtr current_state = app_impl->CurrentHmiState(kDefaultWindowId);
   EXPECT_EQ(state3, current_state);
   // Last state does not have a parent
   EXPECT_EQ(HMILevel::HMI_LIMITED, current_state->hmi_level());
@@ -295,8 +303,8 @@ TEST_F(ApplicationImplTest, SetRegularState_RemoveFirstState) {
   CheckCurrentHMIState();
 
   // Remove first state
-  app_impl->RemoveHMIState(state1->state_id());
-  HmiStatePtr current_state = app_impl->CurrentHmiState();
+  app_impl->RemoveHMIState(kDefaultWindowId, state1->state_id());
+  HmiStatePtr current_state = app_impl->CurrentHmiState(kDefaultWindowId);
   EXPECT_EQ(state3, current_state);
   // Last state has a parent
   EXPECT_EQ(HMILevel::HMI_FULL, current_state->hmi_level());
@@ -311,12 +319,12 @@ TEST_F(ApplicationImplTest, SetPostponedState_RemovePostponedState) {
                                        &ApplicationImpl::SetPostponedState);
 
   // Check that state was setted correctly
-  HmiStatePtr state2 = app_impl->PostponedHmiState();
+  HmiStatePtr state2 = app_impl->PostponedHmiState(kDefaultWindowId);
   EXPECT_EQ(state1, state2);
 
   // Check that state was correctly removed
-  app_impl->RemovePostponedState();
-  state2 = app_impl->PostponedHmiState();
+  app_impl->RemovePostponedState(kDefaultWindowId);
+  state2 = app_impl->PostponedHmiState(kDefaultWindowId);
   EXPECT_EQ(nullptr, state2);
 }
 
@@ -327,9 +335,9 @@ TEST_F(ApplicationImplTest, AddStateAddRegularState_GetHmiLvlAudioSystemState) {
                   HmiState::STATE_ID_REGULAR,
                   &ApplicationImpl::SetRegularState);
 
-  EXPECT_EQ(test_lvl, app_impl->hmi_level());
+  EXPECT_EQ(test_lvl, app_impl->hmi_level(kDefaultWindowId));
   EXPECT_EQ(audiostate, app_impl->audio_streaming_state());
-  EXPECT_EQ(syst_context, app_impl->system_context());
+  EXPECT_EQ(syst_context, app_impl->system_context(kDefaultWindowId));
 
   audiostate = AudioStreamingState::AUDIBLE;
   syst_context = SystemContext::SYSCTXT_MENU;
@@ -337,9 +345,9 @@ TEST_F(ApplicationImplTest, AddStateAddRegularState_GetHmiLvlAudioSystemState) {
                   HmiState::STATE_ID_VIDEO_STREAMING,
                   &ApplicationImpl::AddHMIState);
 
-  EXPECT_EQ(test_lvl, app_impl->hmi_level());
+  EXPECT_EQ(test_lvl, app_impl->hmi_level(kDefaultWindowId));
   EXPECT_EQ(audiostate, app_impl->audio_streaming_state());
-  EXPECT_EQ(syst_context, app_impl->system_context());
+  EXPECT_EQ(syst_context, app_impl->system_context(kDefaultWindowId));
 }
 
 TEST_F(ApplicationImplTest, IsAudioApplication) {
@@ -565,7 +573,9 @@ TEST_F(ApplicationImplTest, SubscribeToSoftButton_UnsubscribeFromSoftButton) {
 
   SoftButtonID test_button;
   for (uint i = 0; i < btn_count; i++) {
-    test_button.insert(i);
+    test_button.insert(std::make_pair(
+        i,
+        static_cast<WindowID>(mobile_apis::PredefinedWindows::DEFAULT_WINDOW)));
   }
   app_impl->SubscribeToSoftButtons(FunctionID::ScrollableMessageID,
                                    test_button);
@@ -754,16 +764,16 @@ TEST_F(ApplicationImplTest, SuspendNaviStreaming) {
   protocol_handler::ServiceType type =
       protocol_handler::ServiceType::kMobileNav;
   EXPECT_CALL(mock_application_manager_, OnAppStreaming(app_id, type, false));
-  EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
-              SendOnDataStreaming(type, false, _));
+  EXPECT_CALL(mock_application_manager_,
+              ProcessOnDataStreamingNotification(type, app_id, false));
   app_impl->SuspendStreaming(type);
 }
 
 TEST_F(ApplicationImplTest, SuspendAudioStreaming) {
   protocol_handler::ServiceType type = protocol_handler::ServiceType::kAudio;
   EXPECT_CALL(mock_application_manager_, OnAppStreaming(app_id, type, false));
-  EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
-              SendOnDataStreaming(type, false, _));
+  EXPECT_CALL(mock_application_manager_,
+              ProcessOnDataStreamingNotification(type, app_id, false));
   app_impl->SuspendStreaming(type);
 }
 
@@ -802,8 +812,8 @@ TEST_F(ApplicationImplTest, StopStreaming_StreamingApproved) {
   app_impl->set_video_streaming_approved(true);
 
   EXPECT_CALL(mock_application_manager_, OnAppStreaming(app_id, type, false));
-  EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
-              SendOnDataStreaming(type, false, _));
+  EXPECT_CALL(mock_application_manager_,
+              ProcessOnDataStreamingNotification(type, app_id, false));
   EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
               SendNaviStopStream(app_id, _));
 
@@ -814,8 +824,8 @@ TEST_F(ApplicationImplTest, StopStreaming_StreamingApproved) {
   app_impl->set_audio_streaming_approved(true);
   type = protocol_handler::ServiceType::kAudio;
   EXPECT_CALL(mock_application_manager_, OnAppStreaming(app_id, type, false));
-  EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
-              SendOnDataStreaming(type, false, _));
+  EXPECT_CALL(mock_application_manager_,
+              ProcessOnDataStreamingNotification(type, app_id, false));
   EXPECT_CALL(*MockMessageHelper::message_helper_mock(),
               SendAudioStopStream(app_id, _));
 
diff --git a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc
index 939ef98620..f8dddcfe27 100644
--- a/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_mock_hmi_test.cc
@@ -191,11 +191,6 @@ TEST_F(ApplicationManagerImplMockHmiTest,
 
   MockCommandFactory mock_command_factory;
 
-  //  // Skip sending notification on device switching as it is not the goal
-  //  here
-  EXPECT_CALL(mock_command_factory, CreateCommand(_, _))
-      .WillOnce(Return(std::shared_ptr<commands::Command>()));
-
   plugin_manager::MockRPCPlugin mock_rpc_plugin;
   utils::Optional<plugin_manager::RPCPlugin> mock_rpc_plugin_opt =
       mock_rpc_plugin;
diff --git a/src/components/application_manager/test/application_manager_impl_test.cc b/src/components/application_manager/test/application_manager_impl_test.cc
index 804959e1db..2c16048e97 100644
--- a/src/components/application_manager/test/application_manager_impl_test.cc
+++ b/src/components/application_manager/test/application_manager_impl_test.cc
@@ -39,12 +39,14 @@
 #include "application_manager/application.h"
 #include "application_manager/application_impl.h"
 #include "application_manager/application_manager_impl.h"
+#include "application_manager/hmi_state.h"
 #include "application_manager/mock_app_service_manager.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager_settings.h"
 #include "application_manager/mock_resumption_data.h"
 #include "application_manager/mock_rpc_plugin_manager.h"
 #include "application_manager/mock_rpc_service.h"
+#include "application_manager/mock_state_controller.h"
 #include "application_manager/policies/mock_policy_handler_interface.h"
 #include "application_manager/resumption/resume_ctrl_impl.h"
 #include "application_manager/test/include/application_manager/mock_message_helper.h"
@@ -57,6 +59,7 @@
 #include "protocol/bson_object_keys.h"
 #include "protocol_handler/mock_protocol_handler.h"
 #include "protocol_handler/mock_session_observer.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "resumption/mock_last_state.h"
 #include "utils/custom_string.h"
 #include "utils/file_system.h"
@@ -88,6 +91,10 @@ using ::testing::SaveArg;
 using ::testing::SetArgPointee;
 using ::testing::SetArgReferee;
 
+using application_manager::plugin_manager::MockRPCPluginManager;
+using test::components::application_manager_test::MockStateController;
+using test::components::policy_test::MockPolicyHandlerInterface;
+
 using namespace application_manager;
 
 // custom action to call a member function with 4 arguments
@@ -96,12 +103,28 @@ ACTION_P6(InvokeMemberFuncWithArg4, ptr, memberFunc, a, b, c, d) {
 }
 
 namespace {
+const uint32_t kCorrelationID = 54321u;
 const std::string kDirectoryName = "./test_storage";
 const uint32_t kTimeout = 10000u;
 connection_handler::DeviceHandle kDeviceId = 12345u;
 const std::string kAppId = "someID";
 const uint32_t kConnectionKey = 1232u;
 const std::string kAppName = "appName";
+const WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const std::vector<std::string> kEnabledLocalApps = {"localAppId"};
+
+typedef hmi_apis::Common_ServiceStatusUpdateReason::eType
+    ServiceStatusUpdateReason;
+typedef hmi_apis::Common_ServiceType::eType ServiceType;
+typedef hmi_apis::Common_ServiceEvent::eType ServiceEvent;
+typedef utils::Optional<ServiceStatusUpdateReason> UpdateReasonOptional;
+
+const std::string kPolicyAppID = "test policy id";
+transport_manager::DeviceInfo kDeviceInfo(1,
+                                          "mac",
+                                          "name",
+                                          "WEB_ENGINE_DEVICE");
 
 #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
 // Cloud application params
@@ -114,10 +137,29 @@ const mobile_api::HybridAppPreference::eType kHybridAppPreference =
     mobile_api::HybridAppPreference::CLOUD;
 const std::string kHybridAppPreferenceStr = "CLOUD";
 const bool kEnabled = true;
+const policy::AppProperties app_properties(kEndpoint2,
+                                           kCertificate,
+                                           kEnabled,
+                                           kAuthToken,
+                                           kTransportType,
+                                           kHybridAppPreferenceStr);
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 }  // namespace
 
-class ApplicationManagerImplTest : public ::testing::Test {
+struct ServiceStatus {
+  ServiceType service_type_;
+  ServiceEvent service_event_;
+  UpdateReasonOptional reason_;
+
+  ServiceStatus(ServiceType type,
+                ServiceEvent event,
+                UpdateReasonOptional reason)
+      : service_type_(type), service_event_(event), reason_(reason) {}
+};
+
+class ApplicationManagerImplTest
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<ServiceStatus> {
  public:
   ApplicationManagerImplTest()
       : app_id_(0u)
@@ -125,12 +167,17 @@ class ApplicationManagerImplTest : public ::testing::Test {
             std::make_shared<NiceMock<resumption_test::MockResumptionData> >(
                 mock_app_mngr_))
       , mock_rpc_service_(new MockRPCService)
-      , mock_policy_handler_(
-            new test::components::policy_test::MockPolicyHandlerInterface)
-      , mock_app_service_manager_(
-            new MockAppServiceManager(mock_app_mngr_, mock_last_state_))
+      , mock_last_state_(std::make_shared<resumption_test::MockLastState>())
+      , mock_policy_handler_(new NiceMock<MockPolicyHandlerInterface>)
+      , mock_app_service_manager_(new MockAppServiceManager(
+            mock_app_mngr_,
+            std::make_shared<resumption::LastStateWrapperImpl>(
+                mock_last_state_)))
       , mock_message_helper_(
             application_manager::MockMessageHelper::message_helper_mock())
+      , mock_statistics_manager_(
+            std::make_shared<
+                NiceMock<usage_statistics_test::MockStatisticsManager> >())
 
   {
 #ifdef ENABLE_LOG
@@ -138,17 +185,35 @@ class ApplicationManagerImplTest : public ::testing::Test {
 #endif
     Mock::VerifyAndClearExpectations(mock_message_helper_);
   }
-  ~ApplicationManagerImplTest() {
+  ~ApplicationManagerImplTest() OVERRIDE {
     Mock::VerifyAndClearExpectations(mock_message_helper_);
   }
 
  protected:
   void SetUp() OVERRIDE {
     CreateAppManager();
+    ON_CALL(mock_state_ctrl_,
+            SetRegularState(_,
+                            mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+                            mobile_apis::HMILevel::HMI_NONE,
+                            true));
+    ON_CALL(*mock_app_ptr_, app_id()).WillByDefault(Return(kConnectionKey));
+    ON_CALL(*mock_app_ptr_, device()).WillByDefault(Return(kDeviceId));
+
+    HmiStatePtr hmi_state(std::make_shared<HmiState>(
+        mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+
+    ON_CALL(*mock_app_ptr_,
+            RegularHmiState(mobile_apis::PredefinedWindows::DEFAULT_WINDOW))
+        .WillByDefault(Return(hmi_state));
+
     ON_CALL(mock_session_observer_, GetDataOnSessionKey(_, _, _, _))
         .WillByDefault(DoAll(SetArgPointee<3u>(kDeviceId), Return(0)));
+    ON_CALL(mock_connection_handler_, GetDataOnSessionKey(_, _, _, &kDeviceId))
+        .WillByDefault(DoAll(SetArgPointee<3u>(app_id_), Return(0)));
     ON_CALL(mock_connection_handler_, get_session_observer())
         .WillByDefault(ReturnRef(mock_session_observer_));
+
     app_manager_impl_->SetMockRPCService(mock_rpc_service_);
     app_manager_impl_->resume_controller().set_resumption_storage(
         mock_storage_);
@@ -159,7 +224,19 @@ class ApplicationManagerImplTest : public ::testing::Test {
         .WillByDefault(Return());
     app_manager_impl_->SetAppServiceManager(mock_app_service_manager_);
     Json::Value empty;
-    ON_CALL(mock_last_state_, get_dictionary()).WillByDefault(ReturnRef(empty));
+    ON_CALL(*mock_last_state_, dictionary()).WillByDefault(Return(empty));
+
+    auto request = std::make_shared<smart_objects::SmartObject>(
+        smart_objects::SmartType_Map);
+    ON_CALL(*mock_message_helper_, CreateModuleInfoSO(_, _))
+        .WillByDefault(Return(request));
+    ON_CALL(*mock_message_helper_, GetBCCloseApplicationRequestToHMI(_, _))
+        .WillByDefault(Return(std::make_shared<smart_objects::SmartObject>(
+            smart_objects::SmartType_Map)));
+    ON_CALL(*mock_policy_handler_, GetStatisticManager())
+        .WillByDefault(Return(mock_statistics_manager_));
+    ON_CALL(*mock_policy_handler_, GetEnabledLocalApps())
+        .WillByDefault(Return(kEnabledLocalApps));
   }
 
   void CreateAppManager() {
@@ -184,12 +261,30 @@ class ApplicationManagerImplTest : public ::testing::Test {
 
     app_manager_impl_.reset(new am::ApplicationManagerImpl(
         mock_application_manager_settings_, mock_policy_settings_));
-    mock_app_ptr_ = std::shared_ptr<MockApplication>(new MockApplication());
+    mock_app_ptr_ = std::shared_ptr<NiceMock<MockApplication> >(
+        new NiceMock<MockApplication>());
     app_manager_impl_->set_protocol_handler(&mock_protocol_handler_);
+    app_manager_impl_->SetMockPolicyHandler(mock_policy_handler_);
     ASSERT_TRUE(app_manager_impl_.get());
     ASSERT_TRUE(mock_app_ptr_.get());
   }
 
+  application_manager::commands::MessageSharedPtr CreateCloseAppMessage() {
+    using namespace application_manager;
+
+    smart_objects::SmartObjectSPtr message =
+        std::make_shared<smart_objects::SmartObject>(
+            smart_objects::SmartType_Map);
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::function_id] =
+                  hmi_apis::FunctionID::BasicCommunication_CloseApplication;
+    (*message)[strings::params][strings::message_type] = MessageType::kRequest;
+    (*message)[strings::params][strings::correlation_id] = kCorrelationID;
+    (*message)[strings::msg_params][strings::app_id] = kAppId;
+
+    return message;
+  }
+
   void AddMockApplication() {
     app_manager_impl_->AddMockApplication(mock_app_ptr_);
   }
@@ -231,26 +326,102 @@ class ApplicationManagerImplTest : public ::testing::Test {
   void AddCloudAppToPendingDeviceMap();
   void CreatePendingApplication();
 #endif
+
+  void CreatePendingLocalApplication(const std::string& policy_app_id);
+
   uint32_t app_id_;
   NiceMock<policy_test::MockPolicySettings> mock_policy_settings_;
   std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > mock_storage_;
 
+  MockStateController mock_state_ctrl_;
   MockRPCService* mock_rpc_service_;
-  resumption_test::MockLastState mock_last_state_;
+  std::shared_ptr<resumption_test::MockLastState> mock_last_state_;
   NiceMock<con_test::MockConnectionHandler> mock_connection_handler_;
   NiceMock<protocol_handler_test::MockSessionObserver> mock_session_observer_;
   NiceMock<MockApplicationManagerSettings> mock_application_manager_settings_;
-  test::components::policy_test::MockPolicyHandlerInterface*
-      mock_policy_handler_;
+  NiceMock<MockPolicyHandlerInterface>* mock_policy_handler_;
   application_manager_test::MockApplicationManager mock_app_mngr_;
   std::unique_ptr<am::ApplicationManagerImpl> app_manager_impl_;
   MockAppServiceManager* mock_app_service_manager_;
   application_manager::MockMessageHelper* mock_message_helper_;
 
-  std::shared_ptr<MockApplication> mock_app_ptr_;
+  std::shared_ptr<NiceMock<MockApplication> > mock_app_ptr_;
   NiceMock<protocol_handler_test::MockProtocolHandler> mock_protocol_handler_;
+  std::shared_ptr<NiceMock<usage_statistics_test::MockStatisticsManager> >
+      mock_statistics_manager_;
 };
 
+INSTANTIATE_TEST_CASE_P(
+    ProcessServiceStatusUpdate_REQUEST_ACCEPTED,
+    ApplicationManagerImplTest,
+    ::testing::Values(ServiceStatus(ServiceType::AUDIO,
+                                    ServiceEvent::REQUEST_ACCEPTED,
+                                    UpdateReasonOptional::EMPTY),
+                      ServiceStatus(ServiceType::VIDEO,
+                                    ServiceEvent::REQUEST_ACCEPTED,
+                                    UpdateReasonOptional::EMPTY),
+                      ServiceStatus(ServiceType::RPC,
+                                    ServiceEvent::REQUEST_ACCEPTED,
+                                    UpdateReasonOptional::EMPTY)));
+
+INSTANTIATE_TEST_CASE_P(
+    ProcessServiceStatusUpdate_REQUEST_RECEIVED,
+    ApplicationManagerImplTest,
+    ::testing::Values(ServiceStatus(ServiceType::AUDIO,
+                                    ServiceEvent::REQUEST_RECEIVED,
+                                    UpdateReasonOptional::EMPTY),
+                      ServiceStatus(ServiceType::VIDEO,
+                                    ServiceEvent::REQUEST_RECEIVED,
+                                    UpdateReasonOptional::EMPTY),
+                      ServiceStatus(ServiceType::RPC,
+                                    ServiceEvent::REQUEST_RECEIVED,
+                                    UpdateReasonOptional::EMPTY)));
+
+INSTANTIATE_TEST_CASE_P(
+    ProcessServiceStatusUpdate_REQUEST_REJECTED,
+    ApplicationManagerImplTest,
+    ::testing::Values(ServiceStatus(ServiceType::AUDIO,
+                                    ServiceEvent::REQUEST_REJECTED,
+                                    UpdateReasonOptional::EMPTY),
+                      ServiceStatus(ServiceType::VIDEO,
+                                    ServiceEvent::REQUEST_REJECTED,
+                                    UpdateReasonOptional::EMPTY),
+                      ServiceStatus(ServiceType::RPC,
+                                    ServiceEvent::REQUEST_REJECTED,
+                                    UpdateReasonOptional::EMPTY)));
+
+TEST_P(ApplicationManagerImplTest,
+       ProcessServiceStatusUpdate_SendMessageToHMI) {
+  smart_objects::SmartObjectSPtr notification_ =
+      std::make_shared<smart_objects::SmartObject>(
+          smart_objects::SmartType_Map);
+  (*notification_)[strings::msg_params][hmi_notification::service_type] =
+      GetParam().service_type_;
+  (*notification_)[strings::msg_params][hmi_notification::service_event] =
+      GetParam().service_event_;
+  (*notification_)[strings::msg_params][strings::app_id] = kConnectionKey;
+
+  AddMockApplication();
+
+  ON_CALL(*mock_app_ptr_, app_id()).WillByDefault(Return(kConnectionKey));
+
+  auto close_message = CreateCloseAppMessage();
+  ON_CALL(*mock_message_helper_, GetBCCloseApplicationRequestToHMI(_, _))
+      .WillByDefault(Return(close_message));
+  ON_CALL(*mock_message_helper_, CreateOnServiceUpdateNotification(_, _, _, _))
+      .WillByDefault(Return(notification_));
+
+  ON_CALL(*mock_rpc_service_, ManageHMICommand(notification_, _))
+      .WillByDefault(Return(true));
+  ON_CALL(*mock_rpc_service_, ManageHMICommand(close_message, _))
+      .WillByDefault(Return(true));
+
+  app_manager_impl_->ProcessServiceStatusUpdate(kConnectionKey,
+                                                GetParam().service_type_,
+                                                GetParam().service_event_,
+                                                GetParam().reason_);
+}
+
 TEST_F(ApplicationManagerImplTest, ProcessQueryApp_ExpectSuccess) {
   using namespace ns_smart_device_link::ns_smart_objects;
   SmartObject app_data;
@@ -382,10 +553,16 @@ TEST_F(ApplicationManagerImplTest, OnServiceStartedCallback_VideoServiceStart) {
   const protocol_handler::ServiceType service_type =
       protocol_handler::ServiceType::kMobileNav;
   const int32_t session_key = 123;
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
+
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -415,7 +592,7 @@ TEST_F(ApplicationManagerImplTest,
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   // is_navi() is false
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(false));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
+  EXPECT_CALL(*mock_app_ptr_, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
 
   bool result = false;
@@ -446,8 +623,14 @@ TEST_F(ApplicationManagerImplTest,
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
   // HMI level is not FULL nor LIMITED
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_BACKGROUND));
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_BACKGROUND);
+
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -476,8 +659,14 @@ TEST_F(ApplicationManagerImplTest,
   const int32_t session_key = 123;
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_LIMITED));
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_LIMITED);
+
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -560,8 +749,13 @@ TEST_F(ApplicationManagerImplTest,
   const int32_t session_key = 123;
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -634,8 +828,13 @@ TEST_F(ApplicationManagerImplTest,
   const int32_t session_key = 123;
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -669,8 +868,13 @@ TEST_F(ApplicationManagerImplTest, OnServiceStartedCallback_AudioServiceStart) {
   const int32_t session_key = 123;
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -699,8 +903,13 @@ TEST_F(ApplicationManagerImplTest,
   const int32_t session_key = 123;
   EXPECT_CALL(*mock_app_ptr_, app_id()).WillRepeatedly(Return(session_key));
   EXPECT_CALL(*mock_app_ptr_, is_navi()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*mock_app_ptr_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
+  HmiStatePtr hmi_state(std::make_shared<HmiState>(
+      mock_app_ptr_, mock_app_mngr_, HmiState::STATE_ID_REGULAR));
+  hmi_state->set_video_streaming_state(
+      mobile_apis::VideoStreamingState::eType::STREAMABLE);
+  hmi_state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
+  EXPECT_CALL(*mock_app_ptr_, CurrentHmiState(_))
+      .WillRepeatedly(Return(hmi_state));
 
   bool result = false;
   std::vector<std::string> rejected_params;
@@ -820,6 +1029,9 @@ TEST_F(ApplicationManagerImplTest,
   std::shared_ptr<MockApplication> switching_app_ptr =
       std::make_shared<MockApplication>();
 
+  ON_CALL(*switching_app_ptr, app_id()).WillByDefault(Return(kConnectionKey));
+  ON_CALL(*switching_app_ptr, device()).WillByDefault(Return(kDeviceId));
+
   const std::string switching_device_id = "switching";
   const std::string switching_device_id_hash =
       encryption::MakeHash(switching_device_id);
@@ -832,7 +1044,7 @@ TEST_F(ApplicationManagerImplTest,
       .WillRepeatedly(Return(policy_app_id_switch));
 
   const auto hmi_level_switching_app = mobile_apis::HMILevel::HMI_FULL;
-  EXPECT_CALL(*switching_app_ptr, hmi_level())
+  EXPECT_CALL(*switching_app_ptr, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_level_switching_app));
 
   std::shared_ptr<MockApplication> nonswitching_app_ptr =
@@ -850,7 +1062,7 @@ TEST_F(ApplicationManagerImplTest,
       .WillRepeatedly(Return(policy_app_id_nonswitch));
 
   const auto hmi_level_nonswitching_app = mobile_apis::HMILevel::HMI_LIMITED;
-  EXPECT_CALL(*nonswitching_app_ptr, hmi_level())
+  EXPECT_CALL(*nonswitching_app_ptr, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_level_nonswitching_app));
 
   // Act
@@ -864,19 +1076,20 @@ TEST_F(ApplicationManagerImplTest,
                                                         nonswitching_device_id,
                                                         "USB");
 
-  EXPECT_CALL(*mock_message_helper_, CreateDeviceListSO(_, _, _))
-      .WillOnce(Return(smart_objects::SmartObjectSPtr()));
   app_manager_impl_->OnDeviceSwitchingStart(switching_device,
                                             non_switching_device);
-  EXPECT_TRUE(app_manager_impl_->IsAppInReconnectMode(policy_app_id_switch));
-  EXPECT_FALSE(
-      app_manager_impl_->IsAppInReconnectMode(policy_app_id_nonswitch));
+  EXPECT_TRUE(
+      app_manager_impl_->IsAppInReconnectMode(kDeviceId, policy_app_id_switch));
+  EXPECT_FALSE(app_manager_impl_->IsAppInReconnectMode(
+      kDeviceId, policy_app_id_nonswitch));
 }
 
 TEST_F(ApplicationManagerImplTest,
        OnDeviceSwitchingFinish_ExpectUnregisterAppsInWaitList) {
   std::shared_ptr<MockApplication> switching_app_ptr =
       std::make_shared<MockApplication>();
+  ON_CALL(*switching_app_ptr, app_id()).WillByDefault(Return(kConnectionKey));
+  ON_CALL(*switching_app_ptr, device()).WillByDefault(Return(kDeviceId));
 
   plugin_manager::MockRPCPluginManager* mock_rpc_plugin_manager =
       new plugin_manager::MockRPCPluginManager;
@@ -896,7 +1109,7 @@ TEST_F(ApplicationManagerImplTest,
       .WillRepeatedly(Return(policy_app_id_switch));
 
   const auto hmi_level_switching_app = mobile_apis::HMILevel::HMI_FULL;
-  EXPECT_CALL(*switching_app_ptr, hmi_level())
+  EXPECT_CALL(*switching_app_ptr, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_level_switching_app));
 
   std::shared_ptr<MockApplication> nonswitching_app_ptr =
@@ -913,8 +1126,12 @@ TEST_F(ApplicationManagerImplTest,
   EXPECT_CALL(*nonswitching_app_ptr, policy_app_id())
       .WillRepeatedly(Return(policy_app_id_nonswitch));
 
+  ON_CALL(*nonswitching_app_ptr, protocol_version())
+      .WillByDefault(
+          Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_4));
+
   const auto hmi_level_nonswitching_app = mobile_apis::HMILevel::HMI_LIMITED;
-  EXPECT_CALL(*nonswitching_app_ptr, hmi_level())
+  EXPECT_CALL(*nonswitching_app_ptr, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_level_nonswitching_app));
 
   // Act
@@ -928,12 +1145,11 @@ TEST_F(ApplicationManagerImplTest,
                                                         nonswitching_device_id,
                                                         "USB");
 
-  EXPECT_CALL(*mock_message_helper_, CreateDeviceListSO(_, _, _))
-      .WillOnce(Return(smart_objects::SmartObjectSPtr()));
   app_manager_impl_->OnDeviceSwitchingStart(switching_device,
                                             non_switching_device);
 
-  EXPECT_TRUE(app_manager_impl_->IsAppInReconnectMode(policy_app_id_switch));
+  EXPECT_TRUE(
+      app_manager_impl_->IsAppInReconnectMode(kDeviceId, policy_app_id_switch));
 
   app_manager_impl_->OnDeviceSwitchingFinish(switching_device_id);
   EXPECT_FALSE(
@@ -1012,6 +1228,15 @@ TEST_F(ApplicationManagerImplTest, StartStopAudioPassThru) {
   }
 }
 
+TEST_F(ApplicationManagerImplTest,
+       StopApplicationManager_ExpectStopRPCService) {
+  EXPECT_CALL(*mock_policy_handler_, UnloadPolicyLibrary());
+
+  EXPECT_CALL(*mock_rpc_service_, Stop());
+
+  app_manager_impl_->Stop();
+}
+
 TEST_F(ApplicationManagerImplTest, UnregisterAnotherAppDuringAudioPassThru) {
   std::string dummy_file_name;
   ON_CALL(mock_application_manager_settings_, recording_file_name())
@@ -1042,7 +1267,9 @@ TEST_F(ApplicationManagerImplTest, UnregisterAnotherAppDuringAudioPassThru) {
   EXPECT_CALL(*mock_app_2, device()).WillRepeatedly(Return(0));
   EXPECT_CALL(*mock_app_2, mac_address())
       .WillRepeatedly(ReturnRef(dummy_mac_address));
-  EXPECT_CALL(*mock_app_2, policy_app_id()).WillRepeatedly(Return(""));
+  const std::string app2_policy_id = "app2_policy_id";
+  EXPECT_CALL(*mock_app_2, policy_app_id())
+      .WillRepeatedly(Return(app2_policy_id));
   EXPECT_CALL(*mock_app_2, protocol_version())
       .WillRepeatedly(
           Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_4));
@@ -1079,6 +1306,9 @@ TEST_F(ApplicationManagerImplTest, UnregisterAnotherAppDuringAudioPassThru) {
                                                 audio_type);
   }
 
+  std::vector<std::string> enabled_apps = {app2_policy_id};
+  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(_, _)).Times(1);
+
   // while running APT, app 1 is unregistered
   app_manager_impl_->UnregisterApplication(
       app_id_1, mobile_apis::Result::SUCCESS, false, true);
@@ -1439,6 +1669,9 @@ TEST_F(ApplicationManagerImplTest,
   smart_objects::SmartObjectSPtr request_for_registration_ptr =
       std::make_shared<smart_objects::SmartObject>(request_for_registration);
 
+  std::unique_ptr<plugin_manager::RPCPluginManager> rpc_plugin_manager(
+      new MockRPCPluginManager());
+  app_manager_impl_->SetPluginManager(rpc_plugin_manager);
   ApplicationSharedPtr application =
       app_manager_impl_->RegisterApplication(request_for_registration_ptr);
   EXPECT_STREQ(kAppName.c_str(), application->name().c_str());
@@ -1455,18 +1688,11 @@ TEST_F(ApplicationManagerImplTest,
 
 #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
 void ApplicationManagerImplTest::AddCloudAppToPendingDeviceMap() {
-  app_manager_impl_->SetMockPolicyHandler(mock_policy_handler_);
   std::vector<std::string> enabled_apps{"1234"};
   EXPECT_CALL(*mock_policy_handler_, GetEnabledCloudApps(_))
       .WillOnce(SetArgReferee<0>(enabled_apps));
-  EXPECT_CALL(*mock_policy_handler_, GetCloudAppParameters(_, _, _, _, _, _, _))
-      .WillOnce(DoAll(SetArgReferee<1>(kEnabled),
-                      SetArgReferee<2>(kEndpoint2),
-                      SetArgReferee<3>(kCertificate),
-                      SetArgReferee<4>(kAuthToken),
-                      SetArgReferee<5>(kTransportType),
-                      SetArgReferee<6>(kHybridAppPreferenceStr),
-                      Return(true)));
+  EXPECT_CALL(*mock_policy_handler_, GetAppProperties(_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
 
   std::vector<std::string> nicknames{"CloudApp"};
   EXPECT_CALL(*mock_policy_handler_, GetInitialAppData(_, _, _))
@@ -1491,14 +1717,8 @@ void ApplicationManagerImplTest::CreatePendingApplication() {
   EXPECT_CALL(*mock_policy_handler_, GetStatisticManager())
       .WillOnce(Return(std::shared_ptr<usage_statistics::StatisticsManager>(
           new usage_statistics_test::MockStatisticsManager())));
-  EXPECT_CALL(*mock_policy_handler_, GetCloudAppParameters(_, _, _, _, _, _, _))
-      .WillOnce(DoAll(SetArgReferee<1>(kEnabled),
-                      SetArgReferee<2>(kEndpoint2),
-                      SetArgReferee<3>(kCertificate),
-                      SetArgReferee<4>(kAuthToken),
-                      SetArgReferee<5>(kTransportType),
-                      SetArgReferee<6>(kHybridAppPreferenceStr),
-                      Return(true)));
+  EXPECT_CALL(*mock_policy_handler_, GetAppProperties(_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
   // Expect Update app list
   EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(_, _)).Times(1);
   app_manager_impl_->CreatePendingApplication(1, device_info, 1);
@@ -1528,14 +1748,8 @@ TEST_F(ApplicationManagerImplTest, SetPendingState) {
 
   EXPECT_CALL(*mock_policy_handler_, GetEnabledCloudApps(_))
       .WillOnce(SetArgReferee<0>(enabled_apps));
-  EXPECT_CALL(*mock_policy_handler_, GetCloudAppParameters(_, _, _, _, _, _, _))
-      .WillOnce(DoAll(SetArgReferee<1>(kEnabled),
-                      SetArgReferee<2>(kEndpoint2),
-                      SetArgReferee<3>(kCertificate),
-                      SetArgReferee<4>(kAuthToken),
-                      SetArgReferee<5>(kTransportType),
-                      SetArgReferee<6>(kHybridAppPreferenceStr),
-                      Return(true)));
+  EXPECT_CALL(*mock_policy_handler_, GetAppProperties(_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
 
   std::vector<std::string> nicknames{"CloudApp"};
   EXPECT_CALL(*mock_policy_handler_, GetInitialAppData(_, _, _))
@@ -1607,6 +1821,9 @@ TEST_F(ApplicationManagerImplTest,
   smart_objects::SmartObjectSPtr request_for_registration_ptr =
       std::make_shared<smart_objects::SmartObject>(request_for_registration);
 
+  std::unique_ptr<plugin_manager::RPCPluginManager> rpc_plugin_manager(
+      new MockRPCPluginManager());
+  app_manager_impl_->SetPluginManager(rpc_plugin_manager);
   ApplicationSharedPtr application =
       app_manager_impl_->RegisterApplication(request_for_registration_ptr);
 
@@ -1672,18 +1889,11 @@ TEST_F(ApplicationManagerImplTest,
 }
 
 TEST_F(ApplicationManagerImplTest, PolicyIDByIconUrl_Success) {
-  app_manager_impl_->SetMockPolicyHandler(mock_policy_handler_);
   std::vector<std::string> enabled_apps{"1234"};
   EXPECT_CALL(*mock_policy_handler_, GetEnabledCloudApps(_))
       .WillOnce(SetArgReferee<0>(enabled_apps));
-  EXPECT_CALL(*mock_policy_handler_, GetCloudAppParameters(_, _, _, _, _, _, _))
-      .WillOnce(DoAll(SetArgReferee<1>(kEnabled),
-                      SetArgReferee<2>(kEndpoint2),
-                      SetArgReferee<3>(kCertificate),
-                      SetArgReferee<4>(kAuthToken),
-                      SetArgReferee<5>(kTransportType),
-                      SetArgReferee<6>(kHybridAppPreferenceStr),
-                      Return(true)));
+  EXPECT_CALL(*mock_policy_handler_, GetAppProperties(_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
 
   std::vector<std::string> nicknames{"CloudApp"};
   EXPECT_CALL(*mock_policy_handler_, GetInitialAppData(_, _, _))
@@ -1725,8 +1935,99 @@ TEST_F(ApplicationManagerImplTest, SetIconFileFromSystemRequest_Success) {
   app_manager_impl_->SetIconFileFromSystemRequest("1234");
   EXPECT_TRUE(file_system::RemoveDirectory(kDirectoryName, true));
 }
-
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
+
+void ApplicationManagerImplTest::CreatePendingLocalApplication(
+    const std::string& policy_app_id) {
+  // CreatePendingApplication
+  std::vector<std::string> nicknames{"PendingApplication"};
+  EXPECT_CALL(*mock_policy_handler_, GetInitialAppData(policy_app_id, _, _))
+      .WillOnce(DoAll(SetArgPointee<1>(nicknames), Return(true)));
+  EXPECT_CALL(mock_connection_handler_, GetWebEngineDeviceInfo())
+      .WillOnce(ReturnRef(kDeviceInfo));
+  EXPECT_CALL(*mock_policy_handler_, GetStatisticManager())
+      .WillOnce(Return(std::shared_ptr<usage_statistics::StatisticsManager>(
+          new usage_statistics_test::MockStatisticsManager())));
+  EXPECT_CALL(*mock_policy_handler_, GetAppProperties(_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
+  // Expect NO Update app list
+  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
+  app_manager_impl_->CreatePendingLocalApplication(policy_app_id);
+  AppsWaitRegistrationSet app_list =
+      app_manager_impl_->AppsWaitingForRegistration().GetData();
+  EXPECT_EQ(1u, app_list.size());
+}
+
+TEST_F(ApplicationManagerImplTest, CreatePendingApplicationByPolicyAppID) {
+  CreatePendingLocalApplication(kPolicyAppID);
+}
+
+TEST_F(ApplicationManagerImplTest, RemoveExistingPendingApplication_SUCCESS) {
+  CreatePendingLocalApplication(kPolicyAppID);
+  auto app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
+  ASSERT_EQ(1u, app_list.size());
+
+  app_manager_impl_->RemovePendingApplication(kPolicyAppID);
+  app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
+  EXPECT_TRUE(app_list.empty());
+}
+
+TEST_F(ApplicationManagerImplTest,
+       RemovePendingApplicationFromEmptyList_NoAppRemoved_SUCCESS) {
+  auto app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
+  ASSERT_TRUE(app_list.empty());
+
+  app_manager_impl_->RemovePendingApplication(kPolicyAppID);
+  app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
+  EXPECT_TRUE(app_list.empty());
+}
+
+TEST_F(
+    ApplicationManagerImplTest,
+    OnWebEngineDeviceCreated_NoEnabledLocalApps_PendingApplicationNotCreatedAndNoUpdateAppList) {
+  std::vector<std::string> enabled_apps;
+  EXPECT_CALL(*mock_policy_handler_, GetEnabledLocalApps())
+      .WillOnce(Return(enabled_apps));
+  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
+
+  app_manager_impl_->OnWebEngineDeviceCreated();
+
+  auto app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
+  EXPECT_TRUE(app_list.empty());
+}
+
+TEST_F(
+    ApplicationManagerImplTest,
+    OnWebEngineDeviceCreated_PendingApplicationCreatedAndUpdateAppListSentToHMI) {
+  std::vector<std::string> enabled_apps = {"app1"};
+  std::vector<std::string> nicknames{"PendingApplication"};
+
+  EXPECT_CALL(*mock_policy_handler_, GetEnabledLocalApps())
+      .WillOnce(Return(enabled_apps));
+  EXPECT_CALL(*mock_rpc_service_, ManageHMICommand(_, _)).Times(1);
+  EXPECT_CALL(*mock_policy_handler_, GetAppProperties(_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
+  EXPECT_CALL(*mock_policy_handler_, GetInitialAppData(_, _, _))
+      .WillOnce(DoAll(SetArgPointee<1>(nicknames), Return(true)));
+  EXPECT_CALL(mock_connection_handler_, GetWebEngineDeviceInfo())
+      .WillOnce(ReturnRef(kDeviceInfo));
+
+  app_manager_impl_->OnWebEngineDeviceCreated();
+
+  auto app_list = app_manager_impl_->AppsWaitingForRegistration().GetData();
+  EXPECT_EQ(1u, app_list.size());
+}
+
+TEST_F(ApplicationManagerImplTest, AddAndRemoveQueryAppDevice_SUCCESS) {
+  const connection_handler::DeviceHandle device_handle = 1u;
+  ASSERT_FALSE(app_manager_impl_->IsAppsQueriedFrom(device_handle));
+
+  app_manager_impl_->OnQueryAppsRequest(device_handle);
+  EXPECT_TRUE(app_manager_impl_->IsAppsQueriedFrom(device_handle));
+  app_manager_impl_->RemoveDevice(device_handle);
+  EXPECT_FALSE(app_manager_impl_->IsAppsQueriedFrom(device_handle));
+}
+
 }  // namespace application_manager_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/application_state_test.cc b/src/components/application_manager/test/application_state_test.cc
index 5ebcdd29c7..22d111f926 100644
--- a/src/components/application_manager/test/application_state_test.cc
+++ b/src/components/application_manager/test/application_state_test.cc
@@ -50,6 +50,11 @@ using namespace mobile_apis;
 typedef HmiState::StateID StateID;
 
 namespace {
+
+const WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const std::string kDefaultWindowName = "DefaultName";
+
 std::vector<StateID> GenerateCurrentStates() {
   std::vector<StateID> states;
   states.push_back(StateID::STATE_ID_PHONE_CALL);
@@ -87,8 +92,8 @@ TEST_F(ApplicationStateTest, AddStates_GetCurrentStates) {
         static_cast<std::shared_ptr<Application> >(mock_app_),
         app_mngr_,
         *new_state);
-    app_state.AddState(state);
-    EXPECT_EQ(state, app_state.GetState(current_id));
+    app_state.AddState(kDefaultWindowId, state);
+    EXPECT_EQ(state, app_state.GetState(kDefaultWindowId, current_id));
   }
 }
 
@@ -99,16 +104,16 @@ TEST_F(ApplicationStateTest, AddStates_RemoveStates_GetCurrentState) {
         static_cast<std::shared_ptr<Application> >(mock_app_),
         app_mngr_,
         *new_state);
-    app_state.AddState(state);
+    app_state.AddState(kDefaultWindowId, state);
 
-    HmiStatePtr curr_state = app_state.GetState(current_id);
+    HmiStatePtr curr_state = app_state.GetState(kDefaultWindowId, current_id);
     ASSERT_EQ(*new_state, curr_state->state_id());
   }
 
   new_state = added_states_.end() - 1;
   while (new_state != added_states_.begin()) {
-    app_state.RemoveState(*new_state);
-    HmiStatePtr curr_state = app_state.GetState(current_id);
+    app_state.RemoveState(kDefaultWindowId, *new_state);
+    HmiStatePtr curr_state = app_state.GetState(kDefaultWindowId, current_id);
     --new_state;
     EXPECT_EQ(*new_state, curr_state->state_id());
   }
@@ -122,19 +127,20 @@ TEST_F(ApplicationStateTest, AddStatesAddPostponedState_GetPostponedState) {
         static_cast<std::shared_ptr<Application> >(mock_app_),
         app_mngr_,
         *new_state);
-    app_state.AddState(state);
+    app_state.AddState(kDefaultWindowId, state);
   }
   // Postponed state wasn't added
-  HmiStatePtr get_postponed_id = app_state.GetState(postponed_id);
+  HmiStatePtr get_postponed_id =
+      app_state.GetState(kDefaultWindowId, postponed_id);
   EXPECT_EQ(nullptr, get_postponed_id);
   // Add posponed state
   HmiStatePtr state = std::make_shared<HmiState>(
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       postponed_id);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
   // Postponed state exists
-  get_postponed_id = app_state.GetState(postponed_id);
+  get_postponed_id = app_state.GetState(kDefaultWindowId, postponed_id);
   EXPECT_EQ(state, get_postponed_id);
 }
 
@@ -146,7 +152,7 @@ TEST_F(ApplicationStateTest, AddStates_GetRegularState) {
       app_mngr_,
       *new_state);
   state->set_hmi_level(HMILevel::HMI_FULL);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
   ++new_state;
   // Add some other
   for (; new_state != added_states_.end(); ++new_state) {
@@ -154,13 +160,14 @@ TEST_F(ApplicationStateTest, AddStates_GetRegularState) {
         static_cast<std::shared_ptr<Application> >(mock_app_),
         app_mngr_,
         *new_state);
-    app_state.AddState(state);
+    app_state.AddState(kDefaultWindowId, state);
     state->set_hmi_level(HMILevel::HMI_LIMITED);
   }
 
   // Regular state will be the first added state
   new_state = added_states_.begin();
-  HmiStatePtr reg_state = app_state.GetState(StateID::STATE_ID_REGULAR);
+  HmiStatePtr reg_state =
+      app_state.GetState(kDefaultWindowId, StateID::STATE_ID_REGULAR);
   EXPECT_EQ(*new_state, reg_state->state_id());
   EXPECT_EQ(HMILevel::HMI_FULL, reg_state->hmi_level());
 }
@@ -171,7 +178,7 @@ TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) {
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       *new_state);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
   ++new_state;
 
   // Add postponed state
@@ -179,10 +186,10 @@ TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) {
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       postponed_id);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
 
   // Make sure that the state was added
-  HmiStatePtr post_state = app_state.GetState(postponed_id);
+  HmiStatePtr post_state = app_state.GetState(kDefaultWindowId, postponed_id);
   ASSERT_EQ(state, post_state);
 
   for (; new_state != added_states_.end(); ++new_state) {
@@ -190,19 +197,20 @@ TEST_F(ApplicationStateTest, AddRegularState_RemoveFirstState_GetRegularState) {
         static_cast<std::shared_ptr<Application> >(mock_app_),
         app_mngr_,
         *new_state);
-    app_state.AddState(state);
+    app_state.AddState(kDefaultWindowId, state);
   }
 
   // Regular state will be the first added state
   new_state = added_states_.begin();
-  HmiStatePtr reg_state = app_state.GetState(StateID::STATE_ID_REGULAR);
+  HmiStatePtr reg_state =
+      app_state.GetState(kDefaultWindowId, StateID::STATE_ID_REGULAR);
   ASSERT_EQ(*new_state, reg_state->state_id());
 
-  app_state.RemoveState(*new_state);
+  app_state.RemoveState(kDefaultWindowId, *new_state);
 
   ++new_state;
   // Now regular state is the next state except postponed
-  reg_state = app_state.GetState(StateID::STATE_ID_REGULAR);
+  reg_state = app_state.GetState(kDefaultWindowId, StateID::STATE_ID_REGULAR);
   EXPECT_EQ(*new_state, reg_state->state_id());
 }
 
@@ -213,14 +221,14 @@ TEST_F(ApplicationStateTest, AddRegularState_PreviousStatePostponed) {
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       first_state);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
 
   // Add postponed state
   state = std::make_shared<HmiState>(
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       postponed_id);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
 
   // Add new postponed state
   std::shared_ptr<MockApplication> mock_app_2(new MockApplication);
@@ -228,21 +236,22 @@ TEST_F(ApplicationStateTest, AddRegularState_PreviousStatePostponed) {
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       postponed_id);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
 
   // Add regular state
   state = std::make_shared<HmiState>(
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       StateID::STATE_ID_REGULAR);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
 
   // Postponed state is the first
-  HmiStatePtr reg_state = app_state.GetState(StateID::STATE_ID_POSTPONED);
+  HmiStatePtr reg_state =
+      app_state.GetState(kDefaultWindowId, StateID::STATE_ID_POSTPONED);
   ASSERT_EQ(postponed_id, reg_state->state_id());
 
   // Regular state is the second one
-  reg_state = app_state.GetState(StateID::STATE_ID_REGULAR);
+  reg_state = app_state.GetState(kDefaultWindowId, StateID::STATE_ID_REGULAR);
   EXPECT_EQ(StateID::STATE_ID_REGULAR, reg_state->state_id());
 }
 
@@ -253,12 +262,14 @@ TEST_F(ApplicationStateTest, InitState_GetRegularState) {
       app_mngr_,
       init_state);
 
-  app_state.InitState(state);
+  app_state.InitState(kDefaultWindowId, kDefaultWindowName, state);
 
-  HmiStatePtr reg_state = app_state.GetState(StateID::STATE_ID_REGULAR);
+  HmiStatePtr reg_state =
+      app_state.GetState(kDefaultWindowId, StateID::STATE_ID_REGULAR);
   EXPECT_EQ(state, reg_state);
 
-  HmiStatePtr curr_state = app_state.GetState(StateID::STATE_ID_CURRENT);
+  HmiStatePtr curr_state =
+      app_state.GetState(kDefaultWindowId, StateID::STATE_ID_CURRENT);
   EXPECT_EQ(state, curr_state);
 }
 
@@ -271,23 +282,24 @@ TEST_F(ApplicationStateTest, AddPosponedState_DeletePosponedState) {
       init_state);
   state->set_hmi_level(mobile_apis::HMILevel::HMI_FULL);
 
-  app_state.InitState(state);
+  app_state.InitState(kDefaultWindowId, kDefaultWindowName, state);
 
   // Add postponed state
   state = std::make_shared<HmiState>(
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       postponed_id);
-  app_state.AddState(state);
+  app_state.AddState(kDefaultWindowId, state);
 
   // Make sure that state was added
-  HmiStatePtr get_postponed_state = app_state.GetState(postponed_id);
+  HmiStatePtr get_postponed_state =
+      app_state.GetState(kDefaultWindowId, postponed_id);
   ASSERT_EQ(state, get_postponed_state);
 
   // Remove postponed state
-  app_state.RemoveState(postponed_id);
+  app_state.RemoveState(kDefaultWindowId, postponed_id);
 
-  get_postponed_state = app_state.GetState(postponed_id);
+  get_postponed_state = app_state.GetState(kDefaultWindowId, postponed_id);
   EXPECT_EQ(nullptr, get_postponed_state);
 }
 
@@ -298,13 +310,13 @@ TEST_F(ApplicationStateTest,
       static_cast<std::shared_ptr<Application> >(mock_app_),
       app_mngr_,
       reg_state);
-  app_state.InitState(state);
+  app_state.InitState(kDefaultWindowId, kDefaultWindowName, state);
 
   // Try deleting regular state
-  app_state.RemoveState(reg_state);
+  app_state.RemoveState(kDefaultWindowId, reg_state);
 
   // Get regular state
-  HmiStatePtr get_reg_state = app_state.GetState(reg_state);
+  HmiStatePtr get_reg_state = app_state.GetState(kDefaultWindowId, reg_state);
   EXPECT_EQ(state, get_reg_state);
 }
 
diff --git a/src/components/application_manager/test/command_holder_test.cc b/src/components/application_manager/test/command_holder_test.cc
index 8a5c639775..acde0bfd86 100644
--- a/src/components/application_manager/test/command_holder_test.cc
+++ b/src/components/application_manager/test/command_holder_test.cc
@@ -80,8 +80,10 @@ class CommandHolderImplTest : public testing::Test {
 
 TEST_F(CommandHolderImplTest, HoldOne_ExpectReleaseOne) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
   // Act
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_, _));
@@ -93,8 +95,10 @@ TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
 
   int32_t iterations = 0;
   do {
-    cmd_holder.Suspend(
-        mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+    cmd_holder.Suspend(mock_app_ptr_,
+                       am::CommandHolder::CommandType::kHmiCommand,
+                       am::commands::Command::CommandSource::SOURCE_HMI,
+                       cmd_ptr_);
     ++iterations;
   } while (iterations < 5);
 
@@ -106,10 +110,14 @@ TEST_F(CommandHolderImplTest, HoldMany_ExpectReleaseSame) {
 
 TEST_F(CommandHolderImplTest, Hold_Drop_ExpectNoReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
   // Act
   cmd_holder.Clear(mock_app_ptr_);
@@ -119,10 +127,14 @@ TEST_F(CommandHolderImplTest, Hold_Drop_ExpectNoReleased) {
 
 TEST_F(CommandHolderImplTest, Hold_ReleaseAnotherId_ExpectNoReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
   // Act
   std::shared_ptr<MockApplication> another_app =
@@ -137,8 +149,10 @@ TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
 
   int32_t iterations = 0;
   do {
-    cmd_holder.Suspend(
-        mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+    cmd_holder.Suspend(mock_app_ptr_,
+                       am::CommandHolder::CommandType::kHmiCommand,
+                       am::commands::Command::CommandSource::SOURCE_HMI,
+                       cmd_ptr_);
     ++iterations;
   } while (iterations < 3);
 
@@ -155,11 +169,15 @@ TEST_F(CommandHolderImplTest, Hold_DropAnotherId_ExpectReleased) {
 TEST_F(CommandHolderImplTest, Hold_Mobile_and_HMI_commands_ExpectReleased) {
   am::CommandHolderImpl cmd_holder(mock_app_manager_);
 
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kHmiCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kHmiCommand,
+                     am::commands::Command::CommandSource::SOURCE_HMI,
+                     cmd_ptr_);
 
-  cmd_holder.Suspend(
-      mock_app_ptr_, am::CommandHolder::CommandType::kMobileCommand, cmd_ptr_);
+  cmd_holder.Suspend(mock_app_ptr_,
+                     am::CommandHolder::CommandType::kMobileCommand,
+                     am::commands::Command::CommandSource::SOURCE_MOBILE,
+                     cmd_ptr_);
 
   // Act
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(cmd_ptr_, _));
diff --git a/src/components/application_manager/test/commands/CMakeLists.txt b/src/components/application_manager/test/commands/CMakeLists.txt
index 556f3a5032..ec7f454c47 100644
--- a/src/components/application_manager/test/commands/CMakeLists.txt
+++ b/src/components/application_manager/test/commands/CMakeLists.txt
@@ -58,7 +58,7 @@ set(LIBRARIES
   connectionHandler
   ApplicationManager
   jsoncpp
-  Policy
+  PolicyStatic
   Resumption
 )
 
diff --git a/src/components/application_manager/test/commands/command_request_impl_test.cc b/src/components/application_manager/test/commands/command_request_impl_test.cc
index cf26c19249..9034bf442f 100644
--- a/src/components/application_manager/test/commands/command_request_impl_test.cc
+++ b/src/components/application_manager/test/commands/command_request_impl_test.cc
@@ -53,6 +53,7 @@
 
 #include "application_manager/mock_app_service_manager.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 
 namespace test {
 namespace components {
@@ -95,6 +96,9 @@ const std::string kDisallowedParam2 = "disallowed_param2";
 const std::string kAllowedParam = "allowed_param";
 const std::string kUndefinedParam = "undefined_params";
 const std::string kMissedParam = "missed_param";
+const std::string kAppStorageFolder = "app_storage_folder";
+const std::string kAppStorageFile = "./app_info.dat";
+const std::string kAppInfoStorage = "app_info_storage";
 }  // namespace
 
 class CommandRequestImplTest
@@ -154,6 +158,13 @@ class CommandRequestImplTest
 typedef CommandRequestImplTest::UnwrappedCommandRequestImpl UCommandRequestImpl;
 typedef std::shared_ptr<UCommandRequestImpl> CommandPtr;
 
+TEST_F(CommandRequestImplTest, WindowID_ExpectDefaultWindowID) {
+  auto msg = CreateMessage();
+  const auto command = CreateCommand<UCommandRequestImpl>(msg);
+  EXPECT_EQ(mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            command->window_id());
+}
+
 TEST_F(CommandRequestImplTest, OnTimeOut_StateCompleted_UNSUCCESS) {
   CommandPtr command = CreateCommand<UCommandRequestImpl>();
 
@@ -311,13 +322,6 @@ TEST_F(CommandRequestImplTest, SendHMIRequest_UseEvent_SUCCESS) {
 }
 
 TEST_F(CommandRequestImplTest, RemoveDisallowedParameters_SUCCESS) {
-  am::VehicleData vehicle_data;
-  vehicle_data.insert(am::VehicleData::value_type(
-      kMissedParam, mobile_apis::VehicleDataType::VEHICLEDATA_MYKEY));
-
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
-
   MessageSharedPtr msg = CreateMessage();
   (*msg)[strings::msg_params][kDisallowedParam1] = 0u;
   (*msg)[strings::msg_params][kDisallowedParam2] = 0u;
@@ -326,7 +330,6 @@ TEST_F(CommandRequestImplTest, RemoveDisallowedParameters_SUCCESS) {
   (*msg)[strings::msg_params][kMissedParam] = 0u;
 
   CommandPtr command = CreateCommand<UCommandRequestImpl>(msg);
-
   CommandParametersPermissions& permission = command->parameters_permissions();
   permission.disallowed_params.insert(kDisallowedParam1);
   permission.disallowed_params.insert(kDisallowedParam2);
@@ -366,6 +369,12 @@ TEST_F(CommandRequestImplTest,
 TEST_F(CommandRequestImplTest, CheckAllowedParameters_NoMsgParamsMap_SUCCESS) {
   MockAppPtr mock_app = CreateMockApp();
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app));
+  ON_CALL(*mock_app, GetWindowIds())
+      .WillByDefault(Return(
+          am::WindowIds(1, mobile_apis::PredefinedWindows::DEFAULT_WINDOW)));
+  ON_CALL(*mock_app,
+          WindowIdExists(mobile_apis::PredefinedWindows::DEFAULT_WINDOW))
+      .WillByDefault(Return(true));
 
   MessageSharedPtr message = CreateMessage();
   (*message)[strings::msg_params] =
@@ -373,7 +382,7 @@ TEST_F(CommandRequestImplTest, CheckAllowedParameters_NoMsgParamsMap_SUCCESS) {
 
   CommandPtr command = CreateCommand<UCommandRequestImpl>(message);
 
-  EXPECT_CALL(app_mngr_, CheckPolicyPermissions(_, _, _, _))
+  EXPECT_CALL(app_mngr_, CheckPolicyPermissions(_, _, _, _, _))
       .WillOnce(Return(kMobResultSuccess));
 
   EXPECT_TRUE(command->CheckPermissions());
@@ -383,10 +392,18 @@ TEST_F(CommandRequestImplTest,
        CheckAllowedParameters_WrongPolicyPermissions_UNSUCCESS) {
   MockAppPtr mock_app = CreateMockApp();
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app));
+  ON_CALL(*mock_app, GetWindowIds())
+      .WillByDefault(Return(
+          am::WindowIds(1, mobile_apis::PredefinedWindows::DEFAULT_WINDOW)));
+  ON_CALL(*mock_app,
+          WindowIdExists(mobile_apis::PredefinedWindows::DEFAULT_WINDOW))
+      .WillByDefault(Return(true));
 
   MessageSharedPtr message = CreateMessage();
   (*message)[strings::msg_params] =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
+  (*message)[strings::params][strings::message_type] =
+      mobile_apis::messageType::request;
 
   CommandPtr command = CreateCommand<UCommandRequestImpl>(message);
 
@@ -394,7 +411,7 @@ TEST_F(CommandRequestImplTest,
       .Times(1)
       .WillRepeatedly(Return(kConnectionKey));
 
-  EXPECT_CALL(app_mngr_, CheckPolicyPermissions(_, _, _, _))
+  EXPECT_CALL(app_mngr_, CheckPolicyPermissions(_, _, _, _, _))
       .WillOnce(Return(mobile_apis::Result::INVALID_ENUM));
 
   EXPECT_CALL(mock_message_helper_, CreateBlockedByPoliciesResponse(_, _, _, _))
@@ -405,7 +422,7 @@ TEST_F(CommandRequestImplTest,
 }
 
 ACTION_P(GetArg3, output) {
-  *output = arg2;
+  *output = arg3;
 }
 
 TEST_F(CommandRequestImplTest, CheckAllowedParameters_MsgParamsMap_SUCCESS) {
@@ -417,9 +434,14 @@ TEST_F(CommandRequestImplTest, CheckAllowedParameters_MsgParamsMap_SUCCESS) {
 
   MockAppPtr app = CreateMockApp();
   ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app));
+  ON_CALL(*app, GetWindowIds())
+      .WillByDefault(Return(
+          am::WindowIds(1, mobile_apis::PredefinedWindows::DEFAULT_WINDOW)));
+  ON_CALL(*app, WindowIdExists(mobile_apis::PredefinedWindows::DEFAULT_WINDOW))
+      .WillByDefault(Return(true));
 
   RPCParams params;
-  EXPECT_CALL(app_mngr_, CheckPolicyPermissions(_, _, _, _))
+  EXPECT_CALL(app_mngr_, CheckPolicyPermissions(_, _, _, _, _))
       .WillOnce(DoAll(GetArg3(&params), Return(kMobResultSuccess)));
 
   EXPECT_TRUE(command->CheckPermissions());
@@ -432,13 +454,13 @@ TEST_F(CommandRequestImplTest, AddDisallowedParameters_SUCCESS) {
   vehicle_data.insert(am::VehicleData::value_type(
       kDisallowedParam1, mobile_apis::VehicleDataType::VEHICLEDATA_MYKEY));
 
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
-
   MessageSharedPtr msg;
 
   CommandPtr command = CreateCommand<UCommandRequestImpl>(msg);
 
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
+
   command->removed_parameters_permissions().disallowed_params.insert(
       kDisallowedParam1);
 
@@ -485,9 +507,6 @@ TEST_F(CommandRequestImplTest,
   vehicle_data.insert(am::VehicleData::value_type(
       kDisallowedParam1, mobile_apis::VehicleDataType::VEHICLEDATA_MYKEY));
 
-  EXPECT_CALL(mock_message_helper_, vehicle_data())
-      .WillOnce(ReturnRef(vehicle_data));
-
   MessageSharedPtr msg = CreateMessage();
   (*msg)[strings::params][strings::function_id] =
       mobile_apis::FunctionID::SubscribeVehicleDataID;
@@ -499,6 +518,9 @@ TEST_F(CommandRequestImplTest,
 
   MessageSharedPtr result;
 
+  ON_CALL(mock_message_helper_, vehicle_data())
+      .WillByDefault(ReturnRef(vehicle_data));
+
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
@@ -521,8 +543,8 @@ TEST_F(CommandRequestImplTest, HashUpdateAllowed_UpdateExpected) {
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
-  const bool is_succedeed = true;
-  command->SendResponse(is_succedeed, kMobResultSuccess, NULL, NULL);
+  const bool is_succeeded = true;
+  command->SendResponse(is_succeeded, kMobResultSuccess, NULL, NULL);
 
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(mock_app));
@@ -542,8 +564,8 @@ TEST_F(CommandRequestImplTest, HashUpdateDisallowed_HashUpdateNotExpected) {
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
-  const bool is_succedeed = true;
-  command->SendResponse(is_succedeed, kMobResultSuccess, NULL, NULL);
+  const bool is_succeeded = true;
+  command->SendResponse(is_succeeded, kMobResultSuccess, NULL, NULL);
 
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(*mock_app, UpdateHash()).Times(0);
@@ -561,8 +583,8 @@ TEST_F(CommandRequestImplTest, RequestFailed_HashUpdateNotExpected) {
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
-  const bool is_succedeed = false;
-  command->SendResponse(is_succedeed, kMobResultSuccess, NULL, NULL);
+  const bool is_succeeded = false;
+  command->SendResponse(is_succeeded, kMobResultSuccess, NULL, NULL);
 
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(*mock_app, UpdateHash()).Times(0);
@@ -580,8 +602,8 @@ TEST_F(CommandRequestImplTest, AppNotFound_HashUpdateNotExpected) {
   EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
       .WillOnce(DoAll(SaveArg<0>(&result), Return(true)));
 
-  const bool is_succedeed = true;
-  command->SendResponse(is_succedeed, kMobResultSuccess, NULL, NULL);
+  const bool is_succeeded = true;
+  command->SendResponse(is_succeeded, kMobResultSuccess, NULL, NULL);
 
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(MockAppPtr()));
@@ -591,8 +613,10 @@ TEST_F(CommandRequestImplTest, AppNotFound_HashUpdateNotExpected) {
 }
 
 TEST_F(CommandRequestImplTest, SendProviderRequest_ByServiceType) {
-  resumption::LastStateImpl last_state("app_storage_folder",
-                                       "app_info_storage");
+  auto last_state = std::make_shared<resumption::LastStateWrapperImpl>(
+      std::make_shared<resumption::LastStateImpl>(kAppStorageFolder,
+                                                  kAppInfoStorage));
+
   MockAppServiceManager app_service_manager(app_mngr_, last_state);
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(app_mngr_, GetAppServiceManager())
@@ -618,8 +642,10 @@ TEST_F(CommandRequestImplTest, SendProviderRequest_ByServiceType) {
 }
 
 TEST_F(CommandRequestImplTest, SendProviderRequest_ByProviderID) {
-  resumption::LastStateImpl last_state("app_storage_folder",
-                                       "app_info_storage");
+  auto last_state = std::make_shared<resumption::LastStateWrapperImpl>(
+      std::make_shared<resumption::LastStateImpl>(kAppStorageFolder,
+                                                  kAppInfoStorage));
+
   MockAppServiceManager app_service_manager(app_mngr_, last_state);
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(app_mngr_, GetAppServiceManager())
@@ -645,8 +671,10 @@ TEST_F(CommandRequestImplTest, SendProviderRequest_ByProviderID) {
 }
 
 TEST_F(CommandRequestImplTest, SendProviderRequestToHMI_ByProviderID) {
-  resumption::LastStateImpl last_state("app_storage_folder",
-                                       "app_info_storage");
+  auto last_state = std::make_shared<resumption::LastStateWrapperImpl>(
+      std::make_shared<resumption::LastStateImpl>(kAppStorageFolder,
+                                                  kAppInfoStorage));
+
   MockAppServiceManager app_service_manager(app_mngr_, last_state);
   MockAppPtr mock_app = CreateMockApp();
   EXPECT_CALL(app_mngr_, GetAppServiceManager())
diff --git a/src/components/application_manager/test/help_prompt_manager_test.cc b/src/components/application_manager/test/help_prompt_manager_test.cc
index dc6635b049..caff56f675 100644
--- a/src/components/application_manager/test/help_prompt_manager_test.cc
+++ b/src/components/application_manager/test/help_prompt_manager_test.cc
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) 2018, Ford Motor Company
  * All rights reserved.
  *
@@ -65,6 +65,9 @@ const std::string kDirectoryName = "./test_storage";
 const uint8_t expected_tread_pool_size = 2u;
 const uint8_t stop_streaming_timeout = 1u;
 const std::vector<std::string> kTimeoutPrompt{"timeoutPrompt"};
+const WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const std::string kDefaultWindowName = "DefaultName";
 }  // namespace
 
 using namespace application_manager;
@@ -177,8 +180,10 @@ void HelpPromptManagerTest::SetUp() {
   mock_help_prompt_manager_ =
       std::shared_ptr<MockHelpPromptManager>(new MockHelpPromptManager());
 
-  std::string path = file_system::CreateDirectory("storage");
-  file_system::CreateFile(path + "/" + "certificate");
+  const std::string path("storage");
+  if (file_system::CreateDirectory(path)) {
+    file_system::CreateFile(path + "/" + "certificate");
+  }
 
   mock_app_ = std::make_shared<application_manager_test::MockApplication>();
 }
@@ -244,7 +249,8 @@ void HelpPromptManagerTest::CreateApplication(
                               app_mngr_,
                               mock_help_prompt_manager));
   HmiStatePtr initial_state = CreateTestHmiState();
-  app_impl_->SetInitialState(initial_state);
+  app_impl_->SetInitialState(
+      kDefaultWindowId, kDefaultWindowName, initial_state);
 }
 
 TEST_F(HelpPromptManagerTest, AddCommand_OnVrCommandAdded) {
diff --git a/src/components/application_manager/test/hmi_capabilities.json b/src/components/application_manager/test/hmi_capabilities.json
index ca67d81d8c..afa5fa6056 100644
--- a/src/components/application_manager/test/hmi_capabilities.json
+++ b/src/components/application_manager/test/hmi_capabilities.json
@@ -355,11 +355,11 @@
                 "STATIC"
             ]
         },
-        "audioPassThruCapabilities": {
+        "audioPassThruCapabilities": [{
             "samplingRate": "44KHZ",
             "bitsPerSample": "RATE_8_BIT",
             "audioType": "PCM"
-        },
+        }],
         "pcmStreamCapabilities": {
             "samplingRate": "16KHZ",
             "bitsPerSample": "RATE_16_BIT",
diff --git a/src/components/application_manager/test/hmi_capabilities_old_apt.json b/src/components/application_manager/test/hmi_capabilities_old_apt.json
new file mode 100644
index 0000000000..5a5af37e2f
--- /dev/null
+++ b/src/components/application_manager/test/hmi_capabilities_old_apt.json
@@ -0,0 +1,9 @@
+{
+  "UI": {
+    "audioPassThruCapabilities": {
+      "samplingRate": "22KHZ",
+      "bitsPerSample": "RATE_16_BIT",
+      "audioType": "PCM"
+    }
+  }
+}
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index e883e7bddb..6234830f50 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -50,6 +50,7 @@
 #include "application_manager/resumption/resume_ctrl.h"
 #include "application_manager/state_controller.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "utils/file_system.h"
 
 namespace test {
@@ -68,7 +69,9 @@ using namespace application_manager;
 class HMICapabilitiesTest : public ::testing::Test {
  protected:
   HMICapabilitiesTest()
-      : last_state_("app_storage_folder", "app_info_data")
+      : last_state_wrapper_(std::make_shared<resumption::LastStateWrapperImpl>(
+            std::make_shared<resumption::LastStateImpl>("app_storage_folder",
+                                                        "app_info_storage")))
       , file_name_("hmi_capabilities.json") {}
   virtual void SetUp() OVERRIDE {
     EXPECT_CALL(app_mngr_, event_dispatcher())
@@ -84,7 +87,7 @@ class HMICapabilitiesTest : public ::testing::Test {
         .WillOnce(Return(false));
     hmi_capabilities_test =
         std::make_shared<HMICapabilitiesForTesting>(app_mngr_);
-    hmi_capabilities_test->Init(&last_state_);
+    hmi_capabilities_test->Init(last_state_wrapper_);
   }
 
   void TearDown() OVERRIDE {
@@ -99,7 +102,7 @@ class HMICapabilitiesTest : public ::testing::Test {
   void SetCooperating();
   MockApplicationManager app_mngr_;
   event_engine_test::MockEventDispatcher mock_event_dispatcher;
-  resumption::LastStateImpl last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   MockApplicationManagerSettings mock_application_manager_settings_;
   std::shared_ptr<HMICapabilitiesForTesting> hmi_capabilities_test;
   const std::string file_name_;
@@ -336,15 +339,18 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
   // Check audio pass thru
   const smart_objects::SmartObject audio_pass_thru_capabilities_so =
       *(hmi_capabilities_test->audio_pass_thru_capabilities());
+  EXPECT_EQ(smart_objects::SmartType_Array,
+            audio_pass_thru_capabilities_so.getType());
+  EXPECT_EQ(1u, audio_pass_thru_capabilities_so.length());
   EXPECT_EQ(hmi_apis::Common_SamplingRate::RATE_44KHZ,
             static_cast<hmi_apis::Common_SamplingRate::eType>(
-                audio_pass_thru_capabilities_so["samplingRate"].asInt()));
+                audio_pass_thru_capabilities_so[0]["samplingRate"].asInt()));
   EXPECT_EQ(hmi_apis::Common_BitsPerSample::RATE_8_BIT,
             static_cast<hmi_apis::Common_BitsPerSample::eType>(
-                audio_pass_thru_capabilities_so["bitsPerSample"].asInt()));
+                audio_pass_thru_capabilities_so[0]["bitsPerSample"].asInt()));
   EXPECT_EQ(hmi_apis::Common_AudioType::PCM,
             static_cast<hmi_apis::Common_AudioType::eType>(
-                audio_pass_thru_capabilities_so["audioType"].asInt()));
+                audio_pass_thru_capabilities_so[0]["audioType"].asInt()));
 
   // Check hmi zone capabilities
   const smart_objects::SmartObject hmi_zone_capabilities_so =
@@ -511,7 +517,7 @@ TEST_F(HMICapabilitiesTest,
 
   std::shared_ptr<HMICapabilitiesForTesting> hmi_capabilities =
       std::make_shared<HMICapabilitiesForTesting>(mock_app_mngr);
-  hmi_capabilities->Init(&last_state_);
+  hmi_capabilities->Init(last_state_wrapper_);
 
   // Check system capabilities; only phone capability is available
   EXPECT_FALSE(hmi_capabilities->navigation_supported());
@@ -551,7 +557,7 @@ TEST_F(HMICapabilitiesTest,
 
   std::shared_ptr<HMICapabilitiesForTesting> hmi_capabilities =
       std::make_shared<HMICapabilitiesForTesting>(mock_app_mngr);
-  hmi_capabilities->Init(&last_state_);
+  hmi_capabilities->Init(last_state_wrapper_);
 
   // Check system capabilities; only navigation capability is valid, the other
   // two are empty
@@ -569,6 +575,59 @@ TEST_F(HMICapabilitiesTest,
   EXPECT_FALSE(navigation_capability_so["getWayPointsEnabled"].asBool());
 }
 
+TEST_F(HMICapabilitiesTest,
+       LoadCapabilitiesFromFileAndVerifyOldAudioPassThruCapabilities) {
+  MockApplicationManager mock_app_mngr;
+  event_engine_test::MockEventDispatcher mock_dispatcher;
+  MockApplicationManagerSettings mock_application_manager_settings;
+
+  const std::string hmi_capabilities_file = "hmi_capabilities_old_apt.json";
+
+  EXPECT_CALL(mock_app_mngr, event_dispatcher())
+      .WillOnce(ReturnRef(mock_dispatcher));
+  EXPECT_CALL(mock_app_mngr, get_settings())
+      .WillRepeatedly(ReturnRef(mock_application_manager_settings));
+  EXPECT_CALL(mock_application_manager_settings, hmi_capabilities_file_name())
+      .WillOnce(ReturnRef(hmi_capabilities_file));
+  EXPECT_CALL(mock_dispatcher, add_observer(_, _, _)).Times(1);
+  EXPECT_CALL(mock_dispatcher, remove_observer(_)).Times(1);
+  EXPECT_CALL(mock_application_manager_settings, launch_hmi())
+      .WillOnce(Return(false));
+  EXPECT_CALL(*(MockMessageHelper::message_helper_mock()),
+              CommonLanguageFromString(_))
+      .WillRepeatedly(Invoke(TestCommonLanguageFromString));
+
+  if (file_system::FileExists("./app_info_data")) {
+    EXPECT_TRUE(::file_system::DeleteFile("./app_info_data"));
+  }
+
+  std::shared_ptr<HMICapabilitiesForTesting> hmi_capabilities =
+      std::make_shared<HMICapabilitiesForTesting>(mock_app_mngr);
+  hmi_capabilities->Init(last_state_wrapper_);
+
+  // with old audio pass thru format, the object is an array containing a single
+  // object
+  smart_objects::SmartObjectSPtr audio_pass_thru_capabilities_so =
+      hmi_capabilities->audio_pass_thru_capabilities();
+  EXPECT_EQ(smart_objects::SmartType_Array,
+            audio_pass_thru_capabilities_so->getType());
+  EXPECT_EQ(1u, audio_pass_thru_capabilities_so->length());
+  smart_objects::SmartObject& first_element =
+      (*audio_pass_thru_capabilities_so)[0];
+  EXPECT_TRUE(first_element.keyExists("samplingRate"));
+  EXPECT_EQ(hmi_apis::Common_SamplingRate::RATE_22KHZ,
+            static_cast<hmi_apis::Common_SamplingRate::eType>(
+                first_element["samplingRate"].asInt()));
+  EXPECT_TRUE(first_element.keyExists("bitsPerSample"));
+  EXPECT_EQ(hmi_apis::Common_BitsPerSample::RATE_16_BIT,
+            static_cast<hmi_apis::Common_BitsPerSample::eType>(
+                first_element["bitsPerSample"].asInt()));
+  EXPECT_TRUE(first_element.keyExists("audioType"));
+  EXPECT_EQ(hmi_apis::Common_AudioType::PCM,
+            static_cast<hmi_apis::Common_AudioType::eType>(
+                first_element["audioType"].asInt()));
+}
+
 TEST_F(HMICapabilitiesTest, VerifyImageType) {
   const int32_t image_type = 1;
   smart_objects::SmartObject sm_obj;
diff --git a/src/components/application_manager/test/hmi_language_handler_test.cc b/src/components/application_manager/test/hmi_language_handler_test.cc
index 5f07c1b9d1..59913b19be 100644
--- a/src/components/application_manager/test/hmi_language_handler_test.cc
+++ b/src/components/application_manager/test/hmi_language_handler_test.cc
@@ -44,6 +44,7 @@
 #include "application_manager/smart_object_keys.h"
 #include "application_manager/state_controller.h"
 #include "gtest/gtest.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "test/resumption/mock_last_state.h"
 
 #include "utils/lock.h"
@@ -135,7 +136,6 @@ class HmiLanguageHandlerTest : public ::testing::Test {
   MockEventDispatcher event_dispatcher_;
   std::shared_ptr<am::HMILanguageHandler> hmi_language_handler_;
   std::shared_ptr<sync_primitives::Lock> app_set_lock_;
-  resumption_test::MockLastState last_state_;
   MockRPCService mock_rpc_service_;
 };
 
@@ -155,9 +155,12 @@ TEST_F(HmiLanguageHandlerTest, OnEvent_AllLanguageIsReceivedAndSame_SUCCESS) {
 
   // Set up `active_*_language` and
   //`persisted_ui_language_` to be the same
+  auto mock_last_state = std::make_shared<resumption_test::MockLastState>();
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper =
+      std::make_shared<resumption::LastStateWrapperImpl>(mock_last_state);
   Json::Value dictionary = Json::Value();
-  ON_CALL(last_state_, get_dictionary()).WillByDefault(ReturnRef(dictionary));
-  hmi_language_handler_->Init(&last_state_);
+  ON_CALL(*mock_last_state, dictionary()).WillByDefault(Return(dictionary));
+  hmi_language_handler_->Init(last_state_wrapper);
   InitHMICapabilitiesLanguages(hmi_apis::Common_Language::eType::EN_US,
                                hmi_apis::Common_Language::eType::EN_US,
                                hmi_apis::Common_Language::eType::EN_US);
diff --git a/src/components/application_manager/test/include/application_manager/commands/commands_test.h b/src/components/application_manager/test/include/application_manager/commands/commands_test.h
index cd0514a0da..fdaef2c716 100644
--- a/src/components/application_manager/test/include/application_manager/commands/commands_test.h
+++ b/src/components/application_manager/test/include/application_manager/commands/commands_test.h
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_COMMANDS_TEST_H_
-#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_COMMANDS_TEST_H_
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMANDS_TEST_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMANDS_TEST_H_
 
 #include <stdint.h>
 #include "gtest/gtest.h"
@@ -245,6 +245,21 @@ MATCHER_P(HMIResultCodeIs, result_code, "") {
                                       .asInt());
 }
 
+MATCHER_P3(
+    HMIMessageParametersAre, correlation_id, function_id, result_code, "") {
+  using namespace application_manager;
+
+  const bool corr_ids_eq =
+      correlation_id ==
+      (*arg)[strings::params][strings::correlation_id].asInt();
+  const bool func_ids_eq =
+      (*arg)[strings::params][strings::function_id].asInt() == function_id;
+  const bool res_codes_eq =
+      (*arg)[strings::params][hmi_response::code].asInt() == result_code;
+
+  return corr_ids_eq && func_ids_eq && res_codes_eq;
+}
+
 MATCHER_P3(MobileResponseIs, result_code, result_info, result_success, "") {
   mobile_apis::Result::eType code = static_cast<mobile_apis::Result::eType>(
       (*arg)[am::strings::msg_params][am::strings::result_code].asInt());
@@ -259,4 +274,4 @@ MATCHER_P3(MobileResponseIs, result_code, result_info, result_success, "") {
 }  // namespace components
 }  // namespace test
 
-#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_COMMANDS_TEST_H_
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_COMMANDS_COMMANDS_TEST_H_
diff --git a/src/components/application_manager/test/include/application_manager/mock_app_service_manager.h b/src/components/application_manager/test/include/application_manager/mock_app_service_manager.h
index f77b5685da..60d2f90297 100644
--- a/src/components/application_manager/test/include/application_manager/mock_app_service_manager.h
+++ b/src/components/application_manager/test/include/application_manager/mock_app_service_manager.h
@@ -37,6 +37,7 @@
 #include "application_manager/app_service_manager.h"
 #include "application_manager/commands/command.h"
 #include "application_manager/commands/command_impl.h"
+#include "application_manager/rpc_passing_handler.h"
 
 namespace test {
 namespace components {
@@ -45,7 +46,7 @@ namespace application_manager_test {
 class MockAppServiceManager : public application_manager::AppServiceManager {
  public:
   MockAppServiceManager(application_manager::ApplicationManager& app_manager,
-                        resumption::LastState& last_state)
+                        resumption::LastStateWrapperPtr last_state)
       : application_manager::AppServiceManager(app_manager, last_state) {}
   MOCK_METHOD3(
       PublishAppService,
@@ -86,6 +87,7 @@ class MockAppServiceManager : public application_manager::AppServiceManager {
                     const bool service_published));
   MOCK_METHOD1(UpdateNavigationCapabilities,
                bool(smart_objects::SmartObject& out_params));
+  MOCK_METHOD0(GetRPCPassingHandler, application_manager::RPCPassingHandler&());
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h
index 65447b61c5..6eb56cb53e 100644
--- a/src/components/application_manager/test/include/application_manager/mock_application.h
+++ b/src/components/application_manager/test/include/application_manager/mock_application.h
@@ -34,6 +34,8 @@
 #include <string>
 #include "application_manager/app_extension.h"
 #include "application_manager/application.h"
+#include "application_manager/display_capabilities_builder.h"
+#include "application_manager/hmi_state.h"
 #include "application_manager/usage_statistics.h"
 #include "gmock/gmock.h"
 #include "smart_objects/smart_object.h"
@@ -56,6 +58,8 @@ class MockApplication : public ::application_manager::Application {
   MOCK_CONST_METHOD0(is_application_data_changed, bool());
   MOCK_METHOD1(set_is_application_data_changed,
                void(bool state_application_data));
+  MOCK_CONST_METHOD0(is_app_data_resumption_allowed, bool());
+  MOCK_METHOD1(set_app_data_resumption_allowance, void(bool allowed));
   MOCK_METHOD0(CloseActiveMessage, void());
   MOCK_CONST_METHOD0(IsFullscreen, bool());
   MOCK_METHOD0(ChangeSupportingAppHMIType, void());
@@ -82,8 +86,9 @@ class MockApplication : public ::application_manager::Application {
                void(protocol_handler::ServiceType service_type));
   MOCK_METHOD1(SuspendStreaming,
                void(protocol_handler::ServiceType service_type));
-  MOCK_METHOD1(WakeUpStreaming,
-               void(protocol_handler::ServiceType service_type));
+  MOCK_METHOD2(WakeUpStreaming,
+               void(protocol_handler::ServiceType service_type,
+                    uint32_t timer_len));
   MOCK_CONST_METHOD0(is_voice_communication_supported, bool());
   MOCK_METHOD1(set_voice_communication_supported,
                void(bool is_voice_communication_supported));
@@ -97,11 +102,15 @@ class MockApplication : public ::application_manager::Application {
   MOCK_METHOD1(set_folder_name, void(const std::string& folder_name));
   MOCK_CONST_METHOD0(folder_name, const std::string());
   MOCK_CONST_METHOD0(is_media_application, bool());
-  MOCK_CONST_METHOD0(hmi_level, const mobile_apis::HMILevel::eType());
+  MOCK_CONST_METHOD1(hmi_level,
+                     const mobile_apis::HMILevel::eType(
+                         const application_manager::WindowID window_id));
   MOCK_CONST_METHOD0(put_file_in_none_count, const uint32_t());
   MOCK_CONST_METHOD0(delete_file_in_none_count, const uint32_t());
   MOCK_CONST_METHOD0(list_files_in_none_count, const uint32_t());
-  MOCK_CONST_METHOD0(system_context, const mobile_apis::SystemContext::eType());
+  MOCK_CONST_METHOD1(system_context,
+                     const mobile_apis::SystemContext::eType(
+                         const application_manager::WindowID window_id));
   MOCK_CONST_METHOD0(audio_streaming_state,
                      const mobile_apis::AudioStreamingState::eType());
   MOCK_CONST_METHOD0(video_streaming_state,
@@ -109,11 +118,20 @@ class MockApplication : public ::application_manager::Application {
   MOCK_CONST_METHOD0(app_icon_path, const std::string&());
   MOCK_CONST_METHOD0(device, connection_handler::DeviceHandle());
   MOCK_CONST_METHOD0(secondary_device, connection_handler::DeviceHandle());
-  MOCK_CONST_METHOD0(CurrentHmiState, const application_manager::HmiStatePtr());
-  MOCK_CONST_METHOD0(RegularHmiState, const application_manager::HmiStatePtr());
+  MOCK_CONST_METHOD1(CurrentHmiState,
+                     const application_manager::HmiStatePtr(
+                         const application_manager::WindowID window_id));
+  MOCK_CONST_METHOD1(RegularHmiState,
+                     const application_manager::HmiStatePtr(
+                         const application_manager::WindowID window_id));
+  MOCK_CONST_METHOD0(GetWindowIds, application_manager::WindowIds());
+  MOCK_CONST_METHOD0(GetWindowNames, application_manager::WindowNames());
+  MOCK_CONST_METHOD1(WindowIdExists,
+                     bool(const application_manager::WindowID window_id));
   MOCK_CONST_METHOD0(IsAllowedToChangeAudioSource, bool());
-  MOCK_CONST_METHOD0(PostponedHmiState,
-                     const application_manager::HmiStatePtr());
+  MOCK_CONST_METHOD1(PostponedHmiState,
+                     const application_manager::HmiStatePtr(
+                         const application_manager::WindowID window_id));
   MOCK_METHOD1(set_tts_properties_in_none, void(bool active));
   MOCK_METHOD0(tts_properties_in_none, bool());
   MOCK_METHOD1(set_tts_properties_in_full, void(bool active));
@@ -167,14 +185,24 @@ class MockApplication : public ::application_manager::Application {
                ::application_manager::HelpPromptManager&());
   MOCK_CONST_METHOD0(help_prompt_manager,
                      const ::application_manager::HelpPromptManager&());
-  MOCK_METHOD1(SetInitialState, void(::application_manager::HmiStatePtr state));
-  MOCK_METHOD1(SetRegularState, void(::application_manager::HmiStatePtr state));
-  MOCK_METHOD1(SetPostponedState,
-               void(::application_manager::HmiStatePtr state));
-  MOCK_METHOD0(RemovePostponedState, void());
-  MOCK_METHOD1(AddHMIState, void(::application_manager::HmiStatePtr state));
-  MOCK_METHOD1(RemoveHMIState,
-               void(::application_manager::HmiState::StateID state_id));
+  MOCK_METHOD3(SetInitialState,
+               void(const application_manager::WindowID window_id,
+                    const std::string& window_name,
+                    application_manager::HmiStatePtr state));
+  MOCK_METHOD2(SetRegularState,
+               void(const application_manager::WindowID window_id,
+                    application_manager::HmiStatePtr state));
+  MOCK_METHOD2(SetPostponedState,
+               void(const application_manager::WindowID window_id,
+                    ::application_manager::HmiStatePtr state));
+  MOCK_METHOD1(RemovePostponedState,
+               void(const application_manager::WindowID window_id));
+  MOCK_METHOD2(AddHMIState,
+               void(const application_manager::WindowID window_id,
+                    application_manager::HmiStatePtr state));
+  MOCK_METHOD2(RemoveHMIState,
+               void(const application_manager::WindowID window_id,
+                    ::application_manager::HmiState::StateID state_id));
   MOCK_METHOD2(SubscribeToSoftButtons,
                void(int32_t cmd_id,
                     const ::application_manager::SoftButtonID& softbuttons_id));
@@ -220,9 +248,35 @@ class MockApplication : public ::application_manager::Application {
   MOCK_CONST_METHOD0(keyboard_props, const smart_objects::SmartObject*());
   MOCK_CONST_METHOD0(menu_title, const smart_objects::SmartObject*());
   MOCK_CONST_METHOD0(menu_icon, const smart_objects::SmartObject*());
-  MOCK_CONST_METHOD0(day_color_scheme, const smart_objects::SmartObject*());
-  MOCK_CONST_METHOD0(night_color_scheme, const smart_objects::SmartObject*());
-  MOCK_CONST_METHOD0(display_layout, const std::string&());
+  MOCK_CONST_METHOD0(day_color_scheme, smart_objects::SmartObject());
+  MOCK_CONST_METHOD0(night_color_scheme, smart_objects::SmartObject());
+  MOCK_CONST_METHOD0(display_layout, std::string());
+  MOCK_CONST_METHOD0(display_capabilities, smart_objects::SmartObjectSPtr());
+  MOCK_CONST_METHOD1(display_capabilities,
+                     smart_objects::SmartObjectSPtr(
+                         const application_manager::WindowID window_id));
+
+  MOCK_METHOD2(set_window_layout,
+               void(const application_manager::WindowID window_id,
+                    const std::string& layout));
+  MOCK_METHOD2(set_day_color_scheme,
+               void(const application_manager::WindowID window_id,
+                    const smart_objects::SmartObject& color_scheme));
+  MOCK_METHOD2(set_night_color_scheme,
+               void(const application_manager::WindowID window_id,
+                    const smart_objects::SmartObject& color_scheme));
+  MOCK_CONST_METHOD1(
+      window_layout,
+      std::string(const application_manager::WindowID window_id));
+  MOCK_CONST_METHOD1(day_color_scheme,
+                     smart_objects::SmartObject(
+                         const application_manager::WindowID window_id));
+  MOCK_CONST_METHOD1(night_color_scheme,
+                     smart_objects::SmartObject(
+                         const application_manager::WindowID window_id));
+  MOCK_METHOD1(set_display_capabilities,
+               void(const smart_objects::SmartObject& display_capabilities));
+
   MOCK_METHOD1(load_global_properties,
                void(const smart_objects::SmartObject& so));
   MOCK_METHOD1(set_help_prompt,
@@ -317,9 +371,10 @@ class MockApplication : public ::application_manager::Application {
       SwapMobileMessageQueue,
       void(::application_manager::MobileMessageQueue& mobile_messages));
 
-  MOCK_METHOD1(
+  MOCK_METHOD2(
       set_system_context,
-      void(const application_manager::mobile_api::SystemContext::eType&));
+      void(const application_manager::WindowID window_id,
+           const application_manager::mobile_api::SystemContext::eType&));
   MOCK_METHOD1(
       set_audio_streaming_state,
       void(const application_manager::mobile_api::AudioStreamingState::eType&
@@ -330,9 +385,10 @@ class MockApplication : public ::application_manager::Application {
                bool(smart_objects::SmartObject module));
   MOCK_METHOD1(UnsubscribeFromInteriorVehicleData,
                bool(smart_objects::SmartObject module));
-  MOCK_METHOD1(
+  MOCK_METHOD2(
       set_hmi_level,
-      void(const application_manager::mobile_api::HMILevel::eType& hmi_level));
+      void(const application_manager::WindowID window_id,
+           const application_manager::mobile_api::HMILevel::eType& hmi_level));
   MOCK_METHOD1(QueryInterface,
                application_manager::AppExtensionPtr(
                    application_manager::AppExtensionUID uid));
@@ -358,6 +414,24 @@ class MockApplication : public ::application_manager::Application {
                void(const mobile_apis::HybridAppPreference::eType&
                         hybrid_app_preference));
   MOCK_METHOD1(set_cloud_app_certificate, void(const std::string& certificate));
+  MOCK_METHOD2(SetWindowInfo,
+               void(const ::application_manager::WindowID windowID,
+                    const smart_objects::SmartObject& window_info));
+  MOCK_METHOD1(RemoveWindowInfo,
+               void((const ::application_manager::WindowID window_id)));
+  MOCK_CONST_METHOD0(window_optional_params_map,
+                     DataAccessor< ::application_manager::WindowParamsMap>());
+  MOCK_METHOD0(display_capabilities_builder,
+               application_manager::DisplayCapabilitiesBuilder&());
+  MOCK_METHOD1(GetSoftButtonWindowID,
+               application_manager::WindowID(const uint32_t button_id));
+  MOCK_METHOD1(remove_window_capability,
+               void(const application_manager::WindowID window_id));
+  MOCK_CONST_METHOD1(menu_layout_supported,
+                     bool(const mobile_apis::MenuLayout::eType layout));
+  MOCK_METHOD1(set_user_location,
+               void(const smart_objects::SmartObject& user_location));
+  MOCK_CONST_METHOD0(get_user_location, const smart_objects::SmartObject&());
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/application_manager/test/include/application_manager/mock_command_holder.h b/src/components/application_manager/test/include/application_manager/mock_command_holder.h
new file mode 100644
index 0000000000..0391808126
--- /dev/null
+++ b/src/components/application_manager/test/include/application_manager/mock_command_holder.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_COMMAND_HOLDER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_COMMAND_HOLDER_H_
+#include "application_manager/command_holder.h"
+#include "gmock/gmock.h"
+
+namespace test {
+namespace components {
+namespace application_manager_test {
+
+class MockCommandHolder : public application_manager::CommandHolder {
+ public:
+  MOCK_METHOD4(
+      Suspend,
+      void(application_manager::ApplicationSharedPtr application,
+           application_manager::CommandHolder::CommandType type,
+           application_manager::commands::Command::CommandSource source,
+           smart_objects::SmartObjectSPtr command));
+  MOCK_METHOD2(Resume,
+               void(application_manager::ApplicationSharedPtr application,
+                    application_manager::CommandHolder::CommandType type));
+  MOCK_METHOD1(Clear,
+               void(application_manager::ApplicationSharedPtr application));
+};
+
+}  // namespace application_manager_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_COMMAND_HOLDER_H_
diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
index 21641d8ab4..b2753fc8a4 100644
--- a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
+++ b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h
@@ -99,55 +99,64 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
   MOCK_METHOD1(set_tts_supported_languages,
                void(const smart_objects::SmartObject& supported_languages));
 
-  MOCK_CONST_METHOD0(display_capabilities, const smart_objects::SmartObject*());
+  MOCK_CONST_METHOD0(display_capabilities,
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_display_capabilities,
                void(const smart_objects::SmartObject& display_capabilities));
 
+  MOCK_CONST_METHOD0(system_display_capabilities,
+                     const smart_objects::SmartObjectSPtr());
+  MOCK_METHOD1(set_system_display_capabilities,
+               void(const smart_objects::SmartObject& display_capabilities));
+
   MOCK_CONST_METHOD0(hmi_zone_capabilities,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_hmi_zone_capabilities,
                void(const smart_objects::SmartObject& hmi_zone_capabilities));
 
   MOCK_CONST_METHOD0(soft_button_capabilities,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(
       set_soft_button_capabilities,
       void(const smart_objects::SmartObject& soft_button_capabilities));
 
-  MOCK_CONST_METHOD0(button_capabilities, const smart_objects::SmartObject*());
+  MOCK_CONST_METHOD0(button_capabilities,
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_button_capabilities,
                void(const smart_objects::SmartObject& button_capabilities));
 
-  MOCK_CONST_METHOD0(speech_capabilities, const smart_objects::SmartObject*());
+  MOCK_CONST_METHOD0(speech_capabilities,
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_speech_capabilities,
                void(const smart_objects::SmartObject& speech_capabilities));
 
-  MOCK_CONST_METHOD0(vr_capabilities, const smart_objects::SmartObject*());
+  MOCK_CONST_METHOD0(vr_capabilities, const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_vr_capabilities,
                void(const smart_objects::SmartObject& vr_capabilities));
 
   MOCK_CONST_METHOD0(audio_pass_thru_capabilities,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(
       set_audio_pass_thru_capabilities,
       void(const smart_objects::SmartObject& audio_pass_thru_capabilities));
 
   MOCK_CONST_METHOD0(pcm_stream_capabilities,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_pcm_stream_capabilities,
                void(const smart_objects::SmartObject& pcm_stream_capabilities));
 
   MOCK_CONST_METHOD0(preset_bank_capabilities,
-                     const smart_objects::SmartObject*());
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(
       set_preset_bank_capabilities,
       void(const smart_objects::SmartObject& preset_bank_capabilities));
 
-  MOCK_CONST_METHOD0(vehicle_type, const smart_objects::SmartObject*());
+  MOCK_CONST_METHOD0(vehicle_type, const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_vehicle_type,
                void(const smart_objects::SmartObject& vehicle_type));
 
-  MOCK_CONST_METHOD0(prerecorded_speech, const smart_objects::SmartObject*());
+  MOCK_CONST_METHOD0(prerecorded_speech,
+                     const smart_objects::SmartObjectSPtr());
   MOCK_METHOD1(set_prerecorded_speech,
                void(const smart_objects::SmartObject& prerecorded_speech));
 
@@ -184,14 +193,26 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
   MOCK_METHOD1(set_rc_capability,
                void(const smart_objects::SmartObject& rc_capability));
 
+<<<<<<< HEAD
   MOCK_CONST_METHOD0(driver_distraction_capability,
                      const smart_objects::SmartObject*());
   MOCK_METHOD1(
       set_driver_distraction_capability,
       void(const smart_objects::SmartObject& driver_distraction_capability));
 
+=======
+  MOCK_CONST_METHOD0(seat_location_capability,
+                     const smart_objects::SmartObject*());
+  MOCK_METHOD1(
+      set_seat_location_capability,
+      void(const smart_objects::SmartObject& seat_location_capability));
+
+  DEPRECATED
+>>>>>>> origin/develop
   MOCK_METHOD1(Init, void(resumption::LastState* last_state));
 
+  MOCK_METHOD1(Init, void(resumption::LastStateWrapperPtr last_state_wrapper));
+
   MOCK_CONST_METHOD0(ccpu_version, const std::string&());
   MOCK_METHOD1(set_ccpu_version, void(const std::string& ccpu_version));
   MOCK_METHOD0(get_hmi_language_handler,
@@ -207,6 +228,9 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities {
   MOCK_CONST_METHOD2(convert_json_languages_to_obj,
                      void(const Json::Value& json_languages,
                           smart_objects::SmartObject& languages));
+  MOCK_CONST_METHOD2(convert_audio_capability_to_obj,
+                     void(const Json::Value& capability,
+                          smart_objects::SmartObject& output_so));
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/application_manager/test/include/application_manager/mock_message_helper.h b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
index 29afd36e52..5f6e613123 100644
--- a/src/components/application_manager/test/include/application_manager/mock_message_helper.h
+++ b/src/components/application_manager/test/include/application_manager/mock_message_helper.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_MESSAGE_HELPER_H_
 #include "application_manager/application.h"
 #include "application_manager/application_manager.h"
+#include "application_manager/hmi_capabilities.h"
 #include "application_manager/message_helper.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "gmock/gmock.h"
@@ -128,8 +129,9 @@ class MockMessageHelper {
   MOCK_METHOD2(CreateMessageForHMI,
                smart_objects::SmartObjectSPtr(hmi_apis::messageType::eType,
                                               const uint32_t));
-  MOCK_METHOD2(SendHMIStatusNotification,
-               void(const Application& application_impl,
+  MOCK_METHOD3(SendHMIStatusNotification,
+               void(ApplicationSharedPtr application,
+                    const WindowID window_id,
                     ApplicationManager& application_manager));
   MOCK_METHOD4(SendPolicyUpdate,
                void(const std::string& file_path,
@@ -153,9 +155,15 @@ class MockMessageHelper {
            uint32_t correlation_id,
            ApplicationManager& app_mngr));
 #endif  // #ifdef EXTERNAL_PROPRIETARY_MODE
-  MOCK_METHOD3(SendOnPermissionsChangeNotification,
+  MOCK_METHOD4(SendOnPermissionsChangeNotification,
                void(uint32_t connection_key,
                     const policy::Permissions& permissions,
+                    ApplicationManager& app_mngr,
+                    const bool require_encryption));
+  MOCK_METHOD4(SendPolicySnapshotNotification,
+               void(uint32_t connection_key,
+                    const std::string& snapshot_file_path,
+                    const std::string& url,
                     ApplicationManager& app_mngr));
   MOCK_METHOD4(SendPolicySnapshotNotification,
                void(uint32_t connection_key,
@@ -223,6 +231,11 @@ class MockMessageHelper {
                    ApplicationConstSharedPtr app,
                    const policy::PolicyHandlerInterface& policy_handler,
                    ApplicationManager& app_mngr));
+  MOCK_METHOD4(SubscribeApplicationToSoftButton,
+               void(smart_objects::SmartObject& message_params,
+                    ApplicationSharedPtr app,
+                    int32_t function_id,
+                    const application_manager::WindowID window_id));
   MOCK_METHOD3(SubscribeApplicationToSoftButton,
                void(smart_objects::SmartObject& message_params,
                     ApplicationSharedPtr app,
@@ -261,6 +274,9 @@ class MockMessageHelper {
                void(ApplicationConstSharedPtr app,
                     const bool is_unexpected_disconnect,
                     ApplicationManager& app_mngr));
+  MOCK_METHOD2(CreateOnAppPropertiesChangeNotification,
+               smart_objects::SmartObjectSPtr(const std::string& policy_app_id,
+                                              ApplicationManager& app_mngr));
   MOCK_METHOD4(SendLaunchApp,
                void(const uint32_t connection_key,
                     const std::string& urlSchema,
@@ -282,6 +298,10 @@ class MockMessageHelper {
 
   MOCK_METHOD1(PrintSmartObject,
                bool(const smart_objects::SmartObject& object));
+
+  MOCK_METHOD1(ExtractWindowIdFromSmartObject,
+               WindowID(const smart_objects::SmartObject& s_map));
+
   MOCK_METHOD3(SendTTSGlobalProperties,
                void(ApplicationSharedPtr app,
                     const bool default_help_prompt,
@@ -320,6 +340,22 @@ class MockMessageHelper {
   MOCK_METHOD2(BroadcastCapabilityUpdate,
                void(smart_objects::SmartObject& msg_params,
                     ApplicationManager& app_mngr));
+  MOCK_METHOD3(CreateUICreateWindowRequestsToHMI,
+               smart_objects::SmartObjectList(
+                   ApplicationSharedPtr application,
+                   ApplicationManager& app_manager,
+                   const smart_objects::SmartObject& windows_info));
+  MOCK_METHOD2(
+      CreateDisplayCapabilityUpdateToMobile,
+      smart_objects::SmartObjectSPtr(const smart_objects::SmartObject&,
+                                     application_manager::Application&));
+  MOCK_METHOD4(CreateOnServiceUpdateNotification,
+               smart_objects::SmartObjectSPtr(
+                   const hmi_apis::Common_ServiceType::eType service_type,
+                   const hmi_apis::Common_ServiceEvent::eType service_event,
+                   const hmi_apis::Common_ServiceStatusUpdateReason::eType
+                       service_update_reason,
+                   const uint32_t app_id));
 
   static MockMessageHelper* message_helper_mock();
 };
diff --git a/src/components/application_manager/test/include/application_manager/mock_request.h b/src/components/application_manager/test/include/application_manager/mock_request.h
index dfc6691ef4..c1cc7f601f 100644
--- a/src/components/application_manager/test/include/application_manager/mock_request.h
+++ b/src/components/application_manager/test/include/application_manager/mock_request.h
@@ -55,6 +55,9 @@ class MockRequest : public application_manager::commands::Command {
   MOCK_METHOD0(CleanUp, bool());
   MOCK_CONST_METHOD0(default_timeout, uint32_t());
   MOCK_CONST_METHOD0(function_id, int32_t());
+  MOCK_CONST_METHOD0(window_id, application_manager::WindowID());
+  MOCK_METHOD1(set_warning_info, void(const std::string info));
+  MOCK_CONST_METHOD0(warning_info, std::string());
   MOCK_METHOD0(onTimeOut, void());
   MOCK_METHOD0(AllowedToTerminate, bool());
   MOCK_METHOD1(SetAllowedToTerminate, void(bool is_allowed));
diff --git a/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h b/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h
index 4fd3b7fc5a..3935ab7924 100644
--- a/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h
+++ b/src/components/application_manager/test/include/application_manager/mock_resume_ctrl.h
@@ -34,7 +34,7 @@
 #include "application_manager/application.h"
 #include "application_manager/resumption/resume_ctrl.h"
 #include "gmock/gmock.h"
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 
 namespace test {
 namespace components {
@@ -82,7 +82,9 @@ class MockResumeCtrl : public resumption::ResumeCtrl {
   MOCK_METHOD1(OnAppActivated,
                void(app_mngr::ApplicationSharedPtr application));
   MOCK_METHOD1(RemoveFromResumption, void(uint32_t app_id));
+  DEPRECATED
   MOCK_METHOD1(Init, bool(resumption::LastState& last_state));
+  MOCK_METHOD1(Init, bool(resumption::LastStateWrapperPtr last_state));
   MOCK_METHOD2(OnAppRegistrationStart,
                void(const std::string& policy_app_id,
                     const std::string& device_id));
@@ -94,13 +96,23 @@ class MockResumeCtrl : public resumption::ResumeCtrl {
   MOCK_METHOD1(SetupDefaultHMILevel,
                bool(application_manager::ApplicationSharedPtr application));
   MOCK_METHOD1(StartAppHmiStateResumption,
-               void(application_manager::ApplicationSharedPtr application));
+               bool(application_manager::ApplicationSharedPtr application));
   MOCK_METHOD3(SetAppHMIState,
                bool(application_manager::ApplicationSharedPtr application,
                     const mobile_apis::HMILevel::eType hmi_level,
                     bool check_policy));
   MOCK_CONST_METHOD0(LaunchTime, time_t());
 
+  MOCK_METHOD2(RestoreAppWidgets,
+               size_t(app_mngr::ApplicationSharedPtr application,
+                      const smart_objects::SmartObject& saved_app));
+
+  MOCK_METHOD1(RestoreWidgetsHMIState,
+               void(const smart_objects::SmartObject& response_message));
+
+  MOCK_METHOD1(StartWaitingForDisplayCapabilitiesUpdate,
+               void(application_manager::ApplicationSharedPtr application));
+
 #ifdef BUILD_TESTS
   MOCK_METHOD1(set_resumption_storage,
                void(std::shared_ptr<resumption::ResumptionData> mock_storage));
diff --git a/src/components/application_manager/test/include/application_manager/mock_rpc_protection_manager.h b/src/components/application_manager/test/include/application_manager/mock_rpc_protection_manager.h
new file mode 100644
index 0000000000..112de0fea5
--- /dev/null
+++ b/src/components/application_manager/test/include/application_manager/mock_rpc_protection_manager.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RPC_PROTECTION_MANAGER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RPC_PROTECTION_MANAGER_H_
+
+#include "application_manager/rpc_protection_manager.h"
+#include "gmock/gmock.h"
+
+namespace application_manager {
+class MockRPCProtectionManager : public RPCProtectionManager {
+ public:
+  MOCK_CONST_METHOD3(CheckPolicyEncryptionFlag,
+                     bool(const uint32_t function_id,
+                          const ApplicationSharedPtr app,
+                          const bool is_rpc_service_secure));
+
+  MOCK_METHOD3(CreateEncryptionNeededResponse,
+               std::shared_ptr<smart_objects::SmartObject>(
+                   const uint32_t connection_key,
+                   const uint32_t function_id,
+                   const uint32_t conrrelation_id));
+
+  MOCK_CONST_METHOD2(IsInEncryptionNeededCache,
+                     bool(const uint32_t app_id,
+                          const uint32_t conrrelation_id));
+
+  MOCK_METHOD2(AddToEncryptionNeededCache,
+               void(const uint32_t app_id, const uint32_t correlation_id));
+
+  MOCK_METHOD2(RemoveFromEncryptionNeededCache,
+               void(const uint32_t app_id, const uint32_t correlation_id));
+};
+}  // namespace application_manager
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_TEST_INCLUDE_APPLICATION_MANAGER_MOCK_RPC_PROTECTION_MANAGER_H_
diff --git a/src/components/application_manager/test/include/application_manager/mock_rpc_protection_mediator.h b/src/components/application_manager/test/include/application_manager/mock_rpc_protection_mediator.h
new file mode 100644
index 0000000000..858673e3b3
--- /dev/null
+++ b/src/components/application_manager/test/include/application_manager/mock_rpc_protection_mediator.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "application_manager/rpc_protection_mediator.h"
+#include "gmock/gmock.h"
+
+namespace application_manager {
+class MockRPCProtectionMediator : public RPCProtectionMediator {
+ public:
+  MOCK_METHOD4(DoesRPCNeedEncryption,
+               bool(const uint32_t function_id,
+                    std::shared_ptr<Application> app,
+                    const uint32_t conrrelation_id,
+                    const bool is_rpc_service_secure));
+  MOCK_METHOD1(DoesRPCNeedEncryption, bool(const uint32_t conrrelation_id));
+  MOCK_METHOD1(EncryptResponseByForce, void(const uint32_t conrrelation_id));
+  MOCK_METHOD3(CreateNegativeResponse,
+               std::shared_ptr<smart_objects::SmartObject>(
+                   const uint32_t connection_key,
+                   const uint32_t function_id,
+                   const uint32_t conrrelation_id));
+};
+}  // namespace application_manager
diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_test.h b/src/components/application_manager/test/include/application_manager/resumption_data_test.h
index cab3c23253..e38b428877 100644
--- a/src/components/application_manager/test/include/application_manager/resumption_data_test.h
+++ b/src/components/application_manager/test/include/application_manager/resumption_data_test.h
@@ -63,7 +63,15 @@ using namespace mobile_apis;
 class ResumptionDataTest : public ::testing::Test {
  protected:
   ResumptionDataTest()
-      : kCountOfCommands_(5u)
+      : help_prompt_(NULL)
+      , timeout_prompt_(NULL)
+      , vr_help_(NULL)
+      , vr_help_title_(NULL)
+      , vr_synonyms_(NULL)
+      , keyboard_props_(NULL)
+      , menu_title_(NULL)
+      , menu_icon_(NULL)
+      , kCountOfCommands_(5u)
       , kCountOfChoice_(2u)
       , kCountOfChoiceSets_(4u)
       , kCountOfSubmenues_(3u)
@@ -74,7 +82,10 @@ class ResumptionDataTest : public ::testing::Test {
       , comlock_ptr_(std::make_shared<sync_primitives::Lock>())
       , setlock_ptr_(std::make_shared<sync_primitives::Lock>())
       , btnlock_ptr_(std::make_shared<sync_primitives::Lock>())
-      , ivilock_ptr_(std::make_shared<sync_primitives::Lock>()) {}
+      , ivilock_ptr_(std::make_shared<sync_primitives::Lock>())
+      , window_params_map_lock_ptr_(std::make_shared<sync_primitives::Lock>()) {
+  }
+  virtual ~ResumptionDataTest();
   // Check structure in saved application
   void CheckSavedApp(sm::SmartObject& saved_data);
   // Set data for resumption
@@ -114,6 +125,9 @@ class ResumptionDataTest : public ::testing::Test {
   void SetHelpAndTimeoutPrompt();
   void SetVRHelpTitle();
   void SetSubscriptions();
+  void SetWindowsInfo();
+  void SetDefaultCurrentHmiState();
+  void SetDefaultWindowIds();
 
   void CheckCommands(sm::SmartObject& res_list);
   void CheckGlobalProporties(sm::SmartObject& res_list);
@@ -129,6 +143,7 @@ class ResumptionDataTest : public ::testing::Test {
       ns_smart_device_link::ns_smart_objects::SmartObject& res_list);
   void CheckVRTitle(sm::SmartObject& res_list);
   void CheckSubscriptions(sm::SmartObject& res_list);
+  void CheckWindowsInfo(sm::SmartObject& res_list);
 
   const size_t kCountOfCommands_;
   const size_t kCountOfChoice_;
@@ -145,14 +160,18 @@ class ResumptionDataTest : public ::testing::Test {
 
   am::ButtonSubscriptions btn_subscr;
 
+  am::WindowParamsMap test_window_params_map_;
+
   std::shared_ptr<sync_primitives::Lock> sublock_ptr_;
   std::shared_ptr<sync_primitives::Lock> comlock_ptr_;
   std::shared_ptr<sync_primitives::Lock> setlock_ptr_;
   std::shared_ptr<sync_primitives::Lock> btnlock_ptr_;
   std::shared_ptr<sync_primitives::Lock> ivilock_ptr_;
+  std::shared_ptr<sync_primitives::Lock> window_params_map_lock_ptr_;
   application_manager_test::MockApplicationManagerSettings
       mock_application_manager_settings_;
-  application_manager_test::MockApplicationManager mock_application_manager_;
+  NiceMock<application_manager_test::MockApplicationManager>
+      mock_application_manager_;
   std::shared_ptr<NiceMock<application_manager_test::MockAppExtension> >
       mock_app_extension_;
   std::list<application_manager::AppExtensionPtr> extensions_;
diff --git a/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h b/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h
index 3f5802cb5a..e7a8f25261 100644
--- a/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h
+++ b/src/components/application_manager/test/include/application_manager/test_resumption_data_db.h
@@ -44,13 +44,16 @@ namespace test {
 namespace components {
 namespace resumption_test {
 
+using ::testing::NiceMock;
+
 class TestResumptionDataDB : public ResumptionDataDB {
  public:
   utils::dbms::SQLDatabase* get_db_handle() {
     return db();
   }
 
-  application_manager_test::MockApplicationManager mock_application_manager_;
+  NiceMock<application_manager_test::MockApplicationManager>
+      mock_application_manager_;
   TestResumptionDataDB(DbStorage db_storage)
       : ResumptionDataDB(db_storage, mock_application_manager_) {}
 };
diff --git a/src/components/application_manager/test/message_helper/CMakeLists.txt b/src/components/application_manager/test/message_helper/CMakeLists.txt
index 99031849f6..31b175cbf0 100755
--- a/src/components/application_manager/test/message_helper/CMakeLists.txt
+++ b/src/components/application_manager/test/message_helper/CMakeLists.txt
@@ -40,7 +40,7 @@ set(LIBRARIES
     ApplicationManager
     MessageHelper
     jsoncpp
-    Policy
+    PolicyStatic
     connectionHandler
     MediaManager
     Resumption
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc
index d0fbe696cd..f85c569bdb 100644
--- a/src/components/application_manager/test/message_helper/message_helper_test.cc
+++ b/src/components/application_manager/test/message_helper/message_helper_test.cc
@@ -279,14 +279,21 @@ TEST(MessageHelperTestCreate,
 
   smart_objects::SmartObject& object = *smartObjectPtr;
 
+  const uint32_t app_id = 1u;
+  const std::string cmd_icon_value = "10";
+  const uint32_t cmd_id = 5u;
+  const uint32_t internal_id = 1u;
+
   object[strings::menu_params] = 1;
   object[strings::cmd_icon] = 1;
-  object[strings::cmd_icon][strings::value] = "10";
+  object[strings::cmd_icon][strings::value] = cmd_icon_value;
+  object[strings::cmd_id] = cmd_id;
 
-  vis.insert(std::pair<uint32_t, smart_objects::SmartObject*>(5, &object));
+  vis.insert(
+      std::pair<uint32_t, smart_objects::SmartObject*>(internal_id, &object));
 
   EXPECT_CALL(*appSharedMock, commands_map()).WillOnce(Return(data_accessor));
-  EXPECT_CALL(*appSharedMock, app_id()).WillOnce(Return(1u));
+  EXPECT_CALL(*appSharedMock, app_id()).WillOnce(Return(app_id));
   application_manager_test::MockApplicationManager mock_application_manager;
   smart_objects::SmartObjectList ptr =
       MessageHelper::CreateAddCommandRequestToHMI(appSharedMock,
@@ -299,14 +306,14 @@ TEST(MessageHelperTestCreate,
   int function_id = static_cast<int>(hmi_apis::FunctionID::UI_AddCommand);
 
   EXPECT_EQ(function_id, obj[strings::params][strings::function_id].asInt());
-  EXPECT_EQ(1u, obj[strings::msg_params][strings::app_id].asUInt());
-  EXPECT_EQ(5, obj[strings::msg_params][strings::cmd_id].asInt());
+  EXPECT_EQ(app_id, obj[strings::msg_params][strings::app_id].asUInt());
+  EXPECT_EQ(cmd_id, obj[strings::msg_params][strings::cmd_id].asUInt());
   EXPECT_EQ(object[strings::menu_params],
             obj[strings::msg_params][strings::menu_params]);
   EXPECT_EQ(object[strings::cmd_icon],
             obj[strings::msg_params][strings::cmd_icon]);
   EXPECT_EQ(
-      "10",
+      cmd_icon_value,
       obj[strings::msg_params][strings::cmd_icon][strings::value].asString());
 }
 
@@ -1084,6 +1091,27 @@ TEST_F(MessageHelperTest, SendNaviSetVideoConfigRequest) {
   EXPECT_EQ(480, msg_params[strings::config][strings::height].asInt());
 }
 
+TEST_F(MessageHelperTest, ExtractWindowIdFromSmartObject_SUCCESS) {
+  const WindowID window_id = 145;
+  smart_objects::SmartObject message(smart_objects::SmartType_Map);
+  message[strings::msg_params][strings::window_id] = window_id;
+  EXPECT_EQ(window_id,
+            MessageHelper::ExtractWindowIdFromSmartObject(
+                message[strings::msg_params]));
+}
+
+TEST_F(MessageHelperTest, ExtractWindowIdFromSmartObject_FromEmptyMessage) {
+  smart_objects::SmartObject message(smart_objects::SmartType_Map);
+  EXPECT_EQ(mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            MessageHelper::ExtractWindowIdFromSmartObject(message));
+}
+
+TEST_F(MessageHelperTest, ExtractWindowIdFromSmartObject_FromWrongType) {
+  smart_objects::SmartObject message(smart_objects::SmartType_Array);
+  EXPECT_EQ(mobile_apis::PredefinedWindows::DEFAULT_WINDOW,
+            MessageHelper::ExtractWindowIdFromSmartObject(message));
+}
+
 }  // namespace application_manager_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/mobile_message_handler_test.cc b/src/components/application_manager/test/mobile_message_handler_test.cc
index cac04d4508..3ae79ce8ce 100644
--- a/src/components/application_manager/test/mobile_message_handler_test.cc
+++ b/src/components/application_manager/test/mobile_message_handler_test.cc
@@ -109,6 +109,7 @@ class MobileMessageHandlerTest : public testing::Test {
                                                 protocol_version,
                                                 &full_data[0],
                                                 full_size,
+                                                false,
                                                 ServiceType::kRpc,
                                                 payload_size);
 
diff --git a/src/components/application_manager/test/mobile_message_handler_v1_test.cc b/src/components/application_manager/test/mobile_message_handler_v1_test.cc
index 7801798705..ab37694c28 100644
--- a/src/components/application_manager/test/mobile_message_handler_v1_test.cc
+++ b/src/components/application_manager/test/mobile_message_handler_v1_test.cc
@@ -69,8 +69,11 @@ const unsigned char* data_v1 =
 
 TEST(MobileMessageHandlerTestV1Test,
      HandleIncomingMessageProtocolV1_SendJSONData_ExpectEqual) {
-  RawMessagePtr message = std::make_shared<RawMessage>(
-      connection_key_p1, protocol_version_1, data_v1, data_json.length());
+  RawMessagePtr message = std::make_shared<RawMessage>(connection_key_p1,
+                                                       protocol_version_1,
+                                                       data_v1,
+                                                       data_json.length(),
+                                                       false);
 
   application_manager::Message* ptr =
       MobileMessageHandler::HandleIncomingMessageProtocol(message);
@@ -89,8 +92,11 @@ TEST(MobileMessageHandlerTestV1Test,
   const unsigned char* data_v1 =
       reinterpret_cast<const unsigned char*>(full_data.c_str());
 
-  RawMessagePtr message = std::make_shared<RawMessage>(
-      connection_key_p1, protocol_version_1, data_v1, full_data.length());
+  RawMessagePtr message = std::make_shared<RawMessage>(connection_key_p1,
+                                                       protocol_version_1,
+                                                       data_v1,
+                                                       full_data.length(),
+                                                       false);
 
   application_manager::Message* ptr =
       MobileMessageHandler::HandleIncomingMessageProtocol(message);
diff --git a/src/components/application_manager/test/mock_message_helper.cc b/src/components/application_manager/test/mock_message_helper.cc
index 3284224237..a001e852b8 100644
--- a/src/components/application_manager/test/mock_message_helper.cc
+++ b/src/components/application_manager/test/mock_message_helper.cc
@@ -212,9 +212,19 @@ void MessageHelper::SendGetListOfPermissionsResponse(
 void MessageHelper::SendOnPermissionsChangeNotification(
     uint32_t connection_key,
     const policy::Permissions& permissions,
-    ApplicationManager& app_mngr) {
+    ApplicationManager& app_mngr,
+    const policy::EncryptionRequired require_encryption) {
   MockMessageHelper::message_helper_mock()->SendOnPermissionsChangeNotification(
-      connection_key, permissions, app_mngr);
+      connection_key, permissions, app_mngr, require_encryption);
+}
+
+void MessageHelper::SendPolicySnapshotNotification(
+    uint32_t connection_key,
+    const std::string& snapshot_file_path,
+    const std::string& url,
+    ApplicationManager& app_mngr) {
+  MockMessageHelper::message_helper_mock()->SendPolicySnapshotNotification(
+      connection_key, snapshot_file_path, url, app_mngr);
 }
 
 void MessageHelper::SendPolicySnapshotNotification(
@@ -258,10 +268,11 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateMessageForHMI(
 }
 
 void MessageHelper::SendHMIStatusNotification(
-    const Application& application_impl,
+    ApplicationSharedPtr application,
+    const WindowID window_id,
     ApplicationManager& application_manager) {
   MockMessageHelper::message_helper_mock()->SendHMIStatusNotification(
-      application_impl, application_manager);
+      application, window_id, application_manager);
 }
 
 void MessageHelper::SendUpdateSDLResponse(const std::string& result,
@@ -408,6 +419,16 @@ mobile_apis::Result::eType MessageHelper::ProcessSoftButtons(
 void MessageHelper::SubscribeApplicationToSoftButton(
     smart_objects::SmartObject& message_params,
     ApplicationSharedPtr app,
+    int32_t function_id,
+    const WindowID window_id) {
+  return MockMessageHelper::message_helper_mock()
+      ->SubscribeApplicationToSoftButton(
+          message_params, app, function_id, window_id);
+}
+
+void MessageHelper::SubscribeApplicationToSoftButton(
+    smart_objects::SmartObject& message_params,
+    ApplicationSharedPtr app,
     int32_t function_id) {
   return MockMessageHelper::message_helper_mock()
       ->SubscribeApplicationToSoftButton(message_params, app, function_id);
@@ -473,6 +494,13 @@ bool MessageHelper::CreateHMIApplicationStruct(
       app, session_observer, policy_handler, output, app_mngr);
 }
 
+smart_objects::SmartObjectSPtr
+MessageHelper::CreateOnAppPropertiesChangeNotification(
+    const std::string& policy_app_id, ApplicationManager& app_mngr) {
+  return MockMessageHelper::message_helper_mock()
+      ->CreateOnAppPropertiesChangeNotification(policy_app_id, app_mngr);
+}
+
 void MessageHelper::SendOnAppUnregNotificationToHMI(
     ApplicationConstSharedPtr app,
     const bool is_unexpected_disconnect,
@@ -528,6 +556,12 @@ bool MessageHelper::PrintSmartObject(const smart_objects::SmartObject& object) {
   return MockMessageHelper::message_helper_mock()->PrintSmartObject(object);
 }
 
+WindowID MessageHelper::ExtractWindowIdFromSmartObject(
+    const smart_objects::SmartObject& s_map) {
+  return MockMessageHelper::message_helper_mock()
+      ->ExtractWindowIdFromSmartObject(s_map);
+}
+
 void MessageHelper::SendSetAppIcon(const uint32_t app_id,
                                    const std::string& icon_path,
                                    ApplicationManager& application_manager) {
@@ -595,4 +629,29 @@ void MessageHelper::BroadcastCapabilityUpdate(
       msg_params, app_mngr);
 }
 
+smart_objects::SmartObjectList MessageHelper::CreateUICreateWindowRequestsToHMI(
+    application_manager::ApplicationSharedPtr application,
+    ApplicationManager& app_mngr,
+    const smart_objects::SmartObject& windows_info) {
+  return MockMessageHelper::message_helper_mock()
+      ->CreateUICreateWindowRequestsToHMI(application, app_mngr, windows_info);
+}
+
+smart_objects::SmartObjectSPtr
+MessageHelper::CreateDisplayCapabilityUpdateToMobile(
+    const smart_objects::SmartObject& system_capabilities, Application& app) {
+  return MockMessageHelper::message_helper_mock()
+      ->CreateDisplayCapabilityUpdateToMobile(system_capabilities, app);
+}
+
+smart_objects::SmartObjectSPtr MessageHelper::CreateOnServiceUpdateNotification(
+    const hmi_apis::Common_ServiceType::eType service_type,
+    const hmi_apis::Common_ServiceEvent::eType service_event,
+    const hmi_apis::Common_ServiceStatusUpdateReason::eType
+        service_update_reason,
+    const uint32_t app_id) {
+  return MockMessageHelper::message_helper_mock()
+      ->CreateOnServiceUpdateNotification(
+          service_type, service_event, service_update_reason, app_id);
+}
 }  // namespace application_manager
diff --git a/src/components/application_manager/test/policy_event_observer_test.cc b/src/components/application_manager/test/policy_event_observer_test.cc
index a74b12071c..22d7a8cfa0 100644
--- a/src/components/application_manager/test/policy_event_observer_test.cc
+++ b/src/components/application_manager/test/policy_event_observer_test.cc
@@ -89,8 +89,6 @@ class PolicyEventObserverTest : public ::testing::Test {
     EXPECT_CALL(policy_handler_mock_,
                 PTUpdatedAt(Counters::KILOMETERS, field_value))
         .Times(pt_updated_calls_number);
-    EXPECT_CALL(policy_handler_mock_, OnSystemReady())
-        .Times(on_system_ready_calls_number);
     policy_event_observer_->on_event(*event_);
   }
 
@@ -125,15 +123,6 @@ TEST_F(PolicyEventObserverTest,
   CheckResultsOnEvent(1u, 0u);
 }
 
-TEST_F(PolicyEventObserverTest,
-       OnEvent_EventBasicCommunication_OnReady_ExpectOnSystemReady) {
-  // Arrange
-  CreateEvent(Event::EventID::BasicCommunication_OnReady);
-  CookSmartObject(hmi_apis::Common_Result::SUCCESS, field_name, field_value);
-  // Check
-  CheckResultsOnEvent(0u, 1u);
-}
-
 }  // namespace policy_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc
index 458b065cdd..ad94c4d1c8 100644
--- a/src/components/application_manager/test/policy_handler_test.cc
+++ b/src/components/application_manager/test/policy_handler_test.cc
@@ -31,6 +31,7 @@
  */
 
 #include <fstream>
+#include <memory>
 #include <string>
 #include <vector>
 #include "gmock/gmock.h"
@@ -72,6 +73,8 @@
 #include "policy/usage_statistics/mock_statistics_manager.h"
 #include "protocol_handler/mock_session_observer.h"
 
+#include "smart_objects/enum_schema_item.h"
+
 namespace test {
 namespace components {
 namespace policy_handler_test {
@@ -90,7 +93,12 @@ using ::testing::SetArgReferee;
 
 typedef NiceMock<application_manager_test::MockRPCService> MockRPCService;
 
+namespace {
+const std::string kFakeNickname = "fake_nickname";
 const std::string kDummyData = "some_data";
+const WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+}  // namespace
 
 class PolicyHandlerTest : public ::testing::Test {
  public:
@@ -173,8 +181,9 @@ class PolicyHandlerTest : public ::testing::Test {
     ON_CALL(policy_settings_, enable_policy()).WillByDefault(Return(true));
     ON_CALL(app_manager_, event_dispatcher())
         .WillByDefault(ReturnRef(mock_event_dispatcher_));
-    std::string path = file_system::CreateDirectory("storage");
-    file_system::CreateFile(path + "/" + "certificate");
+    const std::string path("storage");
+    if (file_system::CreateDirectory(path))
+      file_system::CreateFile(path + "/" + "certificate");
     mock_policy_manager_ =
         std::make_shared<policy_manager_test::MockPolicyManager>();
     ASSERT_TRUE(mock_policy_manager_.use_count() != 0);
@@ -233,21 +242,25 @@ class PolicyHandlerTest : public ::testing::Test {
 
   void TestOnPermissionsUpdated(const std::string& default_hmi_level,
                                 const mobile_apis::HMILevel::eType hmi_level) {
-    EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+    EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
         .WillRepeatedly(Return(mock_app_));
     EXPECT_CALL(*mock_app_, app_id()).WillRepeatedly(Return(kAppId1_));
-    EXPECT_CALL(*mock_app_, hmi_level())
+    EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
         .WillOnce(Return(mobile_apis::HMILevel::HMI_NONE));
 
     EXPECT_CALL(mock_message_helper_, StringToHMILevel(default_hmi_level))
         .WillOnce(Return(hmi_level));
+    ChangePolicyManagerToMock();
+    const policy::EncryptionRequired require_encryption;
+    EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+        .WillOnce(Return(require_encryption));
     EXPECT_CALL(mock_message_helper_,
-                SendOnPermissionsChangeNotification(kAppId1_, _, _));
+                SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
     EXPECT_CALL(app_manager_, state_controller()).Times(0);
 
     Permissions permissions;
     policy_handler_.OnPermissionsUpdated(
-        kPolicyAppId_, permissions, default_hmi_level);
+        kDeviceId, kPolicyAppId_, permissions, default_hmi_level);
   }
 
   void CreateFunctionalGroupPermission(
@@ -265,6 +278,19 @@ class PolicyHandlerTest : public ::testing::Test {
     hmi_types.push_back(hmi_type);
     return hmi_types;
   }
+
+  void SetExpectationsAndCheckCloudAppPropertiesStatus(
+      const policy::AppProperties& app_properties,
+      const smart_objects::SmartObject& properties,
+      const policy::PolicyHandlerInterface::AppPropertiesState&
+          app_properties_state) {
+    EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+        .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
+    EXPECT_CALL(*mock_policy_manager_, GetInitialAppData(kPolicyAppId_, _, _));
+    EXPECT_EQ(
+        app_properties_state,
+        policy_handler_.GetAppPropertiesStatus(properties, kPolicyAppId_));
+  }
 };
 
 namespace {
@@ -386,16 +412,20 @@ TEST_F(PolicyHandlerTest, AppServiceUpdate_CheckAppService) {
   ChangePolicyManagerToMock();
   std::string file_name("sdl_pt_update.json");
   std::ifstream ifile(file_name);
-  Json::Reader reader;
+  Json::CharReaderBuilder reader_builder;
   std::string json;
   Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
+  if (ifile.is_open() &&
+      Json::parseFromStream(reader_builder, ifile, &root, nullptr)) {
     json = root.toStyledString();
   }
   ifile.close();
   BinaryMessage msg(json.begin(), json.end());
   // Checks
-  EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg)).WillOnce(Return(true));
+  EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg))
+      .WillOnce(Return(PolicyManager::PtProcessingResult::kSuccess));
+  EXPECT_CALL(*mock_policy_manager_,
+              OnPTUFinished(PolicyManager::PtProcessingResult::kSuccess));
   policy_handler_.ReceiveMessageFromSDK("", msg);
 
   policy_table::AppServiceParameters app_service_params =
@@ -450,10 +480,12 @@ TEST_F(PolicyHandlerTest, ReceiveMessageFromSDK) {
   ChangePolicyManagerToMock();
   std::string file_name("sdl_pt_update.json");
   std::ifstream ifile(file_name);
-  Json::Reader reader;
+  Json::CharReaderBuilder reader_builder;
+
   std::string json;
   Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
+  if (ifile.is_open() &&
+      Json::parseFromStream(reader_builder, ifile, &root, nullptr)) {
     json = root.toStyledString();
   }
   ifile.close();
@@ -462,7 +494,10 @@ TEST_F(PolicyHandlerTest, ReceiveMessageFromSDK) {
   EXPECT_CALL(app_manager_, GetNextHMICorrelationID());
   EXPECT_CALL(mock_message_helper_, CreateGetVehicleDataRequest(_, _, _));
   EXPECT_CALL(*mock_policy_manager_, PTUpdatedAt(_, _));
-  EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg)).WillOnce(Return(true));
+  EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg))
+      .WillOnce(Return(PolicyManager::PtProcessingResult::kSuccess));
+  EXPECT_CALL(*mock_policy_manager_,
+              OnPTUFinished(PolicyManager::PtProcessingResult::kSuccess));
   EXPECT_CALL(*mock_policy_manager_, CleanupUnpairedDevices());
   policy_handler_.ReceiveMessageFromSDK("", msg);
 }
@@ -473,7 +508,11 @@ TEST_F(PolicyHandlerTest, ReceiveMessageFromSDK_PTNotLoaded) {
   BinaryMessage msg;
   // Checks
 
-  EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg)).WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_, LoadPT("", msg))
+      .WillOnce(Return(PolicyManager::PtProcessingResult::kWrongPtReceived));
+  EXPECT_CALL(
+      *mock_policy_manager_,
+      OnPTUFinished(PolicyManager::PtProcessingResult::kWrongPtReceived));
   EXPECT_CALL(app_manager_, GetNextHMICorrelationID()).Times(0);
   EXPECT_CALL(mock_message_helper_, CreateGetVehicleDataRequest(_, _, _))
       .Times(0);
@@ -494,39 +533,52 @@ TEST_F(PolicyHandlerTest, UnloadPolicyLibrary_method_ExpectLibraryUnloaded) {
 
 TEST_F(PolicyHandlerTest, OnPermissionsUpdated_method_With2Parameters) {
   // Check expectations
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  ChangePolicyManagerToMock();
+  const policy::EncryptionRequired require_encryption;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .WillOnce(Return(require_encryption));
+  EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
       .WillOnce(Return(mock_app_));
   EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId1_));
   EXPECT_CALL(mock_message_helper_,
-              SendOnPermissionsChangeNotification(kAppId1_, _, _));
+              SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
   // Act
   Permissions perms;
-  policy_handler_.OnPermissionsUpdated(kPolicyAppId_, perms);
+  policy_handler_.OnPermissionsUpdated(kDeviceId, kPolicyAppId_, perms);
 }
 
 TEST_F(PolicyHandlerTest, OnPermissionsUpdated_TwoParams_InvalidApp_UNSUCCESS) {
   std::shared_ptr<application_manager_test::MockApplication> invalid_app;
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
       .WillOnce(Return(invalid_app));
+  ChangePolicyManagerToMock();
+  const policy::EncryptionRequired require_encryption;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .Times(0);
   EXPECT_CALL(mock_message_helper_,
-              SendOnPermissionsChangeNotification(_, _, _))
+              SendOnPermissionsChangeNotification(_, _, _, _))
       .Times(0);
 
   Permissions permissions;
-  policy_handler_.OnPermissionsUpdated(kPolicyAppId_, permissions);
+  policy_handler_.OnPermissionsUpdated(kDeviceId, kPolicyAppId_, permissions);
 }
 
 TEST_F(PolicyHandlerTest, OnPermissionsUpdated_InvalidApp_UNSUCCESS) {
   std::shared_ptr<application_manager_test::MockApplication> invalid_app;
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
       .WillOnce(Return(mock_app_))
       .WillOnce(Return(invalid_app));
   EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId1_));
+  ChangePolicyManagerToMock();
+  const policy::EncryptionRequired require_encryption;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .WillOnce(Return(require_encryption));
   EXPECT_CALL(mock_message_helper_,
-              SendOnPermissionsChangeNotification(kAppId1_, _, _));
+              SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
 
   Permissions permissions;
-  policy_handler_.OnPermissionsUpdated(kPolicyAppId_, permissions, "HMI_FULL");
+  policy_handler_.OnPermissionsUpdated(
+      kDeviceId, kPolicyAppId_, permissions, "HMI_FULL");
 }
 
 TEST_F(PolicyHandlerTest, OnPermissionsUpdated_HmiLevelInvalidEnum_UNSUCCESS) {
@@ -544,25 +596,30 @@ TEST_F(PolicyHandlerTest,
   const std::string new_kHmiLevel_string = "HMI_FULL";
   mobile_apis::HMILevel::eType new_hmi_level = mobile_apis::HMILevel::HMI_FULL;
   // Check expectations
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
       .Times(2)
       .WillRepeatedly(Return(mock_app_));
   EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId1_));
   EXPECT_CALL(mock_message_helper_, StringToHMILevel(new_kHmiLevel_string))
       .WillOnce(Return(new_hmi_level));
 
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_NONE));
+  ChangePolicyManagerToMock();
+  const policy::EncryptionRequired require_encryption;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .WillOnce(Return(require_encryption));
   EXPECT_CALL(mock_message_helper_,
-              SendOnPermissionsChangeNotification(kAppId1_, _, _));
+              SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
 
   EXPECT_CALL(app_manager_, state_controller())
       .WillRepeatedly(ReturnRef(mock_state_controller));
-  EXPECT_CALL(mock_state_controller, SetRegularState(_, new_hmi_level, true));
+  EXPECT_CALL(mock_state_controller,
+              SetRegularState(_, kDefaultWindowId, new_hmi_level, true));
   // Act
   Permissions perms;
   policy_handler_.OnPermissionsUpdated(
-      kPolicyAppId_, perms, new_kHmiLevel_string);
+      kDeviceId, kPolicyAppId_, perms, new_kHmiLevel_string);
 }
 
 TEST_F(PolicyHandlerTest,
@@ -572,25 +629,30 @@ TEST_F(PolicyHandlerTest,
   mobile_apis::HMILevel::eType new_hmi_level =
       mobile_apis::HMILevel::HMI_LIMITED;
   // Check expectations
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
       .Times(2)
       .WillRepeatedly(Return(mock_app_));
   EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId1_));
   EXPECT_CALL(mock_message_helper_, StringToHMILevel(new_kHmiLevel_string))
       .WillOnce(Return(new_hmi_level));
 
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_NONE));
+  ChangePolicyManagerToMock();
+  const policy::EncryptionRequired require_encryption;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .WillOnce(Return(require_encryption));
   EXPECT_CALL(mock_message_helper_,
-              SendOnPermissionsChangeNotification(kAppId1_, _, _));
+              SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
 
   EXPECT_CALL(app_manager_, state_controller())
       .WillRepeatedly(ReturnRef(mock_state_controller));
-  EXPECT_CALL(mock_state_controller, SetRegularState(_, new_hmi_level, false));
+  EXPECT_CALL(mock_state_controller,
+              SetRegularState(_, kDefaultWindowId, new_hmi_level, false));
   // Act
   Permissions perms;
   policy_handler_.OnPermissionsUpdated(
-      kPolicyAppId_, perms, new_kHmiLevel_string);
+      kDeviceId, kPolicyAppId_, perms, new_kHmiLevel_string);
 }
 
 TEST_F(PolicyHandlerTest,
@@ -599,23 +661,27 @@ TEST_F(PolicyHandlerTest,
   std::string new_kHmiLevel_string = "HMI_FULL";
   mobile_apis::HMILevel::eType new_hmi_level = mobile_apis::HMILevel::HMI_FULL;
   // Check expectations
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId, kPolicyAppId_))
       .Times(2)
       .WillRepeatedly(Return(mock_app_));
   EXPECT_CALL(*mock_app_, app_id()).WillOnce(Return(kAppId1_));
   EXPECT_CALL(mock_message_helper_, StringToHMILevel(new_kHmiLevel_string))
       .WillOnce(Return(new_hmi_level));
 
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_LIMITED));
+  ChangePolicyManagerToMock();
+  const policy::EncryptionRequired require_encryption;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .WillOnce(Return(require_encryption));
   EXPECT_CALL(mock_message_helper_,
-              SendOnPermissionsChangeNotification(kAppId1_, _, _));
+              SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
 
   EXPECT_CALL(app_manager_, state_controller()).Times(0);
   // Act
   Permissions perms;
   policy_handler_.OnPermissionsUpdated(
-      kPolicyAppId_, perms, new_kHmiLevel_string);
+      kDeviceId, kPolicyAppId_, perms, new_kHmiLevel_string);
 }
 
 TEST_F(PolicyHandlerTest, GetPriority) {
@@ -636,13 +702,14 @@ TEST_F(PolicyHandlerTest, CheckPermissions) {
   const uint32_t device = 3;
   const mobile_apis::HMILevel::eType hmi_level =
       mobile_apis::HMILevel::HMI_NONE;
-  EXPECT_CALL(*mock_app_, hmi_level()).WillOnce(Return(hmi_level));
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
+      .WillOnce(Return(hmi_level));
   EXPECT_CALL(*mock_app_, device()).WillOnce(Return(device));
   EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId_));
 #ifdef EXTERNAL_PROPRIETARY_MODE
-  EXPECT_CALL(
-      *mock_policy_manager_,
-      CheckPermissions(kPolicyAppId_, kHmiLevel_, kRpc_, kRpc_params, _));
+  EXPECT_CALL(*mock_policy_manager_,
+              CheckPermissions(
+                  kDeviceId, kPolicyAppId_, kHmiLevel_, kRpc_, kRpc_params, _));
 
 #else   // EXTERNAL_PROPRIETARY_MODE
   EXPECT_CALL(*mock_policy_manager_,
@@ -654,7 +721,8 @@ TEST_F(PolicyHandlerTest, CheckPermissions) {
   EXPECT_CALL(mock_message_helper_, GetDeviceMacAddressForHandle(device, _))
       .WillOnce(Return(kDeviceId));
   // Act
-  policy_handler_.CheckPermissions(mock_app_, kRpc_, kRpc_params, result);
+  policy_handler_.CheckPermissions(
+      mock_app_, kDefaultWindowId, kRpc_, kRpc_params, result);
 }
 
 TEST_F(PolicyHandlerTest, GetNotificationsNumber) {
@@ -681,9 +749,9 @@ TEST_F(PolicyHandlerTest, GetDefaultHmi) {
   EnablePolicyAndPolicyManagerMock();
   // Check expectations
   EXPECT_CALL(*mock_policy_manager_,
-              GetDefaultHmi(kPolicyAppId_, &default_hmi_));
+              GetDefaultHmi(kDeviceId_, kPolicyAppId_, &default_hmi_));
   // Act
-  policy_handler_.GetDefaultHmi(kPolicyAppId_, &default_hmi_);
+  policy_handler_.GetDefaultHmi(kDeviceId_, kPolicyAppId_, &default_hmi_);
 }
 
 TEST_F(PolicyHandlerTest, GetInitialAppData) {
@@ -747,15 +815,6 @@ TEST_F(PolicyHandlerTest, OnExceededTimeout) {
   policy_handler_.OnExceededTimeout();
 }
 
-TEST_F(PolicyHandlerTest, OnSystemReady) {
-  // Arrange
-  EnablePolicyAndPolicyManagerMock();
-  // Check expectations
-  EXPECT_CALL(*mock_policy_manager_, OnSystemReady());
-  // Act
-  policy_handler_.OnSystemReady();
-}
-
 TEST_F(PolicyHandlerTest, PTUpdatedAt_method_UseCounter_KILOMETERS) {
   // Arrange
   EnablePolicyAndPolicyManagerMock();
@@ -882,12 +941,14 @@ void PolicyHandlerTest::TestActivateApp(const uint32_t connection_key,
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
   EXPECT_CALL(*application1, policy_app_id()).WillOnce(Return(kPolicyAppId_));
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kMacAddr_, kPolicyAppId_))
       .WillOnce(Return(permissions));
   ON_CALL(*mock_policy_manager_, Increment(_, _)).WillByDefault(Return());
   EXPECT_CALL(*mock_policy_manager_, RemovePendingPermissionChanges(_));
   EXPECT_CALL(mock_message_helper_, SendSDLActivateAppResponse(_, _, _));
   ON_CALL(*application1, app_id()).WillByDefault(Return(kAppId1_));
+  ON_CALL(*application1, mac_address()).WillByDefault(ReturnRef(kMacAddr_));
   // Act
   policy_handler_.OnActivateApp(connection_key, correlation_id);
 }
@@ -936,12 +997,14 @@ TEST_F(PolicyHandlerTest, OnActivateApp_AppIsRevoked_AppNotActivated) {
 
   // Check expectations
   EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId_));
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDefaultId, kPolicyAppId_))
       .WillOnce(Return(permissions));
   ON_CALL(*mock_policy_manager_, Increment(_, _)).WillByDefault(Return());
   EXPECT_CALL(*mock_policy_manager_, RemovePendingPermissionChanges(_));
   EXPECT_CALL(mock_message_helper_, SendSDLActivateAppResponse(_, _, _));
   ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId1_));
+  ON_CALL(*mock_app_, mac_address()).WillByDefault(ReturnRef(kDefaultId));
   // Act
   policy_handler_.OnActivateApp(kConnectionKey_, kCorrelationKey_);
 }
@@ -963,10 +1026,10 @@ void PolicyHandlerTest::OnPendingPermissionChangePrecondition(
   std::shared_ptr<application_manager_test::MockApplication> application =
       std::make_shared<application_manager_test::MockApplication>();
 
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
-      .WillOnce(Return(application));
+  EXPECT_CALL(app_manager_, application(_, _)).WillOnce(Return(application));
   EXPECT_CALL(*application, app_id()).WillRepeatedly(Return(kAppId1_));
-  EXPECT_CALL(*application, hmi_level()).WillRepeatedly(Return(hmi_level));
+  EXPECT_CALL(*application, hmi_level(kDefaultWindowId))
+      .WillRepeatedly(Return(hmi_level));
 }
 
 TEST_F(PolicyHandlerTest,
@@ -980,13 +1043,13 @@ TEST_F(PolicyHandlerTest,
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _))
       .Times(0);
-
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
   EXPECT_CALL(*mock_policy_manager_,
               RemovePendingPermissionChanges(kPolicyAppId_));
   // Act
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, OnPendingPermissionChange_AppInLimitedConsentNeeded) {
@@ -998,12 +1061,13 @@ TEST_F(PolicyHandlerTest, OnPendingPermissionChange_AppInLimitedConsentNeeded) {
   // Check expectations
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _));
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
   EXPECT_CALL(*mock_policy_manager_,
               RemovePendingPermissionChanges(kPolicyAppId_));
   // Act
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, OnPendingPermissionChange_AppLimitedAndRevoked) {
@@ -1020,17 +1084,19 @@ TEST_F(PolicyHandlerTest, OnPendingPermissionChange_AppLimitedAndRevoked) {
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _));
   EXPECT_CALL(mock_state_controller,
               SetRegularState(_,
+                              kDefaultWindowId,
                               mobile_apis::HMILevel::HMI_NONE,
                               mobile_apis::AudioStreamingState::NOT_AUDIBLE,
                               mobile_apis::VideoStreamingState::NOT_STREAMABLE,
                               true));
 
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
   EXPECT_CALL(*mock_policy_manager_,
               RemovePendingPermissionChanges(kPolicyAppId_));
   // Act
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, OnPendingPermissionChange_AppInBackgroundAndRevoked) {
@@ -1044,12 +1110,13 @@ TEST_F(PolicyHandlerTest, OnPendingPermissionChange_AppInBackgroundAndRevoked) {
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _));
 
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
   EXPECT_CALL(*mock_policy_manager_,
               RemovePendingPermissionChanges(kPolicyAppId_));
   // Act
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest,
@@ -1066,7 +1133,8 @@ TEST_F(PolicyHandlerTest,
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _));
 
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
 
   EXPECT_CALL(mock_message_helper_,
@@ -1083,7 +1151,7 @@ TEST_F(PolicyHandlerTest,
               RemovePendingPermissionChanges(kPolicyAppId_));
 
   // Act
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest,
@@ -1096,13 +1164,14 @@ TEST_F(PolicyHandlerTest,
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _));
 
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
 
   EXPECT_CALL(*mock_policy_manager_,
               RemovePendingPermissionChanges(kPolicyAppId_));
 
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest,
@@ -1121,7 +1190,8 @@ TEST_F(PolicyHandlerTest,
               SendOnAppPermissionsChangedNotification(kAppId1_, _, _))
       .Times(0);
 
-  EXPECT_CALL(*mock_policy_manager_, GetAppPermissionsChanges(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              GetAppPermissionsChanges(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(permissions));
 
   EXPECT_CALL(mock_message_helper_,
@@ -1138,7 +1208,7 @@ TEST_F(PolicyHandlerTest,
               RemovePendingPermissionChanges(kPolicyAppId_));
 
   // Act
-  policy_handler_.OnPendingPermissionChange(kPolicyAppId_);
+  policy_handler_.OnPendingPermissionChange(kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, PTExchangeAtUserRequest) {
@@ -1234,7 +1304,7 @@ TEST_F(PolicyHandlerTest, OnCurrentDeviceIdUpdateRequired) {
   // Check expectations
   std::shared_ptr<application_manager_test::MockApplication> application =
       std::make_shared<application_manager_test::MockApplication>();
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(application));
   EXPECT_CALL(app_manager_, connection_handler())
       .WillOnce(ReturnRef(conn_handler));
@@ -1251,10 +1321,11 @@ TEST_F(PolicyHandlerTest, OnCurrentDeviceIdUpdateRequired) {
                   _,
                   _,
                   _,
-                  _));
+                  _))
+      .WillOnce(DoAll(SetArgPointee<3>(kDeviceId_), Return(0)));
 
   // Act
-  policy_handler_.OnCurrentDeviceIdUpdateRequired(kPolicyAppId_);
+  policy_handler_.OnCurrentDeviceIdUpdateRequired(handle, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, OnSystemInfoChanged) {
@@ -1290,24 +1361,21 @@ TEST_F(PolicyHandlerTest, IsApplicationRevoked) {
   policy_handler_.IsApplicationRevoked(kPolicyAppId_);
 }
 
-TEST_F(PolicyHandlerTest, OnSystemInfoUpdateRequired) {
-  // Arrange
-  ChangePolicyManagerToMock();
-  // Check expectations
-  EXPECT_CALL(mock_message_helper_, SendGetSystemInfoRequest(_));
-  // Act
-  policy_handler_.OnSystemInfoUpdateRequired();
-}
-
 TEST_F(PolicyHandlerTest, GetAppRequestTypes) {
   // Arrange
   EnablePolicy();
   ChangePolicyManagerToMock();
-  // Check expectations
+  const transport_manager::DeviceHandle handle = 0u;
+// Check expectations
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  EXPECT_CALL(*mock_policy_manager_, GetAppRequestTypes(handle, kPolicyAppId_))
+      .WillOnce(Return(std::vector<std::string>()));
+#else
   EXPECT_CALL(*mock_policy_manager_, GetAppRequestTypes(kPolicyAppId_))
       .WillOnce(Return(std::vector<std::string>()));
+#endif
   // Act
-  policy_handler_.GetAppRequestTypes(kPolicyAppId_);
+  policy_handler_.GetAppRequestTypes(handle, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, OnVIIsReady) {
@@ -1376,13 +1444,14 @@ TEST_F(PolicyHandlerTest, SendOnAppPermissionsChanged) {
   std::shared_ptr<application_manager_test::MockApplication> application =
       std::make_shared<application_manager_test::MockApplication>();
   // Check expectations
-  EXPECT_CALL(app_manager_, application_by_policy_id(kPolicyAppId_))
+  EXPECT_CALL(app_manager_, application(kDeviceId_, kPolicyAppId_))
       .WillOnce(Return(application));
   EXPECT_CALL(mock_message_helper_,
               SendOnAppPermissionsChangedNotification(_, _, _));
   AppPermissions permissions(kPolicyAppId_);
   // Act
-  policy_handler_.SendOnAppPermissionsChanged(permissions, kPolicyAppId_);
+  policy_handler_.SendOnAppPermissionsChanged(
+      permissions, kDeviceId_, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, OnPTExchangeNeeded) {
@@ -1400,11 +1469,12 @@ TEST_F(PolicyHandlerTest, AddApplication) {
   // Check expectations
   EXPECT_CALL(
       *mock_policy_manager_,
-      AddApplication(kPolicyAppId_, HmiTypes(policy_table::AHT_DEFAULT)))
+      AddApplication(
+          kMacAddr_, kPolicyAppId_, HmiTypes(policy_table::AHT_DEFAULT)))
       .WillOnce(Return(std::make_shared<utils::CallNothing>()));
   // Act
-  policy_handler_.AddApplication(kPolicyAppId_,
-                                 HmiTypes(policy_table::AHT_DEFAULT));
+  policy_handler_.AddApplication(
+      kMacAddr_, kPolicyAppId_, HmiTypes(policy_table::AHT_DEFAULT));
 }
 
 TEST_F(PolicyHandlerTest, HeartBeatTimeout) {
@@ -1439,9 +1509,10 @@ TEST_F(PolicyHandlerTest, OnAppRegisteredOnMobile) {
   EnablePolicyAndPolicyManagerMock();
   // Check expectations
 
-  EXPECT_CALL(*mock_policy_manager_, OnAppRegisteredOnMobile(kPolicyAppId_));
+  EXPECT_CALL(*mock_policy_manager_,
+              OnAppRegisteredOnMobile(kDeviceId, kPolicyAppId_));
   // Act
-  policy_handler_.OnAppRegisteredOnMobile(kPolicyAppId_);
+  policy_handler_.OnAppRegisteredOnMobile(kDeviceId, kPolicyAppId_);
 }
 
 TEST_F(PolicyHandlerTest, IsRequestTypeAllowed) {
@@ -1452,13 +1523,20 @@ TEST_F(PolicyHandlerTest, IsRequestTypeAllowed) {
   mobile_apis::RequestType::eType type =
       mobile_apis::RequestType::eType::EMERGENCY;
 
+  const transport_manager::DeviceHandle handle = 0u;
+
   EXPECT_CALL(*mock_policy_manager_, GetAppRequestTypesState(kPolicyAppId_))
       .WillOnce(Return(policy::RequestType::State::AVAILABLE));
-
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  EXPECT_CALL(*mock_policy_manager_, GetAppRequestTypes(handle, kPolicyAppId_))
+      .WillOnce(Return(std::vector<std::string>({"HTTP"})));
+#else
   EXPECT_CALL(*mock_policy_manager_, GetAppRequestTypes(kPolicyAppId_))
       .WillOnce(Return(std::vector<std::string>({"HTTP"})));
+#endif
   // Act
-  EXPECT_FALSE(policy_handler_.IsRequestTypeAllowed(kPolicyAppId_, type));
+  EXPECT_FALSE(
+      policy_handler_.IsRequestTypeAllowed(handle, kPolicyAppId_, type));
 }
 
 TEST_F(PolicyHandlerTest, IsRequestSubTypeAllowed) {
@@ -1477,16 +1555,6 @@ TEST_F(PolicyHandlerTest, IsRequestSubTypeAllowed) {
   EXPECT_TRUE(policy_handler_.IsRequestSubTypeAllowed(kPolicyAppId_, subtype));
 }
 
-TEST_F(PolicyHandlerTest, GetVehicleInfo) {
-  // Arrange
-  EnablePolicyAndPolicyManagerMock();
-  // Check expectations
-  EXPECT_CALL(*mock_policy_manager_, GetVehicleInfo())
-      .WillOnce(Return(VehicleInfo()));
-  // Act
-  policy_handler_.GetVehicleInfo();
-}
-
 TEST_F(PolicyHandlerTest, Increment_method_WithOneParameter) {
   // Arrange
   EnablePolicyAndPolicyManagerMock();
@@ -1722,7 +1790,8 @@ TEST_F(PolicyHandlerTest, OnSnapshotCreated_UrlNotAdded) {
       .WillRepeatedly(SetArgReferee<1>(test_data));
   policy_handler_.OnSnapshotCreated(msg, retry_delay_seconds, timeout_exchange);
 #else   // EXTERNAL_PROPRIETARY_MODE
-  policy_handler_.OnSnapshotCreated(msg);
+  policy_handler_.OnSnapshotCreated(msg,
+                                    policy::PTUIterationType::DefaultIteration);
 #endif  // EXTERNAL_PROPRIETARY_MODE
 }
 
@@ -1790,7 +1859,9 @@ TEST_F(PolicyHandlerTest, DISABLED_OnSnapshotCreated_UrlAdded) {
       .WillOnce(ReturnRef(mock_session_observer));
   EXPECT_CALL(*mock_app_, device()).WillOnce(Return(0));
   EXPECT_CALL(app_manager_, applications()).WillOnce(Return(app_set));
-  EXPECT_CALL(mock_message_helper_, SendPolicySnapshotNotification(_, _, _, _));
+  EXPECT_CALL(mock_message_helper_,
+              SendPolicySnapshotNotification(
+                  _, testing::A<const std::vector<uint8_t>&>(), _, _));
   // Check expectations for get app id
   GetAppIDForSending();
   // Expectations
@@ -1800,7 +1871,8 @@ TEST_F(PolicyHandlerTest, DISABLED_OnSnapshotCreated_UrlAdded) {
 #endif  // PROPRIETARY_MODE
 
   EXPECT_CALL(*mock_policy_manager_, OnUpdateStarted());
-  policy_handler_.OnSnapshotCreated(msg);
+  policy_handler_.OnSnapshotCreated(msg,
+                                    policy::PTUIterationType::DefaultIteration);
 }
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
@@ -1848,8 +1920,9 @@ TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_ConsentAllowed) {
   connection_handler::DeviceHandle test_device_id = 100u;
   EXPECT_CALL(app_manager_, connection_handler())
       .WillOnce(ReturnRef(conn_handler));
+  EXPECT_CALL(app_manager_, applications()).WillRepeatedly(Return(app_set));
 
-  EXPECT_CALL(conn_handler, GetDeviceID(kPolicyAppId_, _))
+  EXPECT_CALL(conn_handler, GetDeviceID(kDeviceId, _))
       .WillOnce(DoAll(SetArgPointee<1>(test_device_id), Return(true)));
 
   test_app.insert(mock_app_);
@@ -1859,12 +1932,13 @@ TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_ConsentAllowed) {
   EXPECT_CALL(*mock_policy_manager_, IsPredataPolicy(kPolicyAppId_))
       .WillOnce(Return(true));
 
+  EXPECT_CALL(
+      *mock_policy_manager_,
+      ReactOnUserDevConsentForApp(test_device_id, kPolicyAppId_, is_allowed));
   EXPECT_CALL(*mock_policy_manager_,
-              ReactOnUserDevConsentForApp(kPolicyAppId_, is_allowed));
-  EXPECT_CALL(*mock_policy_manager_,
-              SendNotificationOnPermissionsUpdated(kPolicyAppId_));
+              SendNotificationOnPermissionsUpdated(kDeviceId, kPolicyAppId_));
 
-  policy_handler_.OnDeviceConsentChanged(kPolicyAppId_, is_allowed);
+  policy_handler_.OnDeviceConsentChanged(kDeviceId, is_allowed);
 }
 
 TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_ConsentNotAllowed) {
@@ -1872,27 +1946,29 @@ TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_ConsentNotAllowed) {
   // Arrange
   EnablePolicyAndPolicyManagerMock();
 
-  connection_handler::DeviceHandle test_device_id = 100u;
+  connection_handler::DeviceHandle handle = 100u;
   EXPECT_CALL(app_manager_, connection_handler())
       .WillOnce(ReturnRef(conn_handler));
 
   // Check expectations
-  EXPECT_CALL(conn_handler, GetDeviceID(kPolicyAppId_, _))
-      .WillOnce(DoAll(SetArgPointee<1>(test_device_id), Return(true)));
+  EXPECT_CALL(conn_handler, GetDeviceID(kMacAddr_, _))
+      .WillOnce(DoAll(SetArgPointee<1>(handle), Return(true)));
   test_app.insert(mock_app_);
 
-  EXPECT_CALL(*mock_app_, device()).WillOnce(Return(test_device_id));
+  EXPECT_CALL(*mock_app_, device()).WillOnce(Return(handle));
   EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId_));
 
   EXPECT_CALL(*mock_policy_manager_, IsPredataPolicy(kPolicyAppId_))
       .WillOnce(Return(true));
 
-  EXPECT_CALL(*mock_policy_manager_, ReactOnUserDevConsentForApp(_, _))
+  EXPECT_CALL(*mock_policy_manager_,
+              ReactOnUserDevConsentForApp(handle, kPolicyAppId_, is_allowed))
       .Times(0);
-  EXPECT_CALL(*mock_policy_manager_, SendNotificationOnPermissionsUpdated(_))
+  EXPECT_CALL(*mock_policy_manager_,
+              SendNotificationOnPermissionsUpdated(kMacAddr_, kPolicyAppId_))
       .Times(0);
 
-  policy_handler_.OnDeviceConsentChanged(kPolicyAppId_, is_allowed);
+  policy_handler_.OnDeviceConsentChanged(kMacAddr_, is_allowed);
 }
 
 TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_PredatePolicyNotAllowed) {
@@ -1903,8 +1979,9 @@ TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_PredatePolicyNotAllowed) {
   connection_handler::DeviceHandle test_device_id = 100u;
   EXPECT_CALL(app_manager_, connection_handler())
       .WillOnce(ReturnRef(conn_handler));
+  EXPECT_CALL(app_manager_, applications()).WillRepeatedly(Return(app_set));
 
-  EXPECT_CALL(conn_handler, GetDeviceID(kPolicyAppId_, _))
+  EXPECT_CALL(conn_handler, GetDeviceID(kMacAddr_, _))
       .WillOnce(DoAll(SetArgPointee<1>(test_device_id), Return(true)));
 
   test_app.insert(mock_app_);
@@ -1916,12 +1993,13 @@ TEST_F(PolicyHandlerTest, OnDeviceConsentChanged_PredatePolicyNotAllowed) {
   EXPECT_CALL(*mock_policy_manager_, IsPredataPolicy(kPolicyAppId_))
       .WillOnce(Return(false));
 
+  EXPECT_CALL(
+      *mock_policy_manager_,
+      ReactOnUserDevConsentForApp(test_device_id, kPolicyAppId_, is_allowed));
   EXPECT_CALL(*mock_policy_manager_,
-              ReactOnUserDevConsentForApp(kPolicyAppId_, is_allowed));
-  EXPECT_CALL(*mock_policy_manager_,
-              SendNotificationOnPermissionsUpdated(kPolicyAppId_));
+              SendNotificationOnPermissionsUpdated(kMacAddr_, kPolicyAppId_));
 
-  policy_handler_.OnDeviceConsentChanged(kPolicyAppId_, is_allowed);
+  policy_handler_.OnDeviceConsentChanged(kMacAddr_, is_allowed);
 }
 #ifdef ENABLE_SECURITY
 #ifdef EXTERNAL_PROPRIETARY_MODE
@@ -1972,7 +2050,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_GetDefaultMacAddress) {
   test_app.insert(mock_app_);
   EXPECT_CALL(*mock_app_, IsRegistered()).WillOnce(Return(true));
   EXPECT_CALL(*mock_app_, app_id()).WillRepeatedly(Return(kAppId1_));
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_FULL));
   EXPECT_CALL(app_manager_, connection_handler())
       .WillOnce(ReturnRef(conn_handler));
@@ -1995,7 +2073,7 @@ void PolicyHandlerTest::GetAppIDForSending() {
   // Check expectations
   EXPECT_CALL(*mock_app_, app_id()).WillRepeatedly(Return(kAppId1_));
   EXPECT_CALL(*mock_app_, IsRegistered()).WillOnce(Return(true));
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_FULL));
   EXPECT_CALL(mock_session_observer,
               GetDataOnDeviceID(
@@ -2022,7 +2100,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyIdButNone) {
   const uint32_t app_in_full_id = 1;
   EXPECT_CALL(*mock_app_in_full, app_id())
       .WillRepeatedly(Return(app_in_full_id));
-  EXPECT_CALL(*mock_app_in_full, hmi_level())
+  EXPECT_CALL(*mock_app_in_full, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_FULL));
   ON_CALL(*mock_app_in_full, IsRegistered()).WillByDefault(Return(true));
 
@@ -2034,7 +2112,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyIdButNone) {
   const uint32_t app_in_limited_id = 2;
   EXPECT_CALL(*mock_app_in_limited, app_id())
       .WillRepeatedly(Return(app_in_limited_id));
-  EXPECT_CALL(*mock_app_in_limited, hmi_level())
+  EXPECT_CALL(*mock_app_in_limited, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_LIMITED));
   ON_CALL(*mock_app_in_limited, IsRegistered()).WillByDefault(Return(true));
 
@@ -2046,7 +2124,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyIdButNone) {
   const uint32_t app_in_background_id = 3;
   EXPECT_CALL(*mock_app_in_background, app_id())
       .WillRepeatedly(Return(app_in_background_id));
-  EXPECT_CALL(*mock_app_in_background, hmi_level())
+  EXPECT_CALL(*mock_app_in_background, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_BACKGROUND));
   ON_CALL(*mock_app_in_background, IsRegistered()).WillByDefault(Return(true));
 
@@ -2057,7 +2135,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyIdButNone) {
   const uint32_t app_in_none_id = 4;
   EXPECT_CALL(*mock_app_in_none, app_id())
       .WillRepeatedly(Return(app_in_none_id));
-  EXPECT_CALL(*mock_app_in_none, hmi_level())
+  EXPECT_CALL(*mock_app_in_none, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_NONE));
   EXPECT_CALL(*mock_app_in_none, IsRegistered()).Times(0);
 
@@ -2087,7 +2165,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyAppInNone) {
   const uint32_t app_in_none_id_1 = 1;
   EXPECT_CALL(*mock_app_in_none_1, app_id())
       .WillRepeatedly(Return(app_in_none_id_1));
-  EXPECT_CALL(*mock_app_in_none_1, hmi_level())
+  EXPECT_CALL(*mock_app_in_none_1, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_FULL));
   ON_CALL(*mock_app_in_none_1, IsRegistered()).WillByDefault(Return(true));
 
@@ -2099,7 +2177,7 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyAppInNone) {
   const uint32_t app_in_none_id_2 = 2;
   EXPECT_CALL(*mock_app_in_none_2, app_id())
       .WillRepeatedly(Return(app_in_none_id_2));
-  EXPECT_CALL(*mock_app_in_none_2, hmi_level())
+  EXPECT_CALL(*mock_app_in_none_2, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_api::HMILevel::HMI_NONE));
   ON_CALL(*mock_app_in_none_2, IsRegistered()).WillByDefault(Return(true));
 
@@ -2122,63 +2200,6 @@ TEST_F(PolicyHandlerTest, GetAppIdForSending_ExpectReturnAnyAppInNone) {
   EXPECT_EQ(app_in_none_id_1 || app_in_none_id_2, app_id);
 }
 
-TEST_F(PolicyHandlerTest,
-       SendMessageToSDK_SuitableAppPresent_ExpectedNotificationSending) {
-  BinaryMessage msg;
-  const std::string url = "test_url";
-  EnablePolicyAndPolicyManagerMock();
-  test_app.insert(mock_app_);
-
-  EXPECT_CALL(app_manager_, application(kAppId1_))
-      .WillRepeatedly(Return(mock_app_));
-  EXPECT_CALL(*mock_app_, app_id()).WillRepeatedly(Return(kAppId1_));
-  EXPECT_CALL(*mock_app_, policy_app_id())
-      .WillRepeatedly(Return(kPolicyAppId_));
-  EXPECT_CALL(*mock_app_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
-  EXPECT_CALL(*mock_app_, IsRegistered()).WillRepeatedly(Return(true));
-
-  const connection_handler::DeviceHandle test_device_id = 1u;
-  EXPECT_CALL(*mock_app_, device()).WillRepeatedly(Return(test_device_id));
-  EXPECT_CALL(*mock_policy_manager_, GetUserConsentForDevice(_))
-      .WillOnce(Return(kDeviceAllowed));
-
-  // Act
-  EXPECT_CALL(mock_message_helper_,
-              SendPolicySnapshotNotification(kAppId1_, msg, url, _));
-  EXPECT_TRUE(policy_handler_.SendMessageToSDK(msg, url));
-}
-
-TEST_F(PolicyHandlerTest,
-       SendMessageToSDK_NoSuitableApp_ExpectedNotificationNotSent) {
-  BinaryMessage msg;
-  const std::string url = "test_url";
-  EnablePolicyAndPolicyManagerMock();
-  test_app.insert(mock_app_);
-
-  EXPECT_CALL(app_manager_, application(kAppId1_))
-      .WillRepeatedly(Return(mock_app_));
-  EXPECT_CALL(*mock_app_, app_id()).WillRepeatedly(Return(kAppId1_));
-  EXPECT_CALL(*mock_app_, policy_app_id())
-      .WillRepeatedly(Return(kPolicyAppId_));
-  EXPECT_CALL(*mock_app_, hmi_level())
-      .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_NONE));
-  EXPECT_CALL(*mock_app_, IsRegistered()).WillRepeatedly(Return(true));
-
-  const connection_handler::DeviceHandle test_device_id = 1u;
-  EXPECT_CALL(*mock_app_, device()).WillRepeatedly(Return(test_device_id));
-  EXPECT_CALL(*mock_policy_manager_, GetUserConsentForDevice(_))
-      .WillOnce(Return(kDeviceDisallowed));
-
-  // Expected to get 0 as application id so SDL does not have valid application
-  // with such id
-  EXPECT_CALL(app_manager_, application(0))
-      .WillOnce(
-          Return(std::shared_ptr<application_manager_test::MockApplication>()));
-
-  EXPECT_FALSE(policy_handler_.SendMessageToSDK(msg, url));
-}
-
 TEST_F(PolicyHandlerTest, CanUpdate) {
   GetAppIDForSending();
   EXPECT_TRUE(policy_handler_.CanUpdate());
@@ -2189,9 +2210,9 @@ TEST_F(PolicyHandlerTest, CanUpdate_TwoApplicationForSending_SUCCESS) {
   std::shared_ptr<application_manager_test::MockApplication> second_mock_app =
       std::make_shared<application_manager_test::MockApplication>();
 
-  EXPECT_CALL(*mock_app_, hmi_level())
+  EXPECT_CALL(*mock_app_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_FULL));
-  EXPECT_CALL(*second_mock_app, hmi_level())
+  EXPECT_CALL(*second_mock_app, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_LIMITED));
 
   EXPECT_CALL(*second_mock_app, app_id()).WillRepeatedly(Return(kAppId2_));
@@ -2500,11 +2521,24 @@ TEST_F(PolicyHandlerTest,
 #endif
 }
 
+ACTION_P(SetEndpoint, endpoint) {
+  arg1 = endpoint;
+}
+
 TEST_F(PolicyHandlerTest, GetLockScreenIconUrl_SUCCESS) {
   EnablePolicyAndPolicyManagerMock();
-  EXPECT_CALL(*mock_policy_manager_, GetLockScreenIconUrl());
 
-  policy_handler_.GetLockScreenIconUrl();
+  const std::string url_str = "test_icon_url";
+  EndpointData data(url_str);
+
+  EndpointUrls endpoints;
+  endpoints.push_back(data);
+
+  const std::string service_type = "lock_screen_icon_url";
+  EXPECT_CALL(*mock_policy_manager_, GetUpdateUrls(service_type, _))
+      .WillOnce(SetEndpoint(endpoints));
+
+  EXPECT_EQ(url_str, policy_handler_.GetLockScreenIconUrl(kPolicyAppId_));
 }
 
 TEST_F(PolicyHandlerTest, RemoveListener_SUCCESS) {
@@ -2567,10 +2601,6 @@ TEST_F(PolicyHandlerTest, OnSystemError_SUCCESS) {
   EXPECT_TRUE(waiter1.Wait(auto_lock));
 }
 
-ACTION_P(SetEndpoint, endpoint) {
-  arg1 = endpoint;
-}
-
 TEST_F(PolicyHandlerTest, RemoteAppsUrl_EndpointsEmpty_UNSUCCESS) {
   EnablePolicyAndPolicyManagerMock();
 
@@ -2612,6 +2642,12 @@ TEST_F(PolicyHandlerTest, OnSetCloudAppProperties_AllProperties_SUCCESS) {
       mobile_apis::HybridAppPreference::CLOUD;
   std::string hybrid_app_preference_str = "CLOUD";
   std::string endpoint = "anEndpoint";
+  const policy::AppProperties app_properties(endpoint,
+                                             " ",
+                                             enabled,
+                                             auth_token,
+                                             cloud_transport_type,
+                                             hybrid_app_preference_str);
 
   StringArray nicknames_vec;
   nicknames_vec.push_back(app_name);
@@ -2645,9 +2681,8 @@ TEST_F(PolicyHandlerTest, OnSetCloudAppProperties_AllProperties_SUCCESS) {
   EXPECT_CALL(*mock_policy_manager_,
               SetHybridAppPreference(kPolicyAppId_, hybrid_app_preference_str));
   EXPECT_CALL(*mock_policy_manager_, SetAppEndpoint(kPolicyAppId_, endpoint));
-  EXPECT_CALL(*mock_policy_manager_,
-              GetCloudAppParameters(kPolicyAppId_, _, _, _, _, _, _))
-      .WillOnce(DoAll(SetArgReferee<4>(auth_token), Return(true)));
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
   EXPECT_CALL(app_manager_, RefreshCloudAppInformation());
   EXPECT_CALL(policy_handler_observer,
               OnAuthTokenUpdated(kPolicyAppId_, auth_token));
@@ -2665,38 +2700,595 @@ TEST_F(PolicyHandlerTest, GetCloudAppParameters_AllProperties_SUCCESS) {
   std::string hybrid_app_preference_str = "CLOUD";
   std::string endpoint = "anEndpoint";
 
+  const policy::AppProperties app_properties(endpoint,
+                                             certificate,
+                                             enabled,
+                                             auth_token,
+                                             cloud_transport_type,
+                                             hybrid_app_preference_str);
+
   application_manager_test::MockPolicyHandlerObserver policy_handler_observer;
   policy_handler_.add_listener(&policy_handler_observer);
 
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(app_properties), Return(true)));
+
+  policy::AppProperties out_app_properties;
+  EXPECT_TRUE(
+      policy_handler_.GetAppProperties(kPolicyAppId_, out_app_properties));
+  EXPECT_EQ(app_properties.enabled, out_app_properties.enabled);
+  EXPECT_EQ(app_properties.endpoint, out_app_properties.endpoint);
+  EXPECT_EQ(app_properties.certificate, out_app_properties.certificate);
+  EXPECT_EQ(app_properties.auth_token, out_app_properties.auth_token);
+  EXPECT_EQ(app_properties.transport_type, out_app_properties.transport_type);
+  EXPECT_EQ(app_properties.hybrid_app_preference,
+            out_app_properties.hybrid_app_preference);
+}
+
+TEST_F(PolicyHandlerTest, SendOnAppPropertiesChangeNotification_SUCCESS) {
+  using namespace smart_objects;
+  auto notification = std::make_shared<SmartObject>(SmartType_Null);
+
+  ON_CALL(app_manager_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+
+  EXPECT_CALL(mock_message_helper_,
+              CreateOnAppPropertiesChangeNotification(kPolicyAppId_, _))
+      .WillOnce(Return(notification));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(notification, commands::Command::SOURCE_HMI));
+
+  policy_handler_.SendOnAppPropertiesChangeNotification(kPolicyAppId_);
+}
+
+TEST_F(PolicyHandlerTest, GetApplicationPolicyIDs_GetEmptyIDsVector_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  std::vector<std::string> app_ids_vector;
+  ON_CALL(*mock_policy_manager_, GetApplicationPolicyIDs())
+      .WillByDefault(Return(app_ids_vector));
+
+  EXPECT_CALL(*mock_policy_manager_, GetApplicationPolicyIDs());
+  EXPECT_EQ(app_ids_vector, policy_handler_.GetApplicationPolicyIDs());
+}
+
+TEST_F(PolicyHandlerTest,
+       GetApplicationPolicyIDs_GetIDFromAppIDsVectorWithWrongIDs_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  std::vector<std::string> app_ids_vector = {policy::kDefaultId,
+                                             policy::kPreDataConsentId,
+                                             policy::kDeviceId,
+                                             kPolicyAppId_};
+  ON_CALL(*mock_policy_manager_, GetApplicationPolicyIDs())
+      .WillByDefault(Return(app_ids_vector));
+
+  EXPECT_CALL(*mock_policy_manager_, GetApplicationPolicyIDs());
+
+  auto policy_ids = policy_handler_.GetApplicationPolicyIDs();
+  EXPECT_NE(app_ids_vector, policy_ids);
+  EXPECT_EQ(1u, policy_ids.size());
+  EXPECT_EQ(kPolicyAppId_, policy_ids[0]);
+}
+
+TEST_F(PolicyHandlerTest, CheckCloudAppEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  policy::AppProperties out_app_properties;
+  out_app_properties.enabled = true;
+
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(DoAll(SetArgReferee<1>(out_app_properties), Return(true)));
+  EXPECT_TRUE(policy_handler_.CheckCloudAppEnabled(kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest, CheckCloudAppNotEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _));
+  EXPECT_FALSE(policy_handler_.CheckCloudAppEnabled(kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest, OnLocalAppAdded_SUCCESS) {
+  ChangePolicyManagerToMock();
+  EXPECT_CALL(*mock_policy_manager_, OnLocalAppAdded());
+  policy_handler_.OnLocalAppAdded();
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_NoPropertiesChanged) {
+  ChangePolicyManagerToMock();
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_, GetInitialAppData(kPolicyAppId_, _, _))
+      .WillOnce(Return(false));
+  EXPECT_EQ(policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES,
+            policy_handler_.GetAppPropertiesStatus(properties, kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest,
+       GetAppPropertiesStatus_EnableFlagSwitchChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  policy::AppProperties app_properties;
+  app_properties.enabled = false;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::enabled] = !app_properties.enabled;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::ENABLED_FLAG_SWITCH);
+}
+
+TEST_F(PolicyHandlerTest,
+       GetAppPropertiesStatus_EnableFlagSwitchNotChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  policy::AppProperties app_properties;
+  app_properties.enabled = false;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::enabled] = app_properties.enabled;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_AuthTokenChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const std::string kCurrentToken = "kCurrentToken";
+  const std::string kNewToken = "kNewToken";
+
+  policy::AppProperties app_properties;
+  app_properties.auth_token = kCurrentToken;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::auth_token] = kNewToken;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::AUTH_TOKEN_CHANGED);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_AuthTokenNotChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const std::string kCurrentToken = "kCurrentToken";
+
+  policy::AppProperties app_properties;
+  app_properties.auth_token = kCurrentToken;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::auth_token] = app_properties.auth_token;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_TransportTypeChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const std::string kCurrentTransportType = "kCurrentTransportType";
+  const std::string kNewTransportType = "kNewTransportType";
+
+  policy::AppProperties app_properties;
+  app_properties.transport_type = kCurrentTransportType;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::cloud_transport_type] = kNewTransportType;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::
+          TRANSPORT_TYPE_CHANGED);
+}
+
+TEST_F(PolicyHandlerTest,
+       GetAppPropertiesStatus_TransportTypeNotChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const std::string kCurrentTransportType = "kCurrentTransportType";
+
+  policy::AppProperties app_properties;
+  app_properties.transport_type = kCurrentTransportType;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::cloud_transport_type] = app_properties.transport_type;
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_EndPointChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const std::string kCurrentEndPoint = "kCurrentEndPoint";
+  const std::string kNewEndPoint = "kNewEndPoint";
+
+  policy::AppProperties app_properties;
+  app_properties.endpoint = kCurrentEndPoint;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::endpoint] = kNewEndPoint;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::ENDPOINT_CHANGED);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_EndPointNotChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const std::string kCurrentEndPoint = "kCurrentEndPoint";
+
+  policy::AppProperties app_properties;
+  app_properties.endpoint = kCurrentEndPoint;
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::endpoint] = app_properties.endpoint;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_NicknameChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::nicknames] =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  properties[strings::nicknames].asArray()->push_back(
+      smart_objects::SmartObject(kFakeNickname));
+
+  std::shared_ptr<policy::StringArray> nicknames =
+      std::make_shared<policy::StringArray>();
+
+  const auto expected_app_properties_state =
+      policy::PolicyHandlerInterface::AppPropertiesState::NICKNAMES_CHANGED;
+
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_policy_manager_, GetInitialAppData(kPolicyAppId_, _, _))
+      .WillOnce(DoAll(SetArgPointee<1>(*nicknames), Return(true)));
+  EXPECT_EQ(expected_app_properties_state,
+            policy_handler_.GetAppPropertiesStatus(properties, kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest,
+       GetAppPropertiesStatus_RemoveNickname_NicknamesChanged) {
+  ChangePolicyManagerToMock();
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::nicknames] =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  properties[strings::nicknames].asArray()->push_back(
+      smart_objects::SmartObject(kFakeNickname));
+
+  auto nicknames = std::make_shared<policy::StringArray>(2, kFakeNickname);
+
+  const auto expected_app_properties_state =
+      policy::PolicyHandlerInterface::AppPropertiesState::NICKNAMES_CHANGED;
+
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_policy_manager_, GetInitialAppData(kPolicyAppId_, _, _))
+      .WillOnce(DoAll(SetArgPointee<1>(*nicknames), Return(true)));
+  EXPECT_EQ(expected_app_properties_state,
+            policy_handler_.GetAppPropertiesStatus(properties, kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_NicknameNotChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::nicknames] =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+  properties[strings::nicknames].asArray()->push_back(
+      smart_objects::SmartObject(kFakeNickname));
+
+  std::shared_ptr<policy::StringArray> nicknames =
+      std::make_shared<policy::StringArray>();
+  nicknames->push_back(kFakeNickname);
+
+  const auto expected_app_properties_state =
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES;
+
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(kPolicyAppId_, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*mock_policy_manager_, GetInitialAppData(kPolicyAppId_, _, _))
+      .WillOnce(DoAll(SetArgPointee<1>(*nicknames), Return(true)));
+  EXPECT_EQ(expected_app_properties_state,
+            policy_handler_.GetAppPropertiesStatus(properties, kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_HybridAppChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const auto kCurrentHybridAppProperties =
+      mobile_apis::HybridAppPreference::eType::CLOUD;
+  const auto kNewHybridAppProperties =
+      mobile_apis::HybridAppPreference::eType::MOBILE;
+
+  policy::AppProperties app_properties;
+  smart_objects::EnumConversionHelper<mobile_apis::HybridAppPreference::eType>::
+      EnumToString(kCurrentHybridAppProperties,
+                   &app_properties.hybrid_app_preference);
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::hybrid_app_preference] = kNewHybridAppProperties;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::
+          HYBRYD_APP_PROPERTIES_CHANGED);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_HybridAppNotChanged_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  const auto kCurrentHybridAppProperties =
+      mobile_apis::HybridAppPreference::eType::CLOUD;
+
+  policy::AppProperties app_properties;
+  smart_objects::EnumConversionHelper<mobile_apis::HybridAppPreference::eType>::
+      EnumToString(kCurrentHybridAppProperties,
+                   &app_properties.hybrid_app_preference);
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+  properties[strings::hybrid_app_preference] = kCurrentHybridAppProperties;
+
+  SetExpectationsAndCheckCloudAppPropertiesStatus(
+      app_properties,
+      properties,
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES);
+}
+
+TEST_F(PolicyHandlerTest, GetAppPropertiesStatus_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  policy_handler_.LoadPolicyLibrary();
+
+  smart_objects::SmartObject properties;
+  properties[strings::app_id] = kPolicyAppId_;
+
+  EXPECT_CALL(*mock_policy_manager_, GetAppProperties(_, _)).Times(0);
+  EXPECT_CALL(*mock_policy_manager_, GetInitialAppData(_, _, _)).Times(0);
+  const auto expected_app_properties_state =
+      policy::PolicyHandlerInterface::AppPropertiesState::NO_CHANGES;
+  EXPECT_EQ(expected_app_properties_state,
+            policy_handler_.GetAppPropertiesStatus(properties, kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest, GetEnabledLocalApps_SUCCESS) {
+  ChangePolicyManagerToMock();
+  std::vector<std::string> enabled_local_apps;
+
+  EXPECT_CALL(*mock_policy_manager_, GetEnabledLocalApps())
+      .WillOnce(Return(enabled_local_apps));
+  EXPECT_EQ(enabled_local_apps, policy_handler_.GetEnabledLocalApps());
+
+  enabled_local_apps.push_back("local_app");
+  EXPECT_CALL(*mock_policy_manager_, GetEnabledLocalApps())
+      .WillOnce(Return(enabled_local_apps));
+  EXPECT_EQ(enabled_local_apps, policy_handler_.GetEnabledLocalApps());
+}
+
+TEST_F(PolicyHandlerTest, PushAppIdToPTUQueue_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+  const uint32_t expected_apps_count = 1u;
+  EXPECT_CALL(*mock_policy_manager_,
+              UpdatePTUReadyAppsCount(expected_apps_count));
+  policy_handler_.PushAppIdToPTUQueue(kAppId1_);
+  EXPECT_EQ(expected_apps_count,
+            policy_handler_.applications_ptu_queue_.size());
+}
+
+TEST_F(PolicyHandlerTest, PushAppIdToPTUQueue_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  const uint32_t expected_apps_count = 0u;
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_,
+              UpdatePTUReadyAppsCount(expected_apps_count))
+      .Times(0);
+
+  policy_handler_.LoadPolicyLibrary();
+  policy_handler_.PushAppIdToPTUQueue(kAppId1_);
+  EXPECT_EQ(expected_apps_count,
+            policy_handler_.applications_ptu_queue_.size());
+}
+
+TEST_F(PolicyHandlerTest, StopRetrySequence_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+  EXPECT_CALL(*mock_policy_manager_, StopRetrySequence());
+  policy_handler_.StopRetrySequence();
+}
+
+TEST_F(PolicyHandlerTest, StopRetrySequence_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_, StopRetrySequence()).Times(0);
+
+  policy_handler_.LoadPolicyLibrary();
+  policy_handler_.StopRetrySequence();
+}
+
+TEST_F(PolicyHandlerTest, GetPolicyTableData_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+  Json::Value expected_table_data(Json::objectValue);
+  expected_table_data["test_key"] = "test_value";
+  EXPECT_CALL(*mock_policy_manager_, GetPolicyTableData())
+      .WillOnce(Return(expected_table_data));
+  EXPECT_EQ(expected_table_data, policy_handler_.GetPolicyTableData());
+}
+
+TEST_F(PolicyHandlerTest, GetPolicyTableData_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_, GetPolicyTableData()).Times(0);
+
+  policy_handler_.LoadPolicyLibrary();
+
+  Json::Value expected_table_data;
+  EXPECT_EQ(expected_table_data, policy_handler_.GetPolicyTableData());
+}
+
+TEST_F(PolicyHandlerTest, GetRemovedVehicleDataItems_PolicyEnabled_SUCCESS) {
+  using rpc::policy_table_interface_base::VehicleDataItem;
+
+  ChangePolicyManagerToMock();
+
+  std::vector<VehicleDataItem> expected_removed_items;
+  expected_removed_items.push_back(VehicleDataItem());
+
+  EXPECT_CALL(*mock_policy_manager_, GetRemovedVehicleDataItems())
+      .WillOnce(Return(expected_removed_items));
+
+  const auto& actually_removed_items =
+      policy_handler_.GetRemovedVehicleDataItems();
+  ASSERT_EQ(expected_removed_items.size(), actually_removed_items.size());
+  EXPECT_TRUE(expected_removed_items[0] == actually_removed_items[0]);
+}
+
+TEST_F(PolicyHandlerTest, GetRemovedVehicleDataItems_PolicyDisabled_FAIL) {
+  using rpc::policy_table_interface_base::VehicleDataItem;
+
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_, GetRemovedVehicleDataItems()).Times(0);
+
+  policy_handler_.LoadPolicyLibrary();
+
+  EXPECT_TRUE(policy_handler_.GetRemovedVehicleDataItems().empty());
+}
+
+TEST_F(PolicyHandlerTest, PopAppIdFromPTUQueue_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  policy_handler_.PushAppIdToPTUQueue(kAppId1_);
+  ASSERT_EQ(1u, policy_handler_.applications_ptu_queue_.size());
+
+  policy_handler_.PopAppIdFromPTUQueue();
+  EXPECT_EQ(0u, policy_handler_.applications_ptu_queue_.size());
+}
+
+TEST_F(PolicyHandlerTest, PopAppIdFromPTUQueue_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  const uint32_t expected_apps_count = 0u;
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
   EXPECT_CALL(*mock_policy_manager_,
-              GetCloudAppParameters(kPolicyAppId_, _, _, _, _, _, _))
-      .WillOnce(DoAll(SetArgReferee<1>(enabled),
-                      SetArgReferee<2>(endpoint),
-                      SetArgReferee<3>(certificate),
-                      SetArgReferee<4>(auth_token),
-                      SetArgReferee<5>(cloud_transport_type),
-                      SetArgReferee<6>(hybrid_app_preference_str),
-                      Return(true)));
-
-  bool enabled_out;
-  std::string endpoint_out;
-  std::string cert_out;
-  std::string auth_token_out;
-  std::string ctt_out;
-  std::string hap_out;
-  EXPECT_TRUE(policy_handler_.GetCloudAppParameters(kPolicyAppId_,
-                                                    enabled_out,
-                                                    endpoint_out,
-                                                    cert_out,
-                                                    auth_token_out,
-                                                    ctt_out,
-                                                    hap_out));
-  EXPECT_EQ(enabled, enabled_out);
-  EXPECT_EQ(endpoint, endpoint_out);
-  EXPECT_EQ(certificate, cert_out);
-  EXPECT_EQ(auth_token, auth_token_out);
-  EXPECT_EQ(cloud_transport_type, ctt_out);
-  EXPECT_EQ(hybrid_app_preference_str, hap_out);
+              UpdatePTUReadyAppsCount(expected_apps_count))
+      .Times(0);
+
+  policy_handler_.LoadPolicyLibrary();
+  policy_handler_.PopAppIdFromPTUQueue();
+  EXPECT_EQ(expected_apps_count,
+            policy_handler_.applications_ptu_queue_.size());
+}
+
+TEST_F(PolicyHandlerTest, OnLocalAppAdded_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+  EXPECT_CALL(*mock_policy_manager_, OnLocalAppAdded());
+  policy_handler_.OnLocalAppAdded();
+}
+
+TEST_F(PolicyHandlerTest, OnLocalAppAdded_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  EXPECT_CALL(*mock_policy_manager_, OnLocalAppAdded()).Times(0);
+
+  policy_handler_.LoadPolicyLibrary();
+  policy_handler_.OnLocalAppAdded();
+}
+
+TEST_F(PolicyHandlerTest, OnPermissionsUpdated_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(app_manager_, application(kDeviceId_, kPolicyAppId_))
+      .WillOnce(Return(mock_app_));
+
+  const rpc::Optional<rpc::Boolean> encryption_requiered;
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .WillOnce(Return(encryption_requiered));
+  EXPECT_CALL(*mock_app_, app_id()).WillRepeatedly(Return(kAppId1_));
+
+  Permissions app_permissions;
+  EXPECT_CALL(mock_message_helper_,
+              SendOnPermissionsChangeNotification(kAppId1_, _, _, _));
+  policy_handler_.OnPermissionsUpdated(
+      kDeviceId_, kPolicyAppId_, app_permissions);
+}
+
+TEST_F(PolicyHandlerTest, OnPermissionsUpdated_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  policy_handler_.LoadPolicyLibrary();
+
+  EXPECT_CALL(app_manager_, application(kDeviceId_, kPolicyAppId_)).Times(0);
+  EXPECT_CALL(*mock_policy_manager_, GetAppEncryptionRequired(kPolicyAppId_))
+      .Times(0);
+  EXPECT_CALL(*mock_app_, app_id()).Times(0);
+
+  Permissions app_permissions;
+  EXPECT_CALL(mock_message_helper_,
+              SendOnPermissionsChangeNotification(_, _, _, _))
+      .Times(0);
+  policy_handler_.OnPermissionsUpdated(
+      kDeviceId_, kPolicyAppId_, app_permissions);
+}
+
+TEST_F(PolicyHandlerTest, IsNewApplication_PolicyEnabled_SUCCESS) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(*mock_policy_manager_, IsNewApplication(kPolicyAppId_))
+      .WillOnce(Return(true));
+  EXPECT_TRUE(policy_handler_.IsNewApplication(kPolicyAppId_));
+}
+
+TEST_F(PolicyHandlerTest, IsNewApplication_PolicyDisabled_FAIL) {
+  ChangePolicyManagerToMock();
+
+  EXPECT_CALL(policy_settings_, enable_policy()).WillOnce(Return(false));
+  policy_handler_.LoadPolicyLibrary();
+
+  EXPECT_CALL(*mock_policy_manager_, IsNewApplication(kPolicyAppId_)).Times(0);
+  EXPECT_FALSE(policy_handler_.IsNewApplication(kPolicyAppId_));
 }
 
 }  // namespace policy_handler_test
diff --git a/src/components/application_manager/test/rc_policy_handler_test.cc b/src/components/application_manager/test/rc_policy_handler_test.cc
index 818a014a3f..cc9f741d28 100644
--- a/src/components/application_manager/test/rc_policy_handler_test.cc
+++ b/src/components/application_manager/test/rc_policy_handler_test.cc
@@ -151,58 +151,6 @@ class RCPolicyHandlerTest : public ::testing::Test {
   }
 };
 
-TEST_F(RCPolicyHandlerTest,
-       SendMessageToSDK_RemoteControlInvalidMobileAppId_UNSUCCESS) {
-  // Precondition
-  BinaryMessage msg;
-  EnablePolicyAndPolicyManagerMock();
-
-  EXPECT_CALL(app_manager_, applications()).WillOnce(Return(app_set));
-  test_app.insert(mock_app_);
-
-  ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId1_));
-  ON_CALL(*mock_app_, hmi_level())
-      .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
-  EXPECT_CALL(*mock_app_, IsRegistered()).WillOnce(Return(true));
-
-  EXPECT_CALL(app_manager_, application(kAppId1_))
-      .WillRepeatedly(Return(mock_app_));
-  const std::string empty_mobile_app_id("");
-  EXPECT_CALL(*mock_app_, policy_app_id())
-      .WillOnce(Return(empty_mobile_app_id));
-
-  EXPECT_CALL(*mock_policy_manager_, GetUserConsentForDevice(_))
-      .WillOnce(Return(kDeviceAllowed));
-
-  EXPECT_CALL(mock_message_helper_, SendPolicySnapshotNotification(_, _, _, _))
-      .Times(0);
-  EXPECT_FALSE(policy_handler_.SendMessageToSDK(msg, kUrl_));
-}
-
-TEST_F(RCPolicyHandlerTest, SendMessageToSDK_RemoteControl_SUCCESS) {
-  BinaryMessage msg;
-  EnablePolicyAndPolicyManagerMock();
-  EXPECT_CALL(app_manager_, applications()).WillOnce(Return(app_set));
-  test_app.insert(mock_app_);
-
-  ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId1_));
-  ON_CALL(*mock_app_, hmi_level())
-      .WillByDefault(Return(mobile_apis::HMILevel::HMI_FULL));
-  EXPECT_CALL(*mock_app_, IsRegistered()).WillOnce(Return(true));
-
-  EXPECT_CALL(app_manager_, application(kAppId1_))
-      .WillRepeatedly(Return(mock_app_));
-
-  EXPECT_CALL(*mock_app_, policy_app_id()).WillOnce(Return(kPolicyAppId_));
-
-  EXPECT_CALL(*mock_policy_manager_, GetUserConsentForDevice(_))
-      .WillOnce(Return(kDeviceAllowed));
-
-  EXPECT_CALL(mock_message_helper_,
-              SendPolicySnapshotNotification(kAppId1_, _, kUrl_, _));
-  EXPECT_TRUE(policy_handler_.SendMessageToSDK(msg, kUrl_));
-}
-
 TEST_F(RCPolicyHandlerTest, OnUpdateHMILevel_InvalidApp_UNSUCCESS) {
   EnablePolicyAndPolicyManagerMock();
 
diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
index a82358b451..b4e5e85376 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -35,10 +35,12 @@
 
 #include "application_manager/application.h"
 #include "application_manager/application_manager_impl.h"
+#include "application_manager/display_capabilities_builder.h"
 #include "application_manager/mock_app_extension.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_help_prompt_manager.h"
 #include "application_manager/mock_resumption_data.h"
+#include "application_manager/mock_rpc_service.h"
 #include "application_manager/resumption/resume_ctrl_impl.h"
 #include "application_manager/usage_statistics.h"
 #include "config_profile/profile.h"
@@ -51,6 +53,7 @@
 #include "application_manager/mock_event_dispatcher.h"
 #include "application_manager/mock_message_helper.h"
 #include "application_manager/mock_state_controller.h"
+#include "application_manager/policies/mock_policy_handler_interface.h"
 
 namespace test {
 namespace components {
@@ -73,6 +76,12 @@ using namespace application_manager_test;
 using namespace resumption;
 using namespace mobile_apis::HMILevel;
 
+namespace {
+const WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const int32_t kDefaultHmiAppId = 111;
+}  // namespace
+
 class ResumeCtrlTest : public ::testing::Test {
  protected:
   ResumeCtrlTest()
@@ -120,6 +129,8 @@ class ResumeCtrlTest : public ::testing::Test {
     EXPECT_CALL(mock_app_mngr_, CheckResumptionRequiredTransportAvailable(_))
         .Times(AtLeast(0))
         .WillRepeatedly(Return(true));
+    ON_CALL(mock_app_mngr_, get_full_or_limited_application())
+        .WillByDefault(Return(ApplicationSharedPtr()));
 
     ON_CALL(mock_application_manager_settings_, use_db_for_resumption())
         .WillByDefault(Return(false));
@@ -156,17 +167,62 @@ class ResumeCtrlTest : public ::testing::Test {
     ON_CALL(*mock_app_, is_cloud_app()).WillByDefault(Return(false));
   }
 
+  smart_objects::SmartObjectSPtr CreateStubCreateWindowRequest(
+      const std::string window_name,
+      const WindowID window_id,
+      const mobile_apis::WindowType::eType window_type) const {
+    auto request = std::make_shared<smart_objects::SmartObject>(
+        smart_objects::SmartType_Map);
+    smart_objects::SmartObject msg_params(smart_objects::SmartType_Map);
+    smart_objects::SmartObject params(smart_objects::SmartType_Map);
+
+    params[strings::correlation_id] = window_id;
+
+    msg_params[strings::window_name] = window_name;
+    msg_params[strings::window_id] = window_id;
+    msg_params[strings::window_type] = window_type;
+    msg_params[strings::app_id] = kDefaultHmiAppId;
+
+    (*request)[strings::msg_params] = msg_params;
+    (*request)[strings::params] = params;
+
+    return request;
+  }
+
+  smart_objects::SmartObjectSPtr CreateStubCreateWindowResponse(
+      const int32_t correlation_id,
+      const hmi_apis::Common_Result::eType result_code) const {
+    auto response = std::make_shared<smart_objects::SmartObject>(
+        smart_objects::SmartType_Map);
+    smart_objects::SmartObject params(smart_objects::SmartType_Map);
+
+    params[strings::correlation_id] = correlation_id;
+    params[hmi_response::code] = result_code;
+
+    (*response)[strings::params] = params;
+
+    return response;
+  }
+
+  void SetupIsAppRevoked(const bool is_app_revoked) {
+    EXPECT_CALL(mock_app_mngr_, GetPolicyHandler())
+        .WillOnce(ReturnRef(mock_policy_handler_));
+    EXPECT_CALL(mock_policy_handler_, IsApplicationRevoked(_))
+        .WillOnce(Return(is_app_revoked));
+  }
+
   NiceMock<event_engine_test::MockEventDispatcher> mock_event_dispatcher_;
-  application_manager_test::MockApplicationManagerSettings
+  NiceMock<application_manager_test::MockApplicationManagerSettings>
       mock_application_manager_settings_;
   NiceMock<application_manager_test::MockApplicationManager> mock_app_mngr_;
   std::shared_ptr<NiceMock<application_manager_test::MockAppExtension> >
       mock_app_extension_;
-  MockStateController mock_state_controller_;
+  NiceMock<MockStateController> mock_state_controller_;
   std::shared_ptr<ResumeCtrl> res_ctrl_;
   std::shared_ptr<NiceMock<resumption_test::MockResumptionData> > mock_storage_;
   std::shared_ptr<NiceMock<MockApplication> > mock_app_;
   std::shared_ptr<MockHelpPromptManager> mock_help_prompt_manager_;
+  policy_test::MockPolicyHandlerInterface mock_policy_handler_;
   application_manager::ApplicationConstSharedPtr const_app_;
   const uint32_t kTestAppId_;
   const std::string kTestPolicyAppId_;
@@ -185,6 +241,7 @@ class ResumeCtrlTest : public ::testing::Test {
   const std::string kNaviLowbandwidthLevel_;
   const std::string kProjectionLowbandwidthLevel_;
   const std::string kMediaLowbandwidthLevel_;
+  NiceMock<application_manager_test::MockRPCService> mock_rpc_service_;
 };
 
 /**
@@ -198,7 +255,6 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithGrammarId) {
 
   // Check RestoreApplicationData
   GetInfoFromApp();
-
   ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillByDefault(Return(kDefaultTestLevel_));
   ON_CALL(*mock_storage_,
@@ -337,9 +393,9 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) {
   GetInfoFromApp();
   smart_objects::SmartObject test_application_commands;
   smart_objects::SmartObject test_commands;
-  const uint32_t count_of_commands = 20;
+  const uint32_t count_of_commands = 20u;
 
-  for (uint32_t i = 0; i < count_of_commands; ++i) {
+  for (uint32_t i = 0u; i < count_of_commands; ++i) {
     test_commands[application_manager::strings::cmd_id] = i;
     test_application_commands[i] = test_commands;
   }
@@ -361,10 +417,33 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithCommands) {
   ON_CALL(*mock_app_, help_prompt_manager())
       .WillByDefault(ReturnRef(*mock_help_prompt_manager_));
 
-  for (uint32_t i = 0; i < count_of_commands; ++i) {
-    EXPECT_CALL(*mock_app_, AddCommand(i, test_application_commands[i]));
-    EXPECT_CALL(*mock_help_prompt_manager_,
-                OnVrCommandAdded(i, test_application_commands[i], true));
+  std::vector<application_manager::CommandsMap> command_vec(count_of_commands);
+  for (uint32_t count = 0u; count < count_of_commands; ++count) {
+    for (uint32_t i = 0u; i < count; ++i) {
+      command_vec[count].insert(
+          std::pair<uint32_t, smart_objects::SmartObject*>(
+              i + 1, &test_application_commands[i]));
+    };
+  }
+
+  uint32_t comm_n = 0u;
+  ON_CALL(*mock_app_, commands_map())
+      .WillByDefault(testing::Invoke(
+          [&]() -> DataAccessor<application_manager::CommandsMap> {
+            DataAccessor<application_manager::CommandsMap> data_accessor(
+                command_vec[comm_n], app_set_lock_ptr_);
+            ++comm_n;
+            return data_accessor;
+          }));
+
+  for (uint32_t cmd_id = 0u, internal_id = 1u; cmd_id < count_of_commands;
+       ++cmd_id, ++internal_id) {
+    EXPECT_CALL(*mock_app_,
+                AddCommand(internal_id, test_application_commands[cmd_id]));
+
+    EXPECT_CALL(
+        *mock_help_prompt_manager_,
+        OnVrCommandAdded(cmd_id, test_application_commands[cmd_id], true));
   }
 
   smart_objects::SmartObjectList requests;
@@ -572,12 +651,231 @@ TEST_F(ResumeCtrlTest, StartResumption_AppWithSubscriptionToWayPoints) {
       mobile_apis::HMILevel::HMI_FULL;
   ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillByDefault(Return(hmi_test_level));
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, hmi_test_level));
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, hmi_test_level));
 
   const bool result = res_ctrl_->StartResumption(mock_app_, kHash_);
   EXPECT_TRUE(result);
 }
 
+TEST_F(ResumeCtrlTest,
+       RestoreAppWidgets_AppWithWidgets_SendCreateWindowRequests) {
+  using namespace smart_objects;
+  using namespace application_manager;
+  GetInfoFromApp();
+  const uint32_t count_of_widgets = 10u;
+
+  auto create_window_info_so = []() -> SmartObject {
+    SmartObject widgets_info(SmartType_Array);
+    for (uint32_t i = 0; i < count_of_widgets; ++i) {
+      SmartObject widget_info(SmartType_Map);
+      widget_info[strings::associated_service_type] = "ServiceType";
+      widget_info[strings::duplicate_updates_from_window_id] = 0;
+      widget_info[strings::window_name] =
+          std::string("Widget ") + std::to_string(i + 1);
+      widget_info[strings::window_type] =
+          static_cast<int32_t>(mobile_apis::WindowType::WIDGET);
+      widget_info[strings::window_id] = i + 1;
+      widgets_info[widgets_info.length()] = widget_info;
+    }
+    return widgets_info;
+  };
+
+  auto create_saved_app_so = [&create_window_info_so, this]() -> SmartObject {
+    smart_objects::SmartObject saved_app;
+    const auto test_app_widgets = create_window_info_so();
+    saved_app[strings::hash_id] = kHash_;
+    saved_app[strings::windows_info] = test_app_widgets;
+    saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
+    saved_app[application_manager::strings::hmi_level] = eType::HMI_FULL;
+    return saved_app;
+  };
+
+  const auto saved_app = create_saved_app_so();
+
+  const auto hmi_request = std::make_shared<smart_objects::SmartObject>(
+      smart_objects::SmartType_Map);
+  const auto hmi_requests =
+      smart_objects::SmartObjectList(count_of_widgets, hmi_request);
+
+  DisplayCapabilitiesBuilder builder(*mock_app_);
+  ON_CALL(*mock_app_, display_capabilities_builder())
+      .WillByDefault(ReturnRef(builder));
+  EXPECT_CALL(
+      *application_manager::MockMessageHelper::message_helper_mock(),
+      CreateUICreateWindowRequestsToHMI(_, _, saved_app[strings::windows_info]))
+      .WillOnce(Return(hmi_requests));
+
+  ON_CALL(mock_app_mngr_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(_, commands::Command::SOURCE_SDL_TO_HMI))
+      .Times(count_of_widgets)
+      .WillRepeatedly(Return(true));
+
+  res_ctrl_->RestoreAppWidgets(mock_app_, saved_app);
+}
+
+TEST_F(ResumeCtrlTest,
+       RestoreWidgetsHMIState_AppWithWidgets_AddWidgetsInternally) {
+  const uint32_t count_of_widgets = 10u;
+
+  smart_objects::SmartObject saved_app;
+  saved_app[strings::hash_id] = kHash_;
+  saved_app[strings::windows_info] = smart_objects::SmartObject();
+  saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
+  saved_app[application_manager::strings::hmi_level] = eType::HMI_FULL;
+
+  ON_CALL(mock_app_mngr_, application_by_hmi_app(kDefaultHmiAppId))
+      .WillByDefault(Return(mock_app_));
+  DisplayCapabilitiesBuilder builder(*mock_app_);
+  ON_CALL(*mock_app_, display_capabilities_builder())
+      .WillByDefault(ReturnRef(builder));
+
+  smart_objects::SmartObjectList requests;
+  smart_objects::SmartObjectList responses;
+  for (uint32_t i = 0; i < count_of_widgets; ++i) {
+    const auto window_type = mobile_apis::WindowType::WIDGET;
+    const WindowID window_id = i + 1;
+    const auto window_name = std::string("Widget ") + std::to_string(window_id);
+    requests.push_back(
+        CreateStubCreateWindowRequest(window_name, window_id, window_type));
+    responses.push_back(CreateStubCreateWindowResponse(
+        window_id, hmi_apis::Common_Result::SUCCESS));
+    EXPECT_CALL(mock_app_mngr_, CreateRegularState(_, window_type, _, _, _, _))
+        .WillRepeatedly(Return(nullptr));
+    EXPECT_CALL(*mock_app_, SetInitialState(window_id, window_name, _));
+    EXPECT_CALL(mock_state_controller_,
+                OnAppWindowAdded(_, window_id, window_type, _));
+  }
+
+  EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(),
+              CreateUICreateWindowRequestsToHMI(_, _, _))
+      .WillOnce(Return(requests));
+
+  ON_CALL(mock_app_mngr_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(_, commands::Command::SOURCE_SDL_TO_HMI))
+      .Times(count_of_widgets)
+      .WillRepeatedly(Return(true));
+  res_ctrl_->RestoreAppWidgets(mock_app_, saved_app);
+  for (const auto& response : responses) {
+    res_ctrl_->RestoreWidgetsHMIState(*response);
+  }
+}
+
+TEST_F(ResumeCtrlTest,
+       RestoreAppWidgets_AppWithoutWidgets_NoCreateWindowRqSent) {
+  smart_objects::SmartObject saved_app;
+  saved_app[strings::hash_id] = kHash_;
+  saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
+  saved_app[application_manager::strings::hmi_level] = eType::HMI_FULL;
+
+  EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(),
+              CreateUICreateWindowRequestsToHMI(_, _, _))
+      .Times(0);
+
+  res_ctrl_->RestoreAppWidgets(mock_app_, saved_app);
+}
+
+TEST_F(ResumeCtrlTest, RestoreWidgetsHMIState_HMIResponseWith_InvalidCorrId) {
+  smart_objects::SmartObject saved_app;
+  saved_app[strings::hash_id] = kHash_;
+  saved_app[strings::windows_info] = smart_objects::SmartObject();
+  saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
+  saved_app[application_manager::strings::hmi_level] = eType::HMI_FULL;
+
+  const int32_t invalid_corr_id = -1;
+  auto response = CreateStubCreateWindowResponse(
+      invalid_corr_id, hmi_apis::Common_Result::SUCCESS);
+
+  ON_CALL(mock_app_mngr_, application_by_hmi_app(kDefaultHmiAppId))
+      .WillByDefault(Return(mock_app_));
+
+  DisplayCapabilitiesBuilder builder(*mock_app_);
+  ON_CALL(*mock_app_, display_capabilities_builder())
+      .WillByDefault(ReturnRef(builder));
+
+  smart_objects::SmartObjectList requests;
+
+  const auto window_type = mobile_apis::WindowType::WIDGET;
+  const WindowID window_id = 1;
+  const auto window_name = std::string("Widget ") + std::to_string(window_id);
+  requests.push_back(
+      CreateStubCreateWindowRequest(window_name, window_id, window_type));
+
+  EXPECT_CALL(mock_app_mngr_, CreateRegularState(_, window_type, _, _, _, _))
+      .Times(0);
+  EXPECT_CALL(*mock_app_, SetInitialState(window_id, window_name, _)).Times(0);
+  EXPECT_CALL(mock_state_controller_,
+              OnAppWindowAdded(_, window_id, window_type, _))
+      .Times(0);
+
+  EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(),
+              CreateUICreateWindowRequestsToHMI(_, _, _))
+      .WillOnce(Return(requests));
+
+  ON_CALL(mock_app_mngr_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(_, commands::Command::SOURCE_SDL_TO_HMI))
+      .WillRepeatedly(Return(true));
+  res_ctrl_->RestoreAppWidgets(mock_app_, saved_app);
+  res_ctrl_->RestoreWidgetsHMIState(*response);
+}
+
+TEST_F(ResumeCtrlTest, RestoreWidgetsHMIState_HMIResponseWith_Unsuccess) {
+  smart_objects::SmartObject saved_app;
+  saved_app[strings::hash_id] = kHash_;
+  saved_app[strings::windows_info] = smart_objects::SmartObject();
+  saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
+  saved_app[application_manager::strings::hmi_level] = eType::HMI_FULL;
+
+  const int32_t correlation_id = 1;
+  auto response = CreateStubCreateWindowResponse(
+      correlation_id, hmi_apis::Common_Result::GENERIC_ERROR);
+
+  ON_CALL(mock_app_mngr_, application_by_hmi_app(kDefaultHmiAppId))
+      .WillByDefault(Return(mock_app_));
+
+  DisplayCapabilitiesBuilder builder(*mock_app_);
+  smart_objects::SmartObject stub_window_info(smart_objects::SmartType_Null);
+  auto stub_resume_cb = [](Application&, const smart_objects::SmartObject&) {};
+  builder.InitBuilder(stub_resume_cb, stub_window_info);
+  ON_CALL(*mock_app_, display_capabilities_builder())
+      .WillByDefault(ReturnRef(builder));
+
+  smart_objects::SmartObjectList requests;
+  smart_objects::SmartObjectList responses;
+
+  const auto window_type = mobile_apis::WindowType::WIDGET;
+  const WindowID window_id = 1;
+  const auto window_name = std::string("Widget ") + std::to_string(window_id);
+  requests.push_back(
+      CreateStubCreateWindowRequest(window_name, window_id, window_type));
+
+  EXPECT_CALL(mock_app_mngr_, CreateRegularState(_, window_type, _, _, _, _))
+      .Times(0);
+  EXPECT_CALL(*mock_app_, SetInitialState(window_id, window_name, _)).Times(0);
+  EXPECT_CALL(mock_state_controller_,
+              OnAppWindowAdded(_, window_id, window_type, _))
+      .Times(0);
+
+  EXPECT_CALL(*application_manager::MockMessageHelper::message_helper_mock(),
+              CreateUICreateWindowRequestsToHMI(_, _, _))
+      .WillOnce(Return(requests));
+
+  ON_CALL(mock_app_mngr_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+  EXPECT_CALL(mock_rpc_service_,
+              ManageHMICommand(_, commands::Command::SOURCE_SDL_TO_HMI))
+      .WillRepeatedly(Return(true));
+  res_ctrl_->RestoreAppWidgets(mock_app_, saved_app);
+  res_ctrl_->RestoreWidgetsHMIState(*response);
+}
+
 TEST_F(ResumeCtrlTest, StartResumptionOnlyHMILevel) {
   smart_objects::SmartObject saved_app;
 
@@ -632,7 +930,8 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) {
   DataAccessor<application_manager::CommandsMap> data_accessor(
       command, app_set_lock_ptr_);
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, restored_test_type))
       .Times(AtLeast(1));
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
@@ -642,6 +941,9 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppInFull) {
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   EXPECT_CALL(*mock_storage_,
               RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_))
       .WillOnce(Return(true));
@@ -681,13 +983,17 @@ TEST_F(ResumeCtrlTest, StartAppHmiStateResumption_AppHasDeferredResumption) {
   saved_app[application_manager::strings::time_stamp] = time_stamp;
 
   // resume into deferred level instead of restored level
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, deferred_level))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, deferred_level))
       .Times(AtLeast(1));
   GetInfoFromApp();
   ON_CALL(*mock_storage_,
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   mobile_apis::HMILevel::eType app_deferred_level = deferred_level;
   EXPECT_CALL(*mock_app_, deferred_resumption_hmi_level())
       .WillRepeatedly(ReturnPointee(&app_deferred_level));
@@ -716,13 +1022,17 @@ TEST_F(ResumeCtrlTest,
   saved_app[application_manager::strings::hmi_level] = restored_test_type;
   saved_app[application_manager::strings::time_stamp] = time_stamp;
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, eType::HMI_LIMITED))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, eType::HMI_LIMITED))
       .Times(AtLeast(1));
   GetInfoFromApp();
   ON_CALL(*mock_storage_,
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   EXPECT_CALL(mock_app_mngr_, CheckResumptionRequiredTransportAvailable(_))
       .WillOnce(Return(false));
 
@@ -760,13 +1070,17 @@ TEST_F(
 
   // in this test, it is expected that the app will resume into LIMITED, which
   // is the higher level among NONE and LIMITED
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, eType::HMI_LIMITED))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, eType::HMI_LIMITED))
       .Times(AtLeast(1));
   GetInfoFromApp();
   ON_CALL(*mock_storage_,
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   EXPECT_CALL(mock_app_mngr_, CheckResumptionRequiredTransportAvailable(_))
       .WillOnce(Return(false));
 
@@ -816,7 +1130,8 @@ TEST_F(ResumeCtrlTest, RestoreAppHMIState_RestoreHMILevelFull) {
   saved_app[application_manager::strings::grammar_id] = kTestGrammarId_;
   saved_app[application_manager::strings::hmi_level] = restored_test_type;
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, restored_test_type))
       .Times(AtLeast(1));
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
@@ -828,7 +1143,6 @@ TEST_F(ResumeCtrlTest, RestoreAppHMIState_RestoreHMILevelFull) {
 
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceAllowed));
-  EXPECT_CALL(*mock_app_, set_is_resuming(true));
 
   const bool res = res_ctrl_->RestoreAppHMIState(mock_app_);
   EXPECT_TRUE(res);
@@ -847,7 +1161,8 @@ TEST_F(ResumeCtrlTest, SetupDefaultHMILevel) {
   ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillByDefault(Return(kDefaultTestLevel_));
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, kDefaultTestLevel_))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, kDefaultTestLevel_))
       .Times(AtLeast(1));
 
   res_ctrl_->SetupDefaultHMILevel(mock_app_);
@@ -876,7 +1191,8 @@ TEST_F(ResumeCtrlTest,
   EXPECT_CALL(*mock_app_, is_media_application()).WillRepeatedly(Return(false));
 
   // SetRegularState() should be called with kProjectionLowbandwidthLevel_
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, eType::HMI_NONE))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, eType::HMI_NONE))
       .Times(AtLeast(1));
 
   res_ctrl_->SetupDefaultHMILevel(mock_app_);
@@ -903,7 +1219,8 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) {
   MockStateController state_controller;
   EXPECT_CALL(mock_app_mngr_, state_controller())
       .WillOnce(ReturnRef(state_controller));
-  EXPECT_CALL(state_controller, SetRegularState(_, restored_test_type))
+  EXPECT_CALL(state_controller,
+              SetRegularState(_, kDefaultWindowId, restored_test_type))
       .Times(AtLeast(1));
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
@@ -913,6 +1230,9 @@ TEST_F(ResumeCtrlTest, ApplicationResumptiOnTimer_AppInFull) {
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   EXPECT_CALL(*mock_storage_,
               RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_))
       .WillOnce(Return(true));
@@ -931,8 +1251,8 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMINone_WithoutCheckPolicy) {
 
   EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0);
 
-  EXPECT_CALL(*mock_app_, set_is_resuming(true));
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, kDefaultTestLevel_))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, kDefaultTestLevel_))
       .Times(AtLeast(1));
   const bool res =
       res_ctrl_->SetAppHMIState(mock_app_, kDefaultTestLevel_, false);
@@ -944,8 +1264,8 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMILimited_WithoutCheckPolicy) {
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0);
 
-  EXPECT_CALL(*mock_app_, set_is_resuming(true));
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, test_type))
       .Times(AtLeast(1));
   const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, false);
   EXPECT_TRUE(res);
@@ -958,8 +1278,8 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMIFull_WithoutCheckPolicy) {
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_)).Times(0);
   EXPECT_CALL(mock_app_mngr_, GetUserConsentForDevice("12345")).Times(0);
 
-  EXPECT_CALL(*mock_app_, set_is_resuming(true));
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, test_type))
       .Times(AtLeast(1));
 
   const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, false);
@@ -973,8 +1293,8 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMIFull_WithPolicy_DevAllowed) {
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceAllowed));
 
-  EXPECT_CALL(*mock_app_, set_is_resuming(true));
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, test_type))
       .Times(AtLeast(1));
 
   const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, true);
@@ -988,10 +1308,10 @@ TEST_F(ResumeCtrlTest, SetAppHMIState_HMIFull_WithPolicy_DevDisallowed) {
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceDisallowed));
 
-  EXPECT_CALL(*mock_app_, set_is_resuming(true));
   ON_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillByDefault(Return(kDefaultTestLevel_));
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, kDefaultTestLevel_))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, kDefaultTestLevel_))
       .Times(AtLeast(1));
   const bool res = res_ctrl_->SetAppHMIState(mock_app_, test_type, true);
   EXPECT_FALSE(res);
@@ -1246,7 +1566,8 @@ TEST_F(
   DataAccessor<application_manager::CommandsMap> data_accessor(
       command, app_set_lock_ptr_);
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, restored_test_type))
       .Times(AtLeast(1));
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
@@ -1256,6 +1577,9 @@ TEST_F(
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   EXPECT_CALL(*mock_storage_,
               RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_))
       .WillOnce(Return(true));
@@ -1298,6 +1622,9 @@ TEST_F(
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceAllowed));
 
@@ -1353,7 +1680,8 @@ TEST_F(
   DataAccessor<application_manager::CommandsMap> data_accessor(
       command, app_set_lock_ptr_);
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
+  EXPECT_CALL(mock_state_controller_,
+              SetRegularState(_, kDefaultWindowId, restored_test_type))
       .Times(AtLeast(1));
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
@@ -1363,6 +1691,9 @@ TEST_F(
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   EXPECT_CALL(*mock_storage_,
               RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_))
       .WillOnce(Return(true));
@@ -1405,6 +1736,9 @@ TEST_F(
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  const bool is_app_revoked = false;
+  SetupIsAppRevoked(is_app_revoked);
+
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceAllowed));
 
diff --git a/src/components/application_manager/test/resumption/resumption_data_json_test.cc b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
index 955309e091..9d348ecbb7 100644
--- a/src/components/application_manager/test/resumption/resumption_data_json_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_json_test.cc
@@ -39,6 +39,7 @@
 #include "application_manager/usage_statistics.h"
 #include "interfaces/MOBILE_API.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 
 #include "application_manager/resumption_data_test.h"
 #include "formatters/CFormatterJsonBase.h"
@@ -66,8 +67,10 @@ namespace formatters = ns_smart_device_link::ns_json_handler::formatters;
 class ResumptionDataJsonTest : public ResumptionDataTest {
  protected:
   ResumptionDataJsonTest()
-      : last_state_("app_storage_folder", "app_info_storage")
-      , res_json(last_state_, mock_application_manager_) {}
+      : last_state_wrapper_(std::make_shared<resumption::LastStateWrapperImpl>(
+            std::make_shared<resumption::LastStateImpl>("app_storage_folder",
+                                                        "app_info_storage")))
+      , res_json(last_state_wrapper_, mock_application_manager_) {}
   virtual void SetUp() {
     app_mock = std::make_shared<
         NiceMock<application_manager_test::MockApplication> >();
@@ -83,12 +86,14 @@ class ResumptionDataJsonTest : public ResumptionDataTest {
   }
 
   void CheckSavedJson() {
-    Value& dictionary = last_state_.get_dictionary();
+    resumption::LastStateAccessor accessor =
+        last_state_wrapper_->get_accessor();
+    Value dictionary = accessor.GetData().dictionary();
     ASSERT_TRUE(dictionary[am::strings::resumption].isObject());
     ASSERT_TRUE(
         dictionary[am::strings::resumption][am::strings::resume_app_list]
             .isArray());
-    Value& resume_app_list =
+    const Value& resume_app_list =
         dictionary[am::strings::resumption][am::strings::resume_app_list];
     sm::SmartObject res_app_list;
     for (uint32_t i = 0; i < resume_app_list.size(); i++) {
@@ -99,13 +104,16 @@ class ResumptionDataJsonTest : public ResumptionDataTest {
   }
 
   void SetZeroIgnOff() {
-    Value& dictionary = last_state_.get_dictionary();
+    resumption::LastStateAccessor accessor =
+        last_state_wrapper_->get_accessor();
+    Value dictionary = accessor.GetData().dictionary();
     Value& res = dictionary[am::strings::resumption];
     res[am::strings::last_ign_off_time] = 0;
-    last_state_.SaveStateToFileSystem();
+    accessor.GetMutableData().set_dictionary(dictionary);
+    accessor.GetMutableData().SaveToFileSystem();
   }
 
-  resumption::LastStateImpl last_state_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
   ResumptionDataJson res_json;
 };
 
diff --git a/src/components/application_manager/test/resumption/resumption_data_test.cc b/src/components/application_manager/test/resumption/resumption_data_test.cc
index 29718b631c..12a38e1bc4 100644
--- a/src/components/application_manager/test/resumption/resumption_data_test.cc
+++ b/src/components/application_manager/test/resumption/resumption_data_test.cc
@@ -52,6 +52,33 @@ using ::testing::Return;
 using ::testing::ReturnPointee;
 using ::testing::ReturnRef;
 
+ResumptionDataTest::~ResumptionDataTest() {
+  delete help_prompt_;
+  delete timeout_prompt_;
+  delete vr_help_;
+  delete vr_help_title_;
+  delete vr_synonyms_;
+  delete keyboard_props_;
+  delete menu_title_;
+  delete menu_icon_;
+
+  for (am::CommandsMap::iterator it = test_commands_map.begin();
+       test_commands_map.end() != it;
+       ++it) {
+    delete it->second;
+  }
+  for (am::SubMenuMap::iterator it = test_submenu_map.begin();
+       test_submenu_map.end() != it;
+       ++it) {
+    delete it->second;
+  }
+  for (am::ChoiceSetMap::iterator it = test_choiceset_map.begin();
+       test_choiceset_map.end() != it;
+       ++it) {
+    delete it->second;
+  }
+}
+
 void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) {
   EXPECT_EQ(policy_app_id_, resume_app_list[am::strings::app_id].asString());
   EXPECT_EQ(grammar_id_, resume_app_list[am::strings::grammar_id].asUInt());
@@ -74,6 +101,7 @@ void ResumptionDataTest::CheckSavedApp(sm::SmartObject& resume_app_list) {
   CheckGlobalProporties(
       resume_app_list[am::strings::application_global_properties]);
   CheckSubscriptions(resume_app_list[am::strings::application_subscriptions]);
+  CheckWindowsInfo(resume_app_list[am::strings::windows_info]);
 }
 
 void ResumptionDataTest::CheckCommands(sm::SmartObject& res_list) {
@@ -327,6 +355,33 @@ void ResumptionDataTest::CheckVRTitle(
   EXPECT_EQ(vtitle, res_list[am::strings::vr_help_title].asString());
 }
 
+void ResumptionDataTest::CheckWindowsInfo(sm::SmartObject& res_list) {
+  using namespace application_manager;
+  auto check_window_info = [this](
+                               const smart_objects::SmartObject& window_info) {
+    using namespace application_manager;
+    const WindowID saved_window_id = window_info[strings::window_id].asInt();
+    const auto test_window_info = test_window_params_map_[saved_window_id];
+    const auto& saved_window_name =
+        window_info[strings::window_name].asString();
+    ASSERT_TRUE(0 != test_window_info.use_count());
+    const auto& window_name =
+        (*test_window_info)[strings::window_name].asString();
+    const auto& saved_duplicate_window_id =
+        window_info[strings::duplicate_updates_from_window_id].asInt();
+    const auto& saved_associated_service_type =
+        window_info[strings::associated_service_type].asString();
+    EXPECT_EQ(saved_window_name, window_name);
+    EXPECT_EQ("ServiceType", saved_associated_service_type);
+    EXPECT_EQ(0, saved_duplicate_window_id);
+  };
+
+  for (size_t i = 0; i < res_list.length(); ++i) {
+    const auto& saved_window_info = res_list[i];
+    check_window_info(saved_window_info);
+  }
+}
+
 void ResumptionDataTest::PrepareData() {
   mock_app_extension_ =
       std::make_shared<NiceMock<application_manager_test::MockAppExtension> >();
@@ -341,9 +396,14 @@ void ResumptionDataTest::PrepareData() {
   DataAccessor<am::SubMenuMap> sub_menu_m(test_submenu_map, sublock_ptr_);
   DataAccessor<am::CommandsMap> commands_m(test_commands_map, comlock_ptr_);
   DataAccessor<am::ChoiceSetMap> choice_set_m(test_choiceset_map, setlock_ptr_);
+  DataAccessor<am::WindowParamsMap> window_params_map(
+      test_window_params_map_, window_params_map_lock_ptr_);
 
   SetSubscriptions();
   DataAccessor<am::ButtonSubscriptions> btn_sub(btn_subscr, btnlock_ptr_);
+  SetWindowsInfo();
+  SetDefaultCurrentHmiState();
+  SetDefaultWindowIds();
 
   ON_CALL(*app_mock, is_application_data_changed()).WillByDefault(Return(true));
 
@@ -352,7 +412,8 @@ void ResumptionDataTest::PrepareData() {
   ON_CALL(*app_mock, curHash()).WillByDefault(ReturnRef(hash_));
   ON_CALL(*app_mock, get_grammar_id()).WillByDefault(Return(grammar_id_));
   ON_CALL(*app_mock, device()).WillByDefault(Return(device_handle_));
-  ON_CALL(*app_mock, hmi_level()).WillByDefault(Return(hmi_level_));
+  ON_CALL(*app_mock, hmi_level(mobile_apis::PredefinedWindows::DEFAULT_WINDOW))
+      .WillByDefault(Return(hmi_level_));
   ON_CALL(*app_mock, app_id()).WillByDefault(Return(app_id_));
   ON_CALL(*app_mock, hmi_app_id()).WillByDefault(Return(hmi_app_id_));
   ON_CALL(*app_mock, IsAudioApplication()).WillByDefault(Return(is_audio_));
@@ -375,6 +436,21 @@ void ResumptionDataTest::PrepareData() {
   ON_CALL(*app_mock, SubscribedButtons()).WillByDefault(Return(btn_sub));
 
   ON_CALL(*app_mock, getAppFiles()).WillByDefault(ReturnRef(app_files_map_));
+  ON_CALL(*app_mock, window_optional_params_map())
+      .WillByDefault(Return(window_params_map));
+}
+
+void ResumptionDataTest::SetDefaultCurrentHmiState() {
+  am::HmiStatePtr hmi_state =
+      std::make_shared<am::HmiState>(app_mock, mock_application_manager_);
+  hmi_state->set_window_type(mobile_apis::WindowType::WIDGET);
+
+  ON_CALL(*app_mock, CurrentHmiState(_)).WillByDefault(Return(hmi_state));
+}
+
+void ResumptionDataTest::SetDefaultWindowIds() {
+  const am::WindowIds window_ids{1, 2, 3, 4, 5};
+  ON_CALL(*app_mock, GetWindowIds()).WillByDefault(Return(window_ids));
 }
 
 void ResumptionDataTest::SetGlobalProporties() {
@@ -550,6 +626,21 @@ void ResumptionDataTest::SetSubscriptions() {
   btn_subscr.insert(ButtonName::eType::OK);
 }
 
+void ResumptionDataTest::SetWindowsInfo() {
+  using namespace application_manager;
+  const uint32_t number_of_widgets = 5;
+  for (uint32_t i = 0; i < number_of_widgets; ++i) {
+    auto window_info = std::make_shared<smart_objects::SmartObject>(
+        smart_objects::SmartType_Map);
+    const WindowID window_id = i + 1;
+    (*window_info)[strings::window_name] =
+        std::string("Widget ") + std::to_string(window_id);
+    (*window_info)[strings::associated_service_type] = "ServiceType";
+    (*window_info)[strings::duplicate_updates_from_window_id] = 0;
+    test_window_params_map_[window_id] = window_info;
+  }
+}
+
 }  // namespace resumption_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/application_manager/test/rpc_handler_impl_test.cc b/src/components/application_manager/test/rpc_handler_impl_test.cc
new file mode 100644
index 0000000000..47c6cd73be
--- /dev/null
+++ b/src/components/application_manager/test/rpc_handler_impl_test.cc
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "application_manager/rpc_handler_impl.h"
+#include <memory>
+#include "application_manager/mock_application_manager.h"
+#include "application_manager/smart_object_keys.h"
+#include "interfaces/HMI_API.h"
+#include "interfaces/MOBILE_API.h"
+
+namespace test {
+namespace components {
+namespace application_manager_test {
+
+using ::test::components::application_manager_test::MockApplicationManager;
+using ::testing::_;
+using ::testing::Mock;
+using ::testing::NiceMock;
+using namespace ::smart_objects;
+using namespace application_manager::rpc_handler;
+
+class RPCHandlerImplTest : public ::testing::Test {
+ public:
+  RPCHandlerImplTest()
+      : rpc_handler_(new RPCHandlerImpl(
+            mock_app_mngr_, hmi_so_factory_, mobile_so_factory_)) {}
+
+ protected:
+  std::unique_ptr<RPCHandlerImpl> rpc_handler_;
+  hmi_apis::HMI_API hmi_so_factory_;
+  mobile_apis::MOBILE_API mobile_so_factory_;
+  NiceMock<MockApplicationManager> mock_app_mngr_;
+};
+
+TEST_F(RPCHandlerImplTest, GetMessageVersion_SUCCESS) {
+  namespace json_str = ns_smart_device_link::ns_json_handler::strings;
+  namespace app_str = application_manager::strings;
+
+  std::vector<utils::SemanticVersion> test_versions = {
+      utils::SemanticVersion("2.5.0"),
+      utils::SemanticVersion("3.0.0"),
+      utils::SemanticVersion("5.0.0"),
+      utils::SemanticVersion("6.1.0")};
+
+  std::vector<utils::SemanticVersion> expected_versions = {
+      utils::base_rpc_version,
+      utils::base_rpc_version,
+      utils::SemanticVersion("5.0.0"),
+      utils::SemanticVersion("6.1.0")};
+
+  SmartObject message;
+  message[json_str::S_MSG_PARAMS] = SmartObject(SmartType_Map);
+  message[json_str::S_MSG_PARAMS][app_str::sync_msg_version] =
+      SmartObject(SmartType_Map);
+
+  for (size_t i = 0; i < test_versions.size(); ++i) {
+    message[json_str::S_MSG_PARAMS][app_str::sync_msg_version]
+           [app_str::major_version] = test_versions[i].major_version_;
+    message[json_str::S_MSG_PARAMS][app_str::sync_msg_version]
+           [app_str::minor_version] = test_versions[i].minor_version_;
+    message[json_str::S_MSG_PARAMS][app_str::sync_msg_version]
+           [app_str::patch_version] = test_versions[i].patch_version_;
+
+    utils::SemanticVersion result_message_version;
+    rpc_handler_->GetMessageVersion(message, result_message_version);
+    EXPECT_EQ(expected_versions[i], result_message_version);
+  }
+}
+
+TEST_F(RPCHandlerImplTest, GetMessageVersion_InvalidVersion) {
+  namespace json_str = ns_smart_device_link::ns_json_handler::strings;
+  namespace app_str = application_manager::strings;
+
+  SmartObject message;
+  message[json_str::S_MSG_PARAMS] = SmartObject(SmartType_Map);
+  message[json_str::S_MSG_PARAMS][app_str::sync_msg_version] =
+      SmartObject(SmartType_Map);
+  message[json_str::S_MSG_PARAMS][app_str::sync_msg_version]
+         [app_str::major_version] = 0;
+  message[json_str::S_MSG_PARAMS][app_str::sync_msg_version]
+         [app_str::minor_version] = 0;
+  message[json_str::S_MSG_PARAMS][app_str::sync_msg_version]
+         [app_str::patch_version] = 0;
+
+  utils::SemanticVersion expected_version("0.0.0");
+
+  utils::SemanticVersion result_message_version;
+  rpc_handler_->GetMessageVersion(message, result_message_version);
+  EXPECT_EQ(expected_version, result_message_version);
+}
+
+}  // namespace application_manager_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/application_manager/test/rpc_passing_handler_test.cc b/src/components/application_manager/test/rpc_passing_handler_test.cc
index fb74a0a7e3..6eac6ca0b1 100644
--- a/src/components/application_manager/test/rpc_passing_handler_test.cc
+++ b/src/components/application_manager/test/rpc_passing_handler_test.cc
@@ -41,6 +41,7 @@
 #include "application_manager/mock_application_manager_settings.h"
 #include "application_manager/mock_rpc_handler.h"
 #include "application_manager/mock_rpc_service.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "resumption/mock_last_state.h"
 
 #include <vector>
@@ -73,7 +74,10 @@ struct PassthroughParams {
 class RPCPassingHandlerTest : public ::testing::Test {
  public:
   RPCPassingHandlerTest()
-      : mock_app_service_manager_(mock_app_manager_, mock_last_state_)
+      : mock_last_state_(std::make_shared<resumption_test::MockLastState>())
+      , last_state_wrapper_(std::make_shared<resumption::LastStateWrapperImpl>(
+            mock_last_state_))
+      , mock_app_service_manager_(mock_app_manager_, last_state_wrapper_)
       , mock_app_ptr_(std::make_shared<NiceMock<MockApplication> >())
       , version_(utils::SemanticVersion(5, 1, 0)) {}
 
@@ -210,7 +214,8 @@ class RPCPassingHandlerTest : public ::testing::Test {
   NiceMock<MockApplicationManagerSettings> mock_app_manager_settings_;
   MockRPCService mock_rpc_service_;
   MockRPCHandler mock_rpc_handler_;
-  resumption_test::MockLastState mock_last_state_;
+  std::shared_ptr<resumption_test::MockLastState> mock_last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   MockAppServiceManager mock_app_service_manager_;
   std::shared_ptr<NiceMock<MockApplication> > mock_app_ptr_;
   const utils::SemanticVersion version_;
diff --git a/src/components/application_manager/test/rpc_service_impl_test.cc b/src/components/application_manager/test/rpc_service_impl_test.cc
new file mode 100644
index 0000000000..0a7cff031d
--- /dev/null
+++ b/src/components/application_manager/test/rpc_service_impl_test.cc
@@ -0,0 +1,837 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <gmock/gmock.h>
+#include "gtest/gtest.h"
+
+#include <string>
+#include "application_manager/rpc_service_impl.h"
+
+#include "application_manager/commands/command.h"
+#include "application_manager/commands/command_impl.h"
+#include "application_manager/mock_app_service_manager.h"
+#include "application_manager/mock_application.h"
+#include "application_manager/mock_application_manager.h"
+#include "application_manager/mock_command_factory.h"
+#include "application_manager/mock_command_holder.h"
+#include "application_manager/mock_message_helper.h"
+#include "application_manager/mock_request.h"
+#include "application_manager/mock_request_controller_settings.h"
+#include "application_manager/mock_rpc_plugin.h"
+#include "application_manager/mock_rpc_plugin_manager.h"
+#include "application_manager/mock_rpc_protection_manager.h"
+#include "application_manager/plugin_manager/plugin_keys.h"
+#include "application_manager/policies/mock_policy_handler_interface.h"
+#include "connection_handler/mock_connection_handler.h"
+#include "hmi_message_handler/mock_hmi_message_handler.h"
+#include "include/test/protocol_handler/mock_protocol_handler.h"
+
+namespace test {
+namespace components {
+namespace application_manager_test {
+
+namespace rpc_service = application_manager::rpc_service;
+namespace am = application_manager;
+using test::components::hmi_message_handler_test::MockHMIMessageHandler;
+using test::components::protocol_handler_test::MockProtocolHandler;
+typedef smart_objects::SmartObjectSPtr MessageSharedPtr;
+typedef utils::Optional<am::plugin_manager::RPCPlugin> PluginOpt;
+using test::components::application_manager_test::MockAppServiceManager;
+using ::testing::_;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace {
+const uint32_t kConnectionKey = 1u;
+const connection_handler::DeviceHandle kDeviceHandle = 1u;
+const std::string kPolicyAppId = "policy_app_id";
+const uint32_t kCorrelationId = 1u;
+const uint32_t kFunctionId = 1u;
+const uint32_t kAppId = 1u;
+const int32_t kMobileProtocolType = 0;
+const int32_t kProtocolVersion = 1;
+const int32_t kConnectionSessionsCount = 2;
+}  // namespace
+
+class RPCServiceImplTest : public ::testing::Test {
+ public:
+  RPCServiceImplTest()
+      : request_controller_(mock_request_controler_)
+      , mock_rpc_protection_manager_(
+            std::make_shared<
+                testing::NiceMock<am::MockRPCProtectionManager> >())
+      , mock_message_helper_(*am::MockMessageHelper::message_helper_mock())
+      , mock_app_service_nmgr_(mock_app_mngr_, nullptr) {
+    rpc_service_ = std::make_shared<rpc_service::RPCServiceImpl>(
+        mock_app_mngr_,
+        request_controller_,
+        &mock_protocol_handler_,
+        &mock_hmi_handler_,
+        mock_command_holder_,
+        mock_rpc_protection_manager_,
+        hmi_so_factory_,
+        mobile_so_factory_);
+  }
+
+  MessageSharedPtr CreateMessage(
+      const smart_objects::SmartType type = smart_objects::SmartType_Null) {
+    return std::make_shared<smart_objects::SmartObject>(type);
+  }
+  void PrepareBasicMessage(MessageSharedPtr& message) {
+    (*message)[am::strings::params][am::strings::function_id] =
+        static_cast<mobile_apis::FunctionID::eType>(
+            mobile_apis::FunctionID::RESERVED);
+    (*message)[am::strings::params][am::strings::correlation_id] =
+        kCorrelationId;
+    (*message)[am::strings::params][am::strings::protocol_type] =
+        kMobileProtocolType;
+    (*message)[am::strings::params][am::strings::connection_key] =
+        kConnectionKey;
+  }
+
+  // This class is created to allow access to protected method
+  // InitFunctionSchema from MOBILE_API
+  class MobileAPIWithPublicSchemaSetting : public mobile_apis::MOBILE_API {
+   public:
+    void SetSchema(mobile_apis::FunctionID::eType function_id,
+                   mobile_apis::messageType::eType message_type) {
+      InitFunctionSchema(function_id, message_type);
+    }
+  };
+
+  // This class is created to allow access to protected method
+  // InitFunctionSchema from HMI_API
+  class HMIAPIWithPublicSchemaSetting : public hmi_apis::HMI_API {
+   public:
+    void SetSchema(hmi_apis::FunctionID::eType function_id,
+                   hmi_apis::messageType::eType message_type) {
+      InitFunctionSchema(function_id, message_type);
+    }
+  };
+
+ protected:
+  hmi_apis::HMI_API hmi_so_factory_;
+  mobile_apis::MOBILE_API mobile_so_factory_;
+  testing::NiceMock<MockApplicationManager> mock_app_mngr_;
+  testing::NiceMock<MockRequestControlerSettings> mock_request_controler_;
+  testing::NiceMock<MockProtocolHandler> mock_protocol_handler_;
+  am::request_controller::RequestController request_controller_;
+  testing::NiceMock<MockHMIMessageHandler> mock_hmi_handler_;
+  testing::NiceMock<MockCommandHolder> mock_command_holder_;
+  std::shared_ptr<am::MockRPCProtectionManager> mock_rpc_protection_manager_;
+  std::shared_ptr<rpc_service::RPCService> rpc_service_;
+  std::shared_ptr<MockApplication> mock_app_ptr_;
+  am::MockMessageHelper& mock_message_helper_;
+  MockAppServiceManager mock_app_service_nmgr_;
+  testing::NiceMock<am::plugin_manager::MockRPCPluginManager>
+      mock_rpc_plugin_manager_;
+  testing::NiceMock<am::plugin_manager::MockRPCPlugin> mock_rpc_plugin_;
+  testing::NiceMock<MockCommandFactory> mock_command_factory_;
+};
+
+TEST_F(RPCServiceImplTest, ManageMobileCommand_MessageIsNullPtr_False) {
+  MessageSharedPtr message;
+  EXPECT_FALSE(rpc_service_->ManageMobileCommand(
+      message, am::commands::Command::CommandSource::SOURCE_MOBILE));
+}
+
+TEST_F(RPCServiceImplTest, ManageMobileCommand_IsLowVoltage_False) {
+  auto message = CreateMessage();
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(true));
+  EXPECT_FALSE(rpc_service_->ManageMobileCommand(
+      message, am::commands::Command::CommandSource::SOURCE_MOBILE));
+}
+
+TEST_F(RPCServiceImplTest, ManageMobileCommand_AppInReconnectMode) {
+  auto message = CreateMessage(smart_objects::SmartType_Map);
+  auto source = am::commands::Command::CommandSource::SOURCE_MOBILE;
+  (*message)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+
+  mock_app_ptr_ = std::make_shared<NiceMock<MockApplication> >();
+  ON_CALL(mock_app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app_ptr_));
+  ON_CALL(*mock_app_ptr_, device()).WillByDefault(Return(kDeviceHandle));
+  ON_CALL(*mock_app_ptr_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+  ON_CALL(mock_app_mngr_, IsAppInReconnectMode(kDeviceHandle, kPolicyAppId))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(mock_command_holder_,
+              Suspend(static_cast<am::ApplicationSharedPtr>(mock_app_ptr_),
+                      am::CommandHolder::CommandType::kMobileCommand,
+                      source,
+                      message))
+      .WillOnce(Return());
+
+  EXPECT_TRUE(rpc_service_->ManageMobileCommand(message, source));
+}
+
+TEST_F(RPCServiceImplTest,
+       ManageMobileCommand_SourceIsCheckedForUnsupportedRequest) {
+  typedef am::plugin_manager::RPCPlugin RPCPlugin;
+
+  auto message = CreateMessage(smart_objects::SmartType_Map);
+  auto source = am::commands::Command::CommandSource::SOURCE_MOBILE;
+  (*message)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+  (*message)[am::strings::params][am::strings::function_id] = kFunctionId;
+  (*message)[am::strings::params][am::strings::protocol_type] =
+      kMobileProtocolType;
+
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(false));
+  mock_app_ptr_ = std::make_shared<NiceMock<MockApplication> >();
+  ON_CALL(mock_app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app_ptr_));
+  ON_CALL(*mock_app_ptr_, device()).WillByDefault(Return(kDeviceHandle));
+  ON_CALL(*mock_app_ptr_, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+  ON_CALL(mock_app_mngr_, IsAppInReconnectMode(kDeviceHandle, kPolicyAppId))
+      .WillByDefault(Return(false));
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  auto empty_plugin(utils::Optional<RPCPlugin>::OptionalEmpty::EMPTY);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(empty_plugin));
+
+  EXPECT_FALSE(rpc_service_->ManageMobileCommand(message, source));
+}
+
+TEST_F(RPCServiceImplTest, ManageHMICommand_MessageIsNullPtr_False) {
+  MessageSharedPtr message;
+  EXPECT_FALSE(rpc_service_->ManageHMICommand(
+      message, am::commands::Command::CommandSource::SOURCE_HMI));
+}
+
+TEST_F(RPCServiceImplTest, ManageHMICommand_IsLowVoltage_ReturnFalse) {
+  auto message = CreateMessage();
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(true));
+  EXPECT_FALSE(rpc_service_->ManageHMICommand(
+      message, am::commands::Command::CommandSource::SOURCE_HMI));
+}
+
+TEST_F(RPCServiceImplTest, ManageHMICommand_PluginIsEmpty_False) {
+  auto message = CreateMessage();
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+  (*message)[am::strings::params][am::strings::function_id] = kFunctionId;
+
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(false));
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  typedef am::plugin_manager::RPCPlugin RPCPlugin;
+  utils::Optional<RPCPlugin> mock_rpc_plugin_opt(
+      utils::Optional<RPCPlugin>::OptionalEmpty::EMPTY);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+
+  EXPECT_FALSE(rpc_service_->ManageHMICommand(message, source));
+}
+
+TEST_F(RPCServiceImplTest, ManageHMICommand_FailedCreateCommand_False) {
+  typedef am::plugin_manager::RPCPlugin RPCPlugin;
+
+  auto message = CreateMessage();
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+  (*message)[am::strings::params][am::strings::function_id] = kFunctionId;
+
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(false));
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  utils::Optional<RPCPlugin> mock_rpc_plugin_opt = mock_rpc_plugin_;
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+  std::shared_ptr<MockRequest> cmd;
+  ON_CALL(mock_command_factory_, CreateCommand(message, source))
+      .WillByDefault(Return(cmd));
+
+  EXPECT_FALSE(rpc_service_->ManageHMICommand(message, source));
+}
+
+TEST_F(RPCServiceImplTest, ManageHMICommand_IsAppInReconnectMode_True) {
+  typedef am::plugin_manager::RPCPlugin RPCPlugin;
+
+  auto message = CreateMessage();
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+  (*message)[am::strings::params][am::strings::function_id] = kFunctionId;
+  (*message)[am::strings::msg_params][am::strings::app_id] = kAppId;
+
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(false));
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  utils::Optional<RPCPlugin> mock_rpc_plugin_opt = mock_rpc_plugin_;
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+  std::shared_ptr<MockRequest> cmd =
+      std::make_shared<MockRequest>(kConnectionKey, kCorrelationId);
+  ON_CALL(mock_command_factory_, CreateCommand(message, source))
+      .WillByDefault(Return(cmd));
+
+  auto mock_app = std::make_shared<NiceMock<MockApplication> >();
+  ON_CALL(mock_app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app));
+  const connection_handler::DeviceHandle device_id1 = 1u;
+  ON_CALL(*mock_app, device()).WillByDefault(Return(device_id1));
+  ON_CALL(*mock_app, policy_app_id()).WillByDefault(Return(kPolicyAppId));
+  ON_CALL(mock_app_mngr_, IsAppInReconnectMode(device_id1, kPolicyAppId))
+      .WillByDefault(Return(true));
+
+  EXPECT_CALL(mock_command_holder_,
+              Suspend(static_cast<am::ApplicationSharedPtr>(mock_app),
+                      am::CommandHolder::CommandType::kHmiCommand,
+                      source,
+                      message))
+      .WillOnce(Return());
+  EXPECT_TRUE(rpc_service_->ManageHMICommand(message, source));
+}
+
+TEST_F(RPCServiceImplTest,
+       ManageHMICommand_MessageTypeUnknownTypeCommandNotInit_ReturnFalse) {
+  typedef am::plugin_manager::RPCPlugin RPCPlugin;
+
+  auto message = CreateMessage();
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+  (*message)[am::strings::params][am::strings::function_id] = kFunctionId;
+  (*message)[am::strings::params][am::strings::message_type] = am::kUnknownType;
+
+  ON_CALL(mock_app_mngr_, IsLowVoltage()).WillByDefault(Return(false));
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  utils::Optional<RPCPlugin> mock_rpc_plugin_opt = mock_rpc_plugin_;
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+  std::shared_ptr<MockRequest> cmd =
+      std::make_shared<MockRequest>(kConnectionKey, kCorrelationId);
+  ON_CALL(mock_command_factory_, CreateCommand(message, source))
+      .WillByDefault(Return(cmd));
+
+  EXPECT_CALL(*cmd, Init()).WillOnce(Return(false));
+  EXPECT_FALSE(rpc_service_->ManageHMICommand(message, source));
+}
+
+TEST_F(RPCServiceImplTest,
+       IsAppServiceRPC_SourceMobileWithValidFuncId_ReturnTrue) {
+  auto source_mobile = am::commands::Command::CommandSource::SOURCE_MOBILE;
+  auto source_sdl = am::commands::Command::CommandSource::SOURCE_SDL;
+
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(
+      mobile_apis::FunctionID::GetSystemCapabilityID, source_mobile));
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(
+      mobile_apis::FunctionID::OnSystemCapabilityUpdatedID, source_sdl));
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(
+      mobile_apis::FunctionID::GetSystemCapabilityID, source_sdl));
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(
+      mobile_apis::FunctionID::OnSystemCapabilityUpdatedID, source_sdl));
+}
+
+TEST_F(RPCServiceImplTest,
+       IsAppServiceRPC_SourceHMIWithValidFuncId_ReturnTrue) {
+  auto source_hmi = am::commands::Command::CommandSource::SOURCE_HMI;
+  auto source_sdl_to_hmi =
+      am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI;
+  int32_t function_id =
+      hmi_apis::FunctionID::BasicCommunication_OnSystemCapabilityUpdated;
+
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(function_id, source_hmi));
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(function_id, source_sdl_to_hmi));
+}
+
+TEST_F(RPCServiceImplTest, IsAppServiceRPC_EmptyPlugin_ReturnFalse) {
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  typedef am::plugin_manager::RPCPlugin RPCPlugin;
+  utils::Optional<RPCPlugin> mock_rpc_plugin_opt(
+      utils::Optional<RPCPlugin>::OptionalEmpty::EMPTY);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+
+  EXPECT_FALSE(rpc_service_->IsAppServiceRPC(kFunctionId, source));
+}
+
+TEST_F(RPCServiceImplTest, IsAppServiceRPC_PluginWithWrongName_ReturnFalse) {
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  PluginOpt mock_rpc_plugin_opt(mock_rpc_plugin_);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, PluginName()).WillByDefault(Return(""));
+
+  EXPECT_FALSE(rpc_service_->IsAppServiceRPC(kFunctionId, source));
+}
+
+TEST_F(RPCServiceImplTest,
+       IsAppServiceRPC_CommandFactoryIsAbleToProcess_ReturnTrue) {
+  auto source = am::commands::Command::CommandSource::SOURCE_HMI;
+  using namespace application_manager::plugin_manager::plugin_names;
+
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  PluginOpt mock_rpc_plugin_opt(mock_rpc_plugin_);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(kFunctionId, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, PluginName())
+      .WillByDefault(Return(app_service_rpc_plugin));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+  ON_CALL(mock_command_factory_, IsAbleToProcess(kFunctionId, source))
+      .WillByDefault(Return(true));
+
+  EXPECT_TRUE(rpc_service_->IsAppServiceRPC(kFunctionId, source));
+}
+
+TEST_F(RPCServiceImplTest,
+       UpdateMobileRPCParams_FunctionSchemaIsResettedAndAddedCustomMember) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+
+  // Get initial state of schema
+  auto function_id = mobile_apis::FunctionID::OnHMIStatusID;
+  auto message_type = mobile_apis::messageType::notification;
+  MobileAPIWithPublicSchemaSetting extended_mobile_api;
+  extended_mobile_api.SetSchema(function_id, message_type);
+
+  auto rpc_service_with_extended_api =
+      std::make_shared<rpc_service::RPCServiceImpl>(
+          mock_app_mngr_,
+          request_controller_,
+          &mock_protocol_handler_,
+          &mock_hmi_handler_,
+          mock_command_holder_,
+          mock_rpc_protection_manager_,
+          hmi_so_factory_,
+          extended_mobile_api);
+
+  CSmartSchema initial_schema;
+  extended_mobile_api.GetSchema(function_id, message_type, initial_schema);
+  auto initial_schema_item = initial_schema.getSchemaItem();
+
+  // Change state of schema and add custom parameter
+  auto new_function_id = mobile_apis::FunctionID::OnButtonEventID;
+  std::map<std::string, SMember> members;
+  members["custom member"] = SMember();
+  rpc_service_with_extended_api->UpdateMobileRPCParams(
+      new_function_id, message_type, members);
+  CSmartSchema updated_schema;
+  extended_mobile_api.GetSchema(new_function_id, message_type, updated_schema);
+
+  // Check that schema is changed
+  EXPECT_NE(initial_schema_item, updated_schema.getSchemaItem());
+}
+
+TEST_F(RPCServiceImplTest,
+       UpdateHMIRPCParams_FunctionSchemaIsResettedAndAddedCustomMember) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+
+  // Get initial state of schema
+  auto function_id = hmi_apis::FunctionID::Buttons_OnButtonEvent;
+  auto message_type = hmi_apis::messageType::notification;
+  HMIAPIWithPublicSchemaSetting extended_hmi_api;
+  extended_hmi_api.SetSchema(function_id, message_type);
+
+  auto rpc_service_with_extended_api =
+      std::make_shared<rpc_service::RPCServiceImpl>(
+          mock_app_mngr_,
+          request_controller_,
+          &mock_protocol_handler_,
+          &mock_hmi_handler_,
+          mock_command_holder_,
+          mock_rpc_protection_manager_,
+          extended_hmi_api,
+          mobile_so_factory_);
+
+  CSmartSchema initial_schema;
+  extended_hmi_api.GetSchema(function_id, message_type, initial_schema);
+  auto initial_schema_item = initial_schema.getSchemaItem();
+
+  // Change state of schema and add custom parameter
+  auto new_function_id = hmi_apis::FunctionID::Buttons_OnButtonPress;
+  std::map<std::string, SMember> members;
+  members["custom member"] = SMember();
+  rpc_service_with_extended_api->UpdateHMIRPCParams(
+      function_id, message_type, members);
+  CSmartSchema updated_schema;
+  extended_hmi_api.GetSchema(new_function_id, message_type, updated_schema);
+
+  // Check that schema is changed
+  EXPECT_NE(initial_schema_item, updated_schema.getSchemaItem());
+}
+
+TEST_F(RPCServiceImplTest, SendMessageToHMI_HappyPath) {
+  using namespace application_manager::plugin_manager::plugin_names;
+  auto source = am::commands::Command::CommandSource::SOURCE_SDL_TO_HMI;
+  auto func_id = mobile_apis::FunctionID::RESERVED;
+  auto message = CreateMessage(smart_objects::SmartType_Map);
+  PrepareBasicMessage(message);
+
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  PluginOpt mock_rpc_plugin_opt(mock_rpc_plugin_);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(func_id, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, PluginName())
+      .WillByDefault(Return(app_service_rpc_plugin));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+
+  EXPECT_CALL(mock_command_factory_, IsAbleToProcess(func_id, source))
+      .WillOnce(Return(true));
+  rpc_service_->SendMessageToHMI(message);
+}
+
+TEST_F(RPCServiceImplTest, SendMessageToHMI_NoHMIHandler_ExecutionAborted) {
+  auto message = CreateMessage(smart_objects::SmartType_Map);
+  PrepareBasicMessage(message);
+
+  rpc_service_->set_hmi_message_handler(nullptr);
+  EXPECT_CALL(mock_app_mngr_, GetPluginManager()).Times(0);
+  rpc_service_->SendMessageToHMI(message);
+}
+
+TEST_F(RPCServiceImplTest, Handle_NoHMIHandler_ExecutionAborted) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+  message_handler->set_hmi_message_handler(nullptr);
+
+  auto msg = std::shared_ptr<am::Message>();
+  auto msg_to_hmi = am::rpc_service::impl::MessageToHmi(msg);
+
+  EXPECT_CALL(mock_hmi_handler_, SendMessageToHMI(msg_to_hmi)).Times(0);
+  message_handler->Handle(msg_to_hmi);
+}
+
+TEST_F(RPCServiceImplTest, Handle_ValidHMIHandler) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+  auto msg = std::shared_ptr<am::Message>();
+  auto msg_to_hmi = am::rpc_service::impl::MessageToHmi(msg);
+
+  EXPECT_CALL(mock_hmi_handler_, SendMessageToHMI(msg_to_hmi));
+  message_handler->Handle(msg_to_hmi);
+}
+
+TEST_F(RPCServiceImplTest, Handle_NoMobileProtocolHandler_ExecutionAborted) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+
+  message_handler->set_protocol_handler(nullptr);
+  auto message_to_send = std::make_shared<am::Message>(
+      protocol_handler::MessagePriority::kDefault);
+
+  EXPECT_CALL(mock_protocol_handler_, IsRPCServiceSecure(_)).Times(0);
+  message_handler->Handle(
+      am::rpc_service::impl::MessageToMobile(message_to_send, false));
+}
+
+TEST_F(RPCServiceImplTest, Handle_NoRawMessage_ExecutionAborted) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+  auto message_to_send = std::make_shared<am::Message>(
+      protocol_handler::MessagePriority::kDefault);
+
+  EXPECT_CALL(mock_protocol_handler_, IsRPCServiceSecure(_)).Times(0);
+  message_handler->Handle(
+      am::rpc_service::impl::MessageToMobile(message_to_send, false));
+}
+
+TEST_F(RPCServiceImplTest,
+       Handle_NeedsEncryptionAndServiceNotSecure_ExecutionAborted) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+  auto message_to_send = std::make_shared<am::Message>(
+      protocol_handler::MessagePriority::kDefault);
+  message_to_send->set_protocol_version(
+      protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1);
+  message_to_send->set_connection_key(kConnectionKey);
+  message_to_send->set_correlation_id(kCorrelationId);
+  message_to_send->set_function_id(kFunctionId);
+  message_to_send->set_message_type(static_cast<am::MessageType>(0));
+  message_to_send->set_json_message(std::string("message"));
+
+  EXPECT_CALL(mock_protocol_handler_, IsRPCServiceSecure(kConnectionKey))
+      .WillOnce(Return(false));
+  EXPECT_CALL(*mock_rpc_protection_manager_, IsInEncryptionNeededCache(_, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(mock_protocol_handler_, SendMessageToMobileApp(_, _, _)).Times(0);
+  message_handler->Handle(
+      am::rpc_service::impl::MessageToMobile(message_to_send, false));
+}
+
+TEST_F(RPCServiceImplTest, Handle_HappyPathWithoutClosingSession) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+  auto message_to_send = std::make_shared<am::Message>(
+      protocol_handler::MessagePriority::kDefault);
+  message_to_send->set_protocol_version(
+      protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1);
+  message_to_send->set_connection_key(kConnectionKey);
+  message_to_send->set_correlation_id(kCorrelationId);
+  message_to_send->set_function_id(kFunctionId);
+  message_to_send->set_message_type(am::MessageType::kNotification);
+  message_to_send->set_json_message(std::string("message"));
+
+  EXPECT_CALL(mock_protocol_handler_, IsRPCServiceSecure(kConnectionKey))
+      .WillOnce(Return(true));
+  ON_CALL(mock_app_mngr_, application(_)).WillByDefault(Return(nullptr));
+  EXPECT_CALL(*mock_rpc_protection_manager_, CheckPolicyEncryptionFlag(_, _, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(mock_protocol_handler_, SendMessageToMobileApp(_, _, _))
+      .WillOnce(Return());
+  EXPECT_CALL(*mock_rpc_protection_manager_,
+              RemoveFromEncryptionNeededCache(_, _))
+      .WillOnce(Return());
+  message_handler->Handle(
+      am::rpc_service::impl::MessageToMobile(message_to_send, false));
+}
+
+TEST_F(RPCServiceImplTest, Handle_HappyPathWithClosedSession) {
+  auto message_handler = std::make_shared<rpc_service::RPCServiceImpl>(
+      mock_app_mngr_,
+      request_controller_,
+      &mock_protocol_handler_,
+      &mock_hmi_handler_,
+      mock_command_holder_,
+      mock_rpc_protection_manager_,
+      hmi_so_factory_,
+      mobile_so_factory_);
+  auto message_to_send = std::make_shared<am::Message>(
+      protocol_handler::MessagePriority::kDefault);
+  message_to_send->set_protocol_version(
+      protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1);
+  message_to_send->set_connection_key(kConnectionKey);
+  message_to_send->set_correlation_id(kCorrelationId);
+  message_to_send->set_function_id(kFunctionId);
+  message_to_send->set_message_type(am::MessageType::kNotification);
+  message_to_send->set_json_message(std::string("message"));
+
+  NiceMock<test::components::connection_handler_test::MockConnectionHandler>
+      mock_conn_handler;
+  EXPECT_CALL(mock_app_mngr_, connection_handler())
+      .WillRepeatedly(ReturnRef(mock_conn_handler));
+  ON_CALL(mock_conn_handler, GetConnectionSessionsCount(_))
+      .WillByDefault(Return(kConnectionSessionsCount));
+  ON_CALL(mock_protocol_handler_, IsRPCServiceSecure(_))
+      .WillByDefault(Return(true));
+  ON_CALL(mock_app_mngr_, application(_)).WillByDefault(Return(nullptr));
+  EXPECT_CALL(*mock_rpc_protection_manager_, CheckPolicyEncryptionFlag(_, _, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(mock_protocol_handler_, SendMessageToMobileApp(_, _, _))
+      .WillOnce(Return());
+  EXPECT_CALL(*mock_rpc_protection_manager_,
+              RemoveFromEncryptionNeededCache(_, _))
+      .WillOnce(Return());
+  EXPECT_CALL(mock_conn_handler, CloseSession(_, _)).WillOnce(Return());
+
+  message_handler->Handle(
+      am::rpc_service::impl::MessageToMobile(message_to_send, true));
+}
+
+TEST_F(RPCServiceImplTest, SendMessageToMobile_HappyPath) {
+  using namespace application_manager::plugin_manager::plugin_names;
+  namespace jhs = ns_smart_device_link::ns_json_handler::strings;
+  auto func_id = mobile_apis::FunctionID::OnSystemRequestID;
+  auto source = am::commands::Command::CommandSource::SOURCE_SDL;
+
+  auto message = CreateMessage(smart_objects::SmartType_Map);
+  (*message)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+  (*message)[am::strings::params][am::strings::function_id] = func_id;
+  (*message)[am::strings::msg_params][am::strings::request_type] =
+      mobile_apis::RequestType::PROPRIETARY;
+  (*message)[am::strings::msg_params][am::strings::result_code] =
+      mobile_apis::Result::SUCCESS;
+
+  (*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID] = func_id;
+  (*message)[jhs::S_PARAMS][jhs::S_MESSAGE_TYPE] =
+      mobile_apis::messageType::request;
+  (*message)[jhs::S_PARAMS][jhs::S_PROTOCOL_TYPE] = kMobileProtocolType;
+  (*message)[jhs::S_PARAMS][jhs::S_PROTOCOL_VERSION] = kProtocolVersion;
+
+  mock_app_ptr_ = std::make_shared<NiceMock<MockApplication> >();
+  ON_CALL(mock_app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app_ptr_));
+  ON_CALL(*mock_app_ptr_, protocol_version())
+      .WillByDefault(
+          Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1));
+
+  EXPECT_CALL(mock_app_mngr_, GetAppServiceManager())
+      .WillRepeatedly(ReturnRef(mock_app_service_nmgr_));
+  auto rpc_pass_handler = std::make_shared<am::RPCPassingHandler>(
+      mock_app_service_nmgr_, mock_app_mngr_);
+  EXPECT_CALL(mock_app_service_nmgr_, GetRPCPassingHandler())
+      .WillRepeatedly(ReturnRef(*rpc_pass_handler));
+  EXPECT_CALL(mock_app_service_nmgr_, GetActiveServices())
+      .WillRepeatedly(Return(std::vector<am::AppService>()));
+
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  PluginOpt mock_rpc_plugin_opt(mock_rpc_plugin_);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(func_id, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, PluginName())
+      .WillByDefault(Return(app_service_rpc_plugin));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+  ON_CALL(mock_command_factory_, IsAbleToProcess(func_id, source))
+      .WillByDefault(Return(true));
+
+  auto window_id = 0;
+  ON_CALL(mock_message_helper_, ExtractWindowIdFromSmartObject(_))
+      .WillByDefault(Return(window_id));
+  ON_CALL(mock_message_helper_, StringifiedFunctionID(func_id))
+      .WillByDefault(Return("OnSystemRequest"));
+  EXPECT_CALL(mock_app_mngr_,
+              CheckPolicyPermissions(_, window_id, "OnSystemRequest", _, _))
+      .WillOnce(Return(mobile_apis::Result::SUCCESS));
+
+  policy_test::MockPolicyHandlerInterface mock_policy_handler;
+  EXPECT_CALL(mock_app_mngr_, GetPolicyHandler())
+      .WillOnce(ReturnRef(mock_policy_handler));
+  EXPECT_CALL(mock_policy_handler, OnUpdateRequestSentToMobile());
+
+  rpc_service_->SendMessageToMobile(message);
+}
+
+TEST_F(RPCServiceImplTest,
+       SendMessageToMobile_PolicyPermissionsFailed_ExecutionAborted) {
+  using namespace application_manager::plugin_manager::plugin_names;
+
+  namespace jhs = ns_smart_device_link::ns_json_handler::strings;
+  auto func_id = mobile_apis::FunctionID::OnSystemRequestID;
+  auto source = am::commands::Command::CommandSource::SOURCE_SDL;
+
+  auto message = CreateMessage(smart_objects::SmartType_Map);
+  (*message)[am::strings::params][am::strings::connection_key] = kConnectionKey;
+  (*message)[am::strings::params][am::strings::function_id] = func_id;
+  (*message)[am::strings::msg_params][am::strings::request_type] =
+      mobile_apis::RequestType::PROPRIETARY;
+  (*message)[am::strings::msg_params][am::strings::result_code] =
+      mobile_apis::Result::SUCCESS;
+
+  (*message)[jhs::S_PARAMS][jhs::S_FUNCTION_ID] = func_id;
+  (*message)[jhs::S_PARAMS][jhs::S_MESSAGE_TYPE] =
+      mobile_apis::messageType::request;
+  (*message)[jhs::S_PARAMS][jhs::S_PROTOCOL_TYPE] = kMobileProtocolType;
+  (*message)[jhs::S_PARAMS][jhs::S_PROTOCOL_VERSION] = kProtocolVersion;
+
+  mock_app_ptr_ = std::make_shared<NiceMock<MockApplication> >();
+  ON_CALL(mock_app_mngr_, application(kConnectionKey))
+      .WillByDefault(Return(mock_app_ptr_));
+  ON_CALL(*mock_app_ptr_, protocol_version())
+      .WillByDefault(
+          Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_1));
+
+  EXPECT_CALL(mock_app_mngr_, GetAppServiceManager())
+      .WillRepeatedly(ReturnRef(mock_app_service_nmgr_));
+  auto rpc_pass_handler = std::make_shared<am::RPCPassingHandler>(
+      mock_app_service_nmgr_, mock_app_mngr_);
+  EXPECT_CALL(mock_app_service_nmgr_, GetRPCPassingHandler())
+      .WillRepeatedly(ReturnRef(*rpc_pass_handler));
+  EXPECT_CALL(mock_app_service_nmgr_, GetActiveServices())
+      .WillRepeatedly(Return(std::vector<am::AppService>()));
+
+  ON_CALL(mock_app_mngr_, GetPluginManager())
+      .WillByDefault(ReturnRef(mock_rpc_plugin_manager_));
+  PluginOpt mock_rpc_plugin_opt(mock_rpc_plugin_);
+  ON_CALL(mock_rpc_plugin_manager_, FindPluginToProcess(func_id, source))
+      .WillByDefault(Return(mock_rpc_plugin_opt));
+  ON_CALL(mock_rpc_plugin_, PluginName())
+      .WillByDefault(Return(app_service_rpc_plugin));
+  ON_CALL(mock_rpc_plugin_, GetCommandFactory())
+      .WillByDefault(ReturnRef(mock_command_factory_));
+  ON_CALL(mock_command_factory_, IsAbleToProcess(func_id, source))
+      .WillByDefault(Return(true));
+
+  auto window_id = -1;  // Assume that this ID is invalid;
+  ON_CALL(mock_message_helper_, ExtractWindowIdFromSmartObject(_))
+      .WillByDefault(Return(window_id));
+  ON_CALL(mock_message_helper_, StringifiedFunctionID(func_id))
+      .WillByDefault(Return("OnSystemRequest"));
+  EXPECT_CALL(mock_app_mngr_,
+              CheckPolicyPermissions(_, window_id, "OnSystemRequest", _, _))
+      .WillOnce(Return(mobile_apis::Result::INVALID_ENUM));
+
+  policy_test::MockPolicyHandlerInterface mock_policy_handler;
+  EXPECT_CALL(mock_app_mngr_, GetPolicyHandler()).Times(0);
+  EXPECT_CALL(mock_policy_handler, OnUpdateRequestSentToMobile()).Times(0);
+
+  rpc_service_->SendMessageToMobile(message);
+}
+}  // namespace application_manager_test
+
+}  // namespace components
+
+}  // namespace test
diff --git a/src/components/application_manager/test/state_controller/state_controller_test.cc b/src/components/application_manager/test/state_controller/state_controller_test.cc
index 9621e20629..93565b8719 100644
--- a/src/components/application_manager/test/state_controller/state_controller_test.cc
+++ b/src/components/application_manager/test/state_controller/state_controller_test.cc
@@ -71,14 +71,19 @@ using ::testing::ReturnRef;
 using ::testing::SaveArg;
 using ::testing::Truly;
 
+using application_manager::MockMessageHelper;
+
 namespace test {
 namespace components {
 namespace state_controller_test {
 
-namespace constants {
+namespace {
 const uint32_t kCorrID = 314u;
 const uint32_t kHMIAppID = 2718u;
-}  // namespace constants
+const am::WindowID kDefaultWindowId =
+    mobile_apis::PredefinedWindows::DEFAULT_WINDOW;
+const am::WindowID kCustomWindowId = 2;
+}  // namespace
 
 struct HmiStatesComparator {
   mobile_apis::HMILevel::eType hmi_level_;
@@ -151,7 +156,6 @@ class StateControllerImplTest : public ::testing::Test {
   ~StateControllerImplTest() {
     Mock::VerifyAndClearExpectations(&message_helper_mock_);
   }
-
   NiceMock<application_manager_test::MockApplicationManager> app_manager_mock_;
   NiceMock<application_manager_test::MockRPCService> mock_rpc_service_;
   NiceMock<policy_test::MockPolicyHandlerInterface> policy_interface_;
@@ -213,7 +217,11 @@ class StateControllerImplTest : public ::testing::Test {
   std::vector<am::HmiStatePtr> invalid_states_for_not_audio_app;
   std::vector<am::HmiStatePtr> invalid_states_for_audio_app;
   std::vector<am::HmiState::StateID> valid_state_ids_;
-  std::vector<am::ApplicationSharedPtr> applications_list_;
+
+  typedef std::map<am::ApplicationSharedPtr,
+                   NiceMock<application_manager_test::MockApplication>*>
+      AppPtrMockMapping;
+  AppPtrMockMapping applications_list_;
 
   connection_handler_test::MockConnectionHandlerSettings
       mock_connection_handler__settings;
@@ -554,21 +562,26 @@ class StateControllerImplTest : public ::testing::Test {
     // application properties, i.e. is_media_application flag from RAI and
     // AppHmiTypes (NAVIGATION, etc.). Most likely logic should be changed
     // after conclusion on APPLINK-20231
-    std::vector<am::ApplicationSharedPtr>::iterator app = std::find_if(
-        applications_list_.begin(),
-        applications_list_.end(),
-        [app_id](am::ApplicationSharedPtr a) { return app_id == a->app_id(); });
-
-    if (app == applications_list_.end()) {
+    AppPtrMockMapping::iterator it =
+        std::find_if(applications_list_.begin(),
+                     applications_list_.end(),
+                     [app_id](AppPtrMockMapping::value_type& item) {
+                       return app_id == item.first->app_id();
+                     });
+
+    if (applications_list_.end() == it) {
       return APP_TYPE_NON_MEDIA;
     }
 
-    if ((*app)->is_navi()) {
+    auto app = it->first;
+    if (app->is_navi()) {
       return APP_TYPE_NAVI;
     }
-    if ((*app)->is_media_application()) {
+
+    if (app->is_media_application()) {
       return APP_TYPE_MEDIA;
     }
+
     return APP_TYPE_NON_MEDIA;
   }
 
@@ -644,17 +657,16 @@ class StateControllerImplTest : public ::testing::Test {
   template <typename T, typename Q>
   void TestMixState(void (StateControllerImplTest::*call_back_result)(
       std::vector<am::HmiStatePtr>&, ApplicationType)) {
-    std::vector<am::ApplicationSharedPtr>::iterator it_begin =
-        applications_list_.begin();
-    std::vector<am::ApplicationSharedPtr>::iterator it_end =
-        applications_list_.end();
+    AppPtrMockMapping::iterator it_begin = applications_list_.begin();
+    AppPtrMockMapping::iterator it_end = applications_list_.end();
     ApplicationType app_type;
     uint32_t app_id;
     am::ApplicationSharedPtr app;
+
     for (; it_begin != it_end; ++it_begin) {
-      app_id = (*it_begin)->app_id();
+      app_id = it_begin->first->app_id();
       app_type = AppType(app_id);
-      app = (*it_begin);
+      app = it_begin->first;
       am::HmiStatePtr state_first = std::make_shared<T>(app, app_manager_mock_);
       am::HmiStatePtr state_second =
           std::make_shared<Q>(app, app_manager_mock_);
@@ -925,14 +937,14 @@ class StateControllerImplTest : public ::testing::Test {
                                       MEDIA,
                                       NAVI,
                                       VC);
-    applications_list_.push_back(simple_app_);
-    applications_list_.push_back(media_app_);
-    applications_list_.push_back(navi_app_);
-    applications_list_.push_back(vc_app_);
-    applications_list_.push_back(media_navi_app_);
-    applications_list_.push_back(media_vc_app_);
-    applications_list_.push_back(navi_vc_app_);
-    applications_list_.push_back(media_navi_vc_app_);
+    applications_list_[simple_app_] = simple_app_ptr_;
+    applications_list_[media_app_] = media_app_ptr_;
+    applications_list_[navi_app_] = navi_app_ptr_;
+    applications_list_[vc_app_] = vc_app_ptr_;
+    applications_list_[media_navi_app_] = media_navi_app_ptr_;
+    applications_list_[media_vc_app_] = media_vc_app_ptr_;
+    applications_list_[navi_vc_app_] = navi_vc_app_ptr_;
+    applications_list_[media_navi_vc_app_] = media_navi_vc_app_ptr_;
   }
   void CheckAppConfiguration() {
     ASSERT_EQ(simple_app_.get(), simple_app_ptr_);
@@ -1003,7 +1015,6 @@ class StateControllerImplTest : public ::testing::Test {
     ON_CALL(app_manager_mock_, event_dispatcher())
         .WillByDefault(ReturnRef(mock_event_dispatcher_));
     state_ctrl_ = std::make_shared<am::StateControllerImpl>(app_manager_mock_);
-
     ON_CALL(app_manager_mock_, applications())
         .WillByDefault(Return(applications_));
     ConfigureApps();
@@ -1016,6 +1027,22 @@ class StateControllerImplTest : public ::testing::Test {
     delete conn_handler;
   }
 
+  application_manager::commands::MessageSharedPtr CreateCloseAppMessage() {
+    using namespace application_manager;
+
+    smart_objects::SmartObjectSPtr message =
+        std::make_shared<smart_objects::SmartObject>(
+            smart_objects::SmartType_Map);
+    (*message)[application_manager::strings::params]
+              [application_manager::strings::function_id] =
+                  hmi_apis::FunctionID::BasicCommunication_CloseApplication;
+    (*message)[strings::params][strings::message_type] = MessageType::kRequest;
+    (*message)[strings::params][strings::correlation_id] = kCorrID;
+    (*message)[strings::msg_params][strings::app_id] = kHMIAppID;
+
+    return message;
+  }
+
   void SetConnection() {
     conn_handler = new connection_handler::ConnectionHandlerImpl(
         mock_connection_handler__settings, mock_transport_manager);
@@ -1044,22 +1071,34 @@ class StateControllerImplTest : public ::testing::Test {
         .WillByDefault(Return(true));
   }
 
-  void ExpectSuccesfullSetHmiState(
+  void ExpectSuccessfulSetHmiState(
+      am::ApplicationSharedPtr app,
+      NiceMock<application_manager_test::MockApplication>* app_mock,
+      am::HmiStatePtr old_state,
+      am::HmiStatePtr new_state) {
+    ExpectSuccessfulSetHmiState(
+        app, app_mock, kDefaultWindowId, old_state, new_state);
+  }
+
+  void ExpectSuccessfulSetHmiState(
       am::ApplicationSharedPtr app,
       NiceMock<application_manager_test::MockApplication>* app_mock,
+      am::WindowID window_id,
       am::HmiStatePtr old_state,
       am::HmiStatePtr new_state) {
-    EXPECT_CALL(*app_mock, CurrentHmiState())
+    EXPECT_CALL(*app_mock, CurrentHmiState(window_id))
         .WillOnce(Return(old_state))
         .WillOnce(Return(new_state));
-    EXPECT_CALL(*app_mock,
-                SetRegularState(Truly(HmiStatesComparator(new_state))));
+    EXPECT_CALL(
+        *app_mock,
+        SetRegularState(window_id, Truly(HmiStatesComparator(new_state))));
     if (!HmiStatesComparator(old_state)(new_state)) {
-      EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(app));
-      EXPECT_CALL(
-          app_manager_mock_,
-          OnHMILevelChanged(
-              app->app_id(), old_state->hmi_level(), new_state->hmi_level()));
+      EXPECT_CALL(message_helper_mock_,
+                  SendHMIStatusNotification(app, window_id, _));
+      if (kDefaultWindowId == window_id) {
+        EXPECT_CALL(app_manager_mock_,
+                    OnHMIStateChanged(app->app_id(), _, new_state));
+      }
     }
   }
 
@@ -1068,22 +1107,33 @@ class StateControllerImplTest : public ::testing::Test {
       NiceMock<application_manager_test::MockApplication>* app_mock,
       am::HmiStatePtr old_state,
       am::HmiStatePtr new_state) {
-    EXPECT_CALL(*app_mock, RegularHmiState())
+    EXPECT_CALL(*app_mock, RegularHmiState(kDefaultWindowId))
         .WillOnce(Return(old_state))
         .WillOnce(Return(old_state));
-    ExpectSuccesfullSetHmiState(app, app_mock, old_state, new_state);
+    ExpectSuccessfulSetHmiState(app, app_mock, old_state, new_state);
   }
 
   void ExpectAppWontChangeHmiStateDueToConflictResolving(
       am::ApplicationSharedPtr app,
       NiceMock<application_manager_test::MockApplication>* app_mock,
+      const am::WindowID window_id,
       am::HmiStatePtr state) {
-    ON_CALL(*app_mock, RegularHmiState()).WillByDefault(Return(state));
-    EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(app)).Times(0);
-    EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(app->app_id(), _, _))
+    ON_CALL(*app_mock, RegularHmiState(window_id)).WillByDefault(Return(state));
+    EXPECT_CALL(message_helper_mock_,
+                SendHMIStatusNotification(app, window_id, _))
+        .Times(0);
+    EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(app->app_id(), _, _))
         .Times(0);
   }
 
+  void ExpectAppWontChangeHmiStateDueToConflictResolving(
+      am::ApplicationSharedPtr app,
+      NiceMock<application_manager_test::MockApplication>* app_mock,
+      am::HmiStatePtr state) {
+    ExpectAppWontChangeHmiStateDueToConflictResolving(
+        app, app_mock, kDefaultWindowId, state);
+  }
+
   void InsertApplication(am::ApplicationSharedPtr app) {
     application_set_.insert(app);
     ON_CALL(app_manager_mock_, application(app->app_id()))
@@ -1135,13 +1185,14 @@ class StateControllerImplTest : public ::testing::Test {
     using smart_objects::SmartObject;
     namespace FunctionID = hmi_apis::FunctionID;
 
-    EXPECT_CALL(app_mock, CurrentHmiState())
+    EXPECT_CALL(app_mock, CurrentHmiState(kDefaultWindowId))
         .WillRepeatedly(Return(NoneNotAudibleState()));
 
     for (size_t i = 0; i < state_ids.size(); ++i) {
       am::HmiState::StateID state_id = state_ids[i];
       EXPECT_CALL(app_mock,
-                  AddHMIState(Truly(HmiStatesIDComparator(state_id))));
+                  AddHMIState(kDefaultWindowId,
+                              Truly(HmiStatesIDComparator(state_id))));
       switch (state_id) {
         case am::HmiState::StateID::STATE_ID_VR_SESSION: {
           Event vr_start_event(FunctionID::VR_Started);
@@ -1182,7 +1233,7 @@ class StateControllerImplTest : public ::testing::Test {
         default:
           break;
       }
-      EXPECT_CALL(app_mock, AddHMIState(_)).Times(0);
+      EXPECT_CALL(app_mock, AddHMIState(kDefaultWindowId, _)).Times(0);
     }
   }
 
@@ -1194,12 +1245,23 @@ class StateControllerImplTest : public ::testing::Test {
     using smart_objects::SmartObject;
     namespace FunctionID = hmi_apis::FunctionID;
 
-    EXPECT_CALL(app_mock, CurrentHmiState())
+    ON_CALL(message_helper_mock_, GetBCCloseApplicationRequestToHMI(_, _))
+        .WillByDefault(Return(CreateCloseAppMessage()));
+    ON_CALL(app_manager_mock_, GetRPCService())
+        .WillByDefault(ReturnRef(mock_rpc_service_));
+    ON_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+        .WillByDefault(Return(true));
+    EXPECT_CALL(app_mock, CurrentHmiState(kDefaultWindowId))
         .WillRepeatedly(Return(NoneNotAudibleState()));
 
+    am::WindowIds window_ids = {kDefaultWindowId};
+    EXPECT_CALL(app_mock, GetWindowIds()).WillRepeatedly(Return(window_ids));
+
     for (uint32_t i = 0; i < state_ids.size(); ++i) {
       am::HmiState::StateID state_id = state_ids[i];
-      EXPECT_CALL(app_mock, AddHMIState(Truly(HmiStatesIDComparator(state_id))))
+      EXPECT_CALL(
+          app_mock,
+          AddHMIState(kDefaultWindowId, Truly(HmiStatesIDComparator(state_id))))
           .Times(1);
 
       switch (state_id) {
@@ -1243,16 +1305,17 @@ class StateControllerImplTest : public ::testing::Test {
           break;
       }
 
-      EXPECT_CALL(app_mock, AddHMIState(_)).Times(0);
+      EXPECT_CALL(app_mock, AddHMIState(kDefaultWindowId, _)).Times(0);
     }
 
     for (uint32_t i = 0; i < state_ids.size(); ++i) {
       am::HmiState::StateID state_id = state_ids[i];
-      EXPECT_CALL(app_mock, RemoveHMIState(state_id)).Times(1);
+      EXPECT_CALL(app_mock, RemoveHMIState(kDefaultWindowId, state_id))
+          .Times(1);
 
-      EXPECT_CALL(app_mock, PostponedHmiState())
+      EXPECT_CALL(app_mock, PostponedHmiState(kDefaultWindowId))
           .WillOnce(Return(NoneNotAudibleState()));
-      EXPECT_CALL(app_mock, RemovePostponedState());
+      EXPECT_CALL(app_mock, RemovePostponedState(kDefaultWindowId));
 
       switch (state_id) {
         case am::HmiState::StateID::STATE_ID_VR_SESSION: {
@@ -1295,18 +1358,19 @@ class StateControllerImplTest : public ::testing::Test {
           break;
       }
 
-      EXPECT_CALL(app_mock, RemoveHMIState(_)).Times(0);
+      EXPECT_CALL(app_mock, RemoveHMIState(kDefaultWindowId, _)).Times(0);
     }
   }
 };
 
 TEST_F(StateControllerImplTest, OnStateChangedWithEqualStates) {
   EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(_)).Times(0);
-  EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(_, _, _)).Times(0);
+  EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _)).Times(0);
   EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(0);
 
   for (uint32_t i = 0; i < valid_states_for_not_audio_app_.size(); ++i) {
     state_ctrl_->OnStateChanged(simple_app_,
+                                kDefaultWindowId,
                                 valid_states_for_not_audio_app_[i],
                                 valid_states_for_not_audio_app_[i]);
   }
@@ -1317,24 +1381,26 @@ TEST_F(StateControllerImplTest, OnStateChangedWithDifferentStates) {
     for (uint32_t j = 0; j < valid_states_for_not_audio_app_.size(); ++j) {
       HmiStatesComparator comp(valid_states_for_not_audio_app_[i]);
       if (!comp(valid_states_for_not_audio_app_[j])) {
-        EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(simple_app_))
-            .Times(1);
         EXPECT_CALL(
-            app_manager_mock_,
-            OnHMILevelChanged(simple_app_id_,
-                              valid_states_for_not_audio_app_[i]->hmi_level(),
-                              valid_states_for_not_audio_app_[j]->hmi_level()))
+            message_helper_mock_,
+            SendHMIStatusNotification(simple_app_, kDefaultWindowId, _));
+        EXPECT_CALL(app_manager_mock_,
+                    OnHMIStateChanged(simple_app_id_,
+                                      valid_states_for_not_audio_app_[i],
+                                      valid_states_for_not_audio_app_[j]))
             .Times(1);
         if (mobile_apis::HMILevel::HMI_NONE ==
             valid_states_for_not_audio_app_[j]->hmi_level()) {
           EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(1);
         }
         state_ctrl_->OnStateChanged(simple_app_,
+                                    kDefaultWindowId,
                                     valid_states_for_not_audio_app_[i],
                                     valid_states_for_not_audio_app_[j]);
 
-        EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(_)).Times(0);
-        EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(_, _, _)).Times(0);
+        EXPECT_CALL(message_helper_mock_, SendHMIStatusNotification(_, _, _))
+            .Times(0);
+        EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _)).Times(0);
         EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(0);
       }
     }
@@ -1356,10 +1422,12 @@ TEST_F(StateControllerImplTest, OnStateChangedToNone) {
                      SystemContext::SYSCTXT_MAIN);
 
   EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(0);
-  state_ctrl_->OnStateChanged(simple_app_, none_state, not_none_state);
+  state_ctrl_->OnStateChanged(
+      simple_app_, kDefaultWindowId, none_state, not_none_state);
 
   EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(1);
-  state_ctrl_->OnStateChanged(simple_app_, not_none_state, none_state);
+  state_ctrl_->OnStateChanged(
+      simple_app_, kDefaultWindowId, not_none_state, none_state);
 }
 
 TEST_F(StateControllerImplTest, MoveSimpleAppToValidStates) {
@@ -1377,18 +1445,21 @@ TEST_F(StateControllerImplTest, MoveSimpleAppToValidStates) {
        it != valid_states_for_not_audio_app_.end();
        ++it) {
     HmiStatePtr state_to_setup = *it;
-    EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+    EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
         .WillOnce(Return(initial_state))
         .WillOnce(Return(state_to_setup));
-    EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(simple_app_));
+    EXPECT_CALL(message_helper_mock_,
+                SendHMIStatusNotification(simple_app_, kDefaultWindowId, _));
     EXPECT_CALL(app_manager_mock_,
-                OnHMILevelChanged(simple_app_id_,
-                                  initial_state->hmi_level(),
-                                  state_to_setup->hmi_level()));
+                OnHMIStateChanged(simple_app_id_,
+                                  Truly(HmiStatesComparator(initial_state)),
+                                  state_to_setup));
 
     EXPECT_CALL(*simple_app_ptr_,
-                SetRegularState(Truly(HmiStatesComparator(state_to_setup))));
-    state_ctrl_->SetRegularState(simple_app_, state_to_setup, false);
+                SetRegularState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(state_to_setup))));
+    state_ctrl_->SetRegularState(
+        simple_app_, kDefaultWindowId, state_to_setup, false);
     initial_state = state_to_setup;
   }
 }
@@ -1413,18 +1484,19 @@ TEST_F(StateControllerImplTest, MoveAudioNotResumeAppToValidStates) {
        it != valid_states_for_audio_app_.end();
        ++it) {
     HmiStatePtr state_to_setup = *it;
-    EXPECT_CALL(*audio_app_mock, CurrentHmiState())
+    EXPECT_CALL(*audio_app_mock, CurrentHmiState(kDefaultWindowId))
         .WillOnce(Return(initial_state))
         .WillOnce(Return(state_to_setup));
-    EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(audio_app));
+    EXPECT_CALL(message_helper_mock_,
+                SendHMIStatusNotification(audio_app, kDefaultWindowId, _));
     EXPECT_CALL(app_manager_mock_,
-                OnHMILevelChanged(audio_app->app_id(),
-                                  initial_state->hmi_level(),
-                                  state_to_setup->hmi_level()));
+                OnHMIStateChanged(audio_app->app_id(), _, state_to_setup));
 
     EXPECT_CALL(*audio_app_mock,
-                SetRegularState(Truly(HmiStatesComparator(state_to_setup))));
-    state_ctrl_->SetRegularState(media_navi_vc_app_, state_to_setup, false);
+                SetRegularState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(state_to_setup))));
+    state_ctrl_->SetRegularState(
+        media_navi_vc_app_, kDefaultWindowId, state_to_setup, false);
     initial_state = state_to_setup;
   }
 }
@@ -1452,7 +1524,7 @@ TEST_F(StateControllerImplTest, MoveAudioResumeAppToValidStates) {
     HmiStatePtr state_to_setup = *it;
     HmiStatePtr state_to_check = state_to_setup;
     // First time current state is initial, then it changes to setup state
-    EXPECT_CALL(*audio_app_mock, CurrentHmiState())
+    EXPECT_CALL(*audio_app_mock, CurrentHmiState(kDefaultWindowId))
         .WillOnce(Return(initial_state))
         .WillOnce(Return(state_to_setup));
     // Audio resume app when HMI level is LIMITED or FULL gets audible state
@@ -1473,15 +1545,15 @@ TEST_F(StateControllerImplTest, MoveAudioResumeAppToValidStates) {
     EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(audio_app))
         .Times(AtLeast(0));
     EXPECT_CALL(app_manager_mock_,
-                OnHMILevelChanged(audio_app->app_id(),
-                                  initial_state->hmi_level(),
-                                  state_to_setup->hmi_level()))
+                OnHMIStateChanged(audio_app->app_id(), _, state_to_setup))
         .Times(AtLeast(0));
 
     // Check that we set correct state
     EXPECT_CALL(*audio_app_mock,
-                SetRegularState(Truly(HmiStatesComparator(state_to_check))));
-    state_ctrl_->SetRegularState(media_navi_vc_app_, state_to_setup, false);
+                SetRegularState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(state_to_check))));
+    state_ctrl_->SetRegularState(
+        media_navi_vc_app_, kDefaultWindowId, state_to_setup, false);
     initial_state = state_to_setup;
   }
 }
@@ -1494,11 +1566,13 @@ TEST_F(StateControllerImplTest, MoveAppFromValidStateToInvalid) {
        invalid_state_it != common_invalid_states_.end();
        ++invalid_state_it) {
     HmiStatePtr invalid_state = *invalid_state_it;
-    EXPECT_CALL(*simple_app_ptr_, CurrentHmiState()).Times(0);
+    EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId)).Times(0);
     EXPECT_CALL(*simple_app_ptr_, is_resuming()).Times(0);
-    EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(_, _, _)).Times(0);
-    EXPECT_CALL(*simple_app_ptr_, SetRegularState(_)).Times(0);
-    state_ctrl_->SetRegularState(simple_app_, invalid_state, false);
+    EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _)).Times(0);
+    EXPECT_CALL(*simple_app_ptr_, SetRegularState(kDefaultWindowId, _))
+        .Times(0);
+    state_ctrl_->SetRegularState(
+        simple_app_, kDefaultWindowId, invalid_state, false);
   }
 
   for (std::vector<HmiStatePtr>::iterator invalid_state_it =
@@ -1506,11 +1580,14 @@ TEST_F(StateControllerImplTest, MoveAppFromValidStateToInvalid) {
        invalid_state_it != common_invalid_states_.end();
        ++invalid_state_it) {
     HmiStatePtr invalid_state = *invalid_state_it;
-    EXPECT_CALL(*media_navi_vc_app_ptr_, CurrentHmiState()).Times(0);
+    EXPECT_CALL(*media_navi_vc_app_ptr_, CurrentHmiState(kDefaultWindowId))
+        .Times(0);
     EXPECT_CALL(*media_navi_vc_app_ptr_, is_resuming()).Times(0);
-    EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(_, _, _)).Times(0);
-    EXPECT_CALL(*media_navi_vc_app_ptr_, SetRegularState(_)).Times(0);
-    state_ctrl_->SetRegularState(media_navi_vc_app_, invalid_state, false);
+    EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _)).Times(0);
+    EXPECT_CALL(*media_navi_vc_app_ptr_, SetRegularState(kDefaultWindowId, _))
+        .Times(0);
+    state_ctrl_->SetRegularState(
+        media_navi_vc_app_, kDefaultWindowId, invalid_state, false);
   }
 }
 
@@ -1532,7 +1609,7 @@ TEST_F(StateControllerImplTest,
   InsertApplication(app_in_full);
   InsertApplication(app_moved_to_full);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullNotAudibleState());
@@ -1540,7 +1617,8 @@ TEST_F(StateControllerImplTest,
   ExpectAppChangeHmiStateDueToConflictResolving(
       app_in_full, app_in_full_mock, FullNotAudibleState(), BackgroundState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullNotAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullNotAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest, SetFullToSimpleAppWhileAudioAppAppIsInFull) {
@@ -1557,14 +1635,15 @@ TEST_F(StateControllerImplTest, SetFullToSimpleAppWhileAudioAppAppIsInFull) {
   InsertApplication(app_in_full);
   InsertApplication(app_moved_to_full);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullNotAudibleState());
 
   ExpectAppChangeHmiStateDueToConflictResolving(
       app_in_full, app_in_full_mock, FullAudibleState(), LimitedState());
-  state_ctrl_->SetRegularState(app_moved_to_full, FullNotAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullNotAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1583,14 +1662,15 @@ TEST_F(StateControllerImplTest,
   InsertApplication(app_in_full);
   InsertApplication(app_moved_to_full);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullAudibleState());
 
   ExpectAppChangeHmiStateDueToConflictResolving(
       app_in_full, app_in_full_mock, FullAudibleState(), LimitedState());
-  state_ctrl_->SetRegularState(app_moved_to_full, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1607,7 +1687,7 @@ TEST_F(StateControllerImplTest,
 
   InsertApplication(app_in_full);
   InsertApplication(app_moved_to_full);
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullAudibleState());
@@ -1615,7 +1695,8 @@ TEST_F(StateControllerImplTest,
   ExpectAppChangeHmiStateDueToConflictResolving(
       app_in_full, app_in_full_mock, FullAudibleState(), BackgroundState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1633,7 +1714,7 @@ TEST_F(StateControllerImplTest,
 
   InsertApplication(app_in_limited);
   InsertApplication(app_moved_to_full);
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullAudibleState());
@@ -1641,7 +1722,8 @@ TEST_F(StateControllerImplTest,
   ExpectAppChangeHmiStateDueToConflictResolving(
       app_in_limited, app_in_limited_mock, LimitedState(), BackgroundState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1660,7 +1742,7 @@ TEST_F(StateControllerImplTest,
   InsertApplication(app_in_limited);
   InsertApplication(app_moved_to_limited);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_limited,
+  ExpectSuccessfulSetHmiState(app_moved_to_limited,
                               app_moved_to_limited_mock,
                               BackgroundState(),
                               LimitedState());
@@ -1668,7 +1750,8 @@ TEST_F(StateControllerImplTest,
   ExpectAppChangeHmiStateDueToConflictResolving(
       app_in_limited, app_in_limited_mock, LimitedState(), BackgroundState());
 
-  state_ctrl_->SetRegularState(app_moved_to_limited, LimitedState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_limited, kDefaultWindowId, LimitedState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1686,14 +1769,15 @@ TEST_F(StateControllerImplTest,
 
   InsertApplication(app_in_limited);
   InsertApplication(app_moved_to_limited);
-  ExpectSuccesfullSetHmiState(app_moved_to_limited,
+  ExpectSuccessfulSetHmiState(app_moved_to_limited,
                               app_moved_to_limited_mock,
                               BackgroundState(),
                               LimitedState());
   ExpectAppWontChangeHmiStateDueToConflictResolving(
       app_in_limited, app_in_limited_mock, LimitedState());
 
-  state_ctrl_->SetRegularState(app_moved_to_limited, LimitedState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_limited, kDefaultWindowId, LimitedState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1712,14 +1796,15 @@ TEST_F(StateControllerImplTest,
   InsertApplication(app_in_full);
   InsertApplication(app_moved_to_limited);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_limited,
+  ExpectSuccessfulSetHmiState(app_moved_to_limited,
                               app_moved_to_limited_mock,
                               BackgroundState(),
                               LimitedState());
 
   ExpectAppWontChangeHmiStateDueToConflictResolving(
       app_in_full, app_in_full_mock, FullAudibleState());
-  state_ctrl_->SetRegularState(app_moved_to_limited, LimitedState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_limited, kDefaultWindowId, LimitedState(), false);
 }
 
 TEST_F(StateControllerImplTest, SetFullToSimpleAppWhile2AudioAppsInLimited) {
@@ -1743,7 +1828,7 @@ TEST_F(StateControllerImplTest, SetFullToSimpleAppWhile2AudioAppsInLimited) {
   InsertApplication(limited_app1);
   InsertApplication(limited_app2);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullNotAudibleState());
@@ -1753,7 +1838,8 @@ TEST_F(StateControllerImplTest, SetFullToSimpleAppWhile2AudioAppsInLimited) {
   ExpectAppWontChangeHmiStateDueToConflictResolving(
       limited_app2, limited_app2_mock, LimitedState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullNotAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullNotAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1778,7 +1864,7 @@ TEST_F(StateControllerImplTest,
   InsertApplication(limited_app);
   InsertApplication(full_app);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullNotAudibleState());
@@ -1789,7 +1875,8 @@ TEST_F(StateControllerImplTest,
   ExpectAppChangeHmiStateDueToConflictResolving(
       full_app, full_app_mock, FullAudibleState(), LimitedState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullNotAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullNotAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1814,7 +1901,7 @@ TEST_F(StateControllerImplTest,
   InsertApplication(limited_app);
   InsertApplication(full_app);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullNotAudibleState());
@@ -1825,7 +1912,8 @@ TEST_F(StateControllerImplTest,
   ExpectAppChangeHmiStateDueToConflictResolving(
       full_app, full_app_mock, FullNotAudibleState(), BackgroundState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullNotAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullNotAudibleState(), false);
 }
 
 TEST_F(
@@ -1851,7 +1939,7 @@ TEST_F(
   InsertApplication(limited_app);
   InsertApplication(full_app);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullAudibleState());
@@ -1862,7 +1950,8 @@ TEST_F(
   ExpectAppChangeHmiStateDueToConflictResolving(
       full_app, full_app_mock, FullNotAudibleState(), BackgroundState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullAudibleState(), false);
 }
 
 TEST_F(
@@ -1888,7 +1977,7 @@ TEST_F(
   InsertApplication(limited_app);
   InsertApplication(full_app);
 
-  ExpectSuccesfullSetHmiState(app_moved_to_full,
+  ExpectSuccessfulSetHmiState(app_moved_to_full,
                               app_moved_to_full_mock,
                               BackgroundState(),
                               FullAudibleState());
@@ -1899,7 +1988,8 @@ TEST_F(
   ExpectAppChangeHmiStateDueToConflictResolving(
       full_app, full_app_mock, FullAudibleState(), LimitedState());
 
-  state_ctrl_->SetRegularState(app_moved_to_full, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      app_moved_to_full, kDefaultWindowId, FullAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1912,19 +2002,20 @@ TEST_F(StateControllerImplTest,
   InsertApplication(media_app_);
   InsertApplication(navi_app_);
   InsertApplication(vc_app_);
-  ExpectSuccesfullSetHmiState(media_navi_vc_app_,
+  ExpectSuccessfulSetHmiState(media_navi_vc_app_,
                               media_navi_vc_app_ptr_,
                               BackgroundState(),
                               FullAudibleState());
 
-  EXPECT_CALL(*media_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillOnce(Return(LimitedState()));
 
   ExpectAppChangeHmiStateDueToConflictResolving(
       navi_app_, navi_app_ptr_, LimitedState(), BackgroundState());
   ExpectAppChangeHmiStateDueToConflictResolving(
       vc_app_, vc_app_ptr_, LimitedState(), BackgroundState());
-  state_ctrl_->SetRegularState(media_navi_vc_app_, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      media_navi_vc_app_, kDefaultWindowId, FullAudibleState(), false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -1937,19 +2028,20 @@ TEST_F(StateControllerImplTest,
   InsertApplication(media_app_);
   InsertApplication(navi_app_);
   InsertApplication(vc_app_);
-  ExpectSuccesfullSetHmiState(media_navi_vc_app_,
+  ExpectSuccessfulSetHmiState(media_navi_vc_app_,
                               media_navi_vc_app_ptr_,
                               BackgroundState(),
                               FullAudibleState());
 
-  EXPECT_CALL(*media_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillOnce(Return(LimitedState()));
 
   ExpectAppChangeHmiStateDueToConflictResolving(
       navi_app_, navi_app_ptr_, LimitedState(), BackgroundState());
   ExpectAppChangeHmiStateDueToConflictResolving(
       vc_app_, vc_app_ptr_, FullAudibleState(), BackgroundState());
-  state_ctrl_->SetRegularState(media_navi_vc_app_, FullAudibleState(), false);
+  state_ctrl_->SetRegularState(
+      media_navi_vc_app_, kDefaultWindowId, FullAudibleState(), false);
 }
 
 // TODO {AKozoriz} Changed logic in state_controller
@@ -1992,9 +2084,9 @@ TEST_F(StateControllerImplTest, DISABLED_ActivateAppSuccessReceivedFromHMI) {
         .WillOnce(Return(hmi_app_id));
     EXPECT_CALL(app_manager_mock_, application_by_hmi_app(hmi_app_id))
         .WillOnce(Return(media_app_));
-    ExpectSuccesfullSetHmiState(
+    ExpectSuccessfulSetHmiState(
         media_app_, media_app_ptr_, initial_hmi_state, hmi_state);
-    state_ctrl_->SetRegularState(media_app_, hmi_state, true);
+    state_ctrl_->SetRegularState(media_app_, kDefaultWindowId, hmi_state, true);
     smart_objects::SmartObject message;
     message[am::strings::params][am::hmi_response::code] =
         Common_Result::SUCCESS;
@@ -2050,14 +2142,15 @@ TEST_F(StateControllerImplTest, SendEventBCActivateApp_HMIReceivesError) {
     EXPECT_CALL(app_manager_mock_, application_by_hmi_app(hmi_app_id))
         .WillOnce(Return(simple_app_));
 
-    EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).Times(0);
-    EXPECT_CALL(*simple_app_ptr_, CurrentHmiState()).Times(0);
-    EXPECT_CALL(*simple_app_ptr_, SetRegularState(_)).Times(0);
+    EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId)).Times(0);
+    EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId)).Times(0);
+    EXPECT_CALL(*simple_app_ptr_, SetRegularState(kDefaultWindowId, _))
+        .Times(0);
 
     EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(simple_app_))
         .Times(0);
     EXPECT_CALL(app_manager_mock_,
-                OnHMILevelChanged(simple_app_->app_id(), _, _))
+                OnHMIStateChanged(simple_app_->app_id(), _, _))
         .Times(0);
 
     smart_objects::SmartObject message;
@@ -2078,13 +2171,14 @@ TEST_F(StateControllerImplTest, ActivateAppInvalidCorrelationId) {
       .WillOnce(Return(hmi_app_id));
   EXPECT_CALL(app_manager_mock_, application_by_hmi_app(hmi_app_id))
       .WillOnce(Return(am::ApplicationSharedPtr()));
-  EXPECT_CALL(*simple_app_ptr_, SetRegularState(_)).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, SetRegularState(kDefaultWindowId, _)).Times(0);
   EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(simple_app_))
       .Times(0);
-  EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(simple_app_->app_id(), _, _))
+  EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(simple_app_->app_id(), _, _))
       .Times(0);
   SetBCActivateAppRequestToHMI(Common_HMILevel::FULL, corr_id);
-  state_ctrl_->SetRegularState(simple_app_, FullNotAudibleState(), true);
+  state_ctrl_->SetRegularState(
+      simple_app_, kDefaultWindowId, FullNotAudibleState(), true);
   smart_objects::SmartObject message;
   message[am::strings::params][am::hmi_response::code] = Common_Result::SUCCESS;
   message[am::strings::params][am::strings::correlation_id] = corr_id;
@@ -2508,45 +2602,52 @@ TEST_F(StateControllerImplTest,
 
 TEST_F(StateControllerImplTest, SetRegularStateWithNewHmiLvl) {
   using namespace mobile_apis;
+  auto message = CreateCloseAppMessage();
+  ON_CALL(message_helper_mock_, GetBCCloseApplicationRequestToHMI(_, _))
+      .WillByDefault(Return(message));
+  ON_CALL(app_manager_mock_, GetRPCService())
+      .WillByDefault(ReturnRef(mock_rpc_service_));
+  ON_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+      .WillByDefault(Return(true));
+
+  ON_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillByDefault(Return(NoneNotAudibleState()));
+  ON_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
+      .WillByDefault(Return(NoneNotAudibleState()));
 
   HMILevel::eType set_lvl = HMILevel::HMI_NONE;
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
-      .WillOnce(Return(BackgroundState()));
 
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
-      .WillOnce(Return(BackgroundState()))
-      .WillOnce(Return(BackgroundState()));
-
-  state_ctrl_->SetRegularState(simple_app_, set_lvl);
+  state_ctrl_->SetRegularState(simple_app_, kDefaultWindowId, set_lvl);
 
   set_lvl = HMILevel::HMI_LIMITED;
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()));
 
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()))
       .WillOnce(Return(BackgroundState()));
-  state_ctrl_->SetRegularState(simple_app_, set_lvl);
+
+  state_ctrl_->SetRegularState(simple_app_, kDefaultWindowId, set_lvl);
 
   set_lvl = HMILevel::HMI_FULL;
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()));
 
   const uint32_t corr_id = 314;
   SetBCActivateAppRequestToHMI(
       static_cast<hmi_apis::Common_HMILevel::eType>(set_lvl), corr_id);
 
-  state_ctrl_->SetRegularState(simple_app_, set_lvl);
+  state_ctrl_->SetRegularState(simple_app_, kDefaultWindowId, set_lvl);
 
   set_lvl = HMILevel::HMI_BACKGROUND;
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()));
 
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()))
       .WillOnce(Return(BackgroundState()));
 
-  state_ctrl_->SetRegularState(simple_app_, set_lvl);
+  state_ctrl_->SetRegularState(simple_app_, kDefaultWindowId, set_lvl);
 }
 
 TEST_F(StateControllerImplTest, SetRegularStateWithAudioStateAudible) {
@@ -2556,16 +2657,18 @@ TEST_F(StateControllerImplTest, SetRegularStateWithAudioStateAudible) {
                                            AudioStreamingState::AUDIBLE,
                                            VideoStreamingState::STREAMABLE,
                                            SystemContext::SYSCTXT_MAIN);
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(BackgroundState()));
 
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(check_state))
       .WillOnce(Return(check_state));
   EXPECT_CALL(*simple_app_ptr_,
-              SetRegularState(Truly(HmiStatesComparator(check_state))));
+              SetRegularState(kDefaultWindowId,
+                              Truly(HmiStatesComparator(check_state))));
 
   state_ctrl_->SetRegularState(simple_app_,
+                               kDefaultWindowId,
                                AudioStreamingState::AUDIBLE,
                                VideoStreamingState::STREAMABLE);
 }
@@ -2582,23 +2685,27 @@ TEST_F(StateControllerImplTest,
 
   // Non-media app can't have LIMITED-AUDIO state
   EXPECT_CALL(*simple_app_ptr_, is_resuming()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState()).Times(0);
-  EXPECT_CALL(*simple_app_ptr_, SetRegularState(_)).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId)).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, SetRegularState(kDefaultWindowId, _)).Times(0);
   EXPECT_CALL(app_manager_mock_, GetDefaultHmiLevel(_))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_NONE));
   EXPECT_CALL(app_manager_mock_, active_application())
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
   EXPECT_CALL(*simple_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(simple_app_, check_state, false);
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      simple_app_, kDefaultWindowId, check_state, false);
 
   check_state = LimitedState();
   EXPECT_CALL(*media_app_ptr_, is_resuming()).WillRepeatedly(Return(true));
-  EXPECT_CALL(*media_app_ptr_, CurrentHmiState()).Times(0);
-  EXPECT_CALL(*media_app_ptr_, SetRegularState(_)).Times(0);
+  EXPECT_CALL(*media_app_ptr_, CurrentHmiState(kDefaultWindowId)).Times(0);
+  EXPECT_CALL(*media_app_ptr_, SetRegularState(kDefaultWindowId, _)).Times(0);
   EXPECT_CALL(*media_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(media_app_, check_state, false);
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      media_app_, kDefaultWindowId, check_state, false);
 }
 
 TEST_F(StateControllerImplTest, SetRegularStateMediaToNonMediaApp_VR_Stopped) {
@@ -2615,7 +2722,7 @@ TEST_F(StateControllerImplTest, SetRegularStateMediaToNonMediaApp_VR_Stopped) {
   HmiStatePtr check_state = FullNotAudibleState();
 
   // Non-media app can't have LIMITED-AUDIO state
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(check_state))
       .WillOnce(Return(check_state));
 
@@ -2625,16 +2732,19 @@ TEST_F(StateControllerImplTest, SetRegularStateMediaToNonMediaApp_VR_Stopped) {
               SendOnResumeAudioSourceToHMI(simple_app_id_, _))
       .Times(0);
   EXPECT_CALL(*simple_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))))
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))))
       .Times(0);
   EXPECT_CALL(*simple_app_ptr_,
-              SetRegularState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(simple_app_, check_state, false);
+              SetRegularState(kDefaultWindowId,
+                              Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      simple_app_, kDefaultWindowId, check_state, false);
 
   // Set state of media app after vr has stopped
   check_state = LimitedState();
 
-  EXPECT_CALL(*media_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*media_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(check_state))
       .WillOnce(Return(check_state));
 
@@ -2643,11 +2753,14 @@ TEST_F(StateControllerImplTest, SetRegularStateMediaToNonMediaApp_VR_Stopped) {
   EXPECT_CALL(message_helper_mock_,
               SendOnResumeAudioSourceToHMI(media_app_id_, _));
   EXPECT_CALL(*media_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))))
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))))
       .Times(0);
   EXPECT_CALL(*media_app_ptr_,
-              SetRegularState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(media_app_, check_state, false);
+              SetRegularState(kDefaultWindowId,
+                              Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      media_app_, kDefaultWindowId, check_state, false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2670,28 +2783,32 @@ TEST_F(StateControllerImplTest,
   HmiStatePtr check_state = FullNotAudibleState();
   EXPECT_CALL(*simple_app_ptr_, is_resuming()).WillRepeatedly(Return(true));
 
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).Times(0);
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState()).Times(0);
-  EXPECT_CALL(*simple_app_ptr_, SetRegularState(_)).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId)).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId)).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, SetRegularState(kDefaultWindowId, _)).Times(0);
   EXPECT_CALL(app_manager_mock_, GetDefaultHmiLevel(_))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_NONE));
   EXPECT_CALL(app_manager_mock_, active_application())
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
   EXPECT_CALL(*simple_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(simple_app_, check_state, false);
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      simple_app_, kDefaultWindowId, check_state, false);
 
   // Set media app
   check_state = LimitedState();
   EXPECT_CALL(*media_app_ptr_, is_resuming()).WillRepeatedly(Return(true));
 
-  EXPECT_CALL(*media_app_ptr_, RegularHmiState()).Times(0);
-  EXPECT_CALL(*media_app_ptr_, CurrentHmiState()).Times(0);
-  EXPECT_CALL(*media_app_ptr_, SetRegularState(_)).Times(0);
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kDefaultWindowId)).Times(0);
+  EXPECT_CALL(*media_app_ptr_, CurrentHmiState(kDefaultWindowId)).Times(0);
+  EXPECT_CALL(*media_app_ptr_, SetRegularState(kDefaultWindowId, _)).Times(0);
 
   EXPECT_CALL(*media_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(media_app_, check_state, false);
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      media_app_, kDefaultWindowId, check_state, false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2724,8 +2841,10 @@ TEST_F(StateControllerImplTest,
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
 
   EXPECT_CALL(*media_app_ptr_,
-              SetPostponedState(Truly(HmiStatesComparator(check_state))));
-  state_ctrl_->SetRegularState(media_app_, check_state, false);
+              SetPostponedState(kDefaultWindowId,
+                                Truly(HmiStatesComparator(check_state))));
+  state_ctrl_->SetRegularState(
+      media_app_, kDefaultWindowId, check_state, false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2753,13 +2872,13 @@ TEST_F(StateControllerImplTest,
   EXPECT_CALL(app_manager_mock_, IsAppTypeExistsInFullOrLimited(_))
       .WillRepeatedly(Return(false));
 
-  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_state));
 
   EXPECT_CALL(app_manager_mock_, active_application())
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
 
-  state_ctrl_->SetRegularState(navi_app_, hmi_state, false);
+  state_ctrl_->SetRegularState(navi_app_, kDefaultWindowId, hmi_state, false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2787,15 +2906,15 @@ TEST_F(StateControllerImplTest,
   EXPECT_CALL(app_manager_mock_, IsAppTypeExistsInFullOrLimited(_))
       .WillRepeatedly(Return(false));
 
-  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_state));
 
   EXPECT_CALL(app_manager_mock_, active_application())
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
 
-  EXPECT_CALL(*navi_app_ptr_, SetPostponedState(_)).Times(0);
+  EXPECT_CALL(*navi_app_ptr_, SetPostponedState(kDefaultWindowId, _)).Times(0);
 
-  state_ctrl_->SetRegularState(navi_app_, hmi_state, false);
+  state_ctrl_->SetRegularState(navi_app_, kDefaultWindowId, hmi_state, false);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2803,7 +2922,6 @@ TEST_F(StateControllerImplTest,
   using namespace hmi_apis;
   using namespace smart_objects;
   using namespace am::event_engine;
-  using namespace constants;
 
   const uint32_t app_id = navi_app_->app_id();
   // Precondition
@@ -2827,13 +2945,13 @@ TEST_F(StateControllerImplTest,
   EXPECT_CALL(app_manager_mock_, IsAppTypeExistsInFullOrLimited(_))
       .WillRepeatedly(Return(false));
 
-  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_state));
 
   EXPECT_CALL(app_manager_mock_, active_application())
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
 
-  state_ctrl_->SetRegularState(navi_app_, hmi_state, true);
+  state_ctrl_->SetRegularState(navi_app_, kDefaultWindowId, hmi_state, true);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2841,7 +2959,6 @@ TEST_F(StateControllerImplTest,
   using namespace hmi_apis;
   using namespace smart_objects;
   using namespace am::event_engine;
-  using namespace constants;
 
   const uint32_t app_id = navi_app_->app_id();
   // Precondition
@@ -2865,15 +2982,15 @@ TEST_F(StateControllerImplTest,
   EXPECT_CALL(app_manager_mock_, IsAppTypeExistsInFullOrLimited(_))
       .WillRepeatedly(Return(false));
 
-  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*navi_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(hmi_state));
 
   EXPECT_CALL(app_manager_mock_, active_application())
       .WillRepeatedly(Return(am::ApplicationSharedPtr()));
 
-  EXPECT_CALL(*navi_app_ptr_, SetPostponedState(_)).Times(0);
+  EXPECT_CALL(*navi_app_ptr_, SetPostponedState(kDefaultWindowId, _)).Times(0);
 
-  state_ctrl_->SetRegularState(navi_app_, hmi_state, true);
+  state_ctrl_->SetRegularState(navi_app_, kDefaultWindowId, hmi_state, true);
 }
 
 TEST_F(StateControllerImplTest,
@@ -2894,13 +3011,16 @@ TEST_F(StateControllerImplTest,
   EXPECT_CALL(*simple_app_ptr_, keep_context()).WillOnce(Return(true));
   EXPECT_CALL(*simple_app_ptr_, IsAudioApplication())
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(FullAudibleState()));
   EXPECT_CALL(*simple_app_ptr_, set_keep_context(false));
 
   HmiStatePtr new_state;
-  EXPECT_CALL(*simple_app_ptr_, AddHMIState(_))
-      .WillOnce(SaveArg<0>(&new_state));
+  EXPECT_CALL(*simple_app_ptr_, AddHMIState(kDefaultWindowId, _))
+      .WillOnce(SaveArg<1>(&new_state));
+
+  am::WindowIds window_ids = {kDefaultWindowId};
+  EXPECT_CALL(*simple_app_ptr_, GetWindowIds()).WillOnce(Return(window_ids));
 
   state_ctrl_->on_event(event);
 
@@ -2925,12 +3045,15 @@ TEST_F(StateControllerImplTest, OnEventChangedAudioSourceAppToBackground) {
 
   EXPECT_CALL(*simple_app_ptr_, IsAudioApplication())
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(LimitedState()));
 
   HmiStatePtr new_state;
-  EXPECT_CALL(*simple_app_ptr_, AddHMIState(_))
-      .WillOnce(SaveArg<0>(&new_state));
+  EXPECT_CALL(*simple_app_ptr_, AddHMIState(kDefaultWindowId, _))
+      .WillOnce(SaveArg<1>(&new_state));
+
+  am::WindowIds window_ids = {kDefaultWindowId};
+  EXPECT_CALL(*simple_app_ptr_, GetWindowIds()).WillOnce(Return(window_ids));
 
   state_ctrl_->on_event(event);
 
@@ -2949,9 +3072,13 @@ TEST_F(StateControllerImplTest, OnEventOnAppDeactivatedIncorrectHmiLevel) {
   event.set_smart_object(msg);
   EXPECT_CALL(app_manager_mock_, application(app_id))
       .WillOnce(Return(simple_app_));
-  EXPECT_CALL(*simple_app_ptr_, hmi_level())
+  EXPECT_CALL(*simple_app_ptr_, hmi_level(kDefaultWindowId))
       .WillOnce(Return(mobile_apis::HMILevel::HMI_BACKGROUND));
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId)).Times(0);
+
+  am::WindowIds window_ids = {kDefaultWindowId};
+  EXPECT_CALL(*simple_app_ptr_, GetWindowIds()).WillOnce(Return(window_ids));
+
   state_ctrl_->on_event(event);
 }
 
@@ -2965,7 +3092,7 @@ TEST_F(StateControllerImplTest, OnEventOnAppDeactivatedIncorrectApp) {
   const am::ApplicationSharedPtr incorrect_app;
   EXPECT_CALL(app_manager_mock_, application(_))
       .WillOnce(Return(incorrect_app));
-  EXPECT_CALL(*simple_app_ptr_, hmi_level()).Times(0);
+  EXPECT_CALL(*simple_app_ptr_, hmi_level(kDefaultWindowId)).Times(0);
   state_ctrl_->on_event(event);
 }
 
@@ -2986,15 +3113,20 @@ TEST_F(StateControllerImplTest, OnEventOnAppDeactivatedAudioApplication) {
   EXPECT_CALL(app_manager_mock_, application(app_id))
       .WillOnce(Return(simple_app_));
   EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
-  EXPECT_CALL(*simple_app_ptr_, hmi_level())
+  EXPECT_CALL(*simple_app_ptr_, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
   // DeactivateApp
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).WillOnce(Return(state));
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(state));
   EXPECT_CALL(*simple_app_ptr_, IsAudioApplication())
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()))
       .WillOnce(Return(BackgroundState()));
+
+  am::WindowIds window_ids = {kDefaultWindowId};
+  EXPECT_CALL(*simple_app_ptr_, GetWindowIds()).WillOnce(Return(window_ids));
+
   state_ctrl_->on_event(event);
 }
 
@@ -3015,16 +3147,21 @@ TEST_F(StateControllerImplTest, OnEventOnAppDeactivatedNotAudioApplication) {
   EXPECT_CALL(app_manager_mock_, application(app_id))
       .WillOnce(Return(simple_app_));
   EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
-  EXPECT_CALL(*simple_app_ptr_, hmi_level())
+  EXPECT_CALL(*simple_app_ptr_, hmi_level(kDefaultWindowId))
       .WillRepeatedly(Return(mobile_apis::HMILevel::HMI_FULL));
   // DeactivateApp
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).WillOnce(Return(state));
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(state));
   EXPECT_CALL(*simple_app_ptr_, IsAudioApplication())
       .WillRepeatedly(Return(false));
 
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillOnce(Return(BackgroundState()))
       .WillOnce(Return(BackgroundState()));
+
+  am::WindowIds window_ids = {kDefaultWindowId};
+  EXPECT_CALL(*simple_app_ptr_, GetWindowIds()).WillOnce(Return(window_ids));
+
   state_ctrl_->on_event(event);
 }
 
@@ -3044,25 +3181,35 @@ TEST_F(StateControllerImplTest, OnEventOnAppActivatedIncorrectApp) {
 }
 
 TEST_F(StateControllerImplTest, OnEventOnAppActivated) {
-  using namespace constants;
-
   smart_objects::SmartObject msg;
-  for (std::vector<am::ApplicationSharedPtr>::const_iterator it =
-           applications_list_.begin();
+  am::WindowIds window_ids = {kDefaultWindowId};
+
+  for (AppPtrMockMapping::const_iterator it = applications_list_.begin();
        it != applications_list_.end();
        ++it) {
-    uint32_t app_id = (*it)->app_id();
+    uint32_t app_id = it->first->app_id();
     msg[am::strings::msg_params][am::strings::app_id] = app_id;
     const hmi_apis::FunctionID::eType event_id =
         hmi_apis::FunctionID::BasicCommunication_OnAppActivated;
     am::event_engine::Event event(event_id);
     event.set_smart_object(msg);
 
-    EXPECT_CALL(app_manager_mock_, application(app_id)).WillOnce(Return(*it));
+    EXPECT_CALL(app_manager_mock_, application(app_id))
+        .WillOnce(Return(it->first));
     // SetRegularState
-    EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
-    EXPECT_CALL(*simple_app_ptr_, IsAudioApplication())
-        .WillRepeatedly(Return(true));
+    EXPECT_CALL(*it->second, app_id()).WillRepeatedly(Return(app_id));
+    EXPECT_CALL(*it->second, IsAudioApplication()).WillRepeatedly(Return(true));
+    EXPECT_CALL(*it->second, GetWindowIds()).WillOnce(Return(window_ids));
+
+    const am::HmiStatePtr old_state =
+        CreateHmiStateByHmiStateType<am::HmiState>(
+            mobile_apis::HMILevel::HMI_NONE,
+            mobile_apis::AudioStreamingState::NOT_AUDIBLE,
+            mobile_apis::VideoStreamingState::NOT_STREAMABLE,
+            mobile_apis::SystemContext::SYSCTXT_MAIN,
+            simple_app_);
+    EXPECT_CALL(*it->second, RegularHmiState(kDefaultWindowId))
+        .WillOnce(Return(old_state));
 
     smart_objects::SmartObjectSPtr activate_app =
         std::make_shared<smart_objects::SmartObject>();
@@ -3143,9 +3290,9 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredDifferentStates) {
       simple_app_);
 
   EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(old_state));
-  EXPECT_CALL(*simple_app_ptr_, AddHMIState(_)).Times(4);
+  EXPECT_CALL(*simple_app_ptr_, AddHMIState(kDefaultWindowId, _)).Times(4);
 
   const am::HmiStatePtr default_state =
       CreateHmiStateByHmiStateType<am::HmiState>(
@@ -3155,13 +3302,15 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredDifferentStates) {
           mobile_apis::SystemContext::SYSCTXT_MAIN,
           simple_app_);
 
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState()).WillOnce(Return(old_state));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(old_state));
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(default_state));
 
   EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(0);
-  EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(_));
-  EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(_, _, _));
+  EXPECT_CALL(message_helper_mock_,
+              SendHMIStatusNotification(simple_app_, kDefaultWindowId, _));
+  EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _));
 
   state_ctrl_->OnApplicationRegistered(simple_app_,
                                        mobile_apis::HMILevel::HMI_BACKGROUND);
@@ -3194,9 +3343,9 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredEqualStates) {
       simple_app_);
 
   EXPECT_CALL(*simple_app_ptr_, app_id()).WillRepeatedly(Return(app_id));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(old_state));
-  EXPECT_CALL(*simple_app_ptr_, AddHMIState(_)).Times(2);
+  EXPECT_CALL(*simple_app_ptr_, AddHMIState(kDefaultWindowId, _)).Times(2);
 
   const am::HmiStatePtr default_state =
       CreateHmiStateByHmiStateType<am::HmiState>(
@@ -3205,19 +3354,341 @@ TEST_F(StateControllerImplTest, OnApplicationRegisteredEqualStates) {
           mobile_apis::VideoStreamingState::NOT_STREAMABLE,
           mobile_apis::SystemContext::SYSCTXT_MAIN,
           simple_app_);
-  EXPECT_CALL(*simple_app_ptr_, RegularHmiState())
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
       .WillOnce(Return(default_state));
-  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState())
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kDefaultWindowId))
       .WillRepeatedly(Return(default_state));
 
   EXPECT_CALL(*simple_app_ptr_, ResetDataInNone()).Times(0);
   EXPECT_CALL(app_manager_mock_, SendHMIStatusNotification(_)).Times(0);
-  EXPECT_CALL(app_manager_mock_, OnHMILevelChanged(_, _, _)).Times(0);
+  EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _)).Times(0);
 
   state_ctrl_->OnApplicationRegistered(simple_app_,
                                        mobile_apis::HMILevel::HMI_BACKGROUND);
 }
 
+TEST_F(
+    StateControllerImplTest,
+    SetRegularState_AppIsResumingAndAudioSourceIsActive_HmiStateIsNotChanged) {
+  am::event_engine::Event audio_source_event(
+      hmi_apis::FunctionID::BasicCommunication_OnEventChanged);
+  smart_objects::SmartObject message;
+  message[am::strings::msg_params][am::hmi_notification::is_active] = true;
+  message[am::strings::msg_params][am::hmi_notification::event_name] =
+      hmi_apis::Common_EventTypes::AUDIO_SOURCE;
+  audio_source_event.set_smart_object(message);
+  state_ctrl_->on_event(audio_source_event);
+
+  EXPECT_CALL(*media_app_ptr_, is_resuming()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*media_app_ptr_, SetRegularState(_, _)).Times(0);
+
+  const am::HmiStatePtr new_state = FullAudibleState();
+  const bool send_activate_app = true;
+  state_ctrl_->SetRegularState(
+      media_app_, kDefaultWindowId, new_state, send_activate_app);
+}
+
+TEST_F(StateControllerImplTest,
+       SetRegularState_BcActivateAppSendFailed_HmiLevelIsNotChanged) {
+  const am::HmiStatePtr new_state = FullAudibleState();
+  SetBCActivateAppRequestToHMI(
+      static_cast<hmi_apis::Common_HMILevel::eType>(new_state->hmi_level()),
+      kCorrID);
+
+  smart_objects::SmartObjectSPtr bc_activate_app_request;
+  EXPECT_CALL(message_helper_mock_, GetBCActivateAppRequestToHMI(_, _, _, _, _))
+      .WillOnce(Return(bc_activate_app_request));
+  EXPECT_CALL(*simple_app_ptr_, SetRegularState(_, _)).Times(0);
+
+  const bool send_activate_app = true;
+  state_ctrl_->SetRegularState(
+      simple_app_, kDefaultWindowId, new_state, send_activate_app);
+}
+
+TEST_F(StateControllerImplTest,
+       SetRegularState_SetLevelAudioAndVideoState_HmiStateIsChanged) {
+  HmiStatePtr old_state = NoneNotAudibleState();
+  HmiStatePtr new_state = BackgroundState();
+
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(old_state));
+  ExpectSuccessfulSetHmiState(
+      simple_app_, simple_app_ptr_, old_state, new_state);
+
+  const bool send_activate_app = false;
+  state_ctrl_->SetRegularState(simple_app_,
+                               kDefaultWindowId,
+                               new_state->hmi_level(),
+                               new_state->audio_streaming_state(),
+                               new_state->video_streaming_state(),
+                               send_activate_app);
+}
+
+TEST_F(StateControllerImplTest,
+       SetRegularState_SetLevelAudioVideoStatesAndContext_HmiStateIsChanged) {
+  HmiStatePtr old_state = NoneNotAudibleState();
+  HmiStatePtr new_state = BackgroundState();
+
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(old_state));
+  ExpectSuccessfulSetHmiState(
+      simple_app_, simple_app_ptr_, old_state, new_state);
+
+  const bool send_activate_app = false;
+  state_ctrl_->SetRegularState(simple_app_,
+                               kDefaultWindowId,
+                               new_state->hmi_level(),
+                               new_state->audio_streaming_state(),
+                               new_state->video_streaming_state(),
+                               new_state->system_context(),
+                               send_activate_app);
+}
+
+TEST_F(StateControllerImplTest,
+       SetRegularState_SetSystemContextOnly_HmiStateIsChanged) {
+  HmiStatePtr old_state = FullAudibleState();
+  HmiStatePtr new_state = FullNotAudibleState();
+
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(old_state));
+  ExpectSuccessfulSetHmiState(
+      simple_app_, simple_app_ptr_, old_state, new_state);
+
+  state_ctrl_->SetRegularState(
+      simple_app_, kDefaultWindowId, new_state->system_context());
+}
+
+TEST_F(StateControllerImplTest,
+       OnAppActivated_ActivateNotExistingWindow_HmiLevelIsNotChanged) {
+  InsertApplication(simple_app_);
+
+  am::event_engine::Event activate_widget_event(
+      hmi_apis::FunctionID::BasicCommunication_OnAppActivated);
+  smart_objects::SmartObject message;
+  message[am::strings::msg_params][am::strings::app_id] = simple_app_id_;
+  message[am::strings::msg_params][am::strings::window_id] = kCustomWindowId;
+  activate_widget_event.set_smart_object(message);
+
+  const am::WindowIds window_ids = {kDefaultWindowId};
+  ON_CALL(*simple_app_ptr_, GetWindowIds()).WillByDefault(Return(window_ids));
+
+  ExpectAppWontChangeHmiStateDueToConflictResolving(
+      simple_app_, simple_app_ptr_, kCustomWindowId, NoneNotAudibleState());
+
+  state_ctrl_->on_event(activate_widget_event);
+}
+
+TEST_F(StateControllerImplTest,
+       OnAppActivated_ActivateCustomWindow_HmiStateIsChanged) {
+  InsertApplication(simple_app_);
+
+  am::event_engine::Event activate_widget_event(
+      hmi_apis::FunctionID::BasicCommunication_OnAppActivated);
+  smart_objects::SmartObject message;
+  message[am::strings::msg_params][am::strings::app_id] = simple_app_id_;
+  message[am::strings::msg_params][am::strings::window_id] = kCustomWindowId;
+  activate_widget_event.set_smart_object(message);
+
+  const am::WindowIds window_ids = {kDefaultWindowId, kCustomWindowId};
+  ON_CALL(*simple_app_ptr_, GetWindowIds()).WillByDefault(Return(window_ids));
+
+  std::vector<std::pair<HmiStatePtr, HmiStatePtr> > states_transition = {
+      std::make_pair(NoneNotAudibleState(), BackgroundState()),
+      std::make_pair(BackgroundState(), FullNotAudibleState())};
+
+  for (auto& states_pair : states_transition) {
+    HmiStatePtr old_state = states_pair.first;
+    HmiStatePtr new_state = states_pair.second;
+
+    EXPECT_CALL(*simple_app_ptr_, hmi_level(kCustomWindowId))
+        .WillOnce(Return(old_state->hmi_level()));
+    EXPECT_CALL(*simple_app_ptr_, audio_streaming_state())
+        .WillOnce(Return(old_state->audio_streaming_state()));
+    EXPECT_CALL(*simple_app_ptr_, video_streaming_state())
+        .WillOnce(Return(old_state->video_streaming_state()));
+
+    EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kCustomWindowId))
+        .WillOnce(Return(old_state));
+    ExpectSuccessfulSetHmiState(
+        simple_app_, simple_app_ptr_, kCustomWindowId, old_state, new_state);
+
+    EXPECT_CALL(message_helper_mock_,
+                GetBCActivateAppRequestToHMI(_, _, _, _, _))
+        .Times(0);
+
+    state_ctrl_->on_event(activate_widget_event);
+  }
+}
+
+TEST_F(StateControllerImplTest,
+       OnAppDeactivated_DeactivateNotExistingWindow_HmiStateIsNotChanged) {
+  InsertApplication(simple_app_);
+
+  am::event_engine::Event activate_widget_event(
+      hmi_apis::FunctionID::BasicCommunication_OnAppDeactivated);
+  smart_objects::SmartObject message;
+  message[am::strings::msg_params][am::strings::app_id] = simple_app_id_;
+  message[am::strings::msg_params][am::strings::window_id] = kCustomWindowId;
+  activate_widget_event.set_smart_object(message);
+
+  const am::WindowIds window_ids = {kDefaultWindowId};
+  ON_CALL(*simple_app_ptr_, GetWindowIds()).WillByDefault(Return(window_ids));
+
+  ExpectAppWontChangeHmiStateDueToConflictResolving(
+      simple_app_, simple_app_ptr_, kCustomWindowId, FullNotAudibleState());
+
+  state_ctrl_->on_event(activate_widget_event);
+}
+
+TEST_F(StateControllerImplTest,
+       OnAppDeactivated_DeactivateCustomWindow_HmiStateIsChanged) {
+  InsertApplication(simple_app_);
+
+  am::event_engine::Event activate_widget_event(
+      hmi_apis::FunctionID::BasicCommunication_OnAppDeactivated);
+  smart_objects::SmartObject message;
+  message[am::strings::msg_params][am::strings::app_id] = simple_app_id_;
+  message[am::strings::msg_params][am::strings::window_id] = kCustomWindowId;
+  activate_widget_event.set_smart_object(message);
+
+  const am::WindowIds window_ids = {kDefaultWindowId, kCustomWindowId};
+  ON_CALL(*simple_app_ptr_, GetWindowIds()).WillByDefault(Return(window_ids));
+
+  std::vector<std::pair<HmiStatePtr, HmiStatePtr> > states_transition = {
+      std::make_pair(FullNotAudibleState(), BackgroundState()),
+      std::make_pair(BackgroundState(), NoneNotAudibleState())};
+
+  for (auto& states_pair : states_transition) {
+    HmiStatePtr old_state = states_pair.first;
+    HmiStatePtr new_state = states_pair.second;
+
+    EXPECT_CALL(*simple_app_ptr_, hmi_level(kCustomWindowId))
+        .WillOnce(Return(old_state->hmi_level()));
+    EXPECT_CALL(*simple_app_ptr_, audio_streaming_state())
+        .WillOnce(Return(old_state->audio_streaming_state()));
+    EXPECT_CALL(*simple_app_ptr_, video_streaming_state())
+        .WillOnce(Return(old_state->video_streaming_state()));
+
+    EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kCustomWindowId))
+        .WillOnce(Return(old_state));
+    ExpectSuccessfulSetHmiState(
+        simple_app_, simple_app_ptr_, kCustomWindowId, old_state, new_state);
+
+    EXPECT_CALL(message_helper_mock_,
+                GetBCActivateAppRequestToHMI(_, _, _, _, _))
+        .Times(0);
+
+    state_ctrl_->on_event(activate_widget_event);
+  }
+}
+
+TEST_F(
+    StateControllerImplTest,
+    ActivateDefaultWindow_AppWithWindowWasActivated_WindowStreamingStateIsUpdated) {
+  HmiStatePtr old_state = NoneNotAudibleState();
+  HmiStatePtr new_state = FullAudibleState();
+
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(old_state))
+      .WillRepeatedly(Return(new_state));
+  ExpectSuccessfulSetHmiState(
+      media_app_, media_app_ptr_, kDefaultWindowId, old_state, new_state);
+
+  const am::WindowIds window_ids = {kDefaultWindowId, kCustomWindowId};
+  ON_CALL(*media_app_ptr_, GetWindowIds()).WillByDefault(Return(window_ids));
+
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kCustomWindowId))
+      .WillOnce(Return(old_state));
+
+  HmiStatePtr expected_window_state = NoneNotAudibleState();
+  expected_window_state->set_audio_streaming_state(
+      new_state->audio_streaming_state());
+  expected_window_state->set_video_streaming_state(
+      new_state->video_streaming_state());
+
+  EXPECT_CALL(
+      *media_app_ptr_,
+      SetRegularState(kCustomWindowId,
+                      Truly(HmiStatesComparator(expected_window_state))));
+  EXPECT_CALL(message_helper_mock_,
+              SendHMIStatusNotification(media_app_, kCustomWindowId, _));
+
+  state_ctrl_->ActivateDefaultWindow(media_app_);
+}
+
+TEST_F(StateControllerImplTest,
+       ExitDefaultWindow_AppWithWindowWasExited_WindowStreamingStateIsUpdated) {
+  HmiStatePtr old_state = FullAudibleState();
+  HmiStatePtr new_state = NoneNotAudibleState();
+
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kDefaultWindowId))
+      .WillOnce(Return(old_state))
+      .WillRepeatedly(Return(new_state));
+  ExpectSuccessfulSetHmiState(
+      media_app_, media_app_ptr_, kDefaultWindowId, old_state, new_state);
+
+  const am::WindowIds window_ids = {kDefaultWindowId, kCustomWindowId};
+  ON_CALL(*media_app_ptr_, GetWindowIds()).WillByDefault(Return(window_ids));
+
+  EXPECT_CALL(*media_app_ptr_, RegularHmiState(kCustomWindowId))
+      .WillOnce(Return(old_state));
+
+  HmiStatePtr expected_window_state = FullAudibleState();
+  expected_window_state->set_audio_streaming_state(
+      new_state->audio_streaming_state());
+  expected_window_state->set_video_streaming_state(
+      new_state->video_streaming_state());
+
+  EXPECT_CALL(
+      *media_app_ptr_,
+      SetRegularState(kCustomWindowId,
+                      Truly(HmiStatesComparator(expected_window_state))));
+  EXPECT_CALL(message_helper_mock_,
+              SendHMIStatusNotification(media_app_, kCustomWindowId, _));
+
+  state_ctrl_->ExitDefaultWindow(media_app_);
+}
+
+TEST_F(StateControllerImplTest,
+       OnAppWindowAdded_NewAppWindowWasAdded_HmiNotificationIsSent) {
+  am::event_engine::Event audio_source_event(
+      hmi_apis::FunctionID::BasicCommunication_OnEventChanged);
+  smart_objects::SmartObject message;
+  message[am::strings::msg_params][am::hmi_notification::is_active] = true;
+  message[am::strings::msg_params][am::hmi_notification::event_name] =
+      hmi_apis::Common_EventTypes::AUDIO_SOURCE;
+  audio_source_event.set_smart_object(message);
+  state_ctrl_->on_event(audio_source_event);
+
+  HmiStatePtr initial_state =
+      createHmiState(mobile_apis::HMILevel::INVALID_ENUM,
+                     mobile_apis::AudioStreamingState::INVALID_ENUM,
+                     mobile_apis::VideoStreamingState::INVALID_ENUM,
+                     mobile_apis::SystemContext::INVALID_ENUM);
+  HmiStatePtr expected_state = NoneNotAudibleState();
+
+  EXPECT_CALL(*simple_app_ptr_,
+              AddHMIState(kCustomWindowId,
+                          Truly(HmiStatesIDComparator(
+                              HmiState::StateID::STATE_ID_AUDIO_SOURCE))));
+  EXPECT_CALL(*simple_app_ptr_, RegularHmiState(kCustomWindowId))
+      .WillOnce(Return(initial_state));
+  EXPECT_CALL(*simple_app_ptr_,
+              SetRegularState(kCustomWindowId,
+                              Truly(HmiStatesComparator(expected_state))));
+  EXPECT_CALL(*simple_app_ptr_, CurrentHmiState(kCustomWindowId))
+      .WillOnce(Return(initial_state))
+      .WillOnce(Return(expected_state));
+  EXPECT_CALL(message_helper_mock_,
+              SendHMIStatusNotification(simple_app_, kCustomWindowId, _));
+  EXPECT_CALL(app_manager_mock_, OnHMIStateChanged(_, _, _)).Times(0);
+
+  state_ctrl_->OnAppWindowAdded(simple_app_,
+                                kCustomWindowId,
+                                mobile_apis::WindowType::WIDGET,
+                                mobile_apis::HMILevel::HMI_NONE);
+}
+
 }  // namespace state_controller_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/config_profile/include/config_profile/ini_file.h b/src/components/config_profile/include/config_profile/ini_file.h
index 3f3ddddf48..204fb6c7bf 100644
--- a/src/components/config_profile/include/config_profile/ini_file.h
+++ b/src/components/config_profile/include/config_profile/ini_file.h
@@ -56,7 +56,7 @@ namespace profile {
 /*
  * @brief Global defines
  */
-#define INI_LINE_LEN 512
+#define INI_LINE_LEN 1024
 #define INI_FILE_TEMP_NAME "ini.tmp"
 
 #define INI_FLAG_UPDATE 0x00
diff --git a/src/components/config_profile/include/config_profile/profile.h b/src/components/config_profile/include/config_profile/profile.h
index 0a1e8b2c17..76c66c7c7b 100644
--- a/src/components/config_profile/include/config_profile/profile.h
+++ b/src/components/config_profile/include/config_profile/profile.h
@@ -413,6 +413,40 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
   const std::string& transport_manager_tcp_adapter_network_interface()
       const OVERRIDE;
 
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  /**
+   * @brief Returns websocket server address
+   */
+  const std::string& websocket_server_address() const OVERRIDE;
+
+  /**
+   * @brief Returns port for websocket server
+   */
+  uint16_t websocket_server_port() const OVERRIDE;
+#ifdef ENABLE_SECURITY
+  /**
+   * @brief Returns ws server certificate path to pem file
+   */
+  const std::string& ws_server_cert_path() const OVERRIDE;
+
+  /**
+   * @brief Returns ws server CA certificate path to pem file
+   */
+  const std::string& ws_server_ca_cert_path() const OVERRIDE;
+
+  /**
+   * @brief Returns ws server key path to pem file
+   */
+  const std::string& ws_server_key_path() const OVERRIDE;
+
+  /**
+   * @brief Returns bool flag indicating whether WSS settings were setup
+   * correctly
+   */
+  const bool wss_server_supported() const OVERRIDE;
+#endif  // ENABLE_SECURITY
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+
   /**
    * @brief Returns retry timeout for cloud app connections
    */
@@ -425,6 +459,13 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
 
   const uint8_t* bluetooth_uuid() const OVERRIDE;
 
+  const std::string& aoa_filter_manufacturer() const OVERRIDE;
+  const std::string& aoa_filter_model_name() const OVERRIDE;
+  const std::string& aoa_filter_description() const OVERRIDE;
+  const std::string& aoa_filter_version() const OVERRIDE;
+  const std::string& aoa_filter_uri() const OVERRIDE;
+  const std::string& aoa_filter_serial_number() const OVERRIDE;
+
   // TransportManageMMESettings interface
 
   const std::string& event_mq_name() const OVERRIDE;
@@ -529,6 +570,11 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
   const std::vector<std::string>& video_service_transports() const OVERRIDE;
 
   uint32_t rpc_pass_through_timeout() const OVERRIDE;
+
+  // RcConsentManager
+  uint16_t period_for_consent_expiration() const OVERRIDE;
+  // RcConsentManager end
+
   const std::vector<std::string>& embedded_services() const OVERRIDE;
   const std::string hmi_origin_id() const OVERRIDE;
   /**
@@ -979,9 +1025,25 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
   std::string system_files_path_;
   uint16_t transport_manager_tcp_adapter_port_;
   std::string transport_manager_tcp_adapter_network_interface_;
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  std::string websocket_server_address_;
+  uint16_t websocket_server_port_;
+#ifdef ENABLE_SECURITY
+  std::string ws_server_cert_path_;
+  std::string ws_server_ca_cert_path_;
+  std::string ws_server_key_path_;
+  bool is_wss_settings_setup_;
+#endif  // ENABLE_SECURITY
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
   uint32_t cloud_app_retry_timeout_;
   uint16_t cloud_app_max_retry_attempts_;
   std::vector<uint8_t> bluetooth_uuid_;
+  std::string aoa_filter_manufacturer_;
+  std::string aoa_filter_model_name_;
+  std::string aoa_filter_description_;
+  std::string aoa_filter_version_;
+  std::string aoa_filter_uri_;
+  std::string aoa_filter_serial_number_;
   std::string tts_delimiter_;
   uint32_t audio_data_stopped_timeout_;
   uint32_t video_data_stopped_timeout_;
@@ -1074,6 +1136,7 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
   int wake_up_signal_offset_;
   int ignition_off_signal_offset_;
   uint32_t rpc_pass_through_timeout_;
+  uint16_t period_for_consent_expiration_;
 
   std::vector<std::string> embedded_services_;
 
diff --git a/src/components/config_profile/src/profile.cc b/src/components/config_profile/src/profile.cc
index c38b28db5f..3037b66fdd 100644
--- a/src/components/config_profile/src/profile.cc
+++ b/src/components/config_profile/src/profile.cc
@@ -97,6 +97,7 @@ const char* kTransportRequiredForResumptionSection =
 const char* kLowBandwidthTransportResumptionLevelSection =
     "LowBandwidthTransportResumptionLevel";
 const char* kAppServicesSection = "AppServices";
+const char* kRCModuleConsentSection = "RCModuleConsent";
 
 const char* kSDLVersionKey = "SDLVersion";
 const char* kHmiCapabilitiesKey = "HMICapabilities";
@@ -156,6 +157,15 @@ const char* kMaxSupportedProtocolVersionKey = "MaxSupportedProtocolVersion";
 const char* kUseLastStateKey = "UseLastState";
 const char* kTCPAdapterPortKey = "TCPAdapterPort";
 const char* kTCPAdapterNetworkInterfaceKey = "TCPAdapterNetworkInterface";
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+const char* kWebSocketServerAddressKey = "WebSocketServerAddress";
+const char* kWebSocketServerPortKey = "WebSocketServerPort";
+#ifdef ENABLE_SECURITY
+const char* kWSServerCertificatePathKey = "WSServerCertificatePath";
+const char* kWSServerCACertificaePathKey = "WSServerCACertificatePath";
+const char* kWSServerKeyPathKey = "WSServerKeyPath";
+#endif  // ENABLE_SECURITY
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
 const char* kCloudAppRetryTimeoutKey = "CloudAppRetryTimeout";
 const char* kCloudAppMaxRetryAttemptsKey = "CloudAppMaxRetryAttempts";
 const char* kServerPortKey = "ServerPort";
@@ -185,6 +195,12 @@ const char* kPendingRequestsAmoundKey = "PendingRequestsAmount";
 const char* kSupportedDiagModesKey = "SupportedDiagModes";
 const char* kTransportManagerDisconnectTimeoutKey = "DisconnectTimeout";
 const char* kBluetoothUUIDKey = "BluetoothUUID";
+const char* kAOAFilterManufacturerKey = "AOAFilterManufacturer";
+const char* kAOAFilterModelNameKey = "AOAFilterModelName";
+const char* kAOAFilterDescriptionKey = "AOAFilterDescription";
+const char* kAOAFilterVersionKey = "AOAFilterVersion";
+const char* kAOAFilterURIKey = "AOAFilterURI";
+const char* kAOAFilterSerialNumber = "AOAFilterSerialNumber";
 const char* kTTSDelimiterKey = "TTSDelimiter";
 const char* kRecordingFileNameKey = "RecordingFileName";
 const char* kRecordingFileSourceKey = "RecordingFileSource";
@@ -241,6 +257,7 @@ const char* kSecondaryTransportForWiFiKey = "SecondaryTransportForWiFi";
 const char* kAudioServiceTransportsKey = "AudioServiceTransports";
 const char* kVideoServiceTransportsKey = "VideoServiceTransports";
 const char* kRpcPassThroughTimeoutKey = "RpcPassThroughTimeout";
+const char* kPeriodForConsentExpirationKey = "PeriodForConsentExpiration";
 
 const char* kDefaultTransportRequiredForResumptionKey =
     "DefaultTransportRequiredForResumption";
@@ -297,6 +314,7 @@ const char* kDefaultPoliciesSnapshotFileName = "sdl_snapshot.json";
 const char* kDefaultHmiCapabilitiesFileName = "hmi_capabilities.json";
 const char* kDefaultPreloadedPTFileName = "sdl_preloaded_pt.json";
 const char* kDefaultServerAddress = "127.0.0.1";
+const char* kDefaultWebsocketServerAddress = "0.0.0.0";
 const char* kDefaultAppInfoFileName = "app_info.dat";
 const char* kDefaultSystemFilesPath = "/tmp/fs/mp/images/ivsu_cache";
 const char* kDefaultPluginsPath = "plugins";
@@ -326,6 +344,7 @@ const uint32_t kDefaultHubProtocolIndex = 0;
 const uint32_t kDefaultHeartBeatTimeout = 0;
 const uint16_t kDefaultMaxSupportedProtocolVersion = 5;
 const uint16_t kDefautTransportManagerTCPPort = 12345;
+const uint16_t kDefaultWebSocketServerPort = 2020;
 const uint16_t kDefaultCloudAppRetryTimeout = 1000;
 const uint16_t kDefaultCloudAppMaxRetryAttempts = 5;
 const uint16_t kDefaultServerPort = 8087;
@@ -397,6 +416,7 @@ const std::string kAllowedSymbols =
 const bool kDefaultMultipleTransportsEnabled = false;
 const char* kDefaultLowBandwidthResumptionLevel = "NONE";
 const uint32_t kDefaultRpcPassThroughTimeout = 10000;
+const uint16_t kDefaultPeriodForConsentExpiration = 30;
 const char* kDefaultHMIOriginId = "HMI_ID";
 const std::vector<uint8_t> kDefaultBluetoothUUID = {0x93,
                                                     0x6D,
@@ -414,6 +434,12 @@ const std::vector<uint8_t> kDefaultBluetoothUUID = {0x93,
                                                     0xC8,
                                                     0x22,
                                                     0xA8};
+const char* kDefaultAOAFilterManufacturer = "SDL";
+const char* kDefaultAOAFilterModelName = "Core";
+const char* kDefaultAOAFilterDescription = "SmartDeviceLink Core Component USB";
+const char* kDefaultAOAFilterVersion = "1.0";
+const char* kDefaultAOAFilterURI = "http://www.smartdevicelink.org";
+const char* kDefaultAOAFilterSerialNumber = "N000000";
 }  // namespace
 
 namespace profile {
@@ -480,6 +506,10 @@ Profile::Profile()
     , supported_diag_modes_()
     , system_files_path_(kDefaultSystemFilesPath)
     , transport_manager_tcp_adapter_port_(kDefautTransportManagerTCPPort)
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+    , websocket_server_address_(kDefaultWebsocketServerAddress)
+    , websocket_server_port_(kDefaultWebSocketServerPort)
+#endif
     , cloud_app_retry_timeout_(kDefaultCloudAppRetryTimeout)
     , cloud_app_max_retry_attempts_(kDefaultCloudAppMaxRetryAttempts)
     , tts_delimiter_(kDefaultTtsDelimiter)
@@ -530,7 +560,8 @@ Profile::Profile()
     , low_voltage_signal_offset_(kDefaultLowVoltageSignalOffset)
     , wake_up_signal_offset_(kDefaultWakeUpSignalOffset)
     , ignition_off_signal_offset_(kDefaultIgnitionOffSignalOffset)
-    , rpc_pass_through_timeout_(kDefaultRpcPassThroughTimeout) {
+    , rpc_pass_through_timeout_(kDefaultRpcPassThroughTimeout)
+    , period_for_consent_expiration_(kDefaultPeriodForConsentExpiration) {
   // SDL version
   ReadStringValue(
       &sdl_version_, kDefaultSDLVersion, kMainSection, kSDLVersionKey);
@@ -815,6 +846,33 @@ const std::string& Profile::transport_manager_tcp_adapter_network_interface()
   return transport_manager_tcp_adapter_network_interface_;
 }
 
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+const std::string& Profile::websocket_server_address() const {
+  return websocket_server_address_;
+}
+
+uint16_t Profile::websocket_server_port() const {
+  return websocket_server_port_;
+}
+#ifdef ENABLE_SECURITY
+const std::string& Profile::ws_server_cert_path() const {
+  return ws_server_cert_path_;
+}
+
+const std::string& Profile::ws_server_key_path() const {
+  return ws_server_key_path_;
+}
+
+const std::string& Profile::ws_server_ca_cert_path() const {
+  return ws_server_ca_cert_path_;
+}
+
+const bool Profile::wss_server_supported() const {
+  return is_wss_settings_setup_;
+}
+#endif  // ENABLE_SECURITY
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+
 uint32_t Profile::cloud_app_retry_timeout() const {
   return cloud_app_retry_timeout_;
 }
@@ -827,6 +885,30 @@ const uint8_t* Profile::bluetooth_uuid() const {
   return bluetooth_uuid_.data();
 }
 
+const std::string& Profile::aoa_filter_manufacturer() const {
+  return aoa_filter_manufacturer_;
+}
+
+const std::string& Profile::aoa_filter_model_name() const {
+  return aoa_filter_model_name_;
+}
+
+const std::string& Profile::aoa_filter_description() const {
+  return aoa_filter_description_;
+}
+
+const std::string& Profile::aoa_filter_version() const {
+  return aoa_filter_version_;
+}
+
+const std::string& Profile::aoa_filter_uri() const {
+  return aoa_filter_uri_;
+}
+
+const std::string& Profile::aoa_filter_serial_number() const {
+  return aoa_filter_serial_number_;
+}
+
 const std::string& Profile::tts_delimiter() const {
   return tts_delimiter_;
 }
@@ -1110,6 +1192,10 @@ uint32_t Profile::rpc_pass_through_timeout() const {
   return rpc_pass_through_timeout_;
 }
 
+uint16_t Profile::period_for_consent_expiration() const {
+  return period_for_consent_expiration_;
+}
+
 const std::vector<std::string>& Profile::secondary_transports_for_bluetooth()
     const {
   return secondary_transports_for_bluetooth_;
@@ -1196,6 +1282,7 @@ void Profile::UpdateValues() {
 
   ReadStringValue(
       &cert_path_, "", kSecuritySection, kSecurityCertificatePathKey);
+
   ReadStringValue(
       &ca_cert_path_, "", kSecuritySection, kSecurityCACertificatePathKey);
 
@@ -1823,6 +1910,58 @@ void Profile::UpdateValues() {
   LOG_UPDATED_VALUE(transport_manager_tcp_adapter_network_interface_,
                     kTCPAdapterNetworkInterfaceKey,
                     kTransportManagerSection);
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  // Websocket server address
+  ReadStringValue(&websocket_server_address_,
+                  kDefaultWebsocketServerAddress,
+                  kTransportManagerSection,
+                  kWebSocketServerAddressKey);
+
+  LOG_UPDATED_VALUE(websocket_server_address_,
+                    kWebSocketServerAddressKey,
+                    kTransportManagerSection);
+
+  // Websocket non-secured server port
+  ReadUIntValue(&websocket_server_port_,
+                kDefaultWebSocketServerPort,
+                kTransportManagerSection,
+                kWebSocketServerPortKey);
+
+  LOG_UPDATED_VALUE(websocket_server_port_,
+                    kWebSocketServerPortKey,
+                    kTransportManagerSection);
+
+#ifdef ENABLE_SECURITY
+  const bool is_ws_server_cert_setup =
+      ReadStringValue(&ws_server_cert_path_,
+                      "",
+                      kTransportManagerSection,
+                      kWSServerCertificatePathKey);
+
+  LOG_UPDATED_VALUE(ws_server_cert_path_,
+                    kWSServerCertificatePathKey,
+                    kTransportManagerSection);
+
+  const bool is_ws_server_key_setup = ReadStringValue(
+      &ws_server_key_path_, "", kTransportManagerSection, kWSServerKeyPathKey);
+
+  LOG_UPDATED_VALUE(
+      ws_server_key_path_, kWSServerKeyPathKey, kTransportManagerSection);
+
+  const bool is_ws_ca_cert_setup =
+      ReadStringValue(&ws_server_ca_cert_path_,
+                      "",
+                      kTransportManagerSection,
+                      kWSServerCACertificaePathKey);
+
+  LOG_UPDATED_VALUE(ws_server_ca_cert_path_,
+                    kWSServerCACertificaePathKey,
+                    kTransportManagerSection);
+
+  is_wss_settings_setup_ =
+      is_ws_server_cert_setup && is_ws_server_key_setup && is_ws_ca_cert_setup;
+#endif  // ENABLE_SECURITY
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
 
   ReadUIntValue(&cloud_app_retry_timeout_,
                 kDefaultCloudAppRetryTimeout,
@@ -1849,6 +1988,57 @@ void Profile::UpdateValues() {
     bluetooth_uuid_ = kDefaultBluetoothUUID;
   }
 
+  ReadStringValue(&aoa_filter_manufacturer_,
+                  kDefaultAOAFilterManufacturer,
+                  kTransportManagerSection,
+                  kAOAFilterManufacturerKey);
+
+  LOG_UPDATED_VALUE(aoa_filter_manufacturer_,
+                    kAOAFilterManufacturerKey,
+                    kTransportManagerSection);
+
+  ReadStringValue(&aoa_filter_model_name_,
+                  kDefaultAOAFilterModelName,
+                  kTransportManagerSection,
+                  kAOAFilterModelNameKey);
+
+  LOG_UPDATED_VALUE(
+      aoa_filter_model_name_, kAOAFilterModelNameKey, kTransportManagerSection);
+
+  ReadStringValue(&aoa_filter_description_,
+                  kDefaultAOAFilterDescription,
+                  kTransportManagerSection,
+                  kAOAFilterDescriptionKey);
+
+  LOG_UPDATED_VALUE(aoa_filter_description_,
+                    kAOAFilterDescriptionKey,
+                    kTransportManagerSection);
+
+  ReadStringValue(&aoa_filter_version_,
+                  kDefaultAOAFilterVersion,
+                  kTransportManagerSection,
+                  kAOAFilterVersionKey);
+
+  LOG_UPDATED_VALUE(
+      aoa_filter_version_, kAOAFilterVersionKey, kTransportManagerSection);
+
+  ReadStringValue(&aoa_filter_uri_,
+                  kDefaultAOAFilterURI,
+                  kTransportManagerSection,
+                  kAOAFilterURIKey);
+
+  LOG_UPDATED_VALUE(
+      aoa_filter_uri_, kAOAFilterURIKey, kTransportManagerSection);
+
+  ReadStringValue(&aoa_filter_serial_number_,
+                  kDefaultAOAFilterSerialNumber,
+                  kTransportManagerSection,
+                  kAOAFilterSerialNumber);
+
+  LOG_UPDATED_VALUE(aoa_filter_serial_number_,
+                    kAOAFilterSerialNumber,
+                    kTransportManagerSection);
+
   // Event MQ
   ReadStringValue(
       &event_mq_name_, kDefaultEventMQ, kTransportManagerSection, kEventMQKey);
@@ -2291,6 +2481,15 @@ void Profile::UpdateValues() {
                     kRpcPassThroughTimeoutKey,
                     kAppServicesSection);
 
+  ReadUIntValue(&period_for_consent_expiration_,
+                kDefaultPeriodForConsentExpiration,
+                kRCModuleConsentSection,
+                kPeriodForConsentExpirationKey);
+
+  LOG_UPDATED_VALUE(period_for_consent_expiration_,
+                    kPeriodForConsentExpirationKey,
+                    kRCModuleConsentSection);
+
   {  // Secondary Transports and ServicesMap
     struct KeyPair {
       std::vector<std::string>* ini_vector;
diff --git a/src/components/config_profile/test/profile_test.cc b/src/components/config_profile/test/profile_test.cc
index 6dc0434440..7b9bb374b9 100644
--- a/src/components/config_profile/test/profile_test.cc
+++ b/src/components/config_profile/test/profile_test.cc
@@ -511,28 +511,58 @@ TEST_F(ProfileTest, StringUpperBoundValue) {
   profile_.set_config_file_name("smartDeviceLink_invalid_string.ini");
   EXPECT_EQ("smartDeviceLink_invalid_string.ini", profile_.config_file_name());
 
-  // Total count of elements in ini file's string will be less 512
+  // Total count of elements in ini file's string will be less 1024
   vr_help_title =
       "0/0/0/1/"
       "2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~"
-      "STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:"
-      "yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!"
-      "def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,"
-      "01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_"
-      "GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$"
-      "mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!"
-      "def@ghi";
+      "STU{}WXY"
+      "[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-"
+      "DEF_GHIJKL+MNO|P"
+      "QR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*"
+      "vwx:yz()ABC-DEF_G"
+      "HIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%"
+      "pqr^stu*vwx:yz()"
+      "ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@"
+      "ghi#jkl$mno%pqr^stu*"
+      "vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi0/0/0/"
+      "1/2345678"
+      "'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]"
+      "Z,012345"
+      "67890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+"
+      "MNO|PQR~STU{}WX"
+      "Y[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-"
+      "DEF_GHIJKL+MNO|PQ"
+      "R~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:"
+      "yz()ABC-DEF_GHIJK"
+      "L+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^"
+      "stu*vwx:yz()ABC-";
   EXPECT_EQ(vr_help_title, profile_.vr_help_title());
   EXPECT_NE(vr_help_title, profile_.recording_file_name());
   recording_file_name =
       "0/0/0/1/"
       "2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~"
-      "STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:"
-      "yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!"
-      "def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,"
-      "01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_"
-      "GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$"
-      "mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc";
+      "STU{}WXY"
+      "[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-"
+      "DEF_GHIJKL+MNO|P"
+      "QR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*"
+      "vwx:yz()ABC-DEF_G"
+      "HIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%"
+      "pqr^stu*vwx:yz()"
+      "ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@"
+      "ghi#jkl$mno%pqr^stu*"
+      "vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi0/0/0/"
+      "1/2345678"
+      "'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]"
+      "Z,012345"
+      "67890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+"
+      "MNO|PQR~STU{}WX"
+      "Y[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-"
+      "DEF_GHIJKL+MNO|PQ"
+      "R~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:"
+      "yz()ABC-DEF_GHIJK"
+      "L+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^"
+      "stu*vwx:yz()ABC-"
+      "DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi01234";
   EXPECT_EQ(recording_file_name, profile_.recording_file_name());
   // Update config file
   profile_.UpdateValues();
diff --git a/src/components/config_profile/test/smartDeviceLink_invalid_string.ini b/src/components/config_profile/test/smartDeviceLink_invalid_string.ini
index f18b43cb41..430cc31f84 100644
--- a/src/components/config_profile/test/smartDeviceLink_invalid_string.ini
+++ b/src/components/config_profile/test/smartDeviceLink_invalid_string.ini
@@ -82,7 +82,7 @@ AudioStreamFile = audio_stream_file
 ; Recording file source (used for audio pass thru emulation only)
 RecordingFileSource = 00012\\345/678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012\\345/678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012\\345/678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012\\345/678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012\\345/678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a
 ; Recording file for audio pass thru
-RecordingFileName = 0/0/0/1/2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi
+RecordingFileName = 0/0/0/1/2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi0/0/0/1/2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi01234
 
 ; HelpPromt and TimeOutPrompt is a vector of strings separated by comma
 [GLOBAL PROPERTIES]
@@ -94,7 +94,7 @@ TTSDelimiter = coma and point
 HelpPromt = Please speak one of the following commands,Please say a command
 ; Default prompt items, separated by comma
 TimeOutPromt = Please speak one of the following commands,Please say a command
-HelpTitle = 0/0/0/1/2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi
+HelpTitle = 0/0/0/1/2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890abc!def@ghi0/0/0/1/2345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-DEF_GHIJKL+MNO|PQR~STU{}WXY[]Z,01234567890a00012345678'90abc!def@ghi#jkl$mno%pqr^stu*vwx:yz()ABC-
 ; In case mobile app didn't send global properties default global properties will be sent after this timeout
 ; max value TTSGlobalPropertiesTimeout 64K
 TTSGlobalPropertiesTimeout = 20
diff --git a/src/components/connection_handler/CMakeLists.txt b/src/components/connection_handler/CMakeLists.txt
index 8018ea3707..30199b2014 100644
--- a/src/components/connection_handler/CMakeLists.txt
+++ b/src/components/connection_handler/CMakeLists.txt
@@ -37,6 +37,7 @@ include_directories (
   ${ENCRYPTION_INCLUDE_DIRECTORY}
   ${LOG4CXX_INCLUDE_DIRECTORY}
   ${BOOST_INCLUDE_DIR}
+  ${JSONCPP_INCLUDE_DIRECTORY}
 )
 
 set(PATHS
diff --git a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
index cca11e5f57..b2b4c5a970 100644
--- a/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
+++ b/src/components/connection_handler/include/connection_handler/connection_handler_impl.h
@@ -606,6 +606,10 @@ class ConnectionHandlerImpl
       const transport_manager::ConnectionUID secondary_connection_handle)
       OVERRIDE;
 
+  const transport_manager::DeviceInfo& GetWebEngineDeviceInfo() const OVERRIDE;
+
+  void CreateWebEngineDevice() OVERRIDE;
+
  private:
   /**
    * \brief Disconnect application.
@@ -620,6 +624,15 @@ class ConnectionHandlerImpl
   const uint8_t GetSessionIdFromSecondaryTransport(
       transport_manager::ConnectionUID secondary_transport_id) const;
 
+  /**
+   * @brief Get pointer to the primary connection by connection handle
+   * @param connection_handle handle of the current connection
+   * @return pointer to the primary connection if current one is secondary
+   * otherwise returns pointer to the same connection
+   */
+  Connection* GetPrimaryConnection(
+      const ConnectionHandle connection_handle) const;
+
   const ConnectionHandlerSettings& settings_;
   /**
    * \brief Pointer to observer
@@ -637,7 +650,7 @@ class ConnectionHandlerImpl
    * \brief List of devices
    */
   DeviceMap device_list_;
-
+  mutable sync_primitives::RWLock device_list_lock_;
   /**
    * @brief session/connection map
    */
diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc
index 84609d47b8..1ad938332a 100644
--- a/src/components/connection_handler/src/connection_handler_impl.cc
+++ b/src/components/connection_handler/src/connection_handler_impl.cc
@@ -120,6 +120,7 @@ void ConnectionHandlerImpl::OnDeviceListUpdated(
     const std::vector<transport_manager::DeviceInfo>&) {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_);
+  sync_primitives::AutoReadLock lock(device_list_lock_);
   if (connection_handler_observer_) {
     connection_handler_observer_->OnDeviceListUpdated(device_list_);
   }
@@ -152,14 +153,21 @@ void ConnectionHandlerImpl::OnDeviceAdded(
                 device_info.mac_address(),
                 device_info.connection_type());
 
-  auto result = device_list_.insert(std::make_pair(handle, device));
+  {
+    sync_primitives::AutoWriteLock write_lock(device_list_lock_);
+    auto result = device_list_.insert(std::make_pair(handle, device));
 
-  if (!result.second) {
-    LOG4CXX_ERROR(logger_,
-                  "Device with handle " << handle
-                                        << " is known already. "
-                                           "Information won't be updated.");
-    return;
+    if (!result.second) {
+      LOG4CXX_ERROR(logger_,
+                    "Device with handle " << handle
+                                          << " is known already. "
+                                             "Information won't be updated.");
+      return;
+    }
+  }
+  if (device_info.name() ==
+      transport_manager::webengine_constants::kWebEngineDeviceName) {
+    connection_handler_observer_->OnWebEngineDeviceCreated();
   }
 }
 
@@ -169,7 +177,6 @@ void ConnectionHandlerImpl::OnDeviceRemoved(
   // Device has been removed. Perform all needed actions.
   // 1. Delete all the connections and sessions of this device
   // 2. Delete device from a list
-  // 3. Let observer know that device has been deleted.
 
   std::vector<ConnectionHandle> connections_to_remove;
   {
@@ -190,11 +197,13 @@ void ConnectionHandlerImpl::OnDeviceRemoved(
   }
 
   sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_);
+  {
+    sync_primitives::AutoWriteLock lock(device_list_lock_);
+    device_list_.erase(device_info.device_handle());
+  }
   if (connection_handler_observer_) {
     connection_handler_observer_->RemoveDevice(device_info.device_handle());
-    connection_handler_observer_->OnDeviceListUpdated(device_list_);
   }
-  device_list_.erase(device_info.device_handle());
 }
 
 void ConnectionHandlerImpl::OnDeviceSwitchingFinish(
@@ -221,6 +230,8 @@ struct DeviceFinder {
 
 void ConnectionHandlerImpl::OnDeviceSwitchingStart(
     const std::string& device_uid_from, const std::string& device_uid_to) {
+  sync_primitives::AutoReadLock lock(device_list_lock_);
+
   auto device_from =
       std::find_if(device_list_.begin(),
                    device_list_.end(),
@@ -258,14 +269,18 @@ void ConnectionHandlerImpl::OnConnectionPending(
     const transport_manager::ConnectionUID connection_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_,
-                "OnConnectionEstablished!!!: "
-                    << device_info.device_handle() << " " << device_info.name()
-                    << " " << device_info.mac_address() << " "
-                    << device_info.connection_type());
-  DeviceMap::iterator it = device_list_.find(device_info.device_handle());
-  if (device_list_.end() == it) {
-    LOG4CXX_ERROR(logger_, "Unknown device!");
-    return;
+                "OnConnectionPending!!!: " << device_info.device_handle() << " "
+                                           << device_info.name() << " "
+                                           << device_info.mac_address() << " "
+                                           << device_info.connection_type());
+  {
+    sync_primitives::AutoReadLock lock(device_list_lock_);
+    auto it = device_list_.find(device_info.device_handle());
+
+    if (device_list_.end() == it) {
+      LOG4CXX_ERROR(logger_, "Unknown device!");
+      return;
+    }
   }
   LOG4CXX_DEBUG(logger_,
                 "Add Pending Connection #" << connection_id << " to the list.");
@@ -312,11 +327,15 @@ void ConnectionHandlerImpl::OnConnectionEstablished(
                     << device_info.device_handle() << " " << device_info.name()
                     << " " << device_info.mac_address() << " "
                     << device_info.connection_type());
-  DeviceMap::iterator it = device_list_.find(device_info.device_handle());
-  if (device_list_.end() == it) {
-    LOG4CXX_ERROR(logger_, "Unknown device!");
-    return;
+  {
+    sync_primitives::AutoReadLock lock(device_list_lock_);
+    auto it = device_list_.find(device_info.device_handle());
+    if (device_list_.end() == it) {
+      LOG4CXX_ERROR(logger_, "Unknown device!");
+      return;
+    }
   }
+
   LOG4CXX_DEBUG(logger_,
                 "Add Connection #" << connection_id << " to the list.");
   sync_primitives::AutoWriteLock lock(connection_list_lock_);
@@ -415,8 +434,9 @@ void ConnectionHandlerImpl::OnSessionStartedCallback(
 
   // In case this is a Session running on a Secondary Transport, we need to
   // find the Sessions's primary transport. In this case, "connection_handle"
-  // reflects the secondary transport, which we need for the various callbacks,
-  // so they can send appropriate Ack or NAK messages on the correct transport.
+  // reflects the secondary transport, which we need for the various
+  // callbacks, so they can send appropriate Ack or NAK messages on the
+  // correct transport.
   transport_manager::ConnectionUID primary_connection_handle =
       connection_handle;
   SessionTransports st = GetSessionTransports(session_id);
@@ -535,7 +555,8 @@ void ConnectionHandlerImpl::NotifyServiceStartedResult(
     start_service_context_map_.erase(it);
   }
 
-  // We need the context's primary connection so we can manage its services list
+  // We need the context's primary connection so we can manage its services
+  // list
   Connection* connection = NULL;
   {
     sync_primitives::AutoReadLock lock(connection_list_lock_);
@@ -648,8 +669,9 @@ uint32_t ConnectionHandlerImpl::OnSessionEndedCallback(
 
   // In case this is a Session running on a Secondary Transport, we need to
   // find the Sessions's primary transport. In this case, "connection_handle"
-  // reflects the secondary transport, which we need for the various callbacks,
-  // so they can send appropriate Ack or NAK messages on the correct transport.
+  // reflects the secondary transport, which we need for the various
+  // callbacks, so they can send appropriate Ack or NAK messages on the
+  // correct transport.
   transport_manager::ConnectionUID primary_connection_handle =
       connection_handle;
   if (session_id != 0) {
@@ -843,6 +865,15 @@ void ConnectionHandlerImpl::OnSecondaryTransportEnded(
   }
 }
 
+const transport_manager::DeviceInfo&
+ConnectionHandlerImpl::GetWebEngineDeviceInfo() const {
+  return transport_manager_.GetWebEngineDeviceInfo();
+}
+
+void ConnectionHandlerImpl::CreateWebEngineDevice() {
+  transport_manager_.CreateWebEngineDevice();
+}
+
 const std::string
 ConnectionHandlerImpl::TransportTypeProfileStringFromConnHandle(
     transport_manager::ConnectionUID connection_handle) const {
@@ -863,11 +894,14 @@ const std::string
 ConnectionHandlerImpl::TransportTypeProfileStringFromDeviceHandle(
     DeviceHandle device_handle) const {
   std::string connection_type;
-  DeviceMap::const_iterator it = device_list_.find(device_handle);
-  if (device_list_.end() == it) {
-    LOG4CXX_ERROR(logger_, "Device not found!");
-  } else {
-    connection_type = it->second.connection_type();
+  {
+    sync_primitives::AutoReadLock lock(device_list_lock_);
+    auto it = device_list_.find(device_handle);
+    if (device_list_.end() == it) {
+      LOG4CXX_ERROR(logger_, "Device not found!");
+    } else {
+      connection_type = it->second.connection_type();
+    }
   }
 
   // Caution: this should be in sync with devicesType map in
@@ -1069,9 +1103,10 @@ SessionTransports ConnectionHandlerImpl::SetSecondaryTransportID(
     st = it->second;
 
     // The only time we overwrite an existing entry in the map is if the new
-    // secondary transport ID is kDisabledSecondary, which effectively DISABLES
-    // the secondary transport feature for the session, or if the new secondary
-    // transport ID is 0, which means a secondary transport has shut down
+    // secondary transport ID is kDisabledSecondary, which effectively
+    // DISABLES the secondary transport feature for the session, or if the new
+    // secondary transport ID is 0, which means a secondary transport has shut
+    // down
     if (st.secondary_transport != 0 &&
         secondary_transport_id != kDisabledSecondary &&
         secondary_transport_id != 0) {
@@ -1124,6 +1159,26 @@ const uint8_t ConnectionHandlerImpl::GetSessionIdFromSecondaryTransport(
   return 0;
 }
 
+Connection* ConnectionHandlerImpl::GetPrimaryConnection(
+    const ConnectionHandle connection_handle) const {
+  LOG4CXX_DEBUG(logger_,
+                "Getting primary connection for ID " << connection_handle);
+  ConnectionList::const_iterator it = connection_list_.find(connection_handle);
+  if (connection_list_.end() == it) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Connection with ID " << connection_handle << " was not found");
+    return nullptr;
+  }
+
+  auto connection_ptr = it->second;
+  if (connection_ptr->primary_connection_handle() != 0) {
+    return GetPrimaryConnection(connection_ptr->primary_connection_handle());
+  }
+
+  return connection_ptr;
+}
+
 std::string ConnectionHandlerImpl::GetCloudAppID(
     const transport_manager::ConnectionUID connection_id) const {
   sync_primitives::AutoLock auto_lock(cloud_app_id_map_lock_);
@@ -1149,6 +1204,7 @@ struct CompareMAC {
 bool ConnectionHandlerImpl::GetDeviceID(const std::string& mac_address,
                                         DeviceHandle* device_handle) {
   DCHECK_OR_RETURN(device_handle, false);
+  sync_primitives::AutoReadLock lock(device_list_lock_);
   DeviceMap::const_iterator it = std::find_if(
       device_list_.begin(), device_list_.end(), CompareMAC(mac_address));
   if (it != device_list_.end()) {
@@ -1167,7 +1223,10 @@ int32_t ConnectionHandlerImpl::GetDataOnDeviceID(
   LOG4CXX_AUTO_TRACE(logger_);
 
   int32_t result = -1;
-  DeviceMap::const_iterator it = device_list_.find(device_handle);
+
+  sync_primitives::AutoReadLock lock(device_list_lock_);
+  auto it = device_list_.find(device_handle);
+
   if (device_list_.end() == it) {
     LOG4CXX_ERROR(logger_, "Device not found for handle " << device_handle);
     return result;
@@ -1213,6 +1272,7 @@ void ConnectionHandlerImpl::GetConnectedDevicesMAC(
     std::vector<std::string>& device_macs) const {
   DeviceMap::const_iterator first = device_list_.begin();
   DeviceMap::const_iterator last = device_list_.end();
+  sync_primitives::AutoReadLock lock(device_list_lock_);
 
   while (first != last) {
     device_macs.push_back((*first).second.mac_address());
@@ -1229,13 +1289,12 @@ int ConnectionHandlerImpl::SetSSLContext(
   PairFromKey(key, &connection_handle, &session_id);
 
   sync_primitives::AutoReadLock lock(connection_list_lock_);
-  ConnectionList::iterator it = connection_list_.find(connection_handle);
-  if (connection_list_.end() == it) {
-    LOG4CXX_ERROR(logger_, "Unknown connection!");
+  auto connection = GetPrimaryConnection(connection_handle);
+  if (!connection) {
     return security_manager::SecurityManager::ERROR_INTERNAL;
   }
-  Connection& connection = *it->second;
-  return connection.SetSSLContext(session_id, context);
+
+  return connection->SetSSLContext(session_id, context);
 }
 
 security_manager::SSLContext* ConnectionHandlerImpl::GetSSLContext(
@@ -1246,13 +1305,12 @@ security_manager::SSLContext* ConnectionHandlerImpl::GetSSLContext(
   PairFromKey(key, &connection_handle, &session_id);
 
   sync_primitives::AutoReadLock lock(connection_list_lock_);
-  ConnectionList::iterator it = connection_list_.find(connection_handle);
-  if (connection_list_.end() == it) {
-    LOG4CXX_ERROR(logger_, "Unknown connection!");
-    return NULL;
+  auto connection = GetPrimaryConnection(connection_handle);
+  if (!connection) {
+    return nullptr;
   }
-  Connection& connection = *it->second;
-  return connection.GetSSLContext(session_id, service_type);
+
+  return connection->GetSSLContext(session_id, service_type);
 }
 
 void ConnectionHandlerImpl::SetProtectionFlag(
@@ -1263,18 +1321,28 @@ void ConnectionHandlerImpl::SetProtectionFlag(
   PairFromKey(key, &connection_handle, &session_id);
 
   sync_primitives::AutoReadLock lock(connection_list_lock_);
-  ConnectionList::iterator it = connection_list_.find(connection_handle);
-  if (connection_list_.end() == it) {
-    LOG4CXX_ERROR(logger_, "Unknown connection!");
+  auto connection = GetPrimaryConnection(connection_handle);
+  if (!connection) {
     return;
   }
-  Connection& connection = *it->second;
-  connection.SetProtectionFlag(session_id, service_type);
+
+  connection->SetProtectionFlag(session_id, service_type);
 }
 
 security_manager::SSLContext::HandshakeContext
 ConnectionHandlerImpl::GetHandshakeContext(uint32_t key) const {
-  return connection_handler_observer_->GetHandshakeContext(key);
+  transport_manager::ConnectionUID connection_handle = 0;
+  uint8_t session_id = 0;
+  PairFromKey(key, &connection_handle, &session_id);
+
+  sync_primitives::AutoReadLock lock(connection_list_lock_);
+  auto connection = GetPrimaryConnection(connection_handle);
+  if (!connection) {
+    return security_manager::SSLContext::HandshakeContext();
+  }
+
+  auto primary_key = KeyFromPair(connection->connection_handle(), session_id);
+  return connection_handler_observer_->GetHandshakeContext(primary_key);
 }
 
 #endif  // ENABLE_SECURITY
@@ -1302,6 +1370,7 @@ void ConnectionHandlerImpl::StartDevicesDiscovery() {
 
   transport_manager_.SearchDevices();
   sync_primitives::AutoReadLock read_lock(connection_handler_observer_lock_);
+  sync_primitives::AutoReadLock lock(device_list_lock_);
   if (connection_handler_observer_) {
     connection_handler_observer_->OnDeviceListUpdated(device_list_);
   }
@@ -1310,6 +1379,7 @@ void ConnectionHandlerImpl::StartDevicesDiscovery() {
 void ConnectionHandlerImpl::ConnectToDevice(
     connection_handler::DeviceHandle device_handle) {
   connection_handler::DeviceMap::const_iterator it_in;
+  sync_primitives::AutoReadLock lock(device_list_lock_);
   it_in = device_list_.find(device_handle);
   if (device_list_.end() != it_in) {
     LOG4CXX_INFO(logger_, "Connecting to device with handle " << device_handle);
@@ -1331,6 +1401,7 @@ transport_manager::ConnectionStatus ConnectionHandlerImpl::GetConnectionStatus(
 
 void ConnectionHandlerImpl::RunAppOnDevice(const std::string& device_mac,
                                            const std::string& bundle_id) const {
+  sync_primitives::AutoReadLock lock(device_list_lock_);
   for (DeviceMap::const_iterator i = device_list_.begin();
        i != device_list_.end();
        ++i) {
@@ -1344,10 +1415,15 @@ void ConnectionHandlerImpl::RunAppOnDevice(const std::string& device_mac,
 }
 
 void ConnectionHandlerImpl::ConnectToAllDevices() {
+  sync_primitives::AutoReadLock lock(device_list_lock_);
   for (DeviceMap::iterator i = device_list_.begin(); i != device_list_.end();
        ++i) {
-    connection_handler::DeviceHandle device_handle = i->first;
-    ConnectToDevice(device_handle);
+    if (transport_manager::webengine_constants::kWebEngineDeviceName ==
+        i->second.user_friendly_name()) {
+      LOG4CXX_DEBUG(logger_, "No need to connect to web engine device");
+      continue;
+    }
+    ConnectToDevice(i->first);
   }
 }
 
@@ -1368,7 +1444,8 @@ void ConnectionHandlerImpl::RemoveCloudAppDevice(const DeviceHandle device_id) {
 
 void ConnectionHandlerImpl::StartTransportManager() {
   LOG4CXX_AUTO_TRACE(logger_);
-  transport_manager_.Visibility(true);
+  transport_manager_.PerformActionOnClients(
+      transport_manager::TransportAction::kVisibilityOn);
 }
 
 void ConnectionHandlerImpl::CloseRevokedConnection(uint32_t connection_key) {
@@ -1637,12 +1714,18 @@ void ConnectionHandlerImpl::OnConnectionEnded(
       const uint32_t session_key =
           KeyFromPair(connection_id, session_it->first);
       const ServiceList& service_list = session_it->second.service_list;
-      for (ServiceList::const_iterator service_it = service_list.begin(),
-                                       end = service_list.end();
-           service_it != end;
-           ++service_it) {
+
+      // Fix:
+      // Endcallback(service_type) by Disconnected,
+      // It should ended in order by 10|11 -> 7.
+      // Refer to service_list.rend() of CloseSession()
+      ServiceList::const_reverse_iterator service_list_itr =
+          service_list.rbegin();
+      for (; service_list_itr != service_list.rend(); ++service_list_itr) {
         connection_handler_observer_->OnServiceEndedCallback(
-            session_key, service_it->service_type, CloseSessionReason::kCommon);
+            session_key,
+            service_list_itr->service_type,
+            CloseSessionReason::kCommon);
       }
     }
     ending_connection_ = NULL;
@@ -1663,9 +1746,9 @@ void ConnectionHandlerImpl::BindProtocolVersionWithSession(
   PairFromKey(connection_key, &connection_handle, &session_id);
 
   sync_primitives::AutoReadLock lock(connection_list_lock_);
-  ConnectionList::iterator it = connection_list_.find(connection_handle);
-  if (connection_list_.end() != it) {
-    it->second->UpdateProtocolVersionSession(session_id, protocol_version);
+  auto connection = GetPrimaryConnection(connection_handle);
+  if (connection) {
+    connection->UpdateProtocolVersionSession(session_id, protocol_version);
   }
 }
 
@@ -1674,13 +1757,14 @@ bool ConnectionHandlerImpl::IsHeartBeatSupported(
     uint8_t session_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoReadLock lock(connection_list_lock_);
-  uint32_t connection = static_cast<uint32_t>(connection_handle);
-  ConnectionList::const_iterator it = connection_list_.find(connection);
-  if (connection_list_.end() == it) {
-    LOG4CXX_WARN(logger_, "Connection not found !");
+  const uint32_t connection_id = static_cast<uint32_t>(connection_handle);
+  auto connection = GetPrimaryConnection(connection_id);
+
+  if (!connection) {
     return false;
   }
-  return it->second->SupportHeartBeat(session_id);
+
+  return connection->SupportHeartBeat(session_id);
 }
 
 bool ConnectionHandlerImpl::ProtocolVersionUsed(
@@ -1689,15 +1773,15 @@ bool ConnectionHandlerImpl::ProtocolVersionUsed(
     uint8_t& protocol_version) const {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoReadLock lock(connection_list_lock_);
-  ConnectionList::const_iterator it = connection_list_.find(connection_id);
-  if (connection_list_.end() != it) {
-    return it->second->ProtocolVersion(session_id, protocol_version);
+  auto connection = GetPrimaryConnection(connection_id);
+
+  if (connection) {
+    return connection->ProtocolVersion(session_id, protocol_version);
   } else if (ending_connection_ &&
              static_cast<uint32_t>(ending_connection_->connection_handle()) ==
                  connection_id) {
     return ending_connection_->ProtocolVersion(session_id, protocol_version);
   }
-  LOG4CXX_WARN(logger_, "Connection not found !");
   return false;
 }
 
diff --git a/src/components/connection_handler/test/connection_handler_impl_test.cc b/src/components/connection_handler/test/connection_handler_impl_test.cc
index af7009c2f5..855225c460 100644
--- a/src/components/connection_handler/test/connection_handler_impl_test.cc
+++ b/src/components/connection_handler/test/connection_handler_impl_test.cc
@@ -787,7 +787,9 @@ TEST_F(ConnectionHandlerTest, StartTransportManager) {
   AddTestDeviceConnection();
   AddTestSession();
 
-  EXPECT_CALL(mock_transport_manager_, Visibility(true));
+  EXPECT_CALL(mock_transport_manager_,
+              PerformActionOnClients(
+                  transport_manager::TransportAction::kVisibilityOn));
   connection_handler_->StartTransportManager();
 }
 
diff --git a/src/components/formatters/include/formatters/CFormatterJsonBase.h b/src/components/formatters/include/formatters/CFormatterJsonBase.h
index b800ac1559..01c84bfba3 100644
--- a/src/components/formatters/include/formatters/CFormatterJsonBase.h
+++ b/src/components/formatters/include/formatters/CFormatterJsonBase.h
@@ -59,7 +59,7 @@ static const tMetaFormatterErrorCode kErrorOk = 0x0;
 static const tMetaFormatterErrorCode kErrorObjectIsNotFunction = 0x01;
 
 /**
- * @brief smart shema describes object which is not function
+ * @brief smart schema describes object which is not function
  */
 static const tMetaFormatterErrorCode kErrorSchemaIsNotFunction = 0x02;
 
diff --git a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h
index b1054100df..ef1bfa1acd 100644
--- a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h
+++ b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv1.h
@@ -174,11 +174,14 @@ int32_t formatters::CFormatterJsonSDLRPCv1::fromString(
   int32_t result = kSuccess;
 
   try {
+    Json::CharReaderBuilder reader_builder;
+    const std::unique_ptr<Json::CharReader> reader(
+        reader_builder.newCharReader());
     Json::Value root;
-    Json::Reader reader;
+    const size_t json_len = str.length();
     std::string type;
 
-    if (false == reader.parse(str, root)) {
+    if (!reader->parse(str.c_str(), str.c_str() + json_len, &root, nullptr)) {
       result = kParsingError | kMessageTypeNotFound | kFunctionIdNotFound |
                kCorrelationIdNotFound;
     }
diff --git a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h
index ab0289b293..416aabe777 100644
--- a/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h
+++ b/src/components/formatters/include/formatters/CFormatterJsonSDLRPCv2.h
@@ -151,13 +151,16 @@ inline bool CFormatterJsonSDLRPCv2::fromString(
   bool result = true;
 
   try {
+    Json::CharReaderBuilder reader_builder;
+    const std::unique_ptr<Json::CharReader> reader(
+        reader_builder.newCharReader());
     Json::Value root;
-    Json::Reader reader;
-
+    const size_t json_len = str.length();
     namespace strings = ns_smart_device_link::ns_json_handler::strings;
-    bool result = reader.parse(str, root);
+    const bool result =
+        reader->parse(str.c_str(), str.c_str() + json_len, &root, nullptr);
 
-    if (true == result) {
+    if (result) {
       out[strings::S_PARAMS][strings::S_MESSAGE_TYPE] = messageType;
       out[strings::S_PARAMS][strings::S_FUNCTION_ID] = functionId;
       out[strings::S_PARAMS][strings::S_PROTOCOL_TYPE] = 0;
diff --git a/src/components/formatters/include/formatters/CSmartFactory.h b/src/components/formatters/include/formatters/CSmartFactory.h
index c384dbf01d..83bcbb770e 100644
--- a/src/components/formatters/include/formatters/CSmartFactory.h
+++ b/src/components/formatters/include/formatters/CSmartFactory.h
@@ -147,16 +147,18 @@ class CSmartFactory {
    * @brief Attach schema to the function SmartObject.
    *
    * @param object SmartObject to attach schema for.
-   *
    * @param remove_unknown_parameters contains true if need
    * to remove fake parameters from smart object otherwise contains false.
+   * @param MessageVersion the version of the schema to be applied
+   * @param report__ object for reporting warnings during schema application
    *
    * @return True if operation was successful or false otherwise.
    */
   bool attachSchema(
       ns_smart_device_link::ns_smart_objects::SmartObject& object,
       const bool remove_unknown_parameters,
-      const utils::SemanticVersion& MessageVersion = utils::SemanticVersion());
+      const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
+      rpc::ValidationReport* report__ = nullptr);
 
   /**
    * @brief Attach schema to the struct SmartObject.
@@ -277,7 +279,8 @@ template <class FunctionIdEnum, class MessageTypeEnum, class StructIdEnum>
 bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema(
     ns_smart_device_link::ns_smart_objects::SmartObject& object,
     const bool remove_unknown_parameters,
-    const utils::SemanticVersion& MessageVersion) {
+    const utils::SemanticVersion& MessageVersion,
+    rpc::ValidationReport* report__) {
   if (false == object.keyExists(strings::S_PARAMS))
     return false;
   if (false == object[strings::S_PARAMS].keyExists(strings::S_MESSAGE_TYPE))
@@ -305,7 +308,7 @@ bool CSmartFactory<FunctionIdEnum, MessageTypeEnum, StructIdEnum>::attachSchema(
   object.setSchema(schemaIterator->second);
 
   schemaIterator->second.applySchema(
-      object, remove_unknown_parameters, MessageVersion);
+      object, remove_unknown_parameters, MessageVersion, report__);
 
   return true;
 }
diff --git a/src/components/formatters/include/formatters/formatter_json_rpc.h b/src/components/formatters/include/formatters/formatter_json_rpc.h
index 593c837877..d1c87fe587 100644
--- a/src/components/formatters/include/formatters/formatter_json_rpc.h
+++ b/src/components/formatters/include/formatters/formatter_json_rpc.h
@@ -278,11 +278,14 @@ int32_t FormatterJsonRpc::FromString(const std::string& str,
                                      ns_smart_objects::SmartObject& out) {
   int32_t result = kSuccess;
   try {
-    Json::Value root;
-    Json::Reader reader;
     namespace strings = ns_smart_device_link::ns_json_handler::strings;
+    Json::CharReaderBuilder reader_builder;
+    const std::unique_ptr<Json::CharReader> reader(
+        reader_builder.newCharReader());
+    Json::Value root;
+    const size_t json_len = str.length();
 
-    if (false == reader.parse(str, root)) {
+    if (!reader->parse(str.c_str(), str.c_str() + json_len, &root, nullptr)) {
       result = kParsingError | kMethodNotSpecified | kUnknownMethod |
                kUnknownMessageType;
     } else {
diff --git a/src/components/formatters/src/CFormatterJsonBase.cc b/src/components/formatters/src/CFormatterJsonBase.cc
index 6dc3d28f16..e5354d5326 100644
--- a/src/components/formatters/src/CFormatterJsonBase.cc
+++ b/src/components/formatters/src/CFormatterJsonBase.cc
@@ -107,10 +107,10 @@ void ns_smart_device_link::ns_json_handler::formatters::CFormatterJsonBase::
       item = obj.asBool();
     } else if (ns_smart_device_link::ns_smart_objects::SmartType_Integer ==
                obj.getType()) {
-      item = utils::ConvertInt64ToLongLongInt(obj.asInt());
+      item = obj.asInt();
     } else if (ns_smart_device_link::ns_smart_objects::SmartType_UInteger ==
                obj.getType()) {
-      item = utils::ConvertUInt64ToLongLongUInt(obj.asUInt());
+      item = obj.asUInt();
     } else if (ns_smart_device_link::ns_smart_objects::SmartType_Double ==
                obj.getType()) {
       item = obj.asDouble();
diff --git a/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc b/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc
index 2f47c83a6b..e0ef7a72dd 100644
--- a/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc
+++ b/src/components/formatters/src/CFormatterJsonSDLRPCv1.cc
@@ -104,8 +104,8 @@ bool CFormatterJsonSDLRPCv1::toString(const smart_objects_ns::SmartObject& obj,
     root[type][S_PARAMETERS] = params;
 
     if (formattedObj[strings::S_PARAMS].keyExists(strings::S_CORRELATION_ID)) {
-      root[type][S_CORRELATION_ID] = utils::ConvertInt64ToLongLongInt(
-          formattedObj[strings::S_PARAMS][strings::S_CORRELATION_ID].asInt());
+      root[type][S_CORRELATION_ID] =
+          formattedObj[strings::S_PARAMS][strings::S_CORRELATION_ID].asInt();
     }
 
     root[type][S_NAME] =
diff --git a/src/components/formatters/src/formatter_json_rpc.cc b/src/components/formatters/src/formatter_json_rpc.cc
index 07d45d5855..134520bdb6 100644
--- a/src/components/formatters/src/formatter_json_rpc.cc
+++ b/src/components/formatters/src/formatter_json_rpc.cc
@@ -122,8 +122,7 @@ bool FormatterJsonRpc::ToString(const ns_smart_objects::SmartObject& obj,
               if (ns_smart_objects::SmartType_Integer != code.getType()) {
                 result = false;
               } else {
-                root[kResult][kCode] =
-                    utils::ConvertInt64ToLongLongInt(code.asInt());
+                root[kResult][kCode] = code.asInt();
               }
             }
           } else if (kNotification == message_type) {
@@ -139,8 +138,7 @@ bool FormatterJsonRpc::ToString(const ns_smart_objects::SmartObject& obj,
             if (ns_smart_objects::SmartType_Integer != code.getType()) {
               result = false;
             } else {
-              root[kError][kCode] =
-                  utils::ConvertInt64ToLongLongInt(code.asInt());
+              root[kError][kCode] = code.asInt();
             }
           }
         }
@@ -180,7 +178,7 @@ bool FormatterJsonRpc::SetId(const ns_smart_objects::SmartObject& params,
         params.getElement(strings::S_CORRELATION_ID);
 
     if (ns_smart_objects::SmartType_Integer == id.getType()) {
-      id_container[kId] = utils::ConvertUInt64ToLongLongUInt(id.asUInt());
+      id_container[kId] = id.asUInt();
       result = true;
     }
   }
diff --git a/src/components/formatters/src/generic_json_formatter.cc b/src/components/formatters/src/generic_json_formatter.cc
index 07b03484d2..a0096a0983 100644
--- a/src/components/formatters/src/generic_json_formatter.cc
+++ b/src/components/formatters/src/generic_json_formatter.cc
@@ -33,6 +33,7 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 #include "formatters/generic_json_formatter.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 
 namespace ns_smart_device_link {
 namespace ns_json_handler {
@@ -48,10 +49,10 @@ void GenericJsonFormatter::ToString(const ns_smart_objects::SmartObject& obj,
 bool GenericJsonFormatter::FromString(const std::string& str,
                                       ns_smart_objects::SmartObject& out) {
   Json::Value json_root;
-  Json::Reader reader;
-  bool result = reader.parse(str, json_root);
+  utils::JsonReader reader;
+  const bool result = reader.parse(str, &json_root);
 
-  if (true == result) {
+  if (result) {
     jsonValueToObj(json_root, out);
   }
 
diff --git a/src/components/formatters/test/CFormatterJsonBase_test.cc b/src/components/formatters/test/CFormatterJsonBase_test.cc
index 91700b3f99..3daf2ca284 100644
--- a/src/components/formatters/test/CFormatterJsonBase_test.cc
+++ b/src/components/formatters/test/CFormatterJsonBase_test.cc
@@ -35,8 +35,8 @@
 #include <string>
 #include "formatters/generic_json_formatter.h"
 #include "gtest/gtest.h"
-#include "json/reader.h"
 #include "json/value.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 
 namespace test {
 namespace components {
@@ -168,9 +168,12 @@ TEST(CFormatterJsonBaseTest, JSonArrayValueToSmartObj_ExpectSuccessful) {
       "[\"test1\", \"test2\", \"test3\"]";  // Array in json format
   Json::Value json_value;  // Json value from array. Will be initialized later
   SmartObject object;
-  Json::Reader reader;  // Json reader - Needed for correct parsing
+  Json::CharReaderBuilder reader_builder;
+  const std::unique_ptr<Json::CharReader> reader(
+      reader_builder.newCharReader());
   // Parse array to json value
-  ASSERT_TRUE(reader.parse(json_array, json_value));
+  ASSERT_TRUE(reader->parse(
+      json_array, json_array + strlen(json_array), &json_value, nullptr));
   // Convert json array to SmartObject
   CFormatterJsonBase::jsonValueToObj(json_value, object);
   // Check conversion was successful
@@ -187,10 +190,15 @@ TEST(CFormatterJsonBaseTest, JSonObjectValueToSmartObj_ExpectSuccessful) {
       "\"json_test_object2\": [\"test11\", \"test12\", \"test13\" ]}";
   Json::Value json_value;  // Json value from object. Will be initialized later
   SmartObject object;
-  Json::Reader reader;  // Json reader - Needed for correct parsing
-  ASSERT_TRUE(reader.parse(
+  Json::CharReaderBuilder reader_builder;
+  const std::unique_ptr<Json::CharReader> reader(
+      reader_builder
+          .newCharReader());  // Json reader - Needed for correct parsing
+  ASSERT_TRUE(reader->parse(
       json_object,
-      json_value));  // If parsing not successful - no sense to continue
+      json_object + strlen(json_object),
+      &json_value,
+      nullptr));  // If parsing not successful - no sense to continue
   CFormatterJsonBase::jsonValueToObj(json_value, object);
   // Check conversion was successful
   EXPECT_TRUE(json_value.isObject());
@@ -302,10 +310,15 @@ TEST(CFormatterJsonBaseTest, ArraySmartObjectToJSon_ExpectSuccessful) {
   Json::Value json_value;  // Json value from array. Will be initialized later
   Json::Value result;      // Json value from array. Will be initialized later
   SmartObject object;
-  Json::Reader reader;  // Json reader - Needed for correct parsing
+  Json::CharReaderBuilder reader_builder;
+  const std::unique_ptr<Json::CharReader> reader(
+      reader_builder
+          .newCharReader());  // Json reader - Needed for correct parsing
   // Parse array to json value
-  ASSERT_TRUE(reader.parse(json_array,
-                           json_value));  // Convert json array to SmartObject
+  ASSERT_TRUE(reader->parse(json_array,
+                            json_array + strlen(json_array),
+                            &json_value,
+                            nullptr));  // Convert json array to SmartObject
   // Convert json array to SmartObject
   CFormatterJsonBase::jsonValueToObj(json_value, object);
   // Convert SmartObject to JSon
@@ -325,11 +338,16 @@ TEST(CFormatterJsonBaseTest, JSonObjectValueToObj_ExpectSuccessful) {
   Json::Value
       result;  // Json value from Smart object. Will keep conversion result
   SmartObject object;
-  Json::Reader reader;  // Json reader - Needed for correct parsing
+  Json::CharReaderBuilder reader_builder;
+  const std::unique_ptr<Json::CharReader> reader(
+      reader_builder
+          .newCharReader());  // Json reader - Needed for correct parsing
   // Parse json object to correct json value
-  ASSERT_TRUE(reader.parse(
+  ASSERT_TRUE(reader->parse(
       json_object,
-      json_value));  // If parsing not successful - no sense to continue
+      json_object + strlen(json_object),
+      &json_value,
+      nullptr));  // If parsing not successful - no sense to continue
   // Convert json array to SmartObject
   CFormatterJsonBase::jsonValueToObj(json_value, object);
   // Convert SmartObject to JSon
diff --git a/src/components/formatters/test/formatter_json_rpc_test.cc b/src/components/formatters/test/formatter_json_rpc_test.cc
index 6e2e8753ca..00ba9ef55a 100644
--- a/src/components/formatters/test/formatter_json_rpc_test.cc
+++ b/src/components/formatters/test/formatter_json_rpc_test.cc
@@ -40,6 +40,7 @@
 #include "gtest/gtest.h"
 #include "interfaces/HMI_API_schema.h"
 #include "interfaces/MOBILE_API_schema.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 
 namespace test {
 namespace components {
@@ -50,11 +51,12 @@ using namespace ns_smart_device_link::ns_json_handler::formatters;
 using namespace ns_smart_device_link::ns_json_handler::strings;
 
 void CompactJson(std::string& str) {
+  utils::JsonReader reader;
   Json::Value root;
-  Json::Reader reader;
-  reader.parse(str, root);
-  Json::FastWriter writer;
-  str = writer.write(root);
+
+  reader.parse(str, &root);
+  Json::StreamWriterBuilder writer_builder;
+  str = Json::writeString(writer_builder, root);
   if (str[str.size() - 1] == '\n') {
     str.erase(str.size() - 1, 1);
   }
diff --git a/src/components/formatters/test/meta_formatter_test.cc b/src/components/formatters/test/meta_formatter_test.cc
index e405ff68eb..8b1164b95a 100644
--- a/src/components/formatters/test/meta_formatter_test.cc
+++ b/src/components/formatters/test/meta_formatter_test.cc
@@ -41,7 +41,6 @@ namespace formatters {
 TEST_F(CMetaFormatterTestHelper,
        inputObjectIdenticalToSchemaWithAndWithoutMandatoryParams) {
   Json::Value value;
-  Json::Reader reader;
   CSmartFactory<FunctionIDTest::eType,
                 MessageTypeTest::eType,
                 StructIdentifiers::eType>
@@ -123,7 +122,7 @@ TEST_F(CMetaFormatterTestHelper,
 }
 
 TEST_F(CMetaFormatterTestHelper, ObjectWithEmptyMap) {
-  std::map<std::string, CObjectSchemaItem::SMember> schemaMembersMap;
+  std::map<std::string, SMember> schemaMembersMap;
   CSmartSchema map_schema =
       CSmartSchema(CObjectSchemaItem::create(schemaMembersMap));
 
@@ -211,67 +210,63 @@ TEST_F(CMetaFormatterTestHelper,
   SmartObject result_object;
   SmartObject object;
 
-  std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap;
+  std::map<std::string, SMember> paramsMembersMap;
 
-  paramsMembersMap[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  paramsMembersMap[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIDTest::eType>::create(function_id_items_), true);
 
-  paramsMembersMap[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  paramsMembersMap[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items_),
       true);
 
-  paramsMembersMap[S_CORRELATION_ID] = CObjectSchemaItem::SMember(
-      TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(0),
-                                     TSchemaItemParameter<int>(100),
-                                     TSchemaItemParameter<int>(55)),
-      true);
+  paramsMembersMap[S_CORRELATION_ID] =
+      SMember(TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(0),
+                                             TSchemaItemParameter<int>(100),
+                                             TSchemaItemParameter<int>(55)),
+              true);
 
-  paramsMembersMap[S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(
-      TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
-                                     TSchemaItemParameter<int>(2)),
-      false);
+  paramsMembersMap[S_PROTOCOL_VERSION] =
+      SMember(TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
+                                             TSchemaItemParameter<int>(2)),
+              false);
   paramsMembersMap[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), false);
+      SMember(TNumberSchemaItem<int>::create(), false);
 
-  std::map<std::string, CObjectSchemaItem::SMember> schemaMembersMap;
+  std::map<std::string, SMember> schemaMembersMap;
 
-  schemaMembersMap["mandatory_emptyMap1"] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(
-          std::map<std::string, CObjectSchemaItem::SMember>()),
-      true);
+  schemaMembersMap["mandatory_emptyMap1"] = SMember(
+      CObjectSchemaItem::create(std::map<std::string, SMember>()), true);
 
-  schemaMembersMap["mandatory_emptyMap2"] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(
-          std::map<std::string, CObjectSchemaItem::SMember>()),
-      true);
+  schemaMembersMap["mandatory_emptyMap2"] = SMember(
+      CObjectSchemaItem::create(std::map<std::string, SMember>()), true);
 
-  schemaMembersMap["mandatory_emptyAray"] = CObjectSchemaItem::SMember(
-      CArraySchemaItem::create(TNumberSchemaItem<int>::create()), true);
+  schemaMembersMap["mandatory_emptyAray"] =
+      SMember(CArraySchemaItem::create(TNumberSchemaItem<int>::create()), true);
 
-  schemaMembersMap["non_mandatory_Array"] = CObjectSchemaItem::SMember(
-      CArraySchemaItem::create(TNumberSchemaItem<int>::create(),
-                               TSchemaItemParameter<size_t>(1),
-                               TSchemaItemParameter<size_t>(2)),
-      false);
+  schemaMembersMap["non_mandatory_Array"] =
+      SMember(CArraySchemaItem::create(TNumberSchemaItem<int>::create(),
+                                       TSchemaItemParameter<size_t>(1),
+                                       TSchemaItemParameter<size_t>(2)),
+              false);
 
-  schemaMembersMap["mandatory_string"] = CObjectSchemaItem::SMember(
+  schemaMembersMap["mandatory_string"] = SMember(
       CStringSchemaItem::create(TSchemaItemParameter<size_t>(0),
                                 TSchemaItemParameter<size_t>(500),
                                 TSchemaItemParameter<std::string>("defValue")),
       true);
 
-  schemaMembersMap["non_mandatory_string"] = CObjectSchemaItem::SMember(
-      CStringSchemaItem::create(
-          TSchemaItemParameter<size_t>(0),
-          TSchemaItemParameter<size_t>(500),
-          TSchemaItemParameter<std::string>("ignoredDefValue")),
-      false);
-
-  std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap;
-  rootMembersMap[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schemaMembersMap), true);
-  rootMembersMap[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(paramsMembersMap), true);
+  schemaMembersMap["non_mandatory_string"] =
+      SMember(CStringSchemaItem::create(
+                  TSchemaItemParameter<size_t>(0),
+                  TSchemaItemParameter<size_t>(500),
+                  TSchemaItemParameter<std::string>("ignoredDefValue")),
+              false);
+
+  std::map<std::string, SMember> rootMembersMap;
+  rootMembersMap[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schemaMembersMap), true);
+  rootMembersMap[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(paramsMembersMap), true);
 
   CSmartSchema schema = CSmartSchema(CObjectSchemaItem::create(rootMembersMap));
 
diff --git a/src/components/formatters/test/src/SmartFactoryTestHelper.cc b/src/components/formatters/test/src/SmartFactoryTestHelper.cc
index d48f9f58a0..4d089ff9b1 100644
--- a/src/components/formatters/test/src/SmartFactoryTestHelper.cc
+++ b/src/components/formatters/test/src/SmartFactoryTestHelper.cc
@@ -169,27 +169,24 @@ void CSmartFactoryTest::InitFunctionSchemes(
     const TStructsSchemaItems& struct_schema_items,
     const std::set<FunctionIdTest::eType>& function_id_items,
     const std::set<MessageTypeTest::eType>& message_type_items) {
-  CObjectSchemaItem::Members params_members;
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  Members params_members;
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[kCode] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[kMessage] =
-      CObjectSchemaItem::SMember(CStringSchemaItem::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[kCode] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[kMessage] = SMember(CStringSchemaItem::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
+  Members root_members_map;
   root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] =
-      CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members),
-                                 true);
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   CSmartSchema error_response_schema(
       CObjectSchemaItem::create(root_members_map));
@@ -240,26 +237,26 @@ void CSmartFactoryTest::InitFunctionSchemes(
 CSmartSchema CSmartFactoryTest::InitFunction_Function1_request(
     const std::set<FunctionIdTest::eType>& function_id_items,
     const std::set<MessageTypeTest::eType>& message_type_items) {
-  CObjectSchemaItem::Members schema_members;
-  CObjectSchemaItem::Members params_members;
+  Members schema_members;
+  Members params_members;
 
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
-  root_members_map[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(params_members), true);
+  Members root_members_map;
+  root_members_map[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -272,31 +269,29 @@ CSmartSchema CSmartFactoryTest::InitFunction_Function1_response(
   std::shared_ptr<ISchemaItem> available_SchemaItem =
       CBoolSchemaItem::create(TSchemaItemParameter<bool>());
 
-  CObjectSchemaItem::Members schema_members;
+  Members schema_members;
 
-  schema_members["available"] =
-      CObjectSchemaItem::SMember(available_SchemaItem, true);
+  schema_members["available"] = SMember(available_SchemaItem, true);
 
-  CObjectSchemaItem::Members params_members;
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  Members params_members;
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[kCode] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[kCode] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
-  root_members_map[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(params_members), true);
+  Members root_members_map;
+  root_members_map[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -304,26 +299,26 @@ CSmartSchema CSmartFactoryTest::InitFunction_Function1_response(
 CSmartSchema CSmartFactoryTest::InitFunction_Function2_request(
     const std::set<FunctionIdTest::eType>& function_id_items,
     const std::set<MessageTypeTest::eType>& message_type_items) {
-  CObjectSchemaItem::Members schema_members;
+  Members schema_members;
 
-  CObjectSchemaItem::Members params_members;
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  Members params_members;
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
-  root_members_map[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(params_members), true);
+  Members root_members_map;
+  root_members_map[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -336,31 +331,29 @@ CSmartSchema CSmartFactoryTest::InitFunction_Function2_response(
   std::shared_ptr<ISchemaItem> available_SchemaItem =
       CBoolSchemaItem::create(TSchemaItemParameter<bool>());
 
-  CObjectSchemaItem::Members schema_members;
+  Members schema_members;
 
-  schema_members["available"] =
-      CObjectSchemaItem::SMember(available_SchemaItem, true);
+  schema_members["available"] = SMember(available_SchemaItem, true);
 
-  CObjectSchemaItem::Members params_members;
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  Members params_members;
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[kCode] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[kCode] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
-  root_members_map[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(params_members), true);
+  Members root_members_map;
+  root_members_map[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -368,26 +361,26 @@ CSmartSchema CSmartFactoryTest::InitFunction_Function2_response(
 CSmartSchema CSmartFactoryTest::InitFunction_Function3_request(
     const std::set<FunctionIdTest::eType>& function_id_items,
     const std::set<MessageTypeTest::eType>& message_type_items) {
-  CObjectSchemaItem::Members schema_members;
+  Members schema_members;
 
-  CObjectSchemaItem::Members params_members;
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  Members params_members;
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
-  root_members_map[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(params_members), true);
+  Members root_members_map;
+  root_members_map[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -402,31 +395,29 @@ CSmartSchema CSmartFactoryTest::InitFunction_Function3_response(
   std::shared_ptr<ISchemaItem> available_SchemaItem =
       CBoolSchemaItem::create(TSchemaItemParameter<bool>());
 
-  CObjectSchemaItem::Members schema_members;
+  Members schema_members;
 
-  schema_members["available"] =
-      CObjectSchemaItem::SMember(available_SchemaItem, true);
+  schema_members["available"] = SMember(available_SchemaItem, true);
 
-  CObjectSchemaItem::Members params_members;
-  params_members[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+  Members params_members;
+  params_members[S_FUNCTION_ID] = SMember(
       TEnumSchemaItem<FunctionIdTest::eType>::create(function_id_items), true);
-  params_members[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
+  params_members[S_MESSAGE_TYPE] = SMember(
       TEnumSchemaItem<MessageTypeTest::eType>::create(message_type_items),
       true);
   params_members[S_PROTOCOL_VERSION] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
   params_members[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[kCode] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[kCode] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
-  root_members_map[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(params_members), true);
+  Members root_members_map;
+  root_members_map[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -455,20 +446,19 @@ std::shared_ptr<ISchemaItem> CSmartFactoryTest::InitStructSchemaItem_Common_1(
       TNumberSchemaItem<int32_t>::create(TSchemaItemParameter<int32_t>(1),
                                          TSchemaItemParameter<int32_t>(500),
                                          TSchemaItemParameter<int32_t>());
-  CObjectSchemaItem::Members struct_members;
-  struct_members["image"] = CObjectSchemaItem::SMember(image_SchemaItem, false);
+  Members struct_members;
+  struct_members["image"] = SMember(image_SchemaItem, false);
 
-  CObjectSchemaItem::Members schema_members;
+  Members schema_members;
 
-  schema_members["text"] = CObjectSchemaItem::SMember(text_SchemaItem, true);
-  schema_members["position"] =
-      CObjectSchemaItem::SMember(position_SchemaItem, true);
+  schema_members["text"] = SMember(text_SchemaItem, true);
+  schema_members["position"] = SMember(position_SchemaItem, true);
 
-  CObjectSchemaItem::Members root_members_map;
-  root_members_map[""] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(struct_members), true);
-  root_members_map[""] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schema_members), true);
+  Members root_members_map;
+  root_members_map[""] =
+      SMember(CObjectSchemaItem::create(struct_members), true);
+  root_members_map[""] =
+      SMember(CObjectSchemaItem::create(schema_members), true);
   return CObjectSchemaItem::create(schema_members);
 }
 
@@ -489,10 +479,9 @@ CSmartFactoryTest::InitStructSchemaItem_Common_2() {
                                          TSchemaItemParameter<int32_t>(500),
                                          TSchemaItemParameter<int32_t>());
 
-  CObjectSchemaItem::Members schema_members;
-  schema_members["text"] = CObjectSchemaItem::SMember(text_SchemaItem, true);
-  schema_members["position"] =
-      CObjectSchemaItem::SMember(position_SchemaItem, true);
+  Members schema_members;
+  schema_members["text"] = SMember(text_SchemaItem, true);
+  schema_members["position"] = SMember(position_SchemaItem, true);
 
   return CObjectSchemaItem::create(schema_members);
 }
diff --git a/src/components/formatters/test/src/create_smartSchema.cc b/src/components/formatters/test/src/create_smartSchema.cc
index 3602fc3de7..c852c65ea1 100644
--- a/src/components/formatters/test/src/create_smartSchema.cc
+++ b/src/components/formatters/test/src/create_smartSchema.cc
@@ -189,39 +189,36 @@ CSmartSchema initObjectSchema() {
                                      TSchemaItemParameter<int>());
 
   // Map of parameters
-  std::map<std::string, CObjectSchemaItem::SMember> schemaMembersMap;
+  std::map<std::string, SMember> schemaMembersMap;
 
-  schemaMembersMap["success"] =
-      CObjectSchemaItem::SMember(success_SchemaItem, false);
-  schemaMembersMap["resultCode"] =
-      CObjectSchemaItem::SMember(resultCode_SchemaItem, false);
-  schemaMembersMap["info"] = CObjectSchemaItem::SMember(info_SchemaItem, false);
-  schemaMembersMap["tryAgainTime"] =
-      CObjectSchemaItem::SMember(tryAgainTime_SchemaItem, false);
+  schemaMembersMap["success"] = SMember(success_SchemaItem, false);
+  schemaMembersMap["resultCode"] = SMember(resultCode_SchemaItem, false);
+  schemaMembersMap["info"] = SMember(info_SchemaItem, false);
+  schemaMembersMap["tryAgainTime"] = SMember(tryAgainTime_SchemaItem, false);
 
-  std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap;
+  std::map<std::string, SMember> paramsMembersMap;
   paramsMembersMap[S_FUNCTION_ID] =
-      CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionIDTest::eType>::create(
-                                     functionId_allowedEnumSubsetValues),
-                                 true);
-  paramsMembersMap[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
-      TEnumSchemaItem<MessageTypeTest::eType>::create(
-          messageType_allowedEnumSubsetValues),
-      true);
+      SMember(TEnumSchemaItem<FunctionIDTest::eType>::create(
+                  functionId_allowedEnumSubsetValues),
+              true);
+  paramsMembersMap[S_MESSAGE_TYPE] =
+      SMember(TEnumSchemaItem<MessageTypeTest::eType>::create(
+                  messageType_allowedEnumSubsetValues),
+              true);
   paramsMembersMap[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  paramsMembersMap[S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(
-      TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
-                                     TSchemaItemParameter<int>(2)),
-      true);
+      SMember(TNumberSchemaItem<int>::create(), true);
+  paramsMembersMap[S_PROTOCOL_VERSION] =
+      SMember(TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
+                                             TSchemaItemParameter<int>(2)),
+              true);
   paramsMembersMap[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap;
-  rootMembersMap[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schemaMembersMap), true);
-  rootMembersMap[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(paramsMembersMap), true);
+  std::map<std::string, SMember> rootMembersMap;
+  rootMembersMap[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schemaMembersMap), true);
+  rootMembersMap[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(paramsMembersMap), true);
   return CSmartSchema(CObjectSchemaItem::create(rootMembersMap));
 };
 
@@ -294,9 +291,9 @@ CSmartSchema initSchemaForMetaFormatter() {
           speechCapabilities_allowedEnumSubsetValues,
           TSchemaItemParameter<SpeechCapabilities::eType>());
 
-  std::map<std::string, CObjectSchemaItem::SMember> ttsMap;
-  ttsMap["text"] = CObjectSchemaItem::SMember(ttsNameItem_SchemaItem, false);
-  ttsMap["type"] = CObjectSchemaItem::SMember(ttstype_SchemaItem, false);
+  std::map<std::string, SMember> ttsMap;
+  ttsMap["text"] = SMember(ttsNameItem_SchemaItem, false);
+  ttsMap["type"] = SMember(ttstype_SchemaItem, false);
   ;
 
   ISchemaItemPtr hmiDisplayLanguageDesired_SchemaItem =
@@ -350,62 +347,57 @@ CSmartSchema initSchemaForMetaFormatter() {
                                TSchemaItemParameter<size_t>(1000));
 
   // Creation map for syncMsgVersion
-  std::map<std::string, CObjectSchemaItem::SMember> schemaSyncMsgVersionMap;
+  std::map<std::string, SMember> schemaSyncMsgVersionMap;
   schemaSyncMsgVersionMap["majorVersion"] =
-      CObjectSchemaItem::SMember(majorVersion_SchemaItem, false);
+      SMember(majorVersion_SchemaItem, false);
   schemaSyncMsgVersionMap["minorVersion"] =
-      CObjectSchemaItem::SMember(minorVersion_SchemaItem, false);
+      SMember(minorVersion_SchemaItem, false);
   schemaSyncMsgVersionMap["patchVersion"] =
-      CObjectSchemaItem::SMember(patchVersion_SchemaItem, false);
+      SMember(patchVersion_SchemaItem, false);
   ;
 
   // Map of parameters
-  std::map<std::string, CObjectSchemaItem::SMember> schemaMembersMap;
-
-  schemaMembersMap["appID"] =
-      CObjectSchemaItem::SMember(appID_SchemaItem, false);
-  schemaMembersMap["appName"] =
-      CObjectSchemaItem::SMember(appName_SchemaItem, false);
-  schemaMembersMap["appType"] =
-      CObjectSchemaItem::SMember(appType_SchemaItem, false);
+  std::map<std::string, SMember> schemaMembersMap;
+
+  schemaMembersMap["appID"] = SMember(appID_SchemaItem, false);
+  schemaMembersMap["appName"] = SMember(appName_SchemaItem, false);
+  schemaMembersMap["appType"] = SMember(appType_SchemaItem, false);
   schemaMembersMap["hmiDisplayLanguageDesired"] =
-      CObjectSchemaItem::SMember(hmiDisplayLanguageDesired_SchemaItem, false);
+      SMember(hmiDisplayLanguageDesired_SchemaItem, false);
   schemaMembersMap["isMediaApplication"] =
-      CObjectSchemaItem::SMember(isMediaApplication_SchemaItem, false);
+      SMember(isMediaApplication_SchemaItem, false);
   schemaMembersMap["languageDesired"] =
-      CObjectSchemaItem::SMember(languageDesired_SchemaItem, false);
+      SMember(languageDesired_SchemaItem, false);
   schemaMembersMap["ngnMediaScreenAppName"] =
-      CObjectSchemaItem::SMember(ngnMediaScreenAppName_SchemaItem, false);
-  schemaMembersMap["syncMsgVersion"] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schemaSyncMsgVersionMap), false);
-  schemaMembersMap["ttsName"] =
-      CObjectSchemaItem::SMember(ttsName_SchemaItem, false);
-  schemaMembersMap["vrSynonyms"] =
-      CObjectSchemaItem::SMember(vrSynonyms_SchemaItem, false);
-
-  std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap;
+      SMember(ngnMediaScreenAppName_SchemaItem, false);
+  schemaMembersMap["syncMsgVersion"] =
+      SMember(CObjectSchemaItem::create(schemaSyncMsgVersionMap), false);
+  schemaMembersMap["ttsName"] = SMember(ttsName_SchemaItem, false);
+  schemaMembersMap["vrSynonyms"] = SMember(vrSynonyms_SchemaItem, false);
+
+  std::map<std::string, SMember> paramsMembersMap;
   paramsMembersMap[S_FUNCTION_ID] =
-      CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionIDTest::eType>::create(
-                                     functionId_allowedEnumSubsetValues),
-                                 true);
-  paramsMembersMap[S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(
-      TEnumSchemaItem<MessageTypeTest::eType>::create(
-          messageType_allowedEnumSubsetValues),
-      true);
+      SMember(TEnumSchemaItem<FunctionIDTest::eType>::create(
+                  functionId_allowedEnumSubsetValues),
+              true);
+  paramsMembersMap[S_MESSAGE_TYPE] =
+      SMember(TEnumSchemaItem<MessageTypeTest::eType>::create(
+                  messageType_allowedEnumSubsetValues),
+              true);
   paramsMembersMap[S_CORRELATION_ID] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  paramsMembersMap[S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(
-      TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
-                                     TSchemaItemParameter<int>(2)),
-      true);
+      SMember(TNumberSchemaItem<int>::create(), true);
+  paramsMembersMap[S_PROTOCOL_VERSION] =
+      SMember(TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
+                                             TSchemaItemParameter<int>(2)),
+              true);
   paramsMembersMap[S_PROTOCOL_TYPE] =
-      CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+      SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap;
-  rootMembersMap[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(schemaMembersMap), true);
-  rootMembersMap[S_PARAMS] = CObjectSchemaItem::SMember(
-      CObjectSchemaItem::create(paramsMembersMap), true);
+  std::map<std::string, SMember> rootMembersMap;
+  rootMembersMap[S_MSG_PARAMS] =
+      SMember(CObjectSchemaItem::create(schemaMembersMap), true);
+  rootMembersMap[S_PARAMS] =
+      SMember(CObjectSchemaItem::create(paramsMembersMap), true);
   return CSmartSchema(CObjectSchemaItem::create(rootMembersMap));
 };
 
diff --git a/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h b/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h
index 8edcfc1a36..08d1b55aaf 100644
--- a/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h
+++ b/src/components/hmi_message_handler/include/hmi_message_handler/websocket_session.h
@@ -108,7 +108,7 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession> {
 
   void Recv(boost::system::error_code ec);
 
-  void Send(std::string& message, Json::Value& json_message);
+  void Send(const std::string& message, Json::Value& json_message);
 
   void SendFromQueue();
 
@@ -164,9 +164,8 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession> {
 
   int mControllersIdCurrent;
 
-  Json::Reader m_reader;
-  Json::FastWriter m_writer;
-  Json::FastWriter m_receiverWriter;
+  Json::StreamWriterBuilder m_writer;
+  Json::StreamWriterBuilder m_receiver_writer;
 
   sync_primitives::Lock queue_lock_;
   sync_primitives::Lock message_queue_lock_;
diff --git a/src/components/hmi_message_handler/src/messagebroker_adapter.cc b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
index 8e45d4ecd9..b5e2defd58 100644
--- a/src/components/hmi_message_handler/src/messagebroker_adapter.cc
+++ b/src/components/hmi_message_handler/src/messagebroker_adapter.cc
@@ -33,6 +33,7 @@
 #include <string>
 
 #include "hmi_message_handler/messagebroker_adapter.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/logger.h"
 
 namespace hmi_message_handler {
@@ -60,10 +61,12 @@ void MessageBrokerAdapter::SendMessageToHMI(
     return;
   }
 
-  Json::Reader reader;
+  utils::JsonReader reader;
   Json::Value json_value;
-  if (!reader.parse(message->json_message(), json_value, false)) {
-    LOG4CXX_ERROR(logger_, "Received invalid json string.");
+  const std::string str = message->json_message();
+
+  if (!reader.parse(str, &json_value)) {
+    LOG4CXX_ERROR(logger_, "Received invalid json string. ");
     return;
   }
 
@@ -139,7 +142,7 @@ void MessageBrokerAdapter::SubscribeTo() {
   MessageBrokerController::subscribeTo("RC.OnInteriorVehicleData");
   MessageBrokerController::subscribeTo("RC.OnRemoteControlSettings");
   MessageBrokerController::subscribeTo(
-      "SystemCapability.OnSystemCapabilityUpdated");
+      "BasicCommunication.OnSystemCapabilityUpdated");
 
   LOG4CXX_INFO(logger_, "Subscribed to notifications.");
 }
@@ -161,8 +164,8 @@ void MessageBrokerAdapter::ProcessRecievedFromMB(Json::Value& root) {
     return;
   }
 
-  Json::FastWriter writer;
-  std::string message_string = writer.write(root);
+  Json::StreamWriterBuilder writer_builder;
+  const std::string message_string = Json::writeString(writer_builder, root);
 
   if (message_string.empty()) {
     // LOG
diff --git a/src/components/hmi_message_handler/src/websocket_session.cc b/src/components/hmi_message_handler/src/websocket_session.cc
index 3d18da19d2..7ffb35aba6 100644
--- a/src/components/hmi_message_handler/src/websocket_session.cc
+++ b/src/components/hmi_message_handler/src/websocket_session.cc
@@ -31,6 +31,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "hmi_message_handler/websocket_session.h"
 #include <unistd.h>
 #include "hmi_message_handler/mb_controller.h"
+#include "utils/jsoncpp_reader_wrapper.h"
+
 using namespace boost::beast::websocket;
 namespace hmi_message_handler {
 
@@ -46,6 +48,7 @@ WebsocketSession::WebsocketSession(boost::asio::ip::tcp::socket socket,
     , shutdown_(false)
     , thread_delegate_(new LoopThreadDelegate(&message_queue_, this))
     , thread_(threads::CreateThread("WS Async Send", thread_delegate_)) {
+  m_writer["indentation"] = "";
   thread_->start(threads::ThreadOptions());
 }
 
@@ -92,7 +95,8 @@ void WebsocketSession::Recv(boost::system::error_code ec) {
                                                       std::placeholders::_2)));
 }
 
-void WebsocketSession::Send(std::string& message, Json::Value& json_message) {
+void WebsocketSession::Send(const std::string& message,
+                            Json::Value& json_message) {
   if (shutdown_) {
     return;
   }
@@ -102,7 +106,7 @@ void WebsocketSession::Send(std::string& message, Json::Value& json_message) {
 }
 
 void WebsocketSession::sendJsonMessage(Json::Value& message) {
-  std::string str_msg = m_writer.write(message);
+  const std::string str_msg = Json::writeString(m_writer, message) + '\n';
   sync_primitives::AutoLock auto_lock(queue_lock_);
   if (!isNotification(message) && !isResponse(message)) {
     mWaitResponseQueue.insert(std::map<std::string, std::string>::value_type(
@@ -128,14 +132,15 @@ void WebsocketSession::Read(boost::system::error_code ec,
   std::string data = boost::beast::buffers_to_string(buffer_.data());
   m_receivingBuffer += data;
 
+  utils::JsonReader reader;
   Json::Value root;
-  if (!m_reader.parse(m_receivingBuffer, root)) {
-    std::string str_err = "Invalid JSON Message: " + data;
-    LOG4CXX_ERROR(ws_logger_, str_err);
+
+  if (!reader.parse(data, &root)) {
+    LOG4CXX_ERROR(ws_logger_, "Invalid JSON Message.");
     return;
   }
 
-  std::string wmes = m_receiverWriter.write(root);
+  const std::string wmes = Json::writeString(m_receiver_writer, root);
   ssize_t beginpos = m_receivingBuffer.find(wmes);
   if (-1 != beginpos) {
     m_receivingBuffer.erase(0, beginpos + wmes.length());
@@ -304,12 +309,14 @@ void WebsocketSession::LoopThreadDelegate::exitThreadMain() {
 }
 
 void WebsocketSession::LoopThreadDelegate::DrainQueue() {
-  while (!message_queue_.empty()) {
-    Message message_ptr;
-    message_queue_.pop(message_ptr);
-    if (!shutdown_) {
-      handler_.ws_.write(boost::asio::buffer(*message_ptr));
-    };
+  Message message_ptr;
+  while (!shutdown_ && message_queue_.pop(message_ptr)) {
+    boost::system::error_code ec;
+    handler_.ws_.write(boost::asio::buffer(*message_ptr), ec);
+    if (ec) {
+      LOG4CXX_ERROR(ws_logger_,
+                    "A system error has occurred: " << ec.message());
+    }
   }
 }
 
diff --git a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc
index eaa274d0f4..c9ad49efed 100644
--- a/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc
+++ b/src/components/hmi_message_handler/test/hmi_message_handler_impl_test.cc
@@ -37,6 +37,7 @@
 #include "hmi_message_handler/mock_hmi_message_adapter_impl.h"
 #include "hmi_message_handler/mock_hmi_message_handler_settings.h"
 #include "hmi_message_handler/mock_hmi_message_observer.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/test_async_waiter.h"
 
 namespace test {
@@ -189,6 +190,53 @@ TEST_F(HMIMessageHandlerImplTest, SendMessageToHMI_Success) {
   EXPECT_TRUE(waiter.WaitFor(1, 100));
 }
 
+TEST(WebsocketSessionTest, SendMessage_UnpreparedConnection_WithoutFall) {
+  // Value "threadsafe" is preferable for this case, but as workaround for
+  // possible bug in gcc compiler value "fast" was set. Because of this warning
+  // message is appeared.
+
+  // ToDo: set value "threadsafe", if current version of gcc can handle
+  // this value correctly without causing of core dump.
+
+  ::testing::FLAGS_gtest_death_test_style = "fast";
+
+  auto send_message = []() {
+    auto message =
+        "{\"id\" : 1,\"jsonrpc\" : \"2.0\",\"method\" : "
+        "\"BasicCommunication.GetSystemInfo\"}";
+
+    utils::JsonReader reader;
+    Json::Value json_value;
+
+    ASSERT_TRUE(reader.parse(message, &json_value));
+
+    // Make unprepared connection
+    boost::asio::io_context ioc{1};
+    boost::asio::ip::tcp::acceptor acceptor{
+        ioc, {boost::asio::ip::make_address("127.0.0.1"), 8087}};
+    boost::asio::ip::tcp::socket socket{ioc};
+
+    std::unique_ptr<hmi_message_handler::WebsocketSession> session(
+        new hmi_message_handler::WebsocketSession(std::move(socket), nullptr));
+
+    // Send message to unprepared connection
+    session->sendJsonMessage(json_value);
+
+    // Wait for the message to be processed
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+    // Stopping connection thread
+    session->Shutdown();
+    session = nullptr;
+
+    exit(0);
+  };
+
+  // Expected exit code 0, if test terminate by other signal(SIGABRT or
+  // SIGSEGV), we will get failed test
+  EXPECT_EXIT(send_message(), ::testing::ExitedWithCode(0), "");
+}
+
 }  // namespace hmi_message_handler_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/include/application_manager/application_manager.h b/src/components/include/application_manager/application_manager.h
index 521eadf48e..9de5b3a143 100644
--- a/src/components/include/application_manager/application_manager.h
+++ b/src/components/include/application_manager/application_manager.h
@@ -38,7 +38,6 @@
 #include <string>
 #include <vector>
 #include "application_manager/application.h"
-#include "application_manager/command_factory.h"
 #include "application_manager/commands/command.h"
 #include "connection_handler/connection_handler.h"
 #include "utils/data_accessor.h"
@@ -46,14 +45,8 @@
 #include "application_manager/application_manager_settings.h"
 #include "application_manager/hmi_interfaces.h"
 #include "application_manager/plugin_manager/rpc_plugin_manager.h"
-#include "application_manager/policies/policy_handler_interface.h"
 #include "application_manager/state_controller.h"
 #include "policy/policy_types.h"
-#include "telemetry_monitor/telemetry_observable.h"
-
-namespace resumption {
-class LastState;
-}
 
 namespace app_launch {
 class AppLaunchCtrl;
@@ -76,6 +69,10 @@ namespace resumption {
 class ResumeCtrl;
 }
 
+namespace policy {
+class PolicyHandlerInterface;
+}
+
 namespace application_manager {
 
 namespace event_engine {
@@ -94,9 +91,12 @@ class StateControllerImpl;
 struct CommandParametersPermissions;
 using policy::RPCParams;
 typedef std::vector<ApplicationSharedPtr> AppSharedPtrs;
-struct ApplicationsAppIdSorter {
+struct ApplicationsSorter {
   bool operator()(const ApplicationSharedPtr lhs,
                   const ApplicationSharedPtr rhs) const {
+    if (lhs->app_id() == rhs->app_id()) {
+      return lhs->device() < rhs->device();
+    }
     return lhs->app_id() < rhs->app_id();
   }
 };
@@ -110,11 +110,17 @@ struct ApplicationsPolicyAppIdSorter {
   }
 };
 
-typedef std::set<ApplicationSharedPtr, ApplicationsAppIdSorter> ApplicationSet;
+typedef std::set<ApplicationSharedPtr, ApplicationsSorter> ApplicationSet;
 
 typedef std::set<ApplicationSharedPtr, ApplicationsPolicyAppIdSorter>
     AppsWaitRegistrationSet;
 
+/**
+ * @brief ReregisterWaitList is list of applications expected to be
+ * re-registered after transport switching is complete
+ */
+typedef std::vector<ApplicationSharedPtr> ReregisterWaitList;
+
 // typedef for Applications list iterator
 typedef ApplicationSet::iterator ApplicationSetIt;
 
@@ -125,10 +131,14 @@ class ApplicationManager {
  public:
   virtual ~ApplicationManager() {}
 
+  DEPRECATED
+  virtual bool Init(resumption::LastState&,
+                    media_manager::MediaManager* media_manager) = 0;
+
   /**
    * Inits application manager
    */
-  virtual bool Init(resumption::LastState& last_state,
+  virtual bool Init(resumption::LastStateWrapperPtr last_state_wrapper,
                     media_manager::MediaManager* media_manager) = 0;
 
   /**
@@ -156,8 +166,34 @@ class ApplicationManager {
   virtual DataAccessor<AppsWaitRegistrationSet> pending_applications()
       const = 0;
 
+  /**
+   * @brief CreatePendingApplication Add applicaiton to pending state
+   * All info mandatory for application will be fetched from policy database.
+   * Application will be stored to internal pending applicaitons list.
+   * UpdateAppList will not be trigerred
+   * Application will be created if app exists in policy database and
+   * nicknames are not empty
+   * @param policy_app_id app id to store
+   */
+  virtual void CreatePendingLocalApplication(
+      const std::string& policy_app_id) = 0;
+
+  /**
+   * @brief RemovePendingApplication Remove applicaiton from pending state
+   * Application will be removed from the internal pending applicaitons list.
+   * UpdateAppList will not be trigerred
+   * @param policy_app_id app id to remove
+   */
+  virtual void RemovePendingApplication(const std::string& policy_app_id) = 0;
+
+  virtual DataAccessor<ReregisterWaitList> reregister_applications() const = 0;
+
   virtual ApplicationSharedPtr application(uint32_t app_id) const = 0;
   virtual ApplicationSharedPtr active_application() const = 0;
+  virtual void OnQueryAppsRequest(
+      const connection_handler::DeviceHandle device) = 0;
+
+  virtual ApplicationSharedPtr get_full_or_limited_application() const = 0;
 
   /**
    * Function used only by HMI request/response/notification base classes
@@ -170,12 +206,17 @@ class ApplicationManager {
   virtual ApplicationSharedPtr application_by_policy_id(
       const std::string& policy_app_id) const = 0;
 
-  virtual ApplicationSharedPtr application_by_name(
+  DEPRECATED virtual ApplicationSharedPtr application_by_name(
       const std::string& app_name) const = 0;
 
   virtual ApplicationSharedPtr pending_application_by_policy_id(
       const std::string& policy_app_id) const = 0;
 
+  virtual ApplicationSharedPtr reregister_application_by_policy_id(
+      const std::string& policy_app_id) const = 0;
+
+  virtual AppSharedPtrs applications_by_name(
+      const std::string& app_name) const = 0;
   virtual AppSharedPtrs applications_by_button(uint32_t button) = 0;
   virtual AppSharedPtrs applications_with_navi() = 0;
 
@@ -265,26 +306,30 @@ class ApplicationManager {
   virtual void set_current_audio_source(const uint32_t source) = 0;
 
   /**
-   * @brief OnHMILevelChanged the callback that allows SDL to react when
+   * @brief OnHMIStateChanged the callback that allows SDL to react when
    * application's HMI level has been changed.
    *
-   * @param app_id application identifier for which HMILevel has been chaned.
+   * @param app_id application identifier for which HMIState has been chaned.
    *
-   * @param from previous HMILevel.
-   * @param to current HMILevel.
+   * @param from previous HMIState.
+   * @param to current HMIState.
    */
-  virtual void OnHMILevelChanged(uint32_t app_id,
-                                 mobile_apis::HMILevel::eType from,
-                                 mobile_apis::HMILevel::eType to) = 0;
+  virtual void OnHMIStateChanged(const uint32_t app_id,
+                                 const HmiStatePtr from,
+                                 const HmiStatePtr to) = 0;
 
   /**
-   * @brief Sends HMI status notification to mobile
-   *
-   * @param application_impl application with changed HMI status
-   *
-   **/
-  virtual void SendHMIStatusNotification(
-      const std::shared_ptr<Application> app) = 0;
+   * @brief Updates streaming service status for specified session and notifies
+   * HMI via notification if required
+   * @param service_type Id of service which status should be updated
+   * @param app_id Id of session which status should be updated
+   * @param streaming_data_available Availability of streaming data for
+   * specified session
+   */
+  virtual void ProcessOnDataStreamingNotification(
+      const protocol_handler::ServiceType service_type,
+      const uint32_t app_id,
+      const bool streaming_data_available) = 0;
 
   /**
    * @brief Checks if driver distraction state is valid, creates message
@@ -299,6 +344,14 @@ class ApplicationManager {
 
   /**
    * @brief Checks if Application is subscribed for way points
+   * @param Application id
+   * @return true if Application is subscribed for way points
+   * otherwise false
+   */
+  virtual bool IsAppSubscribedForWayPoints(uint32_t app_id) const = 0;
+
+  /**
+   * @brief Checks if Application is subscribed for way points
    * @param Application pointer
    * @return true if Application is subscribed for way points
    * otherwise false
@@ -307,12 +360,24 @@ class ApplicationManager {
 
   /**
    * @brief Subscribe Application for way points
+   * @param Application id
+   */
+  virtual void SubscribeAppForWayPoints(uint32_t id) = 0;
+
+  /**
+   * @brief Subscribe Application for way points
    * @param Application pointer
    */
   virtual void SubscribeAppForWayPoints(ApplicationSharedPtr app) = 0;
 
   /**
    * @brief Unsubscribe Application for way points
+   * @param Application id
+   */
+  virtual void UnsubscribeAppFromWayPoints(uint32_t app_id) = 0;
+
+  /**
+   * @brief Unsubscribe Application for way points
    * @param Application pointer
    */
   virtual void UnsubscribeAppFromWayPoints(ApplicationSharedPtr app) = 0;
@@ -324,6 +389,13 @@ class ApplicationManager {
   virtual bool IsAnyAppSubscribedForWayPoints() const = 0;
 
   /**
+   * @brief Save message after OnWayPointsChangeNotification reception
+   * @param way_points_message pointer to the smartobject
+   */
+  virtual void SaveWayPointsMessage(
+      smart_objects::SmartObjectSPtr way_points_message) = 0;
+
+  /**
    * @brief Get subscribed for way points
    * @return reference to set of subscribed apps for way points
    */
@@ -466,8 +538,7 @@ class ApplicationManager {
    * @param vehicle_info Enum value of type of vehicle data
    * @param new value (for integer values currently) of vehicle data
    */
-  virtual void IviInfoUpdated(mobile_apis::VehicleDataType::eType vehicle_info,
-                              int value) = 0;
+  virtual void IviInfoUpdated(const std::string& vehicle_info, int value) = 0;
 
   virtual ApplicationSharedPtr RegisterApplication(
       const std::shared_ptr<smart_objects::SmartObject>&
@@ -595,19 +666,20 @@ class ApplicationManager {
       mobile_api::AppInterfaceUnregisteredReason::eType reason) = 0;
 
   /**
-   * @brief Checks HMI level and returns true if streaming is allowed
+   * @brief Checks application HMI state and returns true if streaming is
+   * allowed
    * @param app_id Application id
    * @param service_type Service type to check
    * @return True if streaming is allowed, false in other case
    */
-  virtual bool HMILevelAllowsStreaming(
+  virtual bool HMIStateAllowsStreaming(
       uint32_t app_id, protocol_handler::ServiceType service_type) const = 0;
 
   /**
    * @brief Checks, if given RPC is allowed at current HMI level for specific
    * application in policy table
-   * @param policy_app_id Application id
-   * @param hmi_level Current HMI level of application
+   * @param app Application
+   * @param window_id id of application's window
    * @param function_id FunctionID of RPC
    * @param params_permissions Permissions for RPC parameters (e.g.
    * SubscribeVehicleData) defined in policy table
@@ -615,6 +687,7 @@ class ApplicationManager {
    */
   virtual mobile_apis::Result::eType CheckPolicyPermissions(
       const ApplicationSharedPtr app,
+      const WindowID window_id,
       const std::string& function_id,
       const RPCParams& rpc_params,
       CommandParametersPermissions* params_permissions = NULL) = 0;
@@ -635,11 +708,14 @@ class ApplicationManager {
   /**
    * @brief IsAppInReconnectMode check if application belongs to session
    * affected by transport switching at the moment
+   * @param device_id device indentifier
    * @param policy_app_id Application id
    * @return True if application is registered within session being switched,
    * otherwise - false
    */
-  virtual bool IsAppInReconnectMode(const std::string& policy_app_id) const = 0;
+  virtual bool IsAppInReconnectMode(
+      const connection_handler::DeviceHandle& device_id,
+      const std::string& policy_app_id) const = 0;
 
   virtual resumption::ResumeCtrl& resume_controller() = 0;
 
@@ -655,6 +731,13 @@ class ApplicationManager {
   virtual protocol_handler::MajorProtocolVersion SupportedSDLVersion()
       const = 0;
 
+  /**
+   * @brief Applies functor for each plugin
+   * @param functor Functor that will be applied to each plugin
+   */
+  virtual void ApplyFunctorForEachPlugin(
+      std::function<void(plugin_manager::RPCPlugin&)> functor) = 0;
+
   /*
    * @brief Converts connection string transport type representation
    * to HMI Common_TransportType
@@ -705,6 +788,7 @@ class ApplicationManager {
   /**
    * @brief CreateRegularState create regular HMI state for application
    * @param app Application
+   * @param window_type type of window
    * @param hmi_level of returned state
    * @param audio_state of returned state
    * @param system_context of returned state
@@ -712,10 +796,11 @@ class ApplicationManager {
    */
   virtual HmiStatePtr CreateRegularState(
       std::shared_ptr<Application> app,
-      mobile_apis::HMILevel::eType hmi_level,
-      mobile_apis::AudioStreamingState::eType audio_state,
-      mobile_apis::VideoStreamingState::eType video_state,
-      mobile_apis::SystemContext::eType system_context) const = 0;
+      const mobile_apis::WindowType::eType window_type,
+      const mobile_apis::HMILevel::eType hmi_level,
+      const mobile_apis::AudioStreamingState::eType audio_state,
+      const mobile_apis::VideoStreamingState::eType video_state,
+      const mobile_apis::SystemContext::eType system_context) const = 0;
 
   /**
    * @brief Checks if application can stream (streaming service is started and
@@ -727,11 +812,16 @@ class ApplicationManager {
   virtual bool CanAppStream(
       uint32_t app_id, protocol_handler::ServiceType service_type) const = 0;
 
+  DEPRECATED
+  virtual void ForbidStreaming(uint32_t app_id) = 0;
+
   /**
    * @brief ForbidStreaming forbid the stream over the certain application.
    * @param app_id the application's id which should stop streaming.
+   * @param service_type Service type to check
    */
-  virtual void ForbidStreaming(uint32_t app_id) = 0;
+  virtual void ForbidStreaming(uint32_t app_id,
+                               protocol_handler::ServiceType service_type) = 0;
 
   /**
    * @brief Called when application completes streaming configuration
diff --git a/src/components/include/application_manager/application_manager_settings.h b/src/components/include/application_manager/application_manager_settings.h
index 0f73ea94ed..5b3dfc26df 100644
--- a/src/components/include/application_manager/application_manager_settings.h
+++ b/src/components/include/application_manager/application_manager_settings.h
@@ -72,7 +72,9 @@ class ApplicationManagerSettings : public RequestControlerSettings,
   virtual const std::string& tts_delimiter() const = 0;
   virtual const uint32_t& put_file_in_none() const = 0;
   virtual const std::string& sdl_version() const = 0;
+  virtual const std::string& vr_help_title() const = 0;
   virtual const std::vector<std::string>& time_out_promt() const = 0;
+  virtual const std::vector<std::string>& help_prompt() const = 0;
   virtual const std::string& hmi_capabilities_file_name() const = 0;
   virtual const std::string& video_server_type() const = 0;
   virtual const std::string& audio_server_type() const = 0;
@@ -83,6 +85,7 @@ class ApplicationManagerSettings : public RequestControlerSettings,
   virtual const std::string& named_audio_pipe_path() const = 0;
   virtual const std::string& video_stream_file() const = 0;
   virtual const std::string& audio_stream_file() const = 0;
+  virtual uint16_t period_for_consent_expiration() const = 0;
 
   virtual bool use_full_app_id() const = 0;
   virtual uint32_t rpc_pass_through_timeout() const = 0;
diff --git a/src/components/include/application_manager/hmi_capabilities.h b/src/components/include/application_manager/hmi_capabilities.h
index 10ca40ca81..aaa041477d 100644
--- a/src/components/include/application_manager/hmi_capabilities.h
+++ b/src/components/include/application_manager/hmi_capabilities.h
@@ -37,13 +37,10 @@
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
 #include "json/json.h"
+#include "resumption/last_state_wrapper.h"
 #include "smart_objects/smart_object.h"
 #include "utils/macro.h"
 
-namespace resumption {
-class LastState;
-}
-
 namespace application_manager {
 class ApplicationManager;
 
@@ -63,9 +60,9 @@ class HMICapabilities {
   virtual HMILanguageHandler& get_hmi_language_handler() = 0;
 
   /*
-   * @brief Checks is image type(Static/Dynamic) requested by
+   * @brief Checks if image type(Static/Dynamic) requested by
    * Mobile Device is supported on current HMI.
-   * @param image_type recieved type of image from Enum.
+   * @param image_type received type of image from Enum.
    * @return Bool true if supported
    */
   virtual bool VerifyImageType(const int32_t image_type) const = 0;
@@ -219,7 +216,7 @@ class HMICapabilities {
    *
    * @return Currently supported display capabilities
    */
-  virtual const smart_objects::SmartObject* display_capabilities() const = 0;
+  virtual const smart_objects::SmartObjectSPtr display_capabilities() const = 0;
 
   /*
    * @brief Sets supported display capabilities
@@ -230,11 +227,26 @@ class HMICapabilities {
       const smart_objects::SmartObject& display_capabilities) = 0;
 
   /*
+   * @brief Retrieves information about the display capability
+   * @return Currently supported display capability
+   */
+  virtual const smart_objects::SmartObjectSPtr system_display_capabilities()
+      const = 0;
+
+  /*
+   * @brief Sets supported display capability
+   * @param display_capabilities supported display capability
+   */
+  virtual void set_system_display_capabilities(
+      const smart_objects::SmartObject& display_capabilities) = 0;
+
+  /*
    * @brief Retrieves information about the HMI zone capabilities
    *
    * @return Currently supported HMI zone capabilities
    */
-  virtual const smart_objects::SmartObject* hmi_zone_capabilities() const = 0;
+  virtual const smart_objects::SmartObjectSPtr hmi_zone_capabilities()
+      const = 0;
 
   /*
    * @brief Sets supported HMI zone capabilities
@@ -249,7 +261,7 @@ class HMICapabilities {
    *
    * @return Currently supported SoftButton's capabilities
    */
-  virtual const smart_objects::SmartObject* soft_button_capabilities()
+  virtual const smart_objects::SmartObjectSPtr soft_button_capabilities()
       const = 0;
 
   /*
@@ -265,7 +277,7 @@ class HMICapabilities {
    *
    * @return Currently supported Button's capabilities
    */
-  virtual const smart_objects::SmartObject* button_capabilities() const = 0;
+  virtual const smart_objects::SmartObjectSPtr button_capabilities() const = 0;
 
   /*
    * @brief Sets supported Button's capabilities
@@ -288,7 +300,7 @@ class HMICapabilities {
    *
    * @return Currently supported speech capabilities
    */
-  virtual const smart_objects::SmartObject* speech_capabilities() const = 0;
+  virtual const smart_objects::SmartObjectSPtr speech_capabilities() const = 0;
 
   /*
    * @brief Sets supported VR capabilities
@@ -303,7 +315,7 @@ class HMICapabilities {
    *
    * @return Currently supported VR capabilities
    */
-  virtual const smart_objects::SmartObject* vr_capabilities() const = 0;
+  virtual const smart_objects::SmartObjectSPtr vr_capabilities() const = 0;
 
   /*
    * @brief Sets supported audio_pass_thru capabilities
@@ -318,7 +330,7 @@ class HMICapabilities {
    *
    * @return Currently supported audio_pass_thru capabilities
    */
-  virtual const smart_objects::SmartObject* audio_pass_thru_capabilities()
+  virtual const smart_objects::SmartObjectSPtr audio_pass_thru_capabilities()
       const = 0;
 
   /*
@@ -334,14 +346,15 @@ class HMICapabilities {
    *
    * @return Currently supported pcm_streaming capabilities
    */
-  virtual const smart_objects::SmartObject* pcm_stream_capabilities() const = 0;
+  virtual const smart_objects::SmartObjectSPtr pcm_stream_capabilities()
+      const = 0;
 
   /*
    * @brief Retrieves information about the preset bank capabilities
    *
    * @return Currently supported preset bank capabilities
    */
-  virtual const smart_objects::SmartObject* preset_bank_capabilities()
+  virtual const smart_objects::SmartObjectSPtr preset_bank_capabilities()
       const = 0;
 
   /*
@@ -365,14 +378,14 @@ class HMICapabilities {
    *
    * @param vehicle_type Cuurent vehicle information
    */
-  virtual const smart_objects::SmartObject* vehicle_type() const = 0;
+  virtual const smart_objects::SmartObjectSPtr vehicle_type() const = 0;
 
   /*
    * @brief Retrieves information about the prerecorded speech
    *
    * @return Currently supported prerecorded speech
    */
-  virtual const smart_objects::SmartObject* prerecorded_speech() const = 0;
+  virtual const smart_objects::SmartObjectSPtr prerecorded_speech() const = 0;
 
   /*
    * @brief Sets supported prerecorded speech
@@ -515,14 +528,36 @@ class HMICapabilities {
 
   virtual const smart_objects::SmartObject* rc_capability() const = 0;
 
+<<<<<<< HEAD
   virtual void set_driver_distraction_capability(
       const smart_objects::SmartObject& rc_capability) = 0;
 
   virtual const smart_objects::SmartObject* driver_distraction_capability()
       const = 0;
 
+=======
+  /**
+   * @brief Sets available SeatLocation capabilities for further usage by
+   * RC functionality
+   * @param seat_location_capability capabilities to set
+   */
+  virtual void set_seat_location_capability(
+      const smart_objects::SmartObject& seat_location_capability) = 0;
+
+  /**
+   * @brief seat_location_capability Retrieves information regarding the
+   * seat location capability
+   * @return smart object of seat location capability
+   */
+  virtual const smart_objects::SmartObject* seat_location_capability()
+      const = 0;
+
+  DEPRECATED
+>>>>>>> origin/develop
   virtual void Init(resumption::LastState* last_state) = 0;
 
+  virtual void Init(resumption::LastStateWrapperPtr last_state_wrapper) = 0;
+
   /**
    * @brief Trigger waiting for response
    * @param request Request object
@@ -547,6 +582,18 @@ class HMICapabilities {
   virtual void convert_json_languages_to_obj(
       const Json::Value& json_languages,
       smart_objects::SmartObject& languages) const = 0;
+
+  /*
+   * @brief function that converts a single entry of audio pass thru capability
+   *        to smart object
+   *
+   * @param capability json object that represents a single entry of audio pass
+   *        thru capability
+   * @param output_so the converted object
+   */
+  virtual void convert_audio_capability_to_obj(
+      const Json::Value& capability,
+      smart_objects::SmartObject& output_so) const = 0;
 };
 
 }  //  namespace application_manager
diff --git a/src/components/include/application_manager/policies/policy_encryption_flag_getter.h b/src/components/include/application_manager/policies/policy_encryption_flag_getter.h
new file mode 100644
index 0000000000..1a004fb926
--- /dev/null
+++ b/src/components/include/application_manager/policies/policy_encryption_flag_getter.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_ENCRYPTION_FLAG_GETTER
+#define SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_ENCRYPTION_FLAG_GETTER
+
+#include <string>
+#include "policy/policy_table/types.h"
+
+using rpc::policy_table_interface_base::Strings;
+
+namespace policy {
+/*
+ * @brief PolicyEncryptionFlagGetterInterface interface
+ */
+class PolicyEncryptionFlagGetterInterface {
+ public:
+  /*!
+   * @brief virtual destructor PolicyEncryptionFlagGetterInterface
+   */
+  virtual ~PolicyEncryptionFlagGetterInterface() {}
+
+  /*
+   * @brief retreives flag whether given application needs encryption
+   * @param policy_app_id policy app id
+   * @return true if the app need encryption
+   */
+  virtual bool AppNeedEncryption(const std::string& policy_app_id) const = 0;
+
+  /*
+   * @brief Retrieves encryption required flag on the application level
+   * @param policy_app_id policy app id
+   * @return true if the app need encryption
+   */
+  virtual const rpc::Optional<rpc::Boolean> GetAppEncryptionRequired(
+      const std::string& policy_app_id) const = 0;
+
+  /*
+   * @brief retreives function group for app
+   * @param policy_app_id policy app id
+   * @return groups that exist for app
+   */
+  virtual const std::vector<std::string> GetFunctionalGroupsForApp(
+      const std::string& policy_app_id) const = 0;
+
+  /*
+   * @brief retreives flag indicating whether function group needs encryption
+   * @param policy_group group
+   * @return true if the group need encryption
+   */
+  virtual bool FunctionGroupNeedEncryption(
+      const std::string& policy_group) const = 0;
+
+  /*
+   * @brief retreives rpcs for given function group
+   * @param policy_group group
+   * @return RPCs that exists in group
+   */
+  virtual const std::vector<std::string> GetRPCsForFunctionGroup(
+      const std::string& group) const = 0;
+
+  /*
+   * @brief retreives policy function name
+   * @param function_id function id
+   * @return policy function name
+   */
+  virtual const std::string GetPolicyFunctionName(
+      const uint32_t function_id) const = 0;
+  /*
+   * @brief retrieves application names from policy table
+   * @return container with policy application names
+   */
+  virtual const std::vector<std::string> GetApplicationPolicyIDs() const = 0;
+};
+
+}  // namespace policy
+#endif  // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_POLICIES_POLICY_ENCRYPTION_FLAG_GETTER
diff --git a/src/components/include/application_manager/policies/policy_handler_interface.h b/src/components/include/application_manager/policies/policy_handler_interface.h
index 835ddedd28..1c039d6a88 100644
--- a/src/components/include/application_manager/policies/policy_handler_interface.h
+++ b/src/components/include/application_manager/policies/policy_handler_interface.h
@@ -41,6 +41,8 @@
 #include "boost/optional.hpp"
 
 #include "application_manager/application.h"
+#include "application_manager/policies/custom_vehicle_data_provider.h"
+#include "application_manager/policies/policy_encryption_flag_getter.h"
 #include "application_manager/policies/policy_handler_observer.h"
 #include "interfaces/MOBILE_API.h"
 #include "policy/cache_manager_interface.h"
@@ -52,44 +54,71 @@
 #include "utils/callable.h"
 #include "utils/custom_string.h"
 #include "utils/optional.h"
+#ifdef EXTERNAL_PROPRIETARY_MODE
+#include "policy/ptu_retry_handler.h"
+#endif  // EXTERNAL_PROPRIETARY_MODE
 
 using namespace ::rpc::policy_table_interface_base;
 namespace policy {
 typedef std::shared_ptr<utils::Callable> StatusNotifier;
+typedef std::shared_ptr<PolicyEncryptionFlagGetterInterface>
+    PolicyEncryptionFlagGetterInterfaceSPtr;
 
-class PolicyHandlerInterface {
+class PTURetryHandler;
+
+class PolicyHandlerInterface : public VehicleDataItemProvider {
  public:
   virtual ~PolicyHandlerInterface() {}
 
   virtual bool LoadPolicyLibrary() = 0;
+  virtual PolicyEncryptionFlagGetterInterfaceSPtr PolicyEncryptionFlagGetter()
+      const = 0;
   virtual bool PolicyEnabled() const = 0;
   virtual bool InitPolicyTable() = 0;
   virtual bool ResetPolicyTable() = 0;
   virtual bool ClearUserConsent() = 0;
-  virtual bool SendMessageToSDK(const BinaryMessage& pt_string,
-                                const std::string& url) = 0;
+  // Deprecated in favor of private variant
+  DEPRECATED virtual bool SendMessageToSDK(const BinaryMessage& pt_string,
+                                           const std::string& url) = 0;
   virtual bool ReceiveMessageFromSDK(const std::string& file,
                                      const BinaryMessage& pt_string) = 0;
   virtual bool UnloadPolicyLibrary() = 0;
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions,
                                     const HMILevel& default_hmi) = 0;
-
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions) = 0;
 
 #ifdef EXTERNAL_PROPRIETARY_MODE
   virtual void OnSnapshotCreated(const BinaryMessage& pt_string,
                                  const std::vector<int>& retry_delay_seconds,
                                  uint32_t timeout_exchange) = 0;
+
+  virtual PTURetryHandler& ptu_retry_handler() const = 0;
 #else   // EXTERNAL_PROPRIETARY_MODE
-  virtual void OnSnapshotCreated(const BinaryMessage& pt_string) = 0;
+  virtual void OnSnapshotCreated(const BinaryMessage& pt_string,
+                                 const PTUIterationType iteration_type) = 0;
+
+  /**
+   * @brief Get the next available PTU URL and the associated application for
+   * performing the PTU
+   * @param iteration_type The iteration type of the PTU.
+   * If this is a retry and a retry URL was cached, that URL will be returned
+   * @param app_id Filled with the ID of application used to perform the PTU on
+   * success
+   * @return The next available PTU URL on success, empty string on failure
+   */
+  virtual std::string GetNextUpdateUrl(const PTUIterationType iteration_type,
+                                       uint32_t& app_id) = 0;
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
   virtual bool GetPriority(const std::string& policy_app_id,
                            std::string* priority) const = 0;
   virtual void CheckPermissions(
       const application_manager::ApplicationSharedPtr app,
+      const application_manager::WindowID window_id,
       const PTString& rpc,
       const RPCParams& rpc_params,
       CheckPermissionResult& result) = 0;
@@ -98,16 +127,26 @@ class PolicyHandlerInterface {
       const std::string& priority) const = 0;
   virtual DeviceConsent GetUserConsentForDevice(
       const std::string& device_id) const = 0;
-  virtual bool GetDefaultHmi(const std::string& policy_app_id,
+  virtual bool GetDefaultHmi(const std::string& device_id,
+                             const std::string& policy_app_id,
                              std::string* default_hmi) const = 0;
   virtual bool GetInitialAppData(const std::string& application_id,
                                  StringArray* nicknames = NULL,
                                  StringArray* app_hmi_types = NULL) = 0;
   virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points) = 0;
+                             EndpointUrls& out_end_points) const = 0;
   virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points) = 0;
-  virtual std::string GetLockScreenIconUrl() const = 0;
+                             EndpointUrls& out_end_points) const = 0;
+  virtual Json::Value GetPolicyTableData() const = 0;
+
+  /**
+   * @brief Gets lock screen icon URL for a requested application
+   * @param policy_app_id policy application id
+   * @return URL for a requested application
+   */
+  virtual std::string GetLockScreenIconUrl(
+      const std::string& policy_app_id = kDefaultId) const = 0;
+
   virtual std::string GetIconUrl(const std::string& policy_app_id) const = 0;
   virtual uint32_t NextRetryTimeout() = 0;
 
@@ -123,7 +162,6 @@ class PolicyHandlerInterface {
    */
   virtual uint32_t TimeoutExchangeMSec() const = 0;
   virtual void OnExceededTimeout() = 0;
-  virtual void OnSystemReady() = 0;
   virtual const boost::optional<bool> LockScreenDismissalEnabledState()
       const = 0;
   virtual const boost::optional<std::string> LockScreenDismissalWarningMessage(
@@ -137,6 +175,14 @@ class PolicyHandlerInterface {
 
   virtual void SendOnAppPermissionsChanged(
       const AppPermissions& permissions,
+      const std::string& device_id,
+      const std::string& policy_app_id) const = 0;
+
+  /**
+   * @brief Send OnAppPropertiesChangeNotification to the HMI
+   * @param policy_app_id policy app id
+   */
+  virtual void SendOnAppPropertiesChangeNotification(
       const std::string& policy_app_id) const = 0;
 
   /**
@@ -176,7 +222,8 @@ class PolicyHandlerInterface {
    */
   virtual void OnIgnitionCycleOver() = 0;
 
-  virtual void OnPendingPermissionChange(const std::string& policy_app_id) = 0;
+  virtual void OnPendingPermissionChange(const std::string& device_id,
+                                         const std::string& policy_app_id) = 0;
 
   /**
    * Initializes PT exchange at user request
@@ -255,9 +302,11 @@ class PolicyHandlerInterface {
   /**
    * @brief Update currently used device id in policies manager for given
    * application
+   * @param device_handle device identifier
    * @param policy_app_id Application id
    */
   virtual std::string OnCurrentDeviceIdUpdateRequired(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) = 0;
 
   /**
@@ -277,11 +326,6 @@ class PolicyHandlerInterface {
                                const std::string& language) = 0;
 
   /**
-   * @brief Send request to HMI to get update on system parameters
-   */
-  virtual void OnSystemInfoUpdateRequired() = 0;
-
-  /**
    * @brief Sends GetVehicleData request in case when Vechicle info is ready.
    */
   virtual void OnVIIsReady() = 0;
@@ -311,9 +355,38 @@ class PolicyHandlerInterface {
    */
   virtual void OnSystemError(int code) = 0;
 
+#ifndef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief Chooses and stores random application id to be used for snapshot
+   * sending considering HMI level
+   * @param iteration_type The iteration type of the request. If RetryIteration,
+   * the previously chosen app ID (via ChoosePTUApplication or CacheRetryInfo)
+   * will be returned if available
+   * @return Application id or 0, if there are no suitable applications
+   */
+  virtual uint32_t ChoosePTUApplication(
+      const PTUIterationType iteration_type =
+          PTUIterationType::DefaultIteration) = 0;
+
+  /**
+   * @brief Update the cached URL and app ID used for policy retries
+   * @param app_id The ID of the application to be used for performing PTUs.
+   * If 0, the existing cached application will be cleared
+   * @param url The URL provided by the HMI to be used for performing PTU
+   * retries. If empty, the existing cached URL will be cleared and Core will
+   * choose which URLs to use on retry
+   * @param snapshot_path The PT snapshot path provided by the HMI. If empty,
+   * the existing cached snapshot path will be cleared.
+   */
+  virtual void CacheRetryInfo(
+      const uint32_t app_id = 0,
+      const std::string url = std::string(),
+      const std::string snapshot_path = std::string()) = 0;
+#endif  // EXTERNAL_PROPRIETARY_MODE
+
   /**
-   * @brief Choose application id to be used for snapshot sending
-   * @return Application id or 0, if there are no applications registered
+   * @brief Retrieve potential application id to be used for snapshot sending
+   * @return Application id or 0, if there are no suitable applications
    */
   virtual uint32_t GetAppIdForSending() const = 0;
 
@@ -327,6 +400,13 @@ class PolicyHandlerInterface {
 
   virtual void OnPTUFinished(const bool ptu_result) = 0;
 
+  virtual void OnPTInited() = 0;
+
+  /**
+   * @brief Force stops retry sequence timer and resets retry sequence
+   */
+  virtual void StopRetrySequence() = 0;
+
 #ifdef EXTERNAL_PROPRIETARY_MODE
   virtual void OnCertificateDecrypted(bool is_succeeded) = 0;
 #endif  // EXTERNAL_PROPRIETARY_MODE
@@ -342,10 +422,12 @@ class PolicyHandlerInterface {
   /**
    * @brief Allows to add new or update existed application during
    * registration process
+   * @param device_id device identifier
    * @param application_id The policy aplication id.
    * @return function that will notify update manager about new application
    */
   virtual StatusNotifier AddApplication(
+      const std::string& device_id,
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) = 0;
 
@@ -380,21 +462,33 @@ class PolicyHandlerInterface {
   virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0;
 
   /**
+   * @brief Notify that new application was added to application list
+   * @param new_app_id app_id for this application
+   * @param policy_id policy_id for this application
+   */
+  virtual void OnAddedNewApplicationToAppList(const uint32_t new_app_id,
+                                              const std::string& policy_id) = 0;
+
+  /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
    * succesfully registered on mobile device.
    * It will send OnAppPermissionSend notification and will try to start PTU.
    *
+   * @param device_id device identifier
    * @param application_id registered application.
    */
-  virtual void OnAppRegisteredOnMobile(const std::string& application_id) = 0;
+  virtual void OnAppRegisteredOnMobile(const std::string& device_id,
+                                       const std::string& application_id) = 0;
 
   /**
    * @brief Checks if certain request type is allowed for application
+   * @param device_handle device identifier
    * @param policy_app_id Unique applicaion id
    * @param type Request type
    * @return true, if allowed, otherwise - false
    */
   virtual bool IsRequestTypeAllowed(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id,
       mobile_apis::RequestType::eType type) const = 0;
 
@@ -426,10 +520,12 @@ class PolicyHandlerInterface {
 
   /**
    * @brief Gets application request types
+   * @param device_handle device identifier
    * @param policy_app_id Unique application id
    * @return request types
    */
   virtual const std::vector<std::string> GetAppRequestTypes(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) const = 0;
 
   /**
@@ -441,10 +537,11 @@ class PolicyHandlerInterface {
       const std::string& policy_app_id) const = 0;
 
   /**
-   * @brief Gets vehicle information
-   * @return Structure with vehicle information
+   * @brief Get a list of policy app ids
+   * @return apps list filled with the policy app ids of each
+   * application
    */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
+  virtual std::vector<std::string> GetApplicationPolicyIDs() const = 0;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -464,29 +561,63 @@ class PolicyHandlerInterface {
       const std::string& policy_app_id) const = 0;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  virtual std::vector<std::string> GetEnabledLocalApps() const = 0;
+
+  /**
+   * @brief Get app policy information, all fields that aren't set for a
    * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(
-      const std::string& policy_app_id,
-      bool& enabled,
-      std::string& endpoint,
-      std::string& certificate,
-      std::string& auth_token,
-      std::string& cloud_transport_type,
-      std::string& hybrid_app_preference) const = 0;
+   * @param policy_app_id policy app id
+   * @param out_app_properties application properties
+   * @return true if application presents in database, otherwise - false
+   */
+  virtual bool GetAppProperties(const std::string& policy_app_id,
+                                AppProperties& out_app_properties) const = 0;
+
+  /**
+   * @brief Callback for when a BC.SetAppProperties message is
+   * received from the HMI
+   * @param message The BC.SetAppProperties message
+   */
+  virtual void OnSetAppProperties(
+      const smart_objects::SmartObject& properties) = 0;
+
+  enum class AppPropertiesState {
+    NO_CHANGES,
+    ENABLED_FLAG_SWITCH,
+    AUTH_TOKEN_CHANGED,
+    TRANSPORT_TYPE_CHANGED,
+    ENDPOINT_CHANGED,
+    NICKNAMES_CHANGED,
+    HYBRYD_APP_PROPERTIES_CHANGED
+  };
+
+  /**
+   * @brief Checks if the application properties were changed. Compares the
+   * properties received from the HMI with the stored properties in the database
+   * @param properties new app properties
+   * @param app_id application id
+   * @return AppPropertiesState enum value that indicates which property has
+   * been changed
+   */
+  virtual AppPropertiesState GetAppPropertiesStatus(
+      const smart_objects::SmartObject& properties,
+      const std::string& app_id) const = 0;
+
+  /**
+   * @brief Check if certain application already in policy db.
+   * @param policy application id.
+   * @return true if application presents false otherwise.
+   */
+  virtual bool IsNewApplication(const std::string& application_id) const = 0;
+
+  /**
+   * @brief OnLocalAppAdded triggers PTU
+   */
+  virtual void OnLocalAppAdded() = 0;
 
   /**
    * @brief Callback for when a SetCloudAppProperties message is received from a
@@ -565,10 +696,12 @@ class PolicyHandlerInterface {
 
   /**
    * @brief Sets HMI default type for specified application
+   * @param device_handle device identifier
    * @param application_id ID application
    * @param app_types list of HMI types
    */
   virtual void SetDefaultHmiTypes(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& application_id,
       const smart_objects::SmartObject* app_types) = 0;
 
@@ -620,6 +753,12 @@ class PolicyHandlerInterface {
                                  const std::string& hmi_level) = 0;
 
   /**
+   * @brief OnPTUTimeOut the callback which is performed when PTU timeout
+   * occurred
+   */
+  virtual void OnPTUTimeOut() = 0;
+
+  /**
    * Gets all allowed module types
    * @param app_id unique identifier of application
    * @param list of allowed module types
@@ -628,6 +767,21 @@ class PolicyHandlerInterface {
   virtual bool GetModuleTypes(const std::string& policy_app_id,
                               std::vector<std::string>* modules) const = 0;
 
+  /**
+   * @brief Notifies policy manager about OnSystemRequest
+   * notification receiving
+   */
+  virtual void OnSystemRequestReceived() const = 0;
+
+  /**
+   * @brief Triggers a PolicyTableUpdate on startup (only if an update is
+   * required)
+   *
+   * Currently, this function is only implemented for regular policies
+   * since the device consent is not enabled by default for external policies.
+   */
+  virtual void TriggerPTUOnStartupIfRequired() = 0;
+
  private:
 /**
  * @brief Processes data received via OnAppPermissionChanged notification
diff --git a/src/components/include/application_manager/policies/policy_handler_observer.h b/src/components/include/application_manager/policies/policy_handler_observer.h
index 9c1091d0a8..fc22d196df 100644
--- a/src/components/include/application_manager/policies/policy_handler_observer.h
+++ b/src/components/include/application_manager/policies/policy_handler_observer.h
@@ -53,6 +53,20 @@ class PolicyHandlerObserver {
 
   virtual void OnPTUFinished(const bool ptu_result) {}
 
+  virtual void OnPTInited() {}
+
+  virtual void OnPTUTimeoutExceeded() {}
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief OnCertDecryptFinished is called when certificate decryption is
+   * finished in the external flow
+   * @param decrypt_result bool value indicating whether decryption was
+   * successful
+   */
+  virtual void OnCertDecryptFinished(const bool decrypt_result) {}
+#endif
+
   virtual ~PolicyHandlerObserver() {}
 };
 }  //  namespace policy
diff --git a/src/components/include/application_manager/rpc_handler.h b/src/components/include/application_manager/rpc_handler.h
index f42d7deb2f..aafb81b853 100644
--- a/src/components/include/application_manager/rpc_handler.h
+++ b/src/components/include/application_manager/rpc_handler.h
@@ -38,11 +38,14 @@
 
 #ifdef TELEMETRY_MONITOR
 #include "application_manager/telemetry_observer.h"
+#include "telemetry_monitor/telemetry_observable.h"
 #endif  // TELEMETRY_MONITOR
 
 namespace application_manager {
 namespace rpc_handler {
 
+using ns_smart_device_link::ns_smart_objects::SMember;
+
 class RPCHandler
     : public hmi_message_handler::HMIMessageObserver,
       public protocol_handler::ProtocolObserver
diff --git a/src/components/include/application_manager/rpc_service.h b/src/components/include/application_manager/rpc_service.h
index d052c4ed0a..630070074a 100644
--- a/src/components/include/application_manager/rpc_service.h
+++ b/src/components/include/application_manager/rpc_service.h
@@ -36,11 +36,16 @@
 #include "application_manager/commands/command.h"
 #include "application_manager/message.h"
 #include "hmi_message_handler/hmi_message_handler.h"
+#include "interfaces/HMI_API_schema.h"
+#include "interfaces/MOBILE_API_schema.h"
 #include "protocol_handler/protocol_handler.h"
+#include "smart_objects/object_schema_item.h"
 
 namespace application_manager {
 namespace rpc_service {
 
+using ns_smart_device_link::ns_smart_objects::SMember;
+
 class RPCService {
  public:
   virtual ~RPCService() {}
@@ -48,19 +53,31 @@ class RPCService {
   /**
    * @brief ManageMobileCommand convert message to mobile command and execute it
    * @param message pointer to received message
-   * @param origin origin of command
+   * @param source source of command
+   * @param warning_info warning message to send on a successful response. Only
+   * applies to requests from mobile.
    * @return true if command is executed, otherwise return false
    */
   virtual bool ManageMobileCommand(const commands::MessageSharedPtr message,
                                    commands::Command::CommandSource source) = 0;
+  virtual bool ManageMobileCommand(const commands::MessageSharedPtr message,
+                                   commands::Command::CommandSource source,
+                                   const std::string warning_info) = 0;
+
   /**
    * @brief ManageHMICommand convert message to HMI command and execute it
    * @param message pointer to received message
+   * @param source source of command
+   * @param warning_info warning message to send on a successful response. Only
+   * applies to requests from HMI.
    * @return true if command is executed, otherwise return false
    */
   virtual bool ManageHMICommand(const commands::MessageSharedPtr message,
                                 commands::Command::CommandSource source =
                                     commands::Command::SOURCE_HMI) = 0;
+  virtual bool ManageHMICommand(const commands::MessageSharedPtr message,
+                                commands::Command::CommandSource source,
+                                const std::string warning_info) = 0;
 
   /**
    * @brief SendMessageToMobile Put message to the queue to be sent to mobile.
@@ -81,12 +98,26 @@ class RPCService {
    * to app services or handled by app services plugin)
    * @param function_id RPC function id
    * @param source RPC command source
-   * @param rpc_passing Reference to bool. Set to true to enable rpc pasing
    * @return true if App Services can handle RPC
    */
   virtual bool IsAppServiceRPC(int32_t function_id,
                                commands::Command::CommandSource source) = 0;
 
+  virtual void UpdateMobileRPCParams(
+      const mobile_apis::FunctionID::eType& function_id,
+      const mobile_apis::messageType::eType& message_type,
+      const std::map<std::string, SMember>& members) = 0;
+
+  virtual void UpdateHMIRPCParams(
+      const hmi_apis::FunctionID::eType& function_id,
+      const hmi_apis::messageType::eType& message_type,
+      const std::map<std::string, SMember>& members) = 0;
+
+  /**
+   * @brief Stop RPC service by shutting down hmi and mobile message queues
+   */
+  virtual void Stop() = 0;
+
   /**
    * @brief set_protocol_handler
    * @param handler
diff --git a/src/components/include/application_manager/state_controller.h b/src/components/include/application_manager/state_controller.h
index fa0d65eb0c..2fa4b0c218 100644
--- a/src/components/include/application_manager/state_controller.h
+++ b/src/components/include/application_manager/state_controller.h
@@ -41,48 +41,145 @@
 namespace application_manager {
 class StateController {
  public:
+  /**
+   * @brief SetRegularState setup regular hmi state, that  will appear if
+   * no specific events are active
+   * @param app appication to setup regular State
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param state state of new regular state
+   * @param request_hmi_state_change: if true, ActivateAppRequest or
+   * CloseApplication will be sent to HMI dependent on hmi level of resolved hmi
+   * state
+   */
   virtual void SetRegularState(ApplicationSharedPtr app,
+                               const WindowID window_id,
                                HmiStatePtr state,
                                const bool request_hmi_state_change) = 0;
 
+  /**
+   * @brief SetRegularState Change regular hmi level and audio state
+   * @param app appication to setup regular State
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param hmi_level of new regular state
+   * @param audio_state of new regular state
+   * @paran video_state of new regular state
+   * @param request_hmi_state_change: if true, ActivateAppRequest or
+   * CloseApplication will be sent to HMI dependent on hmi level of resolved hmi
+   * state
+   */
   virtual void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::HMILevel::eType hmi_level,
       const mobile_apis::AudioStreamingState::eType audio_state,
       const mobile_apis::VideoStreamingState::eType video_state,
       const bool request_hmi_state_change) = 0;
 
+  /**
+   * @brief SetRegularState Change regular hmi level
+   * @param app appication to setup regular State
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param hmi_level of new regular state
+   * @param request_hmi_state_change: if true, ActivateAppRequest or
+   * CloseApplication will be sent to HMI dependent on hmi level of resolved hmi
+   * state
+   */
   virtual void SetRegularState(ApplicationSharedPtr app,
+                               const WindowID window_id,
                                const mobile_apis::HMILevel::eType hmi_level,
                                const bool request_hmi_state_change) = 0;
+  /**
+   * @brief SetRegularState Change regular hmi level, audio state and system
+   * context
+   * @param app appication to setup regular State
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param hmi_level of new regular state
+   * @param audio_state of new regular state
+   * @param video_state of new regular state
+   * @param system_context of new regular state
+   * @param request_hmi_state_change: if true, ActivateAppRequest or
+   * CloseApplication will be sent to HMI dependent on hmi level of resolved hmi
+   * state
+   */
   virtual void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::HMILevel::eType hmi_level,
       const mobile_apis::AudioStreamingState::eType audio_state,
       const mobile_apis::VideoStreamingState::eType video_state,
       const mobile_apis::SystemContext::eType system_context,
       const bool request_hmi_state_change) = 0;
 
+  /**
+   * @brief SetRegularState Sets regular state with new hmi level
+   * to application
+   * @param app appication to setup regular state
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param hmi_level new hmi level for application
+   */
   virtual void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::HMILevel::eType hmi_level) = 0;
 
+  /**
+   * @brief SetRegularState Change regular audio state
+   * @param app appication to setup regular State
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param audio_state of new regular state
+   * @param video_state of new regular state
+   */
   virtual void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::AudioStreamingState::eType audio_state,
       const mobile_apis::VideoStreamingState::eType video_state) = 0;
 
+  /**
+   * @brief SetRegularState Change regular  system context
+   * @param app appication to setup regular State
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param system_context of new regular state
+   */
   virtual void SetRegularState(
       ApplicationSharedPtr app,
+      const WindowID window_id,
       const mobile_apis::SystemContext::eType system_context) = 0;
 
-  virtual void SetRegularState(ApplicationSharedPtr app, HmiStatePtr state) = 0;
+  /**
+   * @brief SetRegularState Sets new regular state to application
+   * @param app appication to setup regular state
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param state new hmi state for application
+   */
+  virtual void SetRegularState(ApplicationSharedPtr app,
+                               const WindowID window_id,
+                               HmiStatePtr state) = 0;
 
+  /**
+   * @brief Sets default application state and apply currently active HMI states
+   * on application registration
+   * @param app application to apply states
+   * @param default_level default HMI level
+   */
   virtual void OnApplicationRegistered(
       ApplicationSharedPtr app,
       const mobile_apis::HMILevel::eType default_level) = 0;
 
   /**
+   * @brief OnAppWidgetAdded Sets default state for widget and apply currently
+   * active HMI states
+   * @param app application to apply states
+   * @param window_id id of window to add
+   * @param default_level default HMI level
+   */
+  virtual void OnAppWindowAdded(
+      ApplicationSharedPtr app,
+      const WindowID window_id,
+      const mobile_apis::WindowType::eType window_type,
+      const mobile_apis::HMILevel::eType default_level) = 0;
+
+  /**
    * @brief OnVideoStreamingStarted process video streaming started
    * @param app projection or navigation application starting streaming
    */
@@ -93,12 +190,41 @@ class StateController {
    * @param app projection or navigation application stopping streaming
    */
   virtual void OnVideoStreamingStopped(ApplicationConstSharedPtr app) = 0;
+
+  /**
+   * @brief OnStateChanged send HMIStatusNotification if needed
+   * @param app application
+   * @param window_id id of applicaion's window to apply HMI state
+   * @param old_state state before change
+   * @param new_state state after change
+   */
   virtual void OnStateChanged(ApplicationSharedPtr app,
+                              const WindowID window_id,
                               HmiStatePtr old_state,
                               HmiStatePtr new_state) = 0;
 
+  /**
+   * @brief Checks activity of Deactivate HMI state.
+   * @return Returns TRUE if deactivate HMI state is active, otherwise returns
+   * FALSE.
+   */
   virtual bool IsStateActive(HmiState::StateID state_id) const = 0;
+
+  /**
+   * @brief ActivateDefaultWindow performs set of actions required for a proper
+   * application activation (i.e. main window activation)
+   * @param app pointer to application to be activated
+   */
+  virtual void ActivateDefaultWindow(ApplicationSharedPtr app) = 0;
+
+  /**
+   * @brief ExitDefaultWindow performs set of action required for a proper
+   * application exiting (i.e. main window exit)
+   * @param app pointer to application to be exited
+   */
+  virtual void ExitDefaultWindow(ApplicationSharedPtr app) = 0;
 };
+
 }  // namespace application_manager
 
 #endif  // SRC_COMPONENTS_INCLUDE_APPLICATION_MANAGER_STATE_CONTROLLER_H_
diff --git a/src/components/include/connection_handler/connection_handler.h b/src/components/include/connection_handler/connection_handler.h
index eb92336b4f..e98a78f377 100644
--- a/src/components/include/connection_handler/connection_handler.h
+++ b/src/components/include/connection_handler/connection_handler.h
@@ -312,6 +312,19 @@ class ConnectionHandler {
       const transport_manager::ConnectionUID primary_connection_handle,
       const transport_manager::ConnectionUID secondary_connection_handle) = 0;
 
+  /**
+   * @brief GetWebEngineDeviceInfo
+   * @return device info for WebEngine device
+   */
+  virtual const transport_manager::DeviceInfo& GetWebEngineDeviceInfo()
+      const = 0;
+
+  /**
+   * @brief Called when HMI cooperation is started,
+   * creates WebSocketDevice for WebEngine
+   */
+  virtual void CreateWebEngineDevice() = 0;
+
  protected:
   /**
    * \brief Destructor
diff --git a/src/components/include/connection_handler/connection_handler_observer.h b/src/components/include/connection_handler/connection_handler_observer.h
index 48e4263959..7d6664a009 100644
--- a/src/components/include/connection_handler/connection_handler_observer.h
+++ b/src/components/include/connection_handler/connection_handler_observer.h
@@ -172,6 +172,11 @@ class ConnectionHandlerObserver {
       const transport_manager::ConnectionUID connection_id,
       const transport_manager::DeviceInfo& device_info) = 0;
 
+  /**
+   *@brief Called when webengine device added
+   */
+  virtual void OnWebEngineDeviceCreated() = 0;
+
  protected:
   /**
    * \brief Destructor
diff --git a/src/components/include/hmi_message_handler/hmi_message_adapter.h b/src/components/include/hmi_message_handler/hmi_message_adapter.h
index 704cc619be..af8cddcf32 100644
--- a/src/components/include/hmi_message_handler/hmi_message_adapter.h
+++ b/src/components/include/hmi_message_handler/hmi_message_adapter.h
@@ -53,7 +53,7 @@ class HMIMessageAdapter : public HMIMessageSender {
   /**
    * \brief Interface for subscriptions.
    * Each class implementing interface should use it according to
-   * standarts of transport for which it is to be an adapter.
+   * standards of transport for which it is to be an adapter.
    * For example, Adapter for MessageBroker will use it to subscribe to
    * notifications
    * from HMI.
diff --git a/src/components/include/media_manager/media_manager.h b/src/components/include/media_manager/media_manager.h
index 0998899bc5..123e11f2f0 100644
--- a/src/components/include/media_manager/media_manager.h
+++ b/src/components/include/media_manager/media_manager.h
@@ -60,6 +60,14 @@ class MediaManager {
    */
   virtual const MediaManagerSettings& settings() const = 0;
 
+  /**
+   * \brief Convert an amount of audio bytes to an estimated time in ms
+   * \param data_size number of bytes to be played
+   * \return milliseconds required to play <data_size> many bytes with
+   *          the current pcm stream capabilities
+   */
+  virtual uint32_t DataSizeToMilliseconds(uint64_t data_size) const = 0;
+
   virtual ~MediaManager() {}
 };
 
diff --git a/src/components/include/policy/policy_external/policy/policy_listener.h b/src/components/include/policy/policy_external/policy/policy_listener.h
index c64a6d5496..0ad695f2c0 100644
--- a/src/components/include/policy/policy_external/policy/policy_listener.h
+++ b/src/components/include/policy/policy_external/policy/policy_listener.h
@@ -42,19 +42,24 @@ namespace policy {
 
 namespace custom_str = utils::custom_string;
 
+class PTURetryHandler;
+
 class PolicyListener {
  public:
   virtual ~PolicyListener() {}
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions,
                                     const policy::HMILevel& default_hmi) = 0;
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions) = 0;
-  virtual void OnPendingPermissionChange(const std::string& policy_app_id) = 0;
+  virtual void OnPendingPermissionChange(const std::string& device_id,
+                                         const std::string& policy_app_id) = 0;
   virtual void OnUpdateStatusChanged(const std::string&) = 0;
   virtual std::string OnCurrentDeviceIdUpdateRequired(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) = 0;
-  virtual void OnSystemInfoUpdateRequired() = 0;
   virtual custom_str::CustomString GetAppName(
       const std::string& policy_app_id) = 0;
   virtual void OnUpdateHMIAppType(
@@ -95,10 +100,20 @@ class PolicyListener {
   /**
    * @brief Sends OnAppPermissionsChanged notification to HMI
    * @param permissions contains parameter for OnAppPermisionChanged
+   * @param device_id device identifier
    * @param policy_app_id contains policy application id
    */
   virtual void SendOnAppPermissionsChanged(
       const AppPermissions& permissions,
+      const std::string& device_id,
+      const std::string& policy_app_id) const = 0;
+
+  /**
+   * @brief Send OnAppPropertiesChangeNotification to the HMI
+   * @param policy_app_id policy app id
+   */
+
+  virtual void SendOnAppPropertiesChangeNotification(
       const std::string& policy_app_id) const = 0;
 
   /**
@@ -146,7 +161,7 @@ class PolicyListener {
    * @return list devices ids
    */
   virtual std::vector<std::string> GetDevicesIds(
-      const std::string& policy_app_id) = 0;
+      const std::string& policy_app_id) const = 0;
 
   /**
    * Notifies about changing HMI level
@@ -181,6 +196,8 @@ class PolicyListener {
    * LockScreenDismissal
    */
   virtual void OnLockScreenDismissalStateChanged() = 0;
+
+  virtual PTURetryHandler& ptu_retry_handler() const = 0;
 };
 }  // namespace policy
 #endif  // SRC_COMPONENTS_INCLUDE_POLICY_POLICY_EXTERNAL_POLICY_POLICY_LISTENER_H_
diff --git a/src/components/include/policy/policy_external/policy/policy_manager.h b/src/components/include/policy/policy_external/policy/policy_manager.h
index aecc4b607a..02810038c3 100644
--- a/src/components/include/policy/policy_external/policy/policy_manager.h
+++ b/src/components/include/policy/policy_external/policy/policy_manager.h
@@ -38,24 +38,31 @@
 #include "utils/callable.h"
 #include "utils/optional.h"
 
+#include "application_manager/policies/policy_encryption_flag_getter.h"
 #include "policy/access_remote.h"
 #include "policy/cache_manager_interface.h"
 #include "policy/policy_listener.h"
 #include "policy/policy_table/types.h"
 #include "policy/policy_types.h"
+#include "policy/ptu_retry_handler.h"
 #include "policy/usage_statistics/statistics_manager.h"
 
 namespace policy {
 class PolicySettings;
 typedef std::shared_ptr<utils::Callable> StatusNotifier;
 
-class PolicyManager : public usage_statistics::StatisticsManager {
+class PolicyManager : public usage_statistics::StatisticsManager,
+                      public PolicyEncryptionFlagGetterInterface,
+                      public PTURetryHandler {
  public:
   /**
    * @brief The NotificationMode enum defines whether application will be
    * notified about changes done (e.g. after consents were changed) or not
    */
   enum NotificationMode { kSilentMode, kNotifyApplicationMode };
+
+  enum PtProcessingResult { kSuccess, kWrongPtReceived, kNewPtRequired };
+
   virtual ~PolicyManager() {}
 
   /**
@@ -79,10 +86,16 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * sent in snapshot and received Policy Table.
    * @param file name of file with update policy table
    * @param pt_content PTU as binary string
-   * @return true if successfully
+   * @return result of PT processing
    */
-  virtual bool LoadPT(const std::string& file,
-                      const BinaryMessage& pt_content) = 0;
+  virtual PtProcessingResult LoadPT(const std::string& file,
+                                    const BinaryMessage& pt_content) = 0;
+
+  /**
+   * @brief Performs finalizing actions after PT update was processed
+   * @param ptu_result result of last PT processing
+   */
+  virtual void OnPTUFinished(const PtProcessingResult ptu_result) = 0;
 
   /**
    * @brief Resets Policy Table
@@ -104,16 +117,9 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * @return vector of urls
    */
   virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points) = 0;
+                             EndpointUrls& out_end_points) const = 0;
   virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points) = 0;
-
-  /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   * @return url which point to the resource where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const = 0;
+                             EndpointUrls& out_end_points) const = 0;
 
   /**
    * @brief Get Icon Url used for showing a cloud apps icon before the initial
@@ -133,6 +139,7 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * @brief Check if specified RPC for specified application
    * has permission to be executed in specified HMI Level
    * and also its permitted params.
+   * @param device_id device identifier
    * @param app_id Id of application provided during registration
    * @param hmi_level Current HMI Level of application
    * @param rpc Name of RPC
@@ -140,7 +147,8 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * @param CheckPermissionResult containing flag if HMI Level is allowed
    * and list of allowed params.
    */
-  virtual void CheckPermissions(const PTString& app_id,
+  virtual void CheckPermissions(const PTString& device_id,
+                                const PTString& app_id,
                                 const PTString& hmi_level,
                                 const PTString& rpc,
                                 const RPCParams& rpc_params,
@@ -195,6 +203,11 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual std::string ForcePTExchange() = 0;
 
   /**
+   * @brief Stops retry sequence timer and resets retry sequence
+   */
+  virtual void StopRetrySequence() = 0;
+
+  /**
    * @brief Exchange by user request
    * @return Current status of policy table
    */
@@ -202,8 +215,9 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Resets retry sequence
+   * @param reset_type - reset retry count with sending OnStatusUpdate or not
    */
-  virtual void ResetRetrySequence() = 0;
+  virtual void ResetRetrySequence(const ResetRetryCountType reset_type) = 0;
 
   /**
    * @brief Gets timeout to wait before next retry updating PT
@@ -265,12 +279,15 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief Update Application Policies as reaction
    * on User allowing/disallowing device this app is running on.
+   * @param device_handle device identifier
    * @param app_id Unique application id
    * @param is_device_allowed true if user allowing device otherwise false
    * @return true if operation was successful
    */
-  virtual bool ReactOnUserDevConsentForApp(const std::string& app_id,
-                                           const bool is_device_allowed) = 0;
+  virtual bool ReactOnUserDevConsentForApp(
+      const transport_manager::DeviceHandle& device_handle,
+      const std::string& app_id,
+      const bool is_device_allowed) = 0;
 
   /**
    * @brief Sets counter value that passed for receiving PT UPdate.
@@ -318,12 +335,14 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Get default HMI level for application
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @param default_hmi Default HMI level for application or empty, if value
    * was not set
    * @return true, if succedeed, otherwise - false
    */
-  virtual bool GetDefaultHmi(const std::string& policy_app_id,
+  virtual bool GetDefaultHmi(const std::string& device_id,
+                             const std::string& policy_app_id,
                              std::string* default_hmi) const = 0;
 
   /**
@@ -369,11 +388,12 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief Gets specific application permissions changes since last policy
    * table update
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @return Permissions changes
    */
   virtual AppPermissions GetAppPermissionsChanges(
-      const std::string& policy_app_id) = 0;
+      const std::string& device_id, const std::string& policy_app_id) = 0;
 
   /**
    * @brief Removes specific application permissions changes
@@ -383,9 +403,11 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Return device id, which hosts specific application
+   * @param device_handle device identifier
    * @param policy_app_id Application id, which is required to update device id
    */
   virtual std::string& GetCurrentDeviceId(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) const = 0;
 
   /**
@@ -406,10 +428,11 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Send OnPermissionsUpdated for choosen application
+   * @param device_id device identifier
    * @param application_id Unique application id
    */
   virtual void SendNotificationOnPermissionsUpdated(
-      const std::string& application_id) = 0;
+      const std::string& device_id, const std::string& application_id) = 0;
 
   /**
    * @brief Marks device as upaired
@@ -420,11 +443,13 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief Adds, application to the db or update existed one
    * run PTU if policy update is necessary for application.
+   * @param device_id device identifier
    * @param application_id Unique application id
    * @param hmi_types application HMI types
    * @return function that will notify update manager about new application
    */
   virtual StatusNotifier AddApplication(
+      const std::string& device_id,
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) = 0;
 
@@ -449,13 +474,6 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual bool CanAppStealFocus(const std::string& app_id) const = 0;
 
   /**
-   * @brief Runs necessary operations, which is depends on external system
-   * state, e.g. getting system-specific parameters which are need to be
-   * filled into policy table
-   */
-  virtual void OnSystemReady() = 0;
-
-  /**
    * @brief Get number of notification by priority
    * @param priority Specified priority
    * @return notification number
@@ -502,12 +520,21 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0;
 
   /**
+   * @brief Change applications count ready for PTU
+   * @param new_app_count new applications count for PTU
+   */
+  virtual void UpdatePTUReadyAppsCount(const uint32_t new_app_count) = 0;
+
+  /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
    * succesfully registered on mobile device.
-   * It will send OnAppPermissionSend notification and will try to start PTU. *
+   * It will send OnAppPermissionSend notification and will try to start PTU.
+   *
+   * @param device_id device identifier
    * @param application_id registered application.
    */
-  virtual void OnAppRegisteredOnMobile(const std::string& application_id) = 0;
+  virtual void OnAppRegisteredOnMobile(const std::string& device_id,
+                                       const std::string& application_id) = 0;
 
   virtual void OnDeviceSwitching(const std::string& device_id_from,
                                  const std::string& device_id_to) = 0;
@@ -530,10 +557,12 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Gets request types for application
+   * @param device_handle device identifier
    * @param policy_app_id Unique application id
    * @return request types of application
    */
   virtual const std::vector<std::string> GetAppRequestTypes(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string policy_app_id) const = 0;
 
   /**
@@ -545,10 +574,31 @@ class PolicyManager : public usage_statistics::StatisticsManager {
       const std::string& policy_app_id) const = 0;
 
   /**
-   * @brief Get information about vehicle
-   * @return vehicle information
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const = 0;
+
+  /**
+   * @brief Gets vehicle data items removed by policies
+   * @return Structure with vehicle data items
+   */
+  virtual std::vector<rpc::policy_table_interface_base::VehicleDataItem>
+  GetRemovedVehicleDataItems() const = 0;
+
+  /**
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
    */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
+  virtual Json::Value GetPolicyTableData() const = 0;
+
+  /**
+   * @brief Get a list of policy app ids
+   * @return apps list filled with the policy app ids of each
+   * application
+   */
+  virtual const std::vector<std::string> GetApplicationPolicyIDs() const = 0;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -559,29 +609,21 @@ class PolicyManager : public usage_statistics::StatisticsManager {
       std::vector<std::string>& enabled_apps) const = 0;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
+   * @brief Get app policy information, all fields that aren't set for a
    * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(
-      const std::string& policy_app_id,
-      bool& enabled,
-      std::string& endpoint,
-      std::string& certificate,
-      std::string& auth_token,
-      std::string& cloud_transport_type,
-      std::string& hybrid_app_preference) const = 0;
+   * @param policy_app_id policy app id
+   * @param out_app_properties application properties
+   * @return true if application presents in database, otherwise - false
+   */
+  virtual bool GetAppProperties(const std::string& policy_app_id,
+                                AppProperties& out_app_properties) const = 0;
+
+  /**
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  virtual std::vector<std::string> GetEnabledLocalApps() const = 0;
 
   /**
    * @ brief Initialize new cloud app in the policy table
@@ -685,20 +727,24 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual const PolicySettings& get_settings() const = 0;
 
   /**
+   * @deprecated Unused in EXTERNAL_PROPRIETARY policies
    * @brief Finds the next URL that must be sent on OnSystemRequest retry
    * @param urls vector of vectors that contain urls for each application
    * @return Pair of policy application id and application url id from the
    * urls vector
    */
-  virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0;
+  DEPRECATED virtual AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) = 0;
 
   /**
    * @brief Assigns new HMI types for specified application
+   * @param device_handle device identifier
    * @param application_id Unique application id
    * @param hmi_types new HMI types list
    */
-  virtual void SetDefaultHmiTypes(const std::string& application_id,
-                                  const std::vector<int>& hmi_types) = 0;
+  virtual void SetDefaultHmiTypes(
+      const transport_manager::DeviceHandle& device_handle,
+      const std::string& application_id,
+      const std::vector<int>& hmi_types) = 0;
   /**
    * @brief Gets HMI types
    * @param application_id ID application
@@ -724,6 +770,12 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    */
   virtual void SendAppPermissionsChanged(const std::string& device_id,
                                          const std::string& application_id) = 0;
+  /**
+   * @brief Send OnAppPropertiesChangeNotification to the HMI
+   * @param policy_app_id policy app id
+   */
+  virtual void SendOnAppPropertiesChangeNotification(
+      const std::string& policy_app_id) const = 0;
 
   /**
    * @brief Gets all allowed module types
@@ -776,6 +828,23 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    */
   virtual ExternalConsentStatus GetExternalConsentStatus() = 0;
 
+  /**
+   * @brief OnLocalAppAdded triggers PTU
+   */
+  virtual void OnLocalAppAdded() = 0;
+
+  /**
+   * @brief Check if certain application already in policy db.
+   * @param policy application id.
+   * @return true if application presents false otherwise.
+   */
+  virtual bool IsNewApplication(const std::string& application_id) const = 0;
+
+  /**
+   * @brief Restart PTU timeout if PTU in UPDATING state
+   */
+  virtual void ResetTimeout() = 0;
+
  protected:
   /**
    * @brief Checks is PT exceeded IgnitionCycles
diff --git a/src/components/include/policy/policy_regular/policy/policy_listener.h b/src/components/include/policy/policy_regular/policy/policy_listener.h
index f12bb2e85f..729eda0a95 100644
--- a/src/components/include/policy/policy_regular/policy/policy_listener.h
+++ b/src/components/include/policy/policy_regular/policy/policy_listener.h
@@ -45,16 +45,19 @@ namespace custom_str = utils::custom_string;
 class PolicyListener {
  public:
   virtual ~PolicyListener() {}
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions,
                                     const policy::HMILevel& default_hmi) = 0;
-  virtual void OnPermissionsUpdated(const std::string& policy_app_id,
+  virtual void OnPermissionsUpdated(const std::string& device_id,
+                                    const std::string& policy_app_id,
                                     const Permissions& permissions) = 0;
-  virtual void OnPendingPermissionChange(const std::string& policy_app_id) = 0;
+  virtual void OnPendingPermissionChange(const std::string& device_id,
+                                         const std::string& policy_app_id) = 0;
   virtual void OnUpdateStatusChanged(const std::string&) = 0;
   virtual std::string OnCurrentDeviceIdUpdateRequired(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) = 0;
-  virtual void OnSystemInfoUpdateRequired() = 0;
   virtual custom_str::CustomString GetAppName(
       const std::string& policy_app_id) = 0;
   virtual void OnUpdateHMIAppType(
@@ -75,11 +78,13 @@ class PolicyListener {
    *
    * @param pt_string the snapshot
    *
-   * @param retry_seconds retry sequence timeouts.
+   * @param iteration_type flag indicating whether PTU was caused by retry
+   * sequence.
    *
    * @param timeout_exceed timeout.
    */
-  virtual void OnSnapshotCreated(const BinaryMessage& pt_string) = 0;
+  virtual void OnSnapshotCreated(const BinaryMessage& pt_string,
+                                 const PTUIterationType iteration_type) = 0;
 
   /**
    * @brief Make appropriate changes for related applications permissions and
@@ -93,10 +98,19 @@ class PolicyListener {
   /**
    * @brief Sends OnAppPermissionsChanged notification to HMI
    * @param permissions contains parameter for OnAppPermisionChanged
+   * @param device_id device identifier
    * @param policy_app_id contains policy application id
    */
   virtual void SendOnAppPermissionsChanged(
       const AppPermissions& permissions,
+      const std::string& device_id,
+      const std::string& policy_app_id) const = 0;
+
+  /**
+   * @brief Send OnAppPropertiesChangeNotification to the HMI
+   * @param policy_app_id policy app id
+   */
+  virtual void SendOnAppPropertiesChangeNotification(
       const std::string& policy_app_id) const = 0;
 
   /**
@@ -113,6 +127,12 @@ class PolicyListener {
   virtual void OnCertificateUpdated(const std::string& certificate_data) = 0;
 
   /**
+   * @brief OnPTUTimeOut the callback which is performed when PTU timeout
+   * occurred
+   */
+  virtual void OnPTUTimeOut() = 0;
+
+  /**
    * @brief OnAuthTokenUpdated the callback which signals if an app's auth token
    * field has been updated during a PTU
    *
@@ -128,7 +148,7 @@ class PolicyListener {
    * @return list devices ids
    */
   virtual std::vector<std::string> GetDevicesIds(
-      const std::string& policy_app_id) = 0;
+      const std::string& policy_app_id) const = 0;
 
   /**
    * Notifies about changing HMI level
diff --git a/src/components/include/policy/policy_regular/policy/policy_manager.h b/src/components/include/policy/policy_regular/policy/policy_manager.h
index 713f71dcdb..99f38673ef 100644
--- a/src/components/include/policy/policy_regular/policy/policy_manager.h
+++ b/src/components/include/policy/policy_regular/policy/policy_manager.h
@@ -50,8 +50,11 @@ namespace policy {
 class PolicySettings;
 typedef std::shared_ptr<utils::Callable> StatusNotifier;
 
-class PolicyManager : public usage_statistics::StatisticsManager {
+class PolicyManager : public usage_statistics::StatisticsManager,
+                      public PolicyEncryptionFlagGetterInterface {
  public:
+  enum PtProcessingResult { kSuccess, kWrongPtReceived, kNewPtRequired };
+
   virtual ~PolicyManager() {}
 
   /**
@@ -75,10 +78,16 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * sent in snapshot and received Policy Table.
    * @param file name of file with update policy table
    * @param pt_content PTU as binary string
-   * @return true if successfully
+   * @return result of PT processing
+   */
+  virtual PtProcessingResult LoadPT(const std::string& file,
+                                    const BinaryMessage& pt_content) = 0;
+
+  /**
+   * @brief Performs finalizing actions after PT update was processed
+   * @param ptu_result result of last PT processing
    */
-  virtual bool LoadPT(const std::string& file,
-                      const BinaryMessage& pt_content) = 0;
+  virtual void OnPTUFinished(const PtProcessingResult ptu_result) = 0;
 
   /**
    * @brief Resets Policy Table
@@ -88,13 +97,6 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual bool ResetPT(const std::string& file_name) = 0;
 
   /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   * @return url which point to the resource where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const = 0;
-
-  /**
    * @brief Get Icon Url used for showing a cloud apps icon before the initial
    *registration
    *
@@ -109,14 +111,14 @@ class PolicyManager : public usage_statistics::StatisticsManager {
    * @param out_end_points output vector of urls
    */
   virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points) = 0;
+                             EndpointUrls& out_end_points) const = 0;
   virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points) = 0;
+                             EndpointUrls& out_end_points) const = 0;
 
   /**
    * @brief PTU is needed, for this PTS has to be formed and sent.
    */
-  virtual bool RequestPTUpdate() = 0;
+  virtual bool RequestPTUpdate(const PTUIterationType iteration_type) = 0;
 
   /**
    * @brief Check if specified RPC for specified application
@@ -201,6 +203,18 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual std::string ForcePTExchangeAtUserRequest() = 0;
 
   /**
+   * @brief Stops retry sequence timer and resets retry sequence
+   */
+  virtual void StopRetrySequence() = 0;
+
+  /**
+   * @brief Resets retry sequence
+   * @param send_event - if true corresponding event is sent to
+   * UpdateStatusManager
+   */
+  virtual void ResetRetrySequence(const ResetRetryCountType reset_type) = 0;
+
+  /**
    * @brief Gets timeout to wait before next retry updating PT
    * If timeout is less or equal to zero then the retry sequence is not need.
    * @return timeout in seconds
@@ -260,12 +274,15 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief Update Application Policies as reaction
    * on User allowing/disallowing device this app is running on.
+   * @param device_handle device identifier
    * @param app_id Unique application id
    * @param is_device_allowed true if user allowing device otherwise false
    * @return true if operation was successful
    */
-  virtual bool ReactOnUserDevConsentForApp(const std::string app_id,
-                                           bool is_device_allowed) = 0;
+  virtual bool ReactOnUserDevConsentForApp(
+      const transport_manager::DeviceHandle& device_handle,
+      const std::string app_id,
+      bool is_device_allowed) = 0;
 
   /**
    * @brief Sets counter value that passed for receiving PT UPdate.
@@ -311,12 +328,14 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Get default HMI level for application
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @param default_hmi Default HMI level for application or empty, if value
    * was not set
    * @return true, if succedeed, otherwise - false
    */
-  virtual bool GetDefaultHmi(const std::string& policy_app_id,
+  virtual bool GetDefaultHmi(const std::string& device_id,
+                             const std::string& policy_app_id,
                              std::string* default_hmi) const = 0;
 
   /**
@@ -360,11 +379,12 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief Gets specific application permissions changes since last policy
    * table update
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @return Permissions changes
    */
   virtual AppPermissions GetAppPermissionsChanges(
-      const std::string& policy_app_id) = 0;
+      const std::string& device_id, const std::string& policy_app_id) = 0;
 
   /**
    * @brief Removes specific application permissions changes
@@ -374,9 +394,11 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Return device id, which hosts specific application
+   * @param device_handle device identifier
    * @param policy_app_id Application id, which is required to update device id
    */
   virtual std::string& GetCurrentDeviceId(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) const = 0;
 
   /**
@@ -397,10 +419,11 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Send OnPermissionsUpdated for choosen application
+   * @param device_id device identifier
    * @param application_id Unique application id
    */
   virtual void SendNotificationOnPermissionsUpdated(
-      const std::string& application_id) = 0;
+      const std::string& device_id, const std::string& application_id) = 0;
 
   /**
    * @brief Marks device as upaired
@@ -411,11 +434,13 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief Adds, application to the db or update existed one
    * run PTU if policy update is necessary for application.
+   * @param device_id device identifier
    * @param application_id Unique application id
    * @param hmi_types application HMI types
    * @return function that will notify update manager about new application
    */
   virtual StatusNotifier AddApplication(
+      const std::string& device_id,
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) = 0;
 
@@ -440,13 +465,6 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual bool CanAppStealFocus(const std::string& app_id) const = 0;
 
   /**
-   * @brief Runs necessary operations, which is depends on external system
-   * state, e.g. getting system-specific parameters which are need to be
-   * filled into policy table
-   */
-  virtual void OnSystemReady() = 0;
-
-  /**
    * @brief Get number of notification by priority
    * @param priority Specified priority
    * @return notification number
@@ -493,6 +511,12 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual void OnAppsSearchCompleted(const bool trigger_ptu) = 0;
 
   /**
+   * @brief Change applications count ready for PTU
+   * @param new_app_count new applications count for PTU
+   */
+  virtual void UpdatePTUReadyAppsCount(const uint32_t new_app_count) = 0;
+
+  /**
    * @brief Get state of request types for given application
    * @param policy_app_id Unique application id
    * @return request type state
@@ -525,10 +549,31 @@ class PolicyManager : public usage_statistics::StatisticsManager {
       const std::string& policy_app_id) const = 0;
 
   /**
-   * @brief Get information about vehicle
-   * @return vehicle information
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const = 0;
+
+  /**
+   * @brief Gets removed vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual std::vector<policy_table::VehicleDataItem>
+  GetRemovedVehicleDataItems() const = 0;
+
+  /**
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
    */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
+  virtual Json::Value GetPolicyTableData() const = 0;
+
+  /**
+   * @brief Get a list of policy app ids
+   * @return apps list filled with the policy app ids of each
+   * application
+   */
+  virtual const std::vector<std::string> GetApplicationPolicyIDs() const = 0;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -539,29 +584,21 @@ class PolicyManager : public usage_statistics::StatisticsManager {
       std::vector<std::string>& enabled_apps) const = 0;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  virtual std::vector<std::string> GetEnabledLocalApps() const = 0;
+
+  /**
+   * @brief Get app policy information, all fields that aren't set for a
    * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(
-      const std::string& policy_app_id,
-      bool& enabled,
-      std::string& endpoint,
-      std::string& certificate,
-      std::string& auth_token,
-      std::string& cloud_transport_type,
-      std::string& hybrid_app_preference) const = 0;
+   * @param policy_app_id policy app id
+   * @param out_app_properties application properties
+   * @return true if application presents in database, otherwise - false
+   */
+  virtual bool GetAppProperties(const std::string& policy_app_id,
+                                AppProperties& out_app_properties) const = 0;
 
   /**
    * @ brief Initialize new cloud app in the policy table
@@ -636,10 +673,13 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
    * succesfully registered on mobile device.
-   * It will send OnAppPermissionSend notification and will try to start PTU. *
+   * It will send OnAppPermissionSend notification and will try to start PTU.
+   *
+   * @param device_id device identifier
    * @param application_id registered application.
    */
-  virtual void OnAppRegisteredOnMobile(const std::string& application_id) = 0;
+  virtual void OnAppRegisteredOnMobile(const std::string& device_id,
+                                       const std::string& application_id) = 0;
 
   virtual void OnDeviceSwitching(const std::string& device_id_from,
                                  const std::string& device_id_to) = 0;
@@ -674,11 +714,14 @@ class PolicyManager : public usage_statistics::StatisticsManager {
 
   /**
    * @brief Assigns new HMI types for specified application
+   * @param device_handle device identifier
    * @param application_id Unique application id
    * @param hmi_types new HMI types list
    */
-  virtual void SetDefaultHmiTypes(const std::string& application_id,
-                                  const std::vector<int>& hmi_types) = 0;
+  virtual void SetDefaultHmiTypes(
+      const transport_manager::DeviceHandle& device_handle,
+      const std::string& application_id,
+      const std::vector<int>& hmi_types) = 0;
 
   /**
    * @brief Gets HMI types
@@ -707,6 +750,13 @@ class PolicyManager : public usage_statistics::StatisticsManager {
                                          const std::string& application_id) = 0;
 
   /**
+   * @brief Send OnAppPropertiesChangeNotification to the HMI
+   * @param policy_app_id policy app id
+   */
+  virtual void SendOnAppPropertiesChangeNotification(
+      const std::string& policy_app_id) const = 0;
+
+  /**
    * @brief Gets all allowed module types
    * @param policy_app_id unique identifier of application
    * @param modules list of allowed module types
@@ -734,6 +784,28 @@ class PolicyManager : public usage_statistics::StatisticsManager {
   virtual AppIdURL RetrySequenceUrl(const struct RetrySequenceURL& rs,
                                     const EndpointUrls& urls) const = 0;
 
+  /**
+   * @brief OnLocalAppAdded triggers PTU
+   */
+  virtual void OnLocalAppAdded() = 0;
+
+  /**
+   * @brief Check if certain application already in policy db.
+   * @param policy application id.
+   * @return true if application presents false otherwise.
+   */
+  virtual bool IsNewApplication(const std::string& application_id) const = 0;
+
+  /**
+   * @brief Restart PTU timeout if PTU in UPDATING state
+   */
+  virtual void ResetTimeout() = 0;
+
+  /**
+   * @brief Trigger a PTU once on startup if it is required
+   */
+  virtual void TriggerPTUOnStartupIfRequired() = 0;
+
  protected:
   /**
    * @brief Checks is PT exceeded IgnitionCycles
diff --git a/src/components/include/protocol/raw_message.h b/src/components/include/protocol/raw_message.h
index 21b324417c..3de0d783cb 100644
--- a/src/components/include/protocol/raw_message.h
+++ b/src/components/include/protocol/raw_message.h
@@ -58,6 +58,7 @@ class RawMessage {
              uint32_t protocol_version,
              const uint8_t* const data_param,
              uint32_t data_size,
+             bool protection,
              uint8_t type = ServiceType::kRpc,
              uint32_t payload_size = 0);
   /**
@@ -96,6 +97,8 @@ class RawMessage {
   ServiceType service_type() const {
     return service_type_;
   }
+
+  bool protection_flag() const;
   /**
    * \brief Specifies current state of message in queue.
    * if false message is "ready to be processed"
@@ -109,6 +112,7 @@ class RawMessage {
   uint8_t* data_;
   size_t data_size_;
   uint32_t protocol_version_;
+  bool protection_;
   ServiceType service_type_;
   size_t payload_size_;
   bool waiting_;
diff --git a/src/components/include/protocol_handler/protocol_handler.h b/src/components/include/protocol_handler/protocol_handler.h
index 5e65fc69d4..aacb31c260 100644
--- a/src/components/include/protocol_handler/protocol_handler.h
+++ b/src/components/include/protocol_handler/protocol_handler.h
@@ -39,6 +39,7 @@
  *\namespace protocol_handlerHandler
  *\brief Namespace for SmartDeviceLink ProtocolHandler related functionality.
  */
+
 namespace protocol_handler {
 
 class ProtocolObserver;
@@ -69,10 +70,12 @@ class ProtocolHandler {
   /**
    * \brief Method for sending message to Mobile Application.
    * \param message RawMessage with params to be sent to Mobile App.
+   * \param needs_encryption whether message needs to be encrypted by policy
    * \param final_message tells whether message's
    * connection must be closed when message is processed
    */
   virtual void SendMessageToMobileApp(const RawMessagePtr message,
+                                      bool needs_encryption,
                                       bool final_message) = 0;
 
   /**
@@ -115,7 +118,7 @@ class ProtocolHandler {
   /**
    * \brief Called to notify all handsheke handlers about handshake failure.
    */
-  virtual void NotifyOnFailedHandshake() = 0;
+  virtual void NotifyOnGetSystemTimeFailed() = 0;
 
   /**
    * \brief Protocol handler settings getter
@@ -136,6 +139,18 @@ class ProtocolHandler {
       const SessionContext& context,
       std::vector<std::string>& rejected_params) = 0;
 
+  virtual bool IsRPCServiceSecure(const uint32_t connection_key) const = 0;
+
+  virtual void ProcessFailedPTU() = 0;
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief ProcessFailedCertDecrypt is called to notify security manager that
+   * certificate decryption failed in the external flow
+   */
+  virtual void ProcessFailedCertDecrypt() = 0;
+#endif
+
  protected:
   /**
    * \brief Destructor
diff --git a/src/components/include/resumption/last_state.h b/src/components/include/resumption/last_state.h
new file mode 100644
index 0000000000..b28e5611b7
--- /dev/null
+++ b/src/components/include/resumption/last_state.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_RESUMPTION_LAST_STATE_H_
+#define SRC_COMPONENTS_INCLUDE_RESUMPTION_LAST_STATE_H_
+
+#include "json/json.h"
+#include "utils/macro.h"
+
+namespace resumption {
+
+class LastState {
+ public:
+  /**
+   * @brief Destructor
+   */
+  virtual ~LastState() {}
+
+  /**
+   * @brief Saves dictionary to filesystem
+   */
+  DEPRECATED
+  virtual void SaveStateToFileSystem() = 0;
+
+  /**
+   * @brief SaveToFileSystem
+   * Saving dictionary to filesystem
+   */
+  virtual void SaveToFileSystem() = 0;
+
+  /**
+   * @brief RemoveFromFileSystem
+   * Remove dictionary from filesystem
+   */
+  virtual void RemoveFromFileSystem() = 0;
+
+  /**
+   * @brief dictionary Gets internal dictionary
+   * @return Reference to internal dictionary json value
+   */
+  virtual Json::Value& get_dictionary() = 0;
+
+  /**
+   * @brief dictionary Gets internal dictionary
+   * @return Copy of internal dictionary json value
+   */
+  virtual Json::Value dictionary() const = 0;
+
+  /**
+   * @brief set_dictionary sets internal dictionary
+   * @param dictionary New dictionary json value to be set
+   */
+  virtual void set_dictionary(const Json::Value& dictionary) = 0;
+};
+
+}  // namespace resumption
+
+#endif  // SRC_COMPONENTS_INCLUDE_RESUMPTION_LAST_STATE_H_
diff --git a/src/components/include/resumption/last_state_wrapper.h b/src/components/include/resumption/last_state_wrapper.h
new file mode 100644
index 0000000000..d5af2e958e
--- /dev/null
+++ b/src/components/include/resumption/last_state_wrapper.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_RESUMPTION_LAST_STATE_WRAPPER_H_
+#define SRC_COMPONENTS_INCLUDE_RESUMPTION_LAST_STATE_WRAPPER_H_
+
+#include <memory>
+
+#include "resumption/last_state.h"
+#include "utils/mutable_data_accessor.h"
+
+namespace resumption {
+class LastStateWrapper;
+typedef std::shared_ptr<LastStateWrapper> LastStateWrapperPtr;
+typedef MutableDataAccessor<LastState> LastStateAccessor;
+
+class LastStateWrapper {
+ public:
+  /**
+   * @brief Getter for providing exclusive access to LastState instance
+   * @return accessor with ability to access to LastState instance
+   */
+  virtual LastStateAccessor get_accessor() const = 0;
+};
+
+}  // namespace resumption
+
+#endif  // SRC_COMPONENTS_INCLUDE_RESUMPTION_LAST_STATE_WRAPPER_H_
diff --git a/src/components/include/security_manager/security_manager.h b/src/components/include/security_manager/security_manager.h
index e02a3a1cbe..358c4e5268 100644
--- a/src/components/include/security_manager/security_manager.h
+++ b/src/components/include/security_manager/security_manager.h
@@ -166,7 +166,17 @@ class SecurityManager : public protocol_handler::ProtocolObserver,
   /**
    * @brief Notify all listeners that handshake was failed
    */
-  virtual void NotifyListenersOnHandshakeFailed() = 0;
+  virtual void NotifyListenersOnGetSystemTimeFailed() = 0;
+
+  virtual void ProcessFailedPTU() = 0;
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief ProcessFailedCertDecrypt is called to notify listeners that
+   * certificate decryption failed in the external flow
+   */
+  virtual void ProcessFailedCertDecrypt() = 0;
+#endif
 
   /**
    * @brief Check if policy certificate data is empty
@@ -175,6 +185,12 @@ class SecurityManager : public protocol_handler::ProtocolObserver,
   virtual bool IsPolicyCertificateDataEmpty() = 0;
 
   /**
+   * @brief ResetPendingSystemTimeRequests resets waiting for system time
+   * requests flag
+   */
+  virtual void ResetPendingSystemTimeRequests() = 0;
+
+  /**
    * \brief Add/Remove for SecurityManagerListener
    */
   virtual void AddListener(SecurityManagerListener* const listener) = 0;
diff --git a/src/components/include/security_manager/security_manager_listener.h b/src/components/include/security_manager/security_manager_listener.h
index 00a4c68134..0f3a126410 100644
--- a/src/components/include/security_manager/security_manager_listener.h
+++ b/src/components/include/security_manager/security_manager_listener.h
@@ -33,6 +33,7 @@
 #define SRC_COMPONENTS_INCLUDE_SECURITY_MANAGER_SECURITY_MANAGER_LISTENER_H_
 
 #include <string>
+#include "security_manager/ssl_context.h"
 
 namespace security_manager {
 
@@ -52,13 +53,28 @@ class SecurityManagerListener {
    * @brief Notification about handshake failure
    * @return true on success notification handling or false otherwise
    */
-  virtual bool OnHandshakeFailed() = 0;
+  virtual bool OnGetSystemTimeFailed() = 0;
 
   /**
    * @brief Notify listeners that certificate update is required.
    */
   virtual void OnCertificateUpdateRequired() = 0;
 
+  virtual bool OnPTUFailed() = 0;
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief OnCertDecryptFailed is called when certificate decryption fails in
+   * external flow
+   * @return since this callback is a part of SecurityManagerListener, bool
+   * return value is used to indicate whether listener instance can be deleted
+   * by calling entity. if true - listener can be deleted and removed from
+   * listeners by SecurityManager, false - listener retains its place within
+   * SecurityManager.
+   */
+  virtual bool OnCertDecryptFailed() = 0;
+#endif
+
   /**
    * @brief Get certificate data from policy
    * @param reference to string where to save certificate data
diff --git a/src/components/include/test/application_manager/mock_application_manager.h b/src/components/include/test/application_manager/mock_application_manager.h
index fcedcebcf8..cd15caf7a5 100644
--- a/src/components/include/test/application_manager/mock_application_manager.h
+++ b/src/components/include/test/application_manager/mock_application_manager.h
@@ -55,7 +55,7 @@
 #include "application_manager/state_controller.h"
 #include "interfaces/HMI_API.h"
 #include "interfaces/MOBILE_API.h"
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 #include "smart_objects/smart_object.h"
 
 namespace test {
@@ -66,6 +66,10 @@ using application_manager::plugin_manager::RPCPluginManager;
 class MockApplicationManager : public application_manager::ApplicationManager {
  public:
   MOCK_METHOD2(Init,
+               bool(resumption::LastStateWrapperPtr last_state,
+                    media_manager::MediaManager* media_manager));
+  DEPRECATED
+  MOCK_METHOD2(Init,
                bool(resumption::LastState& last_state,
                     media_manager::MediaManager* media_manager));
   MOCK_METHOD0(Stop, bool());
@@ -80,10 +84,18 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD0(
       pending_applications,
       DataAccessor<application_manager::AppsWaitRegistrationSet>());
+  MOCK_CONST_METHOD0(reregister_applications,
+                     DataAccessor<application_manager::ReregisterWaitList>());
+  MOCK_METHOD1(CreatePendingLocalApplication,
+               void(const std::string& policy_app_id));
+  MOCK_METHOD1(RemovePendingApplication,
+               void(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(
       application, application_manager::ApplicationSharedPtr(uint32_t app_id));
   MOCK_CONST_METHOD0(active_application,
                      application_manager::ApplicationSharedPtr());
+  MOCK_CONST_METHOD0(get_full_or_limited_application,
+                     application_manager::ApplicationSharedPtr());
   MOCK_CONST_METHOD2(application,
                      application_manager::ApplicationSharedPtr(
                          const std::string& device_id,
@@ -111,6 +123,12 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD1(pending_application_by_policy_id,
                      application_manager::ApplicationSharedPtr(
                          const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(reregister_application_by_policy_id,
+                     application_manager::ApplicationSharedPtr(
+                         const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(applications_by_name,
+                     std::vector<application_manager::ApplicationSharedPtr>(
+                         const std::string& app_name));
   MOCK_METHOD1(
       applications_by_button,
       std::vector<application_manager::ApplicationSharedPtr>(uint32_t button));
@@ -129,10 +147,14 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_METHOD1(application_id, uint32_t(const int32_t correlation_id));
   MOCK_METHOD2(set_application_id,
                void(const int32_t correlation_id, const uint32_t app_id));
-  MOCK_METHOD3(OnHMILevelChanged,
-               void(uint32_t app_id,
-                    mobile_apis::HMILevel::eType from,
-                    mobile_apis::HMILevel::eType to));
+  MOCK_METHOD3(OnHMIStateChanged,
+               void(const uint32_t app_id,
+                    const application_manager::HmiStatePtr from,
+                    const application_manager::HmiStatePtr to));
+  MOCK_METHOD3(ProcessOnDataStreamingNotification,
+               void(const protocol_handler::ServiceType service_type,
+                    const uint32_t app_id,
+                    const bool streaming_data_available));
   MOCK_METHOD1(
       SendHMIStatusNotification,
       void(const std::shared_ptr<application_manager::Application> app));
@@ -194,8 +216,7 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_METHOD1(SetIconFileFromSystemRequest, void(const std::string policy_id));
   MOCK_CONST_METHOD0(IsHMICooperating, bool());
   MOCK_METHOD2(IviInfoUpdated,
-               void(mobile_apis::VehicleDataType::eType vehicle_info,
-                    int value));
+               void(const std::string& vehicle_info, int value));
   MOCK_METHOD1(RegisterApplication,
                application_manager::ApplicationSharedPtr(
                    const std::shared_ptr<smart_objects::SmartObject>&
@@ -232,6 +253,8 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                void(const uint32_t connection_key,
                     const uint32_t corr_id,
                     const int32_t function_id));
+  MOCK_METHOD1(OnQueryAppsRequest,
+               void(const connection_handler::DeviceHandle));
   MOCK_METHOD4(UnregisterApplication,
                void(const uint32_t&, mobile_apis::Result::eType, bool, bool));
   MOCK_METHOD3(updateRequestTimeout,
@@ -245,12 +268,13 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                void(mobile_apis::AppInterfaceUnregisteredReason::eType reason));
   MOCK_METHOD1(HeadUnitReset,
                void(mobile_apis::AppInterfaceUnregisteredReason::eType reason));
-  MOCK_CONST_METHOD2(HMILevelAllowsStreaming,
+  MOCK_CONST_METHOD2(HMIStateAllowsStreaming,
                      bool(uint32_t app_id,
                           protocol_handler::ServiceType service_type));
-  MOCK_METHOD4(CheckPolicyPermissions,
+  MOCK_METHOD5(CheckPolicyPermissions,
                mobile_apis::Result::eType(
                    const application_manager::ApplicationSharedPtr app,
+                   const application_manager::WindowID window_id,
                    const std::string& function_id,
                    const application_manager::RPCParams& rpc_params,
                    application_manager::CommandParametersPermissions*
@@ -264,6 +288,12 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD0(SupportedSDLVersion,
                      protocol_handler::MajorProtocolVersion());
   MOCK_METHOD1(
+      ApplyFunctorForEachPlugin,
+      void(std::function<void(application_manager::plugin_manager::RPCPlugin&)>
+               functor));
+  MOCK_METHOD1(SetVINCode, void(const std::string& vin_code));
+  MOCK_CONST_METHOD0(GetVINCode, const std::string());
+  MOCK_METHOD1(
       GetDeviceTransportType,
       hmi_apis::Common_TransportType::eType(const std::string& transport_type));
   MOCK_METHOD1(AddAppToTTSGlobalPropertiesList, void(const uint32_t app_id));
@@ -277,9 +307,10 @@ class MockApplicationManager : public application_manager::ApplicationManager {
                void(uint32_t app_id,
                     protocol_handler::ServiceType service_type,
                     bool state));
-  MOCK_CONST_METHOD5(CreateRegularState,
+  MOCK_CONST_METHOD6(CreateRegularState,
                      application_manager::HmiStatePtr(
                          application_manager::ApplicationSharedPtr app,
+                         const mobile_apis::WindowType::eType window_type,
                          mobile_apis::HMILevel::eType hmi_level,
                          mobile_apis::AudioStreamingState::eType audio_state,
                          mobile_apis::VideoStreamingState::eType video_state,
@@ -290,7 +321,11 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_CONST_METHOD2(CanAppStream,
                      bool(uint32_t app_id,
                           protocol_handler::ServiceType service_type));
+  DEPRECATED
   MOCK_METHOD1(ForbidStreaming, void(uint32_t app_id));
+  MOCK_METHOD2(ForbidStreaming,
+               void(uint32_t app_id,
+                    protocol_handler::ServiceType service_type));
   MOCK_CONST_METHOD0(get_settings,
                      const application_manager::ApplicationManagerSettings&());
   MOCK_CONST_METHOD1(
@@ -303,14 +338,19 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_METHOD2(IsSOStructValid,
                bool(const hmi_apis::StructIdentifiers::eType struct_id,
                     const smart_objects::SmartObject& display_capabilities));
+  MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints, bool(uint32_t));
   MOCK_CONST_METHOD1(IsAppSubscribedForWayPoints,
                      bool(application_manager::ApplicationSharedPtr));
+  MOCK_METHOD1(SubscribeAppForWayPoints, void(uint32_t));
   MOCK_METHOD1(SubscribeAppForWayPoints,
                void(application_manager::ApplicationSharedPtr));
+  MOCK_METHOD1(UnsubscribeAppFromWayPoints, void(uint32_t));
   MOCK_METHOD1(UnsubscribeAppFromWayPoints,
                void(application_manager::ApplicationSharedPtr));
   MOCK_CONST_METHOD0(IsAnyAppSubscribedForWayPoints, bool());
   MOCK_CONST_METHOD0(GetAppsSubscribedForWayPoints, const std::set<uint32_t>());
+  MOCK_METHOD1(SaveWayPointsMessage,
+               void(std::shared_ptr<smart_objects::SmartObject>));
   MOCK_CONST_METHOD1(
       WaitingApplicationByID,
       application_manager::ApplicationConstSharedPtr(const uint32_t));
@@ -335,8 +375,9 @@ class MockApplicationManager : public application_manager::ApplicationManager {
   MOCK_METHOD2(ProcessReconnection,
                void(application_manager::ApplicationSharedPtr application,
                     const uint32_t connection_key));
-  MOCK_CONST_METHOD1(IsAppInReconnectMode,
-                     bool(const std::string& policy_app_id));
+  MOCK_CONST_METHOD2(IsAppInReconnectMode,
+                     bool(const connection_handler::DeviceHandle& device_id,
+                          const std::string& policy_app_id));
   MOCK_CONST_METHOD0(GetCommandFactory, application_manager::CommandFactory&());
   MOCK_CONST_METHOD0(get_current_audio_source, uint32_t());
   MOCK_METHOD1(set_current_audio_source, void(const uint32_t));
diff --git a/src/components/include/test/application_manager/mock_application_manager_settings.h b/src/components/include/test/application_manager/mock_application_manager_settings.h
index 483e78b3f0..1a68d663fe 100644
--- a/src/components/include/test/application_manager/mock_application_manager_settings.h
+++ b/src/components/include/test/application_manager/mock_application_manager_settings.h
@@ -78,6 +78,8 @@ class MockApplicationManagerSettings
   MOCK_CONST_METHOD0(tts_delimiter, const std::string&());
   MOCK_CONST_METHOD0(put_file_in_none, const uint32_t&());
   MOCK_CONST_METHOD0(sdl_version, const std::string&());
+  MOCK_CONST_METHOD0(vr_help_title, const std::string&());
+  MOCK_CONST_METHOD0(help_prompt, const std::vector<std::string>&());
   MOCK_CONST_METHOD0(time_out_promt, const std::vector<std::string>&());
   MOCK_CONST_METHOD0(hmi_capabilities_file_name, const std::string&());
   MOCK_CONST_METHOD0(video_server_type, const std::string&());
@@ -89,6 +91,7 @@ class MockApplicationManagerSettings
   MOCK_CONST_METHOD0(named_audio_pipe_path, const std::string&());
   MOCK_CONST_METHOD0(video_stream_file, const std::string&());
   MOCK_CONST_METHOD0(audio_stream_file, const std::string&());
+  MOCK_CONST_METHOD0(period_for_consent_expiration, uint16_t());
   MOCK_CONST_METHOD0(use_full_app_id, bool());
   MOCK_CONST_METHOD0(cloud_app_retry_timeout, uint32_t());
   MOCK_CONST_METHOD0(cloud_app_max_retry_attempts, uint16_t());
diff --git a/src/components/include/test/application_manager/mock_rpc_handler.h b/src/components/include/test/application_manager/mock_rpc_handler.h
index fb577622ce..cc7fe988a0 100644
--- a/src/components/include/test/application_manager/mock_rpc_handler.h
+++ b/src/components/include/test/application_manager/mock_rpc_handler.h
@@ -30,8 +30,10 @@ class MockRPCHandler : public application_manager::rpc_handler::RPCHandler {
   MOCK_METHOD1(OnErrorSending,
                void(std::shared_ptr<application_manager::Message> message));
 
+#ifdef TELEMETRY_MONITOR
   MOCK_METHOD1(SetTelemetryObserver,
                void(application_manager::AMTelemetryObserver* observer));
+#endif  // TELEMETRY_MONITOR
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/include/test/application_manager/mock_rpc_plugin.h b/src/components/include/test/application_manager/mock_rpc_plugin.h
index 94ce8ccbb6..2633825428 100644
--- a/src/components/include/test/application_manager/mock_rpc_plugin.h
+++ b/src/components/include/test/application_manager/mock_rpc_plugin.h
@@ -10,11 +10,19 @@ namespace plugin_manager {
 
 class MockRPCPlugin : public RPCPlugin {
  public:
-  MOCK_METHOD4(Init,
+  MOCK_METHOD5(Init,
                bool(ApplicationManager& app_manager,
                     rpc_service::RPCService& rpc_service,
                     HMICapabilities& hmi_capabilities,
-                    policy::PolicyHandlerInterface& policy_handler));
+                    policy::PolicyHandlerInterface& policy_handler,
+                    resumption::LastStateWrapperPtr last_state));
+  DEPRECATED
+  MOCK_METHOD5(Init,
+               bool(ApplicationManager& app_manager,
+                    rpc_service::RPCService& rpc_service,
+                    HMICapabilities& hmi_capabilities,
+                    policy::PolicyHandlerInterface& policy_handler,
+                    resumption::LastState& last_state));
   MOCK_METHOD2(IsAbleToProcess,
                bool(const int32_t function_id,
                     const commands::Command::CommandSource message_source));
diff --git a/src/components/include/test/application_manager/mock_rpc_service.h b/src/components/include/test/application_manager/mock_rpc_service.h
index fbdc451265..e9cf59e670 100644
--- a/src/components/include/test/application_manager/mock_rpc_service.h
+++ b/src/components/include/test/application_manager/mock_rpc_service.h
@@ -3,21 +3,34 @@
 
 #include "application_manager/rpc_service.h"
 #include "gmock/gmock.h"
+#include "smart_objects/object_schema_item.h"
 
 namespace test {
 namespace components {
 namespace application_manager_test {
 
+using ns_smart_device_link::ns_smart_objects::SMember;
+
 class MockRPCService : public application_manager::rpc_service::RPCService {
  public:
   MOCK_METHOD2(
       ManageHMICommand,
       bool(const application_manager::commands::MessageSharedPtr message,
            application_manager::commands::Command::CommandSource source));
+  MOCK_METHOD3(
+      ManageHMICommand,
+      bool(const application_manager::commands::MessageSharedPtr message,
+           application_manager::commands::Command::CommandSource source,
+           const std::string warning_info));
   MOCK_METHOD2(
       ManageMobileCommand,
       bool(const application_manager::commands::MessageSharedPtr message,
            application_manager::commands::Command::CommandSource origin));
+  MOCK_METHOD3(
+      ManageMobileCommand,
+      bool(const application_manager::commands::MessageSharedPtr message,
+           application_manager::commands::Command::CommandSource origin,
+           const std::string warning_info));
   MOCK_METHOD2(SendMessageToMobile,
                void(application_manager::commands::MessageSharedPtr, bool));
   MOCK_METHOD1(
@@ -31,6 +44,17 @@ class MockRPCService : public application_manager::rpc_service::RPCService {
       IsAppServiceRPC,
       bool(int32_t function_id,
            application_manager::commands::Command::CommandSource source));
+  MOCK_METHOD3(UpdateMobileRPCParams,
+               void(const mobile_apis::FunctionID::eType& function_id,
+                    const mobile_apis::messageType::eType& message_type,
+                    const std::map<std::string, SMember>& members));
+
+  MOCK_METHOD3(UpdateHMIRPCParams,
+               void(const hmi_apis::FunctionID::eType& function_id,
+                    const hmi_apis::messageType::eType& message_type,
+                    const std::map<std::string, SMember>& members));
+
+  MOCK_METHOD0(Stop, void());
 };
 }  // namespace application_manager_test
 }  // namespace components
diff --git a/src/components/include/test/application_manager/mock_state_controller.h b/src/components/include/test/application_manager/mock_state_controller.h
index 20a84e7f00..545090bf30 100644
--- a/src/components/include/test/application_manager/mock_state_controller.h
+++ b/src/components/include/test/application_manager/mock_state_controller.h
@@ -46,55 +46,68 @@ namespace am = application_manager;
 
 class MockStateController : public am::StateController {
  public:
-  MOCK_METHOD3(SetRegularState,
+  MOCK_METHOD4(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     am::HmiStatePtr state,
                     const bool request_hmi_state_change));
-  MOCK_METHOD5(SetRegularState,
+  MOCK_METHOD6(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level,
                     const mobile_apis::AudioStreamingState::eType audio_state,
                     const mobile_apis::VideoStreamingState::eType video_state,
                     const bool request_hmi_state_change));
-  MOCK_METHOD3(SetRegularState,
+  MOCK_METHOD4(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level,
                     const bool request_hmi_state_change));
-  MOCK_METHOD6(SetRegularState,
+  MOCK_METHOD7(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level,
                     const mobile_apis::AudioStreamingState::eType audio_state,
                     const mobile_apis::VideoStreamingState::eType video_state,
                     const mobile_apis::SystemContext::eType system_context,
                     const bool request_hmi_state_change));
-  MOCK_METHOD2(SetRegularState,
+  MOCK_METHOD3(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::HMILevel::eType hmi_level));
-  MOCK_METHOD3(SetRegularState,
+  MOCK_METHOD4(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::AudioStreamingState::eType audio_state,
                     const mobile_apis::VideoStreamingState::eType video_state));
-  MOCK_METHOD2(SetRegularState,
+  MOCK_METHOD3(SetRegularState,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     const mobile_apis::SystemContext::eType system_context));
-  MOCK_METHOD2(SetRegularState,
-               void(am::ApplicationSharedPtr app, am::HmiStatePtr state));
+  MOCK_METHOD3(SetRegularState,
+               void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
+                    am::HmiStatePtr state));
   MOCK_METHOD2(OnApplicationRegistered,
                void(am::ApplicationSharedPtr app,
                     const mobile_apis::HMILevel::eType default_level));
-  MOCK_METHOD3(RequestHMIStateChange,
-               int64_t(am::ApplicationConstSharedPtr app,
-                       hmi_apis::Common_HMILevel::eType level,
-                       bool send_policy_priority));
+  MOCK_METHOD4(OnAppWindowAdded,
+               void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
+                    const mobile_apis::WindowType::eType window_type,
+                    const mobile_apis::HMILevel::eType default_level));
   MOCK_METHOD1(OnVideoStreamingStarted,
                void(am::ApplicationConstSharedPtr app));
   MOCK_METHOD1(OnVideoStreamingStopped,
                void(am::ApplicationConstSharedPtr app));
-  MOCK_METHOD3(OnStateChanged,
+  MOCK_METHOD4(OnStateChanged,
                void(am::ApplicationSharedPtr app,
+                    const am::WindowID window_id,
                     am::HmiStatePtr old_state,
                     am::HmiStatePtr new_state));
   MOCK_CONST_METHOD1(IsStateActive, bool(am::HmiState::StateID state_id));
+  MOCK_METHOD1(ActivateDefaultWindow, void(am::ApplicationSharedPtr app));
+  MOCK_METHOD1(ExitDefaultWindow, void(am::ApplicationSharedPtr app));
 };
 
 }  // namespace application_manager_test
diff --git a/src/components/include/test/application_manager/policies/mock_custom_vehicle_data_provider.h b/src/components/include/test/application_manager/policies/mock_custom_vehicle_data_provider.h
new file mode 100644
index 0000000000..ba077122ce
--- /dev/null
+++ b/src/components/include/test/application_manager/policies/mock_custom_vehicle_data_provider.h
@@ -0,0 +1,24 @@
+#ifndef MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H
+#define MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H
+
+#include "application_manager/policies/custom_vehicle_data_provider.h"
+#include "gmock/gmock.h"
+
+namespace test {
+namespace components {
+namespace policy_test {
+
+class MockCustomVehicleDataProvider : public policy::VehicleDataItemProvider {
+ public:
+  MOCK_CONST_METHOD0(
+      GetVehicleDataItems,
+      const std::vector<rpc::policy_table_interface_base::VehicleDataItem>());
+  MOCK_CONST_METHOD0(
+      GetRemovedVehicleDataItems,
+      std::vector<rpc::policy_table_interface_base::VehicleDataItem>());
+};
+
+}  // namespace policy_test
+}  // namespace components
+}  // namespace test
+#endif  // MOCK_CUSTOM_VEHICLE_DATA_MANAGER_H
diff --git a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
index 342debca0a..38c1cca69e 100644
--- a/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
+++ b/src/components/include/test/application_manager/policies/mock_policy_handler_interface.h
@@ -34,6 +34,7 @@
 #define SRC_COMPONENTS_INCLUDE_TEST_APPLICATION_MANAGER_POLICIES_MOCK_POLICY_HANDLER_INTERFACE_H_
 
 #include "application_manager/application_manager.h"
+#include "application_manager/policies/policy_encryption_flag_getter.h"
 #include "application_manager/policies/policy_handler_interface.h"
 #include "gmock/gmock.h"
 #include "policy/policy_types.h"
@@ -46,6 +47,8 @@ namespace policy_test {
 class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
  public:
   MOCK_METHOD0(LoadPolicyLibrary, bool());
+  MOCK_CONST_METHOD0(PolicyEncryptionFlagGetter,
+                     policy::PolicyEncryptionFlagGetterInterfaceSPtr());
   MOCK_CONST_METHOD0(PolicyEnabled, bool());
   MOCK_METHOD0(InitPolicyTable, bool());
   MOCK_METHOD0(ResetPolicyTable, bool());
@@ -57,13 +60,22 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                bool(const std::string& file,
                     const policy::BinaryMessage& pt_string));
   MOCK_METHOD0(UnloadPolicyLibrary, bool());
-  MOCK_METHOD3(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
+  MOCK_METHOD4(OnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id,
                     const policy::Permissions& permissions,
                     const policy::HMILevel& default_hmi));
-  MOCK_METHOD2(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
+  MOCK_METHOD3(OnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id,
                     const policy::Permissions& permissions));
+  MOCK_CONST_METHOD0(GetPolicyTableData, Json::Value());
+  MOCK_CONST_METHOD0(
+      GetVehicleDataItems,
+      const std::vector<rpc::policy_table_interface_base::VehicleDataItem>());
+  MOCK_CONST_METHOD0(
+      GetRemovedVehicleDataItems,
+      std::vector<rpc::policy_table_interface_base::VehicleDataItem>());
 
 #ifdef EXTERNAL_PROPRIETARY_MODE
   MOCK_METHOD3(OnSnapshotCreated,
@@ -71,14 +83,20 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                     const std::vector<int>& retry_delay_seconds,
                     uint32_t timeout_exchange));
 #else   // EXTERNAL_PROPRIETARY_MODE
-  MOCK_METHOD1(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string));
+  MOCK_METHOD2(OnSnapshotCreated,
+               void(const policy::BinaryMessage& pt_string,
+                    const policy::PTUIterationType iteration_type));
+  MOCK_METHOD2(GetNextUpdateUrl,
+               std::string(const policy::PTUIterationType iteration_type,
+                           uint32_t& app_id));
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
   MOCK_CONST_METHOD2(GetPriority,
                      bool(const std::string& policy_app_id,
                           std::string* priority));
-  MOCK_METHOD4(CheckPermissions,
+  MOCK_METHOD5(CheckPermissions,
                void(const application_manager::ApplicationSharedPtr app,
+                    const application_manager::WindowID window_id,
                     const policy::PTString& rpc,
                     const application_manager::RPCParams& rpc_params,
                     policy::CheckPermissionResult& result));
@@ -86,8 +104,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                      uint32_t(const std::string& priority));
   MOCK_CONST_METHOD1(GetUserConsentForDevice,
                      policy::DeviceConsent(const std::string& device_id));
-  MOCK_CONST_METHOD2(GetDefaultHmi,
-                     bool(const std::string& policy_app_id,
+  MOCK_CONST_METHOD3(GetDefaultHmi,
+                     bool(const std::string& device_id,
+                          const std::string& policy_app_id,
                           std::string* default_hmi));
 
   MOCK_METHOD3(GetInitialAppData,
@@ -98,17 +117,17 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                bool(const std::string& application_id,
                     policy::StringArray* nicknames));
   MOCK_METHOD1(GetInitialAppData, bool(const std::string& application_id));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const uint32_t service_type,
-                    policy::EndpointUrls& end_points));
-  MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string());
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const uint32_t service_type,
+                          policy::EndpointUrls& end_points));
+  MOCK_CONST_METHOD1(GetLockScreenIconUrl,
+                     std::string(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(GetIconUrl, std::string(const std::string& policy_app_id));
   MOCK_METHOD0(ResetRetrySequence, void());
   MOCK_METHOD0(NextRetryTimeout, uint32_t());
   MOCK_CONST_METHOD0(TimeoutExchangeSec, uint32_t());
   MOCK_CONST_METHOD0(TimeoutExchangeMSec, uint32_t());
   MOCK_METHOD0(OnExceededTimeout, void());
-  MOCK_METHOD0(OnSystemReady, void());
   MOCK_CONST_METHOD0(LockScreenDismissalEnabledState,
                      const boost::optional<bool>());
   MOCK_CONST_METHOD1(LockScreenDismissalWarningMessage,
@@ -127,8 +146,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_METHOD2(OnAllowSDLFunctionalityNotification,
                void(bool is_allowed, const std::string& device_id));
   MOCK_METHOD0(OnIgnitionCycleOver, void());
-  MOCK_METHOD1(OnPendingPermissionChange,
-               void(const std::string& policy_app_id));
+  MOCK_METHOD2(OnPendingPermissionChange,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id));
   MOCK_METHOD1(PTExchangeAtUserRequest, void(uint32_t correlation_id));
   MOCK_METHOD2(AddDevice,
                void(const std::string& device_id,
@@ -156,20 +176,28 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                     const uint32_t correlation_id));
   MOCK_METHOD1(OnGetStatusUpdate, void(const uint32_t correlation_id));
   MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status));
-  MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired,
-               std::string(const std::string& policy_app_id));
+  MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired,
+               std::string(const transport_manager::DeviceHandle& device_handle,
+                           const std::string& policy_app_id));
   MOCK_METHOD1(OnSystemInfoChanged, void(const std::string& language));
   MOCK_METHOD3(OnGetSystemInfo,
                void(const std::string& ccpu_version,
                     const std::string& wers_country_code,
                     const std::string& language));
-  MOCK_METHOD0(OnSystemInfoUpdateRequired, void());
   MOCK_METHOD0(OnVIIsReady, void());
   MOCK_METHOD1(OnVehicleDataUpdated,
                void(const smart_objects::SmartObject& message));
   MOCK_METHOD1(RemoveDevice, void(const std::string& device_id));
   MOCK_METHOD1(AddStatisticsInfo, void(int type));
   MOCK_METHOD1(OnSystemError, void(int code));
+#ifndef EXTERNAL_PROPRIETARY_MODE
+  MOCK_METHOD1(ChoosePTUApplication,
+               uint32_t(const policy::PTUIterationType iteration_type));
+  MOCK_METHOD3(CacheRetryInfo,
+               void(const uint32_t app_id,
+                    const std::string url,
+                    const std::string snapshot_path));
+#endif
   MOCK_CONST_METHOD0(GetAppIdForSending, uint32_t());
   MOCK_METHOD1(
       GetAppName,
@@ -178,18 +206,25 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                void(std::map<std::string, policy::StringArray> app_hmi_types));
   MOCK_METHOD1(OnCertificateUpdated, void(const std::string& certificate_data));
   MOCK_METHOD1(OnPTUFinished, void(const bool ptu_result));
+  MOCK_METHOD0(OnPTInited, void());
+  MOCK_METHOD0(StopRetrySequence, void());
   MOCK_METHOD1(OnCertificateDecrypted, void(bool is_succeeded));
   MOCK_METHOD0(CanUpdate, bool());
   MOCK_METHOD2(OnDeviceConsentChanged,
                void(const std::string& device_id, bool is_allowed));
-  MOCK_CONST_METHOD2(SendOnAppPermissionsChanged,
+  MOCK_CONST_METHOD3(SendOnAppPermissionsChanged,
                      void(const policy::AppPermissions& permissions,
+                          const std::string& device_id,
                           const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(SendOnAppPropertiesChangeNotification,
+                     void(const std::string& policy_app_id));
   MOCK_METHOD0(OnPTExchangeNeeded, void());
+  MOCK_METHOD0(TriggerPTUOnStartupIfRequired, void());
   MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>& apps));
-  MOCK_METHOD2(
+  MOCK_METHOD3(
       AddApplication,
       policy::StatusNotifier(
+          const std::string& device_id,
           const std::string& application_id,
           const rpc::policy_table_interface_base::AppHmiTypes& hmi_types));
   MOCK_METHOD1(IsApplicationRevoked, bool(const std::string& app_id));
@@ -197,10 +232,14 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_CONST_METHOD1(HeartBeatTimeout, uint32_t(const std::string& app_id));
   MOCK_METHOD0(OnAppsSearchStarted, void());
   MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu));
-  MOCK_METHOD1(OnAppRegisteredOnMobile,
-               void(const std::string& application_id));
-  MOCK_CONST_METHOD2(IsRequestTypeAllowed,
-                     bool(const std::string& policy_app_id,
+  MOCK_METHOD2(OnAddedNewApplicationToAppList,
+               void(const uint32_t new_app_id, const std::string& policy_id));
+  MOCK_METHOD2(OnAppRegisteredOnMobile,
+               void(const std::string& device_id,
+                    const std::string& application_id));
+  MOCK_CONST_METHOD3(IsRequestTypeAllowed,
+                     bool(const transport_manager::DeviceHandle& device_handle,
+                          const std::string& policy_app_id,
                           mobile_apis::RequestType::eType type));
   MOCK_CONST_METHOD2(IsRequestSubTypeAllowed,
                      bool(const std::string& policy_app_id,
@@ -214,22 +253,28 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
   MOCK_CONST_METHOD1(
       GetAppRequestSubTypes,
       const std::vector<std::string>(const std::string& policy_app_id));
-  MOCK_CONST_METHOD1(
-      GetAppRequestTypes,
-      const std::vector<std::string>(const std::string& policy_app_id));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const policy::VehicleInfo());
+  MOCK_CONST_METHOD2(GetAppRequestTypes,
+                     const std::vector<std::string>(
+                         const transport_manager::DeviceHandle& device_handle,
+                         const std::string& policy_app_id));
+  MOCK_CONST_METHOD0(GetApplicationPolicyIDs, std::vector<std::string>());
   MOCK_CONST_METHOD1(GetEnabledCloudApps,
                      void(std::vector<std::string>& enabled_apps));
   MOCK_CONST_METHOD1(CheckCloudAppEnabled,
                      const bool(const std::string& policy_app_id));
-  MOCK_CONST_METHOD7(GetCloudAppParameters,
+  MOCK_CONST_METHOD0(GetEnabledLocalApps, std::vector<std::string>());
+  MOCK_CONST_METHOD2(GetAppProperties,
                      bool(const std::string& policy_app_id,
-                          bool& enabled,
-                          std::string& endpoint,
-                          std::string& certificate,
-                          std::string& auth_token,
-                          std::string& cloud_transport_type,
-                          std::string& hybrid_app_preference));
+                          policy::AppProperties& out_app_properties));
+
+  MOCK_METHOD1(OnSetAppProperties,
+               void(const smart_objects::SmartObject& message));
+  MOCK_CONST_METHOD2(
+      GetAppPropertiesStatus,
+      AppPropertiesState(const smart_objects::SmartObject& properties,
+                         const std::string& app_id));
+  MOCK_CONST_METHOD1(IsNewApplication, bool(const std::string& application_id));
+  MOCK_METHOD0(OnLocalAppAdded, void());
   MOCK_METHOD1(OnSetCloudAppProperties,
                void(const smart_objects::SmartObject& message));
   MOCK_CONST_METHOD2(
@@ -246,6 +291,8 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
 
 #ifdef EXTERNAL_PROPRIETARY_MODE
   MOCK_CONST_METHOD0(GetMetaInfo, const policy::MetaInfo());
+  MOCK_METHOD0(IncrementRetryIndex, void());
+  MOCK_CONST_METHOD0(ptu_retry_handler, policy::PTURetryHandler&());
 #endif  // EXTERNAL_PROPRIETARY_MODE
 
   MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type));
@@ -265,9 +312,9 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
 #endif  // ENABLE_SECURITY
   MOCK_CONST_METHOD0(get_settings, const policy::PolicySettings&());
   MOCK_CONST_METHOD0(RemoteAppsUrl, const std::string());
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const std::string& service_type,
-                    policy::EndpointUrls& end_points));
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const std::string& service_type,
+                          policy::EndpointUrls& end_points));
 
   MOCK_METHOD3(OnUpdateHMILevel,
                void(const std::string& device_id,
@@ -290,16 +337,20 @@ class MockPolicyHandlerInterface : public policy::PolicyHandlerInterface {
                void(const std::string& device_id,
                     const std::string& policy_app_id,
                     const std::string& hmi_level));
+  MOCK_METHOD0(OnPTUTimeOut, void());
   MOCK_CONST_METHOD2(GetModuleTypes,
                      bool(const std::string& policy_app_id,
                           std::vector<std::string>* modules));
-  MOCK_METHOD2(SetDefaultHmiTypes,
-               void(const std::string& application_id,
+  MOCK_METHOD3(SetDefaultHmiTypes,
+               void(const transport_manager::DeviceHandle& device_handle,
+                    const std::string& application_id,
                     const smart_objects::SmartObject* app_types));
   MOCK_METHOD2(OnDeviceSwitching,
                void(const std::string& device_id_from,
                     const std::string& device_id_to));
 
+  MOCK_CONST_METHOD0(OnSystemRequestReceived, void());
+
  private:
 #ifdef EXTERNAL_PROPRIETARY_MODE
   MOCK_METHOD3(OnAppPermissionConsentInternal,
diff --git a/src/components/include/test/connection_handler/mock_connection_handler.h b/src/components/include/test/connection_handler/mock_connection_handler.h
index 41c2f04ebb..6acffea0ed 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler.h
@@ -133,6 +133,8 @@ class MockConnectionHandler : public connection_handler::ConnectionHandler {
       OnSecondaryTransportEnded,
       void(const transport_manager::ConnectionUID primary_connection_handle,
            const transport_manager::ConnectionUID secondary_connection_handle));
+  MOCK_METHOD0(CreateWebEngineDevice, void());
+  MOCK_CONST_METHOD0(GetWebEngineDeviceInfo, transport_manager::DeviceInfo&());
 };
 
 }  // namespace connection_handler_test
diff --git a/src/components/include/test/connection_handler/mock_connection_handler_observer.h b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
index 8f7ec90550..61877daa23 100644
--- a/src/components/include/test/connection_handler/mock_connection_handler_observer.h
+++ b/src/components/include/test/connection_handler/mock_connection_handler_observer.h
@@ -46,6 +46,7 @@ class MockConnectionHandlerObserver
   MOCK_METHOD1(OnDeviceListUpdated,
                void(const connection_handler::DeviceMap& device_list));
   MOCK_METHOD0(OnFindNewApplicationsRequest, void());
+  MOCK_METHOD0(OnWebEngineDeviceCreated, void());
   MOCK_METHOD1(RemoveDevice,
                void(const connection_handler::DeviceHandle& device_handle));
   MOCK_METHOD4(OnServiceStartedCallback,
diff --git a/src/components/include/test/media_manager/mock_media_manager.h b/src/components/include/test/media_manager/mock_media_manager.h
index b58cfab5d7..aa0baa5682 100644
--- a/src/components/include/test/media_manager/mock_media_manager.h
+++ b/src/components/include/test/media_manager/mock_media_manager.h
@@ -57,6 +57,7 @@ class MockMediaManager : public media_manager::MediaManager {
   MOCK_METHOD2(FramesProcessed,
                void(int32_t application_key, int32_t frame_number));
   MOCK_CONST_METHOD0(settings, const media_manager::MediaManagerSettings&());
+  MOCK_CONST_METHOD1(DataSizeToMilliseconds, uint32_t(uint64_t data_size));
 };
 
 }  // namespace media_manager_test
diff --git a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h
index 0a6bef45dd..c7a6e3d50a 100644
--- a/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h
+++ b/src/components/include/test/policy/policy_external/policy/mock_cache_manager.h
@@ -57,9 +57,11 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface {
                     const PTString& hmi_level,
                     const PTString& rpc,
                     CheckPermissionResult& result));
+  MOCK_CONST_METHOD0(pt, std::shared_ptr<policy_table::Table>());
   MOCK_METHOD0(IsPTPreloaded, bool());
   MOCK_METHOD0(IgnitionCyclesBeforeExchange, int());
   MOCK_METHOD1(KilometersBeforeExchange, int(int current));
+  MOCK_CONST_METHOD0(GetEnabledLocalApps, std::vector<std::string>());
   MOCK_CONST_METHOD1(GetPermissionsList, bool(StringArray& perm_list));
   MOCK_METHOD2(SetCountersPassedForSuccessfulUpdate,
                bool(Counters counter, int value));
@@ -75,17 +77,16 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface {
   MOCK_METHOD0(TimeoutResponse, int());
   MOCK_METHOD1(SecondsBetweenRetries, bool(std::vector<int>& seconds));
   MOCK_CONST_METHOD1(IsDeviceConsentCached, bool(const std::string& device_id));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const VehicleInfo());
+  MOCK_CONST_METHOD0(GetPolicyTableData, Json::Value());
+  MOCK_CONST_METHOD0(GetVehicleDataItems,
+                     const std::vector<policy_table::VehicleDataItem>());
+  MOCK_CONST_METHOD0(GetRemovedVehicleDataItems,
+                     std::vector<policy_table::VehicleDataItem>());
   MOCK_CONST_METHOD1(GetEnabledCloudApps,
                      void(std::vector<std::string>& enabled_apps));
-  MOCK_CONST_METHOD7(GetCloudAppParameters,
+  MOCK_CONST_METHOD2(GetAppProperties,
                      bool(const std::string& policy_app_id,
-                          bool& enabled,
-                          std::string& endpoint,
-                          std::string& certificate,
-                          std::string& auth_token,
-                          std::string& cloud_transport_type,
-                          std::string& hybrid_app_preference));
+                          AppProperties& out_app_properties));
   MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id));
   MOCK_METHOD2(SetCloudAppEnabled,
                void(const std::string& policy_app_id, const bool enabled));
@@ -129,12 +130,12 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface {
                          const std::vector<std::string>& msg_codes,
                          const std::string& language,
                          const std::string& active_hmi_language));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const std::string& service_type,
-                    EndpointUrls& out_end_points));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const uint32_t service_type, EndpointUrls& out_end_points));
-  MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string());
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const std::string& service_type,
+                          EndpointUrls& out_end_points));
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const uint32_t service_type,
+                          EndpointUrls& out_end_points));
   MOCK_CONST_METHOD1(GetIconUrl, std::string(const std::string& policy_app_id));
   MOCK_METHOD1(
       GetNotificationsNumber,
@@ -296,6 +297,19 @@ class MockCacheManagerInterface : public ::policy::CacheManagerInterface {
                      RequestType::State(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(GetAppRequestSubTypesState,
                      RequestSubType::State(const std::string& policy_app_id));
+
+  MOCK_CONST_METHOD1(
+      GetAppEncryptionRequiredFlag,
+      rpc::Optional<rpc::Boolean>(const std::string& application_policy_name));
+
+  MOCK_CONST_METHOD1(
+      GetFunctionalGroupingEncryptionRequiredFlag,
+      rpc::Optional<rpc::Boolean>(const std::string& functional_group));
+
+  MOCK_CONST_METHOD2(GetApplicationParams,
+                     void(const std::string& application_name,
+                          policy_table::ApplicationParams& application_params));
+  MOCK_CONST_METHOD0(GetPolicyAppIDs, const policy_table::Strings());
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h
index e6ee086b31..62dfdf4058 100644
--- a/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h
+++ b/src/components/include/test/policy/policy_external/policy/mock_policy_listener.h
@@ -38,6 +38,7 @@
 #include <vector>
 
 #include "gmock/gmock.h"
+#include "utils/macro.h"
 
 #include "policy/policy_listener.h"
 #include "policy/policy_table/types.h"
@@ -54,19 +55,22 @@ namespace custom_str = utils::custom_string;
 
 class MockPolicyListener : public ::policy::PolicyListener {
  public:
-  MOCK_METHOD3(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
+  MOCK_METHOD4(OnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id,
                     const policy::Permissions& permissions,
                     const policy::HMILevel& default_hmi));
-  MOCK_METHOD2(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
+  MOCK_METHOD3(OnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id,
                     const policy::Permissions& permissions));
-  MOCK_METHOD1(OnPendingPermissionChange,
-               void(const std::string& policy_app_id));
+  MOCK_METHOD2(OnPendingPermissionChange,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id));
   MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status));
-  MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired,
-               std::string(const std::string& policy_app_id));
-  MOCK_METHOD0(OnSystemInfoUpdateRequired, void());
+  MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired,
+               std::string(const transport_manager::DeviceHandle& device_handle,
+                           const std::string& policy_app_id));
   MOCK_METHOD1(GetAppName,
                custom_str::CustomString(const std::string& policy_app_id));
   MOCK_METHOD0(OnUserRequestedUpdateCheckRequired, void());
@@ -85,10 +89,15 @@ class MockPolicyListener : public ::policy::PolicyListener {
                void(const std::string& policy_app_id,
                     const std::string& auth_token));
   MOCK_METHOD1(OnPTUFinished, void(const bool ptu_result));
-  MOCK_CONST_METHOD2(SendOnAppPermissionsChanged,
-                     void(const policy::AppPermissions&, const std::string&));
-  MOCK_METHOD1(GetDevicesIds,
-               std::vector<std::string>(const std::string& policy_app_id));
+  MOCK_CONST_METHOD3(SendOnAppPermissionsChanged,
+                     void(const policy::AppPermissions& permissions,
+                          const std::string& device_id,
+                          const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(SendOnAppPropertiesChangeNotification,
+                     void(const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(
+      GetDevicesIds,
+      std::vector<std::string>(const std::string& policy_app_id));
   MOCK_METHOD3(OnUpdateHMILevel,
                void(const std::string& device_id,
                     const std::string& policy_app_id,
@@ -104,6 +113,9 @@ class MockPolicyListener : public ::policy::PolicyListener {
                     const std::string& policy_app_id,
                     const std::string& hmi_level));
   MOCK_METHOD0(OnLockScreenDismissalStateChanged, void());
+  MOCK_METHOD1(OnCertDecryptFinished, void(bool));
+  MOCK_METHOD0(IncrementRetryIndex, void());
+  MOCK_CONST_METHOD0(ptu_retry_handler, policy::PTURetryHandler&());
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
index 309e357235..bf092d38e8 100644
--- a/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
+++ b/src/components/include/test/policy/policy_external/policy/mock_policy_manager.h
@@ -54,22 +54,43 @@ namespace policy_manager_test {
 
 class MockPolicyManager : public PolicyManager {
  public:
+  MOCK_CONST_METHOD1(AppNeedEncryption, bool(const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(
+      GetFunctionalGroupsForApp,
+      const std::vector<std::string>(const std::string& policy_app_id));
+  MOCK_CONST_METHOD0(GetApplicationPolicyIDs, const std::vector<std::string>());
+  MOCK_CONST_METHOD2(FunctionNeedEncryption,
+                     bool(const std::string& policy_group,
+                          const std::string& policy_function_id));
+  MOCK_CONST_METHOD1(FunctionGroupNeedEncryption,
+                     bool(const std::string& policy_group));
+  MOCK_CONST_METHOD1(
+      GetAppEncryptionRequired,
+      const rpc::Optional<rpc::Boolean>(const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(GetRPCsForFunctionGroup,
+                     const std::vector<std::string>(const std::string& group));
+  MOCK_CONST_METHOD1(GetPolicyFunctionName,
+                     const std::string(const uint32_t function_id));
   MOCK_METHOD1(set_listener, void(PolicyListener* listener));
   MOCK_METHOD2(InitPT,
                bool(const std::string& file_name,
                     const PolicySettings* settings));
   MOCK_METHOD2(LoadPT,
-               bool(const std::string& file, const BinaryMessage& pt_content));
+               PtProcessingResult(const std::string& file,
+                                  const BinaryMessage& pt_content));
+  MOCK_METHOD1(OnPTUFinished, void(const PtProcessingResult ptu_result));
   MOCK_METHOD1(ResetPT, bool(const std::string& file_name));
   MOCK_METHOD1(GetUpdateUrl, std::string(int service_type));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const uint32_t service_type, EndpointUrls& out_end_points));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const std::string& service_type,
-                    EndpointUrls& out_end_points));
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const uint32_t service_type,
+                          EndpointUrls& out_end_points));
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const std::string& service_type,
+                          EndpointUrls& out_end_points));
   MOCK_METHOD0(RequestPTUpdate, void());
-  MOCK_METHOD5(CheckPermissions,
-               void(const PTString& app_id,
+  MOCK_METHOD6(CheckPermissions,
+               void(const PTString& device_id,
+                    const PTString& app_id,
                     const PTString& hmi_level,
                     const PTString& rpc,
                     const RPCParams& rpc_params,
@@ -84,7 +105,9 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(IncrementIgnitionCycles, void());
   MOCK_METHOD0(ForcePTExchange, std::string());
   MOCK_METHOD0(ForcePTExchangeAtUserRequest, std::string());
-  MOCK_METHOD0(ResetRetrySequence, void());
+  MOCK_METHOD0(StopRetrySequence, void());
+  MOCK_METHOD1(ResetRetrySequence,
+               void(const policy::ResetRetryCountType send_event));
   MOCK_METHOD0(NextRetryTimeout, int());
   MOCK_METHOD0(TimeoutExchangeMSec, uint32_t());
   MOCK_METHOD0(RetrySequenceDelaysSeconds, const std::vector<int>());
@@ -99,8 +122,10 @@ class MockPolicyManager : public PolicyManager {
            std::vector<policy::FunctionalGroupPermission>& permissions));
   MOCK_METHOD2(SetUserConsentForDevice,
                void(const std::string& device_id, const bool is_allowed));
-  MOCK_METHOD2(ReactOnUserDevConsentForApp,
-               bool(const std::string& app_id, bool is_device_allowed));
+  MOCK_METHOD3(ReactOnUserDevConsentForApp,
+               bool(const transport_manager::DeviceHandle& device_handle,
+                    const std::string& app_id,
+                    bool is_device_allowed));
   MOCK_METHOD2(PTUpdatedAt, void(policy::Counters counter, int value));
 
   MOCK_METHOD3(GetInitialAppData,
@@ -117,8 +142,9 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD2(SetUserConsentForApp,
                void(const policy::PermissionConsent& permissions,
                     const policy::PolicyManager::NotificationMode mode));
-  MOCK_CONST_METHOD2(GetDefaultHmi,
-                     bool(const std::string& policy_app_id,
+  MOCK_CONST_METHOD3(GetDefaultHmi,
+                     bool(const std::string& device_id,
+                          const std::string& policy_app_id,
                           std::string* default_hmi));
   MOCK_CONST_METHOD2(GetPriority,
                      bool(const std::string& policy_app_id,
@@ -134,26 +160,32 @@ class MockPolicyManager : public PolicyManager {
       void(const std::string& device_id,
            const std::string& policy_app_id,
            std::vector<policy::FunctionalGroupPermission>& permissions));
-  MOCK_METHOD1(GetAppPermissionsChanges,
-               policy::AppPermissions(const std::string& policy_app_id));
+  MOCK_METHOD2(GetAppPermissionsChanges,
+               policy::AppPermissions(const std::string& device_id,
+                                      const std::string& policy_app_id));
   MOCK_METHOD1(RemovePendingPermissionChanges, void(const std::string& app_id));
-  MOCK_CONST_METHOD1(GetCurrentDeviceId,
-                     std::string&(const std::string& policy_app_id));
+  MOCK_CONST_METHOD2(
+      GetCurrentDeviceId,
+      std::string&(const transport_manager::DeviceHandle& device_handle,
+                   const std::string& policy_app_id));
   MOCK_METHOD1(SetSystemLanguage, void(const std::string& language));
   MOCK_METHOD3(SetSystemInfo,
                void(const std::string& ccpu_version,
                     const std::string& wers_country_code,
                     const std::string& language));
-  MOCK_METHOD1(SendNotificationOnPermissionsUpdated,
-               void(const std::string& application_id));
+  MOCK_METHOD2(SendNotificationOnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& application_id));
   MOCK_METHOD1(MarkUnpairedDevice, void(const std::string& device_id));
-  MOCK_METHOD2(
+  MOCK_METHOD3(
       AddApplication,
       StatusNotifier(
+          const std::string& device_id,
           const std::string& application_id,
           const rpc::policy_table_interface_base::AppHmiTypes& hmi_types));
-  MOCK_METHOD2(SetDefaultHmiTypes,
-               void(const std::string& application_id,
+  MOCK_METHOD3(SetDefaultHmiTypes,
+               void(const transport_manager::DeviceHandle& device_handle,
+                    const std::string& application_id,
                     const std::vector<int>& hmi_types));
   MOCK_METHOD2(GetHMITypes,
                bool(const std::string& application_id,
@@ -163,6 +195,8 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD2(SendAppPermissionsChanged,
                void(const std::string& device_id,
                     const std::string& application_id));
+  MOCK_CONST_METHOD1(SendOnAppPropertiesChangeNotification,
+                     void(const std::string& application_id));
   MOCK_CONST_METHOD2(GetModuleTypes,
                      bool(const std::string& policy_app_id,
                           std::vector<std::string>* modules));
@@ -172,7 +206,6 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(CleanupUnpairedDevices, bool());
   MOCK_CONST_METHOD1(CanAppKeepContext, bool(const std::string& app_id));
   MOCK_CONST_METHOD1(CanAppStealFocus, bool(const std::string& app_id));
-  MOCK_METHOD0(OnSystemReady, void());
   MOCK_CONST_METHOD1(GetNotificationsNumber,
                      uint32_t(const std::string& priority));
   MOCK_METHOD1(SetVINValue, void(const std::string& value));
@@ -181,24 +214,28 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD1(SaveUpdateStatusRequired, void(bool is_update_needed));
   MOCK_METHOD0(OnAppsSearchStarted, void());
   MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu));
-  MOCK_METHOD1(OnAppRegisteredOnMobile,
-               void(const std::string& application_id));
-  MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string());
+  MOCK_METHOD1(UpdatePTUReadyAppsCount, void(const uint32_t new_app_count));
+  MOCK_METHOD2(OnAppRegisteredOnMobile,
+               void(const std::string& device_id,
+                    const std::string& application_id));
   MOCK_CONST_METHOD1(GetIconUrl, std::string(const std::string& policy_app_id));
-  MOCK_CONST_METHOD1(
-      GetAppRequestTypes,
-      const std::vector<std::string>(const std::string policy_app_id));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const policy::VehicleInfo());
+  MOCK_CONST_METHOD2(GetAppRequestTypes,
+                     const std::vector<std::string>(
+                         const transport_manager::DeviceHandle& device_handle,
+                         const std::string policy_app_id));
+  MOCK_CONST_METHOD0(GetPolicyTableData, Json::Value());
+  MOCK_CONST_METHOD0(GetVehicleDataItems,
+                     const std::vector<policy_table::VehicleDataItem>());
+  MOCK_CONST_METHOD0(GetRemovedVehicleDataItems,
+                     std::vector<policy_table::VehicleDataItem>());
   MOCK_CONST_METHOD1(GetEnabledCloudApps,
                      void(std::vector<std::string>& enabled_apps));
-  MOCK_CONST_METHOD7(GetCloudAppParameters,
+  MOCK_CONST_METHOD2(GetAppProperties,
                      bool(const std::string& policy_app_id,
-                          bool& enabled,
-                          std::string& endpoint,
-                          std::string& certificate,
-                          std::string& auth_token,
-                          std::string& cloud_transport_type,
-                          std::string& hybrid_app_preference));
+                          AppProperties& out_app_properties));
+  MOCK_CONST_METHOD0(GetEnabledLocalApps, std::vector<std::string>());
+  MOCK_CONST_METHOD1(IsNewApplication, bool(const std::string& application_id));
+  MOCK_METHOD0(OnLocalAppAdded, void());
   MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id));
   MOCK_METHOD2(SetCloudAppEnabled,
                void(const std::string& policy_app_id, const bool enabled));
@@ -262,6 +299,12 @@ class MockPolicyManager : public PolicyManager {
                      RequestType::State(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(GetAppRequestSubTypesState,
                      RequestSubType::State(const std::string& policy_app_id));
+  MOCK_METHOD0(IncrementPTURetryIndex, void());
+  MOCK_CONST_METHOD0(IsAllowedPTURetryCountExceeded, bool());
+  MOCK_CONST_METHOD0(IsAllowedRetryCountExceeded, bool());
+  MOCK_METHOD0(OnSystemRequestReceived, void());
+  MOCK_METHOD0(RetrySequenceFailed, void());
+  MOCK_METHOD0(ResetTimeout, void());
 };
 }  // namespace policy_manager_test
 }  // namespace components
diff --git a/src/components/include/test/policy/policy_external/policy/mock_ptu_retry_handler.h b/src/components/include/test/policy/policy_external/policy/mock_ptu_retry_handler.h
new file mode 100644
index 0000000000..d76c791b85
--- /dev/null
+++ b/src/components/include/test/policy/policy_external/policy/mock_ptu_retry_handler.h
@@ -0,0 +1,48 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_MOCK_PTU_RETRY_HANDLER_H_
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_MOCK_PTU_RETRY_HANDLER_H_
+
+#include "policy/ptu_retry_handler.h"
+
+namespace policy {
+
+class MockPTURetryHandler : public PTURetryHandler {
+ public:
+  MOCK_CONST_METHOD0(IsAllowedRetryCountExceeded, bool());
+  MOCK_METHOD0(OnSystemRequestReceived, void());
+  MOCK_METHOD0(RetrySequenceFailed, void());
+};
+}  // namespace policy
+
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_MOCK_PTU_RETRY_HANDLER_H_
\ No newline at end of file
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h
index c296701e34..d8e13b4b2e 100644
--- a/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h
+++ b/src/components/include/test/policy/policy_regular/policy/mock_cache_manager.h
@@ -55,6 +55,7 @@ class MockCacheManagerInterface : public CacheManagerInterface {
   MOCK_METHOD0(IsPTPreloaded, bool());
   MOCK_METHOD0(IgnitionCyclesBeforeExchange, int());
   MOCK_METHOD1(KilometersBeforeExchange, int(int current));
+  MOCK_CONST_METHOD0(GetEnabledLocalApps, std::vector<std::string>());
   MOCK_METHOD2(SetCountersPassedForSuccessfulUpdate,
                bool(Counters counter, int value));
   MOCK_METHOD1(DaysBeforeExchange, int(int current));
@@ -62,17 +63,16 @@ class MockCacheManagerInterface : public CacheManagerInterface {
   MOCK_METHOD0(ResetIgnitionCycles, void());
   MOCK_METHOD0(TimeoutResponse, int());
   MOCK_METHOD1(SecondsBetweenRetries, bool(std::vector<int>& seconds));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const VehicleInfo());
+  MOCK_CONST_METHOD0(GetPolicyTableData, Json::Value());
+  MOCK_CONST_METHOD0(GetVehicleDataItems,
+                     const std::vector<policy_table::VehicleDataItem>());
+  MOCK_CONST_METHOD0(GetRemovedVehicleDataItems,
+                     std::vector<policy_table::VehicleDataItem>());
   MOCK_CONST_METHOD1(GetEnabledCloudApps,
                      void(std::vector<std::string>& enabled_apps));
-  MOCK_CONST_METHOD7(GetCloudAppParameters,
+  MOCK_CONST_METHOD2(GetAppProperties,
                      bool(const std::string& policy_app_id,
-                          bool& enabled,
-                          std::string& endpoint,
-                          std::string& certificate,
-                          std::string& auth_token,
-                          std::string& cloud_transport_type,
-                          std::string& hybrid_app_preference));
+                          AppProperties& out_app_properties));
   MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id));
   MOCK_METHOD2(SetCloudAppEnabled,
                void(const std::string& policy_app_id, const bool enabled));
@@ -112,12 +112,12 @@ class MockCacheManagerInterface : public CacheManagerInterface {
   MOCK_CONST_METHOD2(GetPriority,
                      bool(const std::string& policy_app_id,
                           std::string& priority));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const std::string& service_type,
-                    EndpointUrls& out_end_points));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const uint32_t service_type, EndpointUrls& out_end_points));
-  MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string());
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const std::string& service_type,
+                          EndpointUrls& out_end_points));
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const uint32_t service_type,
+                          EndpointUrls& out_end_points));
   MOCK_CONST_METHOD1(GetIconUrl, std::string(const std::string& policy_app_id));
   MOCK_METHOD2(Init,
                bool(const std::string& file_name,
@@ -258,6 +258,19 @@ class MockCacheManagerInterface : public CacheManagerInterface {
                      RequestType::State(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(GetAppRequestSubTypesState,
                      RequestSubType::State(const std::string& policy_app_id));
+
+  MOCK_CONST_METHOD1(
+      GetAppEncryptionRequiredFlag,
+      rpc::Optional<rpc::Boolean>(const std::string& application_policy_name));
+
+  MOCK_CONST_METHOD1(
+      GetFunctionalGroupingEncryptionRequiredFlag,
+      rpc::Optional<rpc::Boolean>(const std::string& functional_group));
+
+  MOCK_CONST_METHOD2(GetApplicationParams,
+                     void(const std::string& application_name,
+                          policy_table::ApplicationParams& application_params));
+  MOCK_CONST_METHOD0(GetPolicyAppIDs, const policy_table::Strings());
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h
index 7958bd3304..f12358396b 100644
--- a/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h
+++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_listener.h
@@ -35,6 +35,7 @@
 #include <string>
 
 #include "gmock/gmock.h"
+#include "utils/macro.h"
 
 #include "policy/policy_listener.h"
 #include "policy/policy_table/types.h"
@@ -52,18 +53,21 @@ namespace custom_str = utils::custom_string;
 class MockPolicyListener : public ::policy::PolicyListener {
  public:
   MOCK_METHOD3(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id,
+                    const policy::Permissions& permissions));
+  MOCK_METHOD4(OnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id,
                     const policy::Permissions& permissions,
                     const policy::HMILevel& default_hmi));
-  MOCK_METHOD2(OnPermissionsUpdated,
-               void(const std::string& policy_app_id,
-                    const policy::Permissions& permissions));
-  MOCK_METHOD1(OnPendingPermissionChange,
-               void(const std::string& policy_app_id));
+  MOCK_METHOD2(OnPendingPermissionChange,
+               void(const std::string& device_id,
+                    const std::string& policy_app_id));
   MOCK_METHOD1(OnUpdateStatusChanged, void(const std::string& status));
-  MOCK_METHOD1(OnCurrentDeviceIdUpdateRequired,
-               std::string(const std::string& policy_app_id));
-  MOCK_METHOD0(OnSystemInfoUpdateRequired, void());
+  MOCK_METHOD2(OnCurrentDeviceIdUpdateRequired,
+               std::string(const transport_manager::DeviceHandle& device_handle,
+                           const std::string& policy_app_id));
   MOCK_METHOD1(GetAppName,
                custom_str::CustomString(const std::string& policy_app_id));
   MOCK_METHOD0(OnUserRequestedUpdateCheckRequired, void());
@@ -72,20 +76,27 @@ class MockPolicyListener : public ::policy::PolicyListener {
   MOCK_METHOD1(OnUpdateHMIAppType,
                void(std::map<std::string, policy::StringArray>));
   MOCK_METHOD1(GetAvailableApps, void(std::queue<std::string>&));
-  MOCK_METHOD1(OnSnapshotCreated, void(const policy::BinaryMessage& pt_string));
+  MOCK_METHOD2(OnSnapshotCreated,
+               void(const policy::BinaryMessage& pt_string,
+                    const policy::PTUIterationType iteration_type));
   MOCK_METHOD0(CanUpdate, bool());
   MOCK_METHOD1(OnCertificateUpdated, void(const std::string&));
   MOCK_METHOD2(OnAuthTokenUpdated,
                void(const std::string& policy_app_id,
                     const std::string& auth_token));
-  MOCK_CONST_METHOD2(SendOnAppPermissionsChanged,
-                     void(const policy::AppPermissions&, const std::string&));
+  MOCK_CONST_METHOD3(SendOnAppPermissionsChanged,
+                     void(const policy::AppPermissions& permissions,
+                          const std::string& device_id,
+                          const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(SendOnAppPropertiesChangeNotification,
+                     void(const std::string& policy_app_id));
   MOCK_METHOD3(OnUpdateHMILevel,
                void(const std::string& device_id,
                     const std::string& policy_app_id,
                     const std::string& hmi_level));
-  MOCK_METHOD1(GetDevicesIds,
-               std::vector<std::string>(const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(
+      GetDevicesIds,
+      std::vector<std::string>(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(GetRegisteredLinks,
                      void(std::map<std::string, std::string>&));
   MOCK_METHOD1(OnRemoteAllowedChanged, void(bool new_consent));
@@ -97,6 +108,7 @@ class MockPolicyListener : public ::policy::PolicyListener {
                     const std::string& policy_app_id,
                     const std::string& hmi_level));
   MOCK_METHOD0(OnLockScreenDismissalStateChanged, void());
+  MOCK_METHOD0(OnPTUTimeOut, void());
 };
 
 }  // namespace policy_test
diff --git a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
index a670e99bef..ac0fab4328 100644
--- a/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
+++ b/src/components/include/test/policy/policy_regular/policy/mock_policy_manager.h
@@ -55,20 +55,41 @@ using namespace policy;
 
 class MockPolicyManager : public PolicyManager {
  public:
+  MOCK_CONST_METHOD1(AppNeedEncryption, bool(const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(
+      GetFunctionalGroupsForApp,
+      const std::vector<std::string>(const std::string& policy_app_id));
+  MOCK_CONST_METHOD0(GetApplicationPolicyIDs, const std::vector<std::string>());
+  MOCK_CONST_METHOD2(FunctionNeedEncryption,
+                     bool(const std::string& policy_group,
+                          const std::string& policy_function_id));
+  MOCK_CONST_METHOD1(FunctionGroupNeedEncryption,
+                     bool(const std::string& policy_group));
+  MOCK_CONST_METHOD1(
+      GetAppEncryptionRequired,
+      const rpc::Optional<rpc::Boolean>(const std::string& policy_app_id));
+  MOCK_CONST_METHOD1(GetRPCsForFunctionGroup,
+                     const std::vector<std::string>(const std::string& group));
+  MOCK_CONST_METHOD1(GetPolicyFunctionName,
+                     const std::string(const uint32_t function_id));
   MOCK_METHOD1(set_listener, void(PolicyListener* listener));
   MOCK_METHOD2(InitPT,
                bool(const std::string& file_name,
                     const PolicySettings* settings));
   MOCK_METHOD2(LoadPT,
-               bool(const std::string& file, const BinaryMessage& pt_content));
+               PtProcessingResult(const std::string& file,
+                                  const BinaryMessage& pt_content));
+  MOCK_METHOD1(OnPTUFinished, void(const PtProcessingResult ptu_result));
   MOCK_METHOD1(ResetPT, bool(const std::string& file_name));
 
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const uint32_t service_type, EndpointUrls& out_end_points));
-  MOCK_METHOD2(GetUpdateUrls,
-               void(const std::string& service_type,
-                    EndpointUrls& out_end_points));
-  MOCK_METHOD0(RequestPTUpdate, bool());
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const uint32_t service_type,
+                          EndpointUrls& out_end_points));
+  MOCK_CONST_METHOD2(GetUpdateUrls,
+                     void(const std::string& service_type,
+                          EndpointUrls& out_end_points));
+  MOCK_METHOD1(RequestPTUpdate,
+               bool(const policy::PTUIterationType iteration_type));
   MOCK_METHOD5(CheckPermissions,
                void(const PTString& app_id,
                     const PTString& hmi_level,
@@ -85,7 +106,9 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(IncrementIgnitionCycles, void());
   MOCK_METHOD0(ForcePTExchange, std::string());
   MOCK_METHOD0(ForcePTExchangeAtUserRequest, std::string());
-  MOCK_METHOD0(ResetRetrySequence, void());
+  MOCK_METHOD0(StopRetrySequence, void());
+  MOCK_METHOD1(ResetRetrySequence,
+               void(const policy::ResetRetryCountType send_event));
   MOCK_METHOD0(NextRetryTimeout, uint32_t());
   MOCK_METHOD0(TimeoutExchangeMSec, uint32_t());
   MOCK_METHOD0(RetrySequenceDelaysSeconds, const std::vector<int>());
@@ -100,8 +123,10 @@ class MockPolicyManager : public PolicyManager {
            std::vector<policy::FunctionalGroupPermission>& permissions));
   MOCK_METHOD2(SetUserConsentForDevice,
                void(const std::string& device_id, const bool is_allowed));
-  MOCK_METHOD2(ReactOnUserDevConsentForApp,
-               bool(const std::string app_id, bool is_device_allowed));
+  MOCK_METHOD3(ReactOnUserDevConsentForApp,
+               bool(const transport_manager::DeviceHandle& device_handle,
+                    const std::string app_id,
+                    bool is_device_allowed));
   MOCK_METHOD2(PTUpdatedAt, void(policy::Counters counter, int value));
 
   MOCK_METHOD3(GetInitialAppData,
@@ -117,8 +142,9 @@ class MockPolicyManager : public PolicyManager {
                     const policy::DeviceInfo& device_info));
   MOCK_METHOD1(SetUserConsentForApp,
                void(const policy::PermissionConsent& permissions));
-  MOCK_CONST_METHOD2(GetDefaultHmi,
-                     bool(const std::string& policy_app_id,
+  MOCK_CONST_METHOD3(GetDefaultHmi,
+                     bool(const std::string& device_id,
+                          const std::string& policy_app_id,
                           std::string* default_hmi));
   MOCK_CONST_METHOD2(GetPriority,
                      bool(const std::string& policy_app_id,
@@ -133,26 +159,32 @@ class MockPolicyManager : public PolicyManager {
       void(const std::string& device_id,
            const std::string& policy_app_id,
            std::vector<policy::FunctionalGroupPermission>& permissions));
-  MOCK_METHOD1(GetAppPermissionsChanges,
-               policy::AppPermissions(const std::string& policy_app_id));
+  MOCK_METHOD2(GetAppPermissionsChanges,
+               policy::AppPermissions(const std::string& device_id,
+                                      const std::string& policy_app_id));
   MOCK_METHOD1(RemovePendingPermissionChanges, void(const std::string& app_id));
-  MOCK_CONST_METHOD1(GetCurrentDeviceId,
-                     std::string&(const std::string& policy_app_id));
+  MOCK_CONST_METHOD2(
+      GetCurrentDeviceId,
+      std::string&(const transport_manager::DeviceHandle& device_handle,
+                   const std::string& policy_app_id));
   MOCK_METHOD1(SetSystemLanguage, void(const std::string& language));
   MOCK_METHOD3(SetSystemInfo,
                void(const std::string& ccpu_version,
                     const std::string& wers_country_code,
                     const std::string& language));
-  MOCK_METHOD1(SendNotificationOnPermissionsUpdated,
-               void(const std::string& application_id));
+  MOCK_METHOD2(SendNotificationOnPermissionsUpdated,
+               void(const std::string& device_id,
+                    const std::string& application_id));
   MOCK_METHOD1(MarkUnpairedDevice, void(const std::string& device_id));
-  MOCK_METHOD2(
+  MOCK_METHOD3(
       AddApplication,
       StatusNotifier(
+          const std::string& device_id,
           const std::string& application_id,
           const rpc::policy_table_interface_base::AppHmiTypes& hmi_types));
-  MOCK_METHOD2(SetDefaultHmiTypes,
-               void(const std::string& application_id,
+  MOCK_METHOD3(SetDefaultHmiTypes,
+               void(const transport_manager::DeviceHandle& device_handle,
+                    const std::string& application_id,
                     const std::vector<int>& hmi_types));
   MOCK_METHOD2(GetHMITypes,
                bool(const std::string& application_id,
@@ -162,6 +194,8 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD2(SendAppPermissionsChanged,
                void(const std::string& device_id,
                     const std::string& application_id));
+  MOCK_CONST_METHOD1(SendOnAppPropertiesChangeNotification,
+                     void(const std::string& application_id));
   MOCK_CONST_METHOD2(GetModuleTypes,
                      bool(const std::string& policy_app_id,
                           std::vector<std::string>* modules));
@@ -170,7 +204,6 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(CleanupUnpairedDevices, bool());
   MOCK_CONST_METHOD1(CanAppKeepContext, bool(const std::string& app_id));
   MOCK_CONST_METHOD1(CanAppStealFocus, bool(const std::string& app_id));
-  MOCK_METHOD0(OnSystemReady, void());
   MOCK_CONST_METHOD1(GetNotificationsNumber,
                      uint32_t(const std::string& priority));
   MOCK_METHOD1(SetVINValue, void(const std::string& value));
@@ -179,22 +212,26 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD1(SaveUpdateStatusRequired, void(bool is_update_needed));
   MOCK_METHOD0(OnAppsSearchStarted, void());
   MOCK_METHOD1(OnAppsSearchCompleted, void(const bool trigger_ptu));
-  MOCK_METHOD1(OnAppRegisteredOnMobile,
-               void(const std::string& application_id));
+  MOCK_METHOD1(UpdatePTUReadyAppsCount, void(const uint32_t new_app_count));
+  MOCK_METHOD2(OnAppRegisteredOnMobile,
+               void(const std::string& device_id,
+                    const std::string& application_id));
   MOCK_CONST_METHOD1(
       GetAppRequestTypes,
       const std::vector<std::string>(const std::string policy_app_id));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const policy::VehicleInfo());
+  MOCK_CONST_METHOD0(GetPolicyTableData, Json::Value());
+  MOCK_CONST_METHOD0(GetVehicleDataItems,
+                     const std::vector<policy_table::VehicleDataItem>());
+  MOCK_CONST_METHOD0(GetRemovedVehicleDataItems,
+                     std::vector<policy_table::VehicleDataItem>());
   MOCK_CONST_METHOD1(GetEnabledCloudApps,
                      void(std::vector<std::string>& enabled_apps));
-  MOCK_CONST_METHOD7(GetCloudAppParameters,
+  MOCK_CONST_METHOD2(GetAppProperties,
                      bool(const std::string& policy_app_id,
-                          bool& enabled,
-                          std::string& endpoint,
-                          std::string& certificate,
-                          std::string& auth_token,
-                          std::string& cloud_transport_type,
-                          std::string& hybrid_app_preference));
+                          AppProperties& out_app_properties));
+  MOCK_CONST_METHOD0(GetEnabledLocalApps, std::vector<std::string>());
+  MOCK_CONST_METHOD1(IsNewApplication, bool(const std::string& application_id));
+  MOCK_METHOD0(OnLocalAppAdded, void());
   MOCK_METHOD1(InitCloudApp, void(const std::string& policy_app_id));
   MOCK_METHOD2(SetCloudAppEnabled,
                void(const std::string& policy_app_id, const bool enabled));
@@ -225,6 +262,7 @@ class MockPolicyManager : public PolicyManager {
   MOCK_METHOD0(ExceededIgnitionCycles, bool());
   MOCK_METHOD0(ExceededDays, bool());
   MOCK_METHOD0(StartPTExchange, void());
+  MOCK_METHOD0(TriggerPTUOnStartupIfRequired, void());
 
   // --- Statistics Manager section
   MOCK_METHOD1(Increment, void(usage_statistics::GlobalCounterId type));
@@ -241,7 +279,6 @@ class MockPolicyManager : public PolicyManager {
                     int32_t timespan_seconds));
   MOCK_CONST_METHOD0(get_settings, const PolicySettings&());
   MOCK_METHOD1(set_settings, void(const PolicySettings* get_settings));
-  MOCK_CONST_METHOD0(GetLockScreenIconUrl, std::string());
   MOCK_CONST_METHOD1(GetIconUrl, std::string(const std::string& policy_app_id));
   MOCK_METHOD1(GetNextUpdateUrl, AppIdURL(const EndpointUrls& urls));
   MOCK_CONST_METHOD2(RetrySequenceUrl,
@@ -270,6 +307,7 @@ class MockPolicyManager : public PolicyManager {
                      RequestType::State(const std::string& policy_app_id));
   MOCK_CONST_METHOD1(GetAppRequestSubTypesState,
                      RequestSubType::State(const std::string& policy_app_id));
+  MOCK_METHOD0(ResetTimeout, void());
 };
 
 }  // namespace policy_manager_test
diff --git a/src/components/include/test/protocol_handler/mock_protocol_handler.h b/src/components/include/test/protocol_handler/mock_protocol_handler.h
index 4468914a26..354c797c24 100644
--- a/src/components/include/test/protocol_handler/mock_protocol_handler.h
+++ b/src/components/include/test/protocol_handler/mock_protocol_handler.h
@@ -44,8 +44,9 @@ namespace protocol_handler_test {
 
 class MockProtocolHandler : public ::protocol_handler::ProtocolHandler {
  public:
-  MOCK_METHOD2(SendMessageToMobileApp,
+  MOCK_METHOD3(SendMessageToMobileApp,
                void(const ::protocol_handler::RawMessagePtr message,
+                    bool needs_encryption,
                     bool final_message));
   MOCK_METHOD1(AddProtocolObserver,
                void(::protocol_handler::ProtocolObserver* observer));
@@ -66,7 +67,12 @@ class MockProtocolHandler : public ::protocol_handler::ProtocolHandler {
   MOCK_METHOD2(NotifySessionStarted,
                void(const ::protocol_handler::SessionContext& context,
                     std::vector<std::string>& rejected_params));
-  MOCK_METHOD0(NotifyOnFailedHandshake, void());
+  MOCK_METHOD0(NotifyOnGetSystemTimeFailed, void());
+  MOCK_CONST_METHOD1(IsRPCServiceSecure, bool(const uint32_t connection_key));
+  MOCK_METHOD0(ProcessFailedPTU, void());
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  MOCK_METHOD0(ProcessFailedCertDecrypt, void());
+#endif
 };
 }  // namespace protocol_handler_test
 }  // namespace components
diff --git a/src/components/include/test/resumption/mock_last_state.h b/src/components/include/test/resumption/mock_last_state.h
index 9f4b11cbbf..99c3799a95 100644
--- a/src/components/include/test/resumption/mock_last_state.h
+++ b/src/components/include/test/resumption/mock_last_state.h
@@ -35,6 +35,7 @@
 
 #include "gmock/gmock.h"
 #include "resumption/last_state.h"
+#include "utils/macro.h"
 
 namespace test {
 namespace components {
@@ -42,8 +43,14 @@ namespace resumption_test {
 
 class MockLastState : public resumption::LastState {
  public:
+  DEPRECATED
   MOCK_METHOD0(SaveStateToFileSystem, void());
+  DEPRECATED
   MOCK_METHOD0(get_dictionary, Json::Value&());
+  MOCK_METHOD0(SaveToFileSystem, void());
+  MOCK_METHOD0(RemoveFromFileSystem, void());
+  MOCK_CONST_METHOD0(dictionary, Json::Value());
+  MOCK_METHOD1(set_dictionary, void(const Json::Value&));
 };
 
 }  // namespace resumption_test
diff --git a/src/components/include/test/security_manager/mock_security_manager.h b/src/components/include/test/security_manager/mock_security_manager.h
index 2b5d99c156..e44d6207c1 100644
--- a/src/components/include/test/security_manager/mock_security_manager.h
+++ b/src/components/include/test/security_manager/mock_security_manager.h
@@ -68,11 +68,16 @@ class MockSecurityManager : public ::security_manager::SecurityManager {
                void(const ::protocol_handler::RawMessagePtr));
   MOCK_METHOD1(IsCertificateUpdateRequired, bool(const uint32_t));
   MOCK_METHOD0(NotifyOnCertificateUpdateRequired, void());
-  MOCK_METHOD0(NotifyListenersOnHandshakeFailed, void());
+  MOCK_METHOD0(NotifyListenersOnGetSystemTimeFailed, void());
   MOCK_METHOD0(IsPolicyCertificateDataEmpty, bool());
+  MOCK_METHOD0(ProcessFailedPTU, void());
   MOCK_METHOD1(OnCertificateUpdated, bool(const std::string&));
   MOCK_METHOD1(PostponeHandshake, void(const uint32_t));
   MOCK_CONST_METHOD0(IsSystemTimeProviderReady, bool());
+  MOCK_METHOD0(ResetPendingSystemTimeRequests, void());
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  MOCK_METHOD0(ProcessFailedCertDecrypt, void());
+#endif
 };
 
 /*
diff --git a/src/components/include/test/security_manager/mock_security_manager_listener.h b/src/components/include/test/security_manager/mock_security_manager_listener.h
index 7a7714d299..81790d1830 100644
--- a/src/components/include/test/security_manager/mock_security_manager_listener.h
+++ b/src/components/include/test/security_manager/mock_security_manager_listener.h
@@ -49,7 +49,11 @@ class MockSecurityManagerListener
                     ::security_manager::SSLContext::HandshakeResult result));
   MOCK_METHOD0(OnCertificateUpdateRequired, void());
   MOCK_CONST_METHOD1(GetPolicyCertificateData, bool(std::string& data));
-  MOCK_METHOD0(OnHandshakeFailed, bool());
+  MOCK_METHOD0(OnGetSystemTimeFailed, bool());
+  MOCK_METHOD0(OnPTUFailed, bool());
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  MOCK_METHOD0(OnCertDecryptFailed, bool());
+#endif
 };
 }  // namespace security_manager_test
 }  // namespace components
diff --git a/src/components/include/test/transport_manager/mock_transport_manager.h b/src/components/include/test/transport_manager/mock_transport_manager.h
index 395beeff7b..1920af18a3 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager.h
@@ -35,7 +35,7 @@
 
 #include <string>
 #include "gmock/gmock.h"
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 #include "telemetry_monitor/telemetry_observable.h"
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
 #include "transport_manager/transport_manager.h"
@@ -56,8 +56,13 @@ class MockTransportManager : public ::transport_manager::TransportManager,
                              public ::telemetry_monitor::TelemetryObservable<
                                  transport_manager::TMTelemetryObserver> {
  public:
+  MOCK_METHOD1(Init, int(resumption::LastStateWrapperPtr last_state));
+  DEPRECATED
   MOCK_METHOD1(Init, int(resumption::LastState& last_state));
   MOCK_METHOD0(Reinit, int());
+  MOCK_METHOD0(Deinit, void());
+  MOCK_METHOD0(StopEventsProcessing, void());
+  MOCK_METHOD0(StartEventsProcessing, void());
   MOCK_METHOD0(SearchDevices, int());
   MOCK_METHOD1(
       AddCloudDevice,
@@ -78,9 +83,13 @@ class MockTransportManager : public ::transport_manager::TransportManager,
   MOCK_METHOD1(AddEventListener, int(TransportManagerListener* listener));
   MOCK_METHOD0(Stop, int());
   MOCK_METHOD1(RemoveDevice, int(const DeviceHandle));
-  MOCK_CONST_METHOD1(Visibility, int(const bool&));
+  MOCK_CONST_METHOD1(PerformActionOnClients,
+                     int(transport_manager::TransportAction required_action));
+
   MOCK_METHOD1(SetTelemetryObserver,
                void(transport_manager::TMTelemetryObserver* observer));
+  MOCK_METHOD0(CreateWebEngineDevice, void());
+  MOCK_CONST_METHOD0(GetWebEngineDeviceInfo, transport_manager::DeviceInfo&());
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/include/test/transport_manager/mock_transport_manager_settings.h b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
index eb12ce1b55..10320d51ab 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager_settings.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
@@ -63,9 +63,21 @@ class MockTransportManagerSettings
   MOCK_CONST_METHOD0(app_transport_change_timer_addition, uint32_t());
   MOCK_CONST_METHOD0(transport_manager_tcp_adapter_network_interface,
                      std::string&());
+  MOCK_CONST_METHOD0(websocket_server_address, const std::string&());
+  MOCK_CONST_METHOD0(websocket_server_port, uint16_t());
   MOCK_CONST_METHOD0(cloud_app_retry_timeout, uint32_t());
   MOCK_CONST_METHOD0(cloud_app_max_retry_attempts, uint16_t());
   MOCK_CONST_METHOD0(bluetooth_uuid, const uint8_t*());
+  MOCK_CONST_METHOD0(aoa_filter_manufacturer, const std::string&());
+  MOCK_CONST_METHOD0(aoa_filter_model_name, const std::string&());
+  MOCK_CONST_METHOD0(aoa_filter_description, const std::string&());
+  MOCK_CONST_METHOD0(aoa_filter_version, const std::string&());
+  MOCK_CONST_METHOD0(aoa_filter_uri, const std::string&());
+  MOCK_CONST_METHOD0(aoa_filter_serial_number, const std::string&());
+  MOCK_CONST_METHOD0(ws_server_cert_path, const std::string&());
+  MOCK_CONST_METHOD0(ws_server_key_path, const std::string&());
+  MOCK_CONST_METHOD0(ws_server_ca_cert_path, const std::string&());
+  MOCK_CONST_METHOD0(wss_server_supported, const bool());
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
index 3ac6331f71..d4ce0a39c8 100644
--- a/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
+++ b/src/components/include/test/transport_manager/transport_adapter/mock_transport_adapter.h
@@ -72,12 +72,9 @@ class MockTransportAdapter
                          const ::transport_manager::DeviceUID& device_handle));
   MOCK_METHOD2(RunAppOnDevice, void(const std::string&, const std::string&));
   MOCK_CONST_METHOD0(IsClientOriginatedConnectSupported, bool());
-  MOCK_METHOD0(
-      StartClientListening,
-      ::transport_manager::transport_adapter::TransportAdapter::Error());
-  MOCK_METHOD0(
-      StopClientListening,
-      ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_METHOD1(ChangeClientListening,
+               ::transport_manager::transport_adapter::TransportAdapter::Error(
+                   ::transport_manager::TransportAction required_change));
   MOCK_METHOD2(RemoveFinalizedConnection,
                void(const ::transport_manager::DeviceUID& device_handle,
                     const ::transport_manager::ApplicationHandle& app_handle));
@@ -111,9 +108,16 @@ class MockTransportAdapter
                      transport_manager::transport_adapter::TransportConfig());
   MOCK_METHOD1(CreateDevice, void(const std::string& uid));
 
+  MOCK_METHOD1(AddDevice,
+               transport_manager::transport_adapter::DeviceSptr(
+                   transport_manager::transport_adapter::DeviceSptr device));
+
 #ifdef TELEMETRY_MONITOR
   MOCK_METHOD0(GetTelemetryObserver,
                ::transport_manager::TMTelemetryObserver*());
+  MOCK_METHOD1(SetTelemetryObserver,
+               void(::transport_manager::TMTelemetryObserver* observer));
+
 #endif  // TELEMETRY_MONITOR
 };
 
diff --git a/src/components/include/test/utils/mock_system_time_handler.h b/src/components/include/test/utils/mock_system_time_handler.h
index 7bb2a7f0a5..5d82c0a8c7 100644
--- a/src/components/include/test/utils/mock_system_time_handler.h
+++ b/src/components/include/test/utils/mock_system_time_handler.h
@@ -50,6 +50,7 @@ class MockSystemTimeHandler : public ::utils::SystemTimeHandler {
                void(utils::SystemTimeListener* listener));
   MOCK_METHOD0(GetUTCTime, time_t());
   MOCK_CONST_METHOD0(system_time_can_be_received, bool());
+  MOCK_METHOD0(ResetPendingSystemTimeRequests, void());
   ~MockSystemTimeHandler() {}
 
  private:
diff --git a/src/components/include/transport_manager/common.h b/src/components/include/transport_manager/common.h
index 300ce26d0b..f8b0cabe2e 100644
--- a/src/components/include/transport_manager/common.h
+++ b/src/components/include/transport_manager/common.h
@@ -43,6 +43,17 @@
 namespace transport_manager {
 
 /**
+ * @enum Actions that could
+ * be performed on connected clients.
+ */
+enum class TransportAction {
+  kVisibilityOn,
+  kVisibilityOff,
+  kListeningOn,
+  kListeningOff
+};
+
+/**
  * @enum Transport manager states.
  */
 enum {
@@ -58,6 +69,11 @@ enum {
 
 enum ConnectionStatus { INVALID = -1, PENDING, RETRY, CONNECTED, CLOSING };
 
+namespace webengine_constants {
+const std::string kWebEngineConnectionType("WEBENGINE_WEBSOCKET");
+const std::string kWebEngineDeviceName("Web Engine");
+}  // namespace webengine_constants
+
 /**
  * @brief Type definition for variable that hold handle of device.
  */
diff --git a/src/components/include/transport_manager/transport_adapter/transport_adapter.h b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
index 1d21ff4ae4..e9494b4ced 100644
--- a/src/components/include/transport_manager/transport_adapter/transport_adapter.h
+++ b/src/components/include/transport_manager/transport_adapter/transport_adapter.h
@@ -68,6 +68,7 @@ enum DeviceType {
   IOS_USB_HOST_MODE,
   IOS_USB_DEVICE_MODE,
   IOS_CARPLAY_WIRELESS,  // running on iAP over Carplay wireless transport
+  WEBENGINE_WEBSOCKET,
   UNKNOWN
 };
 
@@ -111,7 +112,15 @@ class TransportAdapter {
   /**
    * @enum Available types of errors.
    */
-  enum Error { OK, FAIL, NOT_SUPPORTED, ALREADY_EXISTS, BAD_STATE, BAD_PARAM };
+  enum Error {
+    UNKNOWN = -1,
+    OK,
+    FAIL,
+    NOT_SUPPORTED,
+    ALREADY_EXISTS,
+    BAD_STATE,
+    BAD_PARAM
+  };
 
  public:
   /**
@@ -217,6 +226,16 @@ class TransportAdapter {
       const DeviceUID& device_handle) const = 0;
 
   /**
+   * @brief Add device to the container(map), if container doesn't hold it yet.
+   * in TransportAdapter is used only to add a WebEngine device
+   *
+   * @param device Smart pointer to the device.
+   *
+   * @return Smart pointer to the device.
+   */
+  virtual DeviceSptr AddDevice(DeviceSptr device) = 0;
+
+  /**
    * @brief RunAppOnDevice allows to run specific application on the certain
    *device.
    *
@@ -236,18 +255,10 @@ class TransportAdapter {
   virtual bool IsClientOriginatedConnectSupported() const = 0;
 
   /**
-   * @brief Start client listener.
-   *
-   * @return Error information about possible reason of failure.
-   */
-  virtual Error StartClientListening() = 0;
-
-  /**
-   * @brief Stop client listener.
-   *
+   * @brief Changes client listening state of current adapter
    * @return Error information about possible reason of failure.
    */
-  virtual Error StopClientListening() = 0;
+  virtual Error ChangeClientListening(TransportAction required_change) = 0;
 
   /**
    * @brief Remove marked as FINALISING connection from accounting.
@@ -357,6 +368,14 @@ class TransportAdapter {
    * @param return pointer to Time metric observer
    */
   virtual TMTelemetryObserver* GetTelemetryObserver() = 0;
+
+  /**
+   * @brief Setup observer for time metric.
+   *
+   * @param observer - pointer to observer
+   */
+  virtual void SetTelemetryObserver(TMTelemetryObserver* observer) = 0;
+
 #endif  // TELEMETRY_MONITOR
 };
 }  // namespace transport_adapter
diff --git a/src/components/include/transport_manager/transport_manager.h b/src/components/include/transport_manager/transport_manager.h
index 275608c315..4697bf9982 100644
--- a/src/components/include/transport_manager/transport_manager.h
+++ b/src/components/include/transport_manager/transport_manager.h
@@ -34,14 +34,11 @@
 #define SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_H_
 
 #include "protocol/common.h"
+#include "resumption/last_state_wrapper.h"
 #include "transport_manager/common.h"
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
 #include "transport_manager/transport_manager_listener.h"
 
-namespace resumption {
-class LastState;
-}
-
 namespace transport_manager {
 
 class TransportAdapterEvent;
@@ -56,11 +53,14 @@ class TransportManager {
    **/
   virtual ~TransportManager() {}
 
+  DEPRECATED
+  virtual int Init(resumption::LastState& last_state) = 0;
+
   /**
    * @brief Initialize transport manager.
    * @return Error code.
    */
-  virtual int Init(resumption::LastState& last_state) = 0;
+  virtual int Init(resumption::LastStateWrapperPtr last_state_wrapper) = 0;
 
   /**
    * @brief Reinitializes transport manager
@@ -69,6 +69,21 @@ class TransportManager {
   virtual int Reinit() = 0;
 
   /**
+   * @brief Deinitializes all transport adapters and device instances
+   */
+  virtual void Deinit() = 0;
+
+  /**
+   * @brief Stops transport events processing handler threads
+   */
+  virtual void StopEventsProcessing() = 0;
+
+  /**
+   * @brief Resumes transport events processing handler threads
+   */
+  virtual void StartEventsProcessing() = 0;
+
+  /**
    * @brief Start scanning for new devices.
    *
    * @return Code error.
@@ -193,13 +208,25 @@ class TransportManager {
   virtual int RemoveDevice(const DeviceHandle device_handle) = 0;
 
   /**
-   * @brief Turns on or off visibility of SDL to mobile devices
-   * when visibility is ON (on_off = true) mobile devices are able to connect
-   * otherwise ((on_off = false)) SDL is not visible from outside
-   *
-   * @return Code error.
+   * @brief Performs specified action on connected clients
+   * @param required_action is the action which should be performed for the
+   * connected clients
+   * @return error code
+   */
+  virtual int PerformActionOnClients(
+      const TransportAction required_action) const = 0;
+
+  /**
+   * @brief Called when websocket server transport adapter is available.
+   * Creates WebSocketDevice for WebEngine and add it to the device list
+   */
+  virtual void CreateWebEngineDevice() = 0;
+
+  /**
+   * @brief GetWebEngineDeviceInfo
+   * @return device info for WebEngine device
    */
-  virtual int Visibility(const bool& on_off) const = 0;
+  virtual const DeviceInfo& GetWebEngineDeviceInfo() const = 0;
 };
 }  // namespace transport_manager
 #endif  // SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_H_
diff --git a/src/components/include/transport_manager/transport_manager_settings.h b/src/components/include/transport_manager/transport_manager_settings.h
index 4a183ad22d..fee5b031ed 100644
--- a/src/components/include/transport_manager/transport_manager_settings.h
+++ b/src/components/include/transport_manager/transport_manager_settings.h
@@ -69,7 +69,24 @@ class TransportManagerSettings : public TransportManagerMMESettings {
    */
   virtual const std::string& transport_manager_tcp_adapter_network_interface()
       const = 0;
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  /**
+   *@brief Returns websocket server address
+   */
+  virtual const std::string& websocket_server_address() const = 0;
+
+  /**
+   * @brief Returns port for websocket server
+   */
+  virtual uint16_t websocket_server_port() const = 0;
 
+#ifdef ENABLE_SECURITY
+  virtual const std::string& ws_server_cert_path() const = 0;
+  virtual const std::string& ws_server_key_path() const = 0;
+  virtual const std::string& ws_server_ca_cert_path() const = 0;
+  virtual const bool wss_server_supported() const = 0;
+#endif  // ENABLE_SECURITY
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
   /**
    * @brief Returns retry timeout for cloud app connections
    */
@@ -81,6 +98,13 @@ class TransportManagerSettings : public TransportManagerMMESettings {
   virtual uint16_t cloud_app_max_retry_attempts() const = 0;
 
   virtual const uint8_t* bluetooth_uuid() const = 0;
+
+  virtual const std::string& aoa_filter_manufacturer() const = 0;
+  virtual const std::string& aoa_filter_model_name() const = 0;
+  virtual const std::string& aoa_filter_description() const = 0;
+  virtual const std::string& aoa_filter_version() const = 0;
+  virtual const std::string& aoa_filter_uri() const = 0;
+  virtual const std::string& aoa_filter_serial_number() const = 0;
 };
 }  // namespace transport_manager
 #endif  // SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_SETTINGS_H_
diff --git a/src/components/include/utils/data_accessor.h b/src/components/include/utils/data_accessor.h
index 1be7c3ab53..99820237c8 100644
--- a/src/components/include/utils/data_accessor.h
+++ b/src/components/include/utils/data_accessor.h
@@ -56,6 +56,7 @@ class DataAccessor {
       --(*counter_);
     }
   }
+
   const T& GetData() const {
     return data_;
   }
diff --git a/src/components/include/utils/date_time.h b/src/components/include/utils/date_time.h
index 17b4fafe38..747cb0ea69 100644
--- a/src/components/include/utils/date_time.h
+++ b/src/components/include/utils/date_time.h
@@ -53,6 +53,7 @@ const int32_t MILLISECONDS_IN_SECOND = 1000;
 const int32_t MICROSECONDS_IN_MILLISECOND = 1000;
 const int32_t NANOSECONDS_IN_MICROSECOND = 1000;
 const int32_t SECONDS_IN_HOUR = 3600;
+const int32_t SECONDS_IN_DAY = 86400;
 const int32_t MICROSECONDS_IN_SECOND =
     MILLISECONDS_IN_SECOND * MICROSECONDS_IN_MILLISECOND;
 const int32_t NANOSECONDS_IN_MILLISECOND =
@@ -83,6 +84,9 @@ int64_t calculateTimeSpan(const TimeDuration& sinceTime);
 // return MILLISECONDS count between time1 and time2
 int64_t calculateTimeDiff(const TimeDuration& time1, const TimeDuration& time2);
 
+// returns difference between specific date and current date
+int64_t calculateAmountDaysFromDate(const std::time_t& start_date);
+
 /**
  * @brief Adds milliseconds to time struct
  * @param time contains time struct
diff --git a/src/components/include/utils/logger.h b/src/components/include/utils/logger.h
index 907f8f4db0..d492cfcb1b 100644
--- a/src/components/include/utils/logger.h
+++ b/src/components/include/utils/logger.h
@@ -65,6 +65,11 @@
 void deinit_logger();
 #define DEINIT_LOGGER() deinit_logger()
 
+// Logger thread deinitilization macro that need to stop the thread of handling
+// messages for the log4cxx
+#define DELETE_THREAD_LOGGER(logger_var) \
+  logger::delete_log_message_loop_thread(logger_var)
+
 // special macros to dump logs from queue
 // it's need, for example, when crash happend
 #define FLUSH_LOGGER() logger::flush_logger()
@@ -141,6 +146,8 @@ log4cxx_time_t time_now();
 
 #define DEINIT_LOGGER()
 
+#define DELETE_THREAD_LOGGER(logger_var)
+
 #define FLUSH_LOGGER()
 
 #define LOG4CXX_IS_TRACE_ENABLED(logger) false
diff --git a/src/components/include/utils/mutable_data_accessor.h b/src/components/include/utils/mutable_data_accessor.h
new file mode 100644
index 0000000000..0e03345a45
--- /dev/null
+++ b/src/components/include/utils/mutable_data_accessor.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_INCLUDE_UTILS_MUTABLE_DATA_ACCESSOR_H
+#define SRC_COMPONENTS_INCLUDE_UTILS_MUTABLE_DATA_ACCESSOR_H
+
+#include "utils/lock.h"
+
+// This class is for thread-safe mutable access to data
+
+template <class T>
+class MutableDataAccessor {
+ public:
+  MutableDataAccessor(T& data,
+                      const std::shared_ptr<sync_primitives::BaseLock>& lock)
+      : data_(data), lock_(lock), counter_(new uint32_t(0)) {
+    lock_->Acquire();
+  }
+
+  MutableDataAccessor(const MutableDataAccessor<T>& other)
+      : data_(other.data_), lock_(other.lock_), counter_(other.counter_) {
+    ++(*counter_);
+  }
+
+  ~MutableDataAccessor() {
+    if (0 == *counter_) {
+      lock_->Release();
+    } else {
+      --(*counter_);
+    }
+  }
+
+  const T& GetData() const {
+    return data_;
+  }
+
+  T& GetMutableData() {
+    return data_;
+  }
+
+ private:
+  void* operator new(size_t size);
+  T& data_;
+  // Require that the lock lives at least as long as the DataAccessor
+  const std::shared_ptr<sync_primitives::BaseLock> lock_;
+  std::shared_ptr<uint32_t> counter_;
+};
+
+#endif  // SRC_COMPONENTS_INCLUDE_UTILS_MUTABLE_DATA_ACCESSOR_H
diff --git a/src/components/include/utils/push_log.h b/src/components/include/utils/push_log.h
index aaeaa83bae..f6c396ae71 100644
--- a/src/components/include/utils/push_log.h
+++ b/src/components/include/utils/push_log.h
@@ -51,7 +51,7 @@ bool logs_enabled();
 void set_logs_enabled(bool state);
 
 void create_log_message_loop_thread();
-void delete_log_message_loop_thread();
+void delete_log_message_loop_thread(log4cxx::LoggerPtr& logger);
 }  // namespace logger
 
 #endif  // SRC_COMPONENTS_INCLUDE_UTILS_PUSH_LOG_H_
diff --git a/src/components/include/utils/semantic_version.h b/src/components/include/utils/semantic_version.h
index 5b2f2a1cdf..01b04495ad 100644
--- a/src/components/include/utils/semantic_version.h
+++ b/src/components/include/utils/semantic_version.h
@@ -51,16 +51,16 @@ struct SemanticVersion {
 
   SemanticVersion(const std::string& versionString)
       : major_version_(0), minor_version_(0), patch_version_(0) {
-    unsigned int major_int, minor_int, patch_int;
-    int readElements = sscanf(
-        versionString.c_str(), "%u.%u.%u", &major_int, &minor_int, &patch_int);
-    if (readElements != 3) {
-      // LOG4CXX_WARN(logger_,
-      //             "Error while parsing version string: " << versionString);
-    } else {
-      major_version_ = static_cast<uint8_t>(major_int);
-      minor_version_ = static_cast<uint8_t>(minor_int);
-      patch_version_ = static_cast<uint8_t>(patch_int);
+    int readElements = sscanf(versionString.c_str(),
+                              "%hu.%hu.%hu",
+                              &major_version_,
+                              &minor_version_,
+                              &patch_version_);
+
+    if (readElements < 2) {
+      major_version_ = 0;
+      minor_version_ = 0;
+      patch_version_ = 0;
     }
   }
 
@@ -122,4 +122,4 @@ extern const SemanticVersion base_rpc_version;
 extern const SemanticVersion rpc_version_5;
 }  // namespace utils
 
-#endif  // SRC_COMPONENTS_INCLUDE_UTILS_CALLABLE_H
\ No newline at end of file
+#endif  // SRC_COMPONENTS_INCLUDE_UTILS_CALLABLE_H
diff --git a/src/components/interfaces/CMakeLists.txt b/src/components/interfaces/CMakeLists.txt
index ae5adc6d2a..7f1a65277d 100644
--- a/src/components/interfaces/CMakeLists.txt
+++ b/src/components/interfaces/CMakeLists.txt
@@ -28,6 +28,19 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+# Copy RPC spec submodule files to interfaces directory
+if(EXISTS ${CMAKE_SOURCE_DIR}/tools/rpc_spec/)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                  ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xml
+                  ${CMAKE_CURRENT_SOURCE_DIR}/MOBILE_API.xml)
+  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                  ${CMAKE_SOURCE_DIR}/tools/rpc_spec/MOBILE_API.xsd
+                  ${CMAKE_CURRENT_SOURCE_DIR}/MOBILE_API.xsd)
+else ()
+  message( FATAL_ERROR "Missing the RPC Spec submodule" )
+  message( FATAL_ERROR "Please run `git submodule update --init` in the SDL Core source directory" )
+endif ()
+
 include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/generators.cmake)
 
 include_directories (
@@ -39,6 +52,10 @@ include_directories (
   ${CMAKE_BINARY_DIR}
 )
 
+execute_process(COMMAND /usr/bin/env python3 -m pip install --upgrade --user pip setuptools wheel)
+set(GENERATOR_REQUIREMENTS "${CMAKE_SOURCE_DIR}/tools/InterfaceGenerator/requirements.txt")
+execute_process(COMMAND /usr/bin/env python3 -m pip install --user --requirement ${GENERATOR_REQUIREMENTS})
+
 generate_interface("v4_protocol_v1_2_no_extra.xml" "ns_smart_device_link_rpc::V1" "sdlrpcv1")
 add_library(v4_protocol_v1_2_no_extra ${CMAKE_CURRENT_BINARY_DIR}/v4_protocol_v1_2_no_extra_schema.cc)
 
@@ -51,4 +68,3 @@ add_library(HMI_API ${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.cc)
 target_link_libraries(v4_protocol_v1_2_no_extra Utils)
 target_link_libraries(MOBILE_API Utils)
 target_link_libraries(HMI_API Utils)
-
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 73d69c6388..231c205c75 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -66,6 +66,28 @@
     <element name="READ_ONLY" value="26"/>
 </enum>
 
+<enum name="WindowType">
+  <element name="MAIN">
+    <description>
+      This window type describes the main screen on a display.
+    </description>
+  </element>
+  <element name="WIDGET">
+    <description>
+      A widget is a small window that the app can create to provide information and softbuttons for a quick app control.
+    </description>
+  </element>
+</enum>
+
+<enum name="PredefinedWindows">
+  <element name="DEFAULT_WINDOW" value="0">
+    <description>The default window is a main window pre-created on behalf of the app.</description>
+  </element>
+  <element name="PRIMARY_WIDGET" value="1">
+    <description>The primary widget of the app.</description>
+  </element>
+</enum>
+
 <enum name="TransportType">
   <description>Lists of the transport types used for device connection to HU.</description>
   <element name="BLUETOOTH"/>
@@ -73,6 +95,7 @@
   <element name="USB_AOA"/>
   <element name="WIFI"/>
   <element name="CLOUD_WEBSOCKET"/>
+  <element name="WEBENGINE_WEBSOCKET"/>
 </enum>
 
 <enum name="ButtonName">
@@ -380,7 +403,7 @@
   <element name="STOP">
     <description>Indicates that a button press of the Play/Pause button would stop the current playback.</description>
   </element>
-</enum> 
+</enum>
 
 <enum name="SystemContext">
   <description>Enumeration that describes possible contexts the application might be in on HU.</description>
@@ -589,12 +612,6 @@
   <element name="menuTitle">
     <description> Optional text to label an app menu button (for certain touchscreen platforms).</description>
   </element>
-  <element name="navigationText">
-    <description>Navigation text for UpdateTurnList.</description>
-  </element>
-  <element name="notificationText">
-    <description>Text of notification to be displayed on screen.</description>
-  </element>
   <element name="locationName">
     <description> Optional name / title of intended location for SendLocation.</description>
   </element>
@@ -605,11 +622,17 @@
     <description> Optional location address (if applicable) for SendLocation.</description>
   </element>
   <element name="phoneNumber">
-    <description> Optional hone number of intended location / establishment (if applicable) for SendLocation.</description>
+    <description> Optional phone number of intended location / establishment (if applicable) for SendLocation.</description>
   </element>
   <element name="timeToDestination"/>
     <!-- TO DO to be removed -->
   <element name="turnText"/>
+  <element name="navigationText">
+    <description>Navigation text for UpdateTurnList.</description>
+  </element>
+  <element name="notificationText">
+    <description>Text of notification to be displayed on screen.</description>
+  </element>
 </enum>
 
 <enum name="MetadataType">
@@ -1138,6 +1161,7 @@
   <element name="VEHICLEDATA_ENGINEOILLIFE" />
   <element name="VEHICLEDATA_ELECTRONICPARKBRAKESTATUS" />
   <element name="VEHICLEDATA_CLOUDAPPVEHICLEID" />
+  <element name="VEHICLEDATA_OEM_CUSTOM_DATA" />
 </enum>
 
 <enum name="WiperStatus">
@@ -1632,6 +1656,56 @@
 <!-- End of Policies -->
 
 <!-- Remote Control -->
+
+<struct name="Grid">
+    <description>Describes a location (origin coordinates and span) of a vehicle component.</description>
+    <param name="col" type="Integer" mandatory="true" minvalue="-1" maxvalue="100">
+    </param>
+    <param name="row" type="Integer"  mandatory="true" minvalue="-1" maxvalue="100">
+    </param>
+    <param name="level" type="Integer" mandatory="false"  defvalue="0" minvalue="-1" maxvalue="100" >
+    </param>
+    <param name="colspan" type="Integer" mandatory="false" defvalue="1" minvalue="1" maxvalue="100">
+    </param>
+    <param name="rowspan" type="Integer" mandatory="false" defvalue="1" minvalue="1" maxvalue="100">
+    </param>
+    <param name="levelspan" type="Integer" mandatory="false" defvalue="1" minvalue="1" maxvalue="100">
+    </param>
+</struct>
+
+<struct name="ModuleInfo">
+    <description>Information about a RC module</description>
+    <param name="moduleId" type="String" maxlength="100" mandatory="true">
+        <description> uuid of a module. "moduleId + moduleType" uniquely identify a module.</description>
+    </param>
+    <param name="location" type="Grid" mandatory="false">
+       <description>Location of a module.</description>
+    </param>
+    <param name="serviceArea" type="Grid" mandatory="false">
+       <description>Service area of a module. </description>
+    </param>
+    <param name="allowMultipleAccess" type="Boolean" mandatory="false" defvalue="true">
+        <description>allow multiple users/apps to access the module or not </description>
+    </param>
+</struct>
+
+<struct name="SeatLocation">
+    <description>Describes the location of a seat.</description>
+    <param name="grid" type="Grid"  mandatory="false">
+    </param>
+</struct>
+
+<struct name="SeatLocationCapability">
+    <description>Contains information about the locations of each seat</description>
+    <param name="rows" type="Integer" minvalue="1" maxvalue="100" mandatory="false"></param>
+    <param name="columns" type="Integer" minvalue="1" maxvalue="100" mandatory="false"></param>
+    <param name="levels" type="Integer" minvalue="1" maxvalue="100" defvalue="1" mandatory="false">   
+    </param>
+    <param name="seats" type="SeatLocation" array="true" mandatory="false">
+        <description>Contains a list of SeatLocation in the vehicle</description>
+    </param>
+</struct>
+
 <enum name="ModuleType">
    <element name="CLIMATE"/>
    <element name="RADIO"/>
@@ -1705,8 +1779,7 @@
 
     <struct name="SeatControlData">
       <description>Seat control data corresponds to "SEAT" ModuleType. </description>
-      <param name="id" type="SupportedSeat" mandatory="true"></param>
-
+      <param name="id" type="SupportedSeat" mandatory="false"></param>
       <param name="heatingEnabled" type="Boolean" mandatory="false"></param>
       <param name="coolingEnabled" type="Boolean" mandatory="false"></param>
       <param name="heatingLevel" type="Integer" minvalue="0" maxvalue="100" mandatory="false"></param>
@@ -1734,6 +1807,9 @@
         It should not be used to identify a module by mobile application.
         </description>
       </param>
+      <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+          <description>Information about a RC module, including its id. </description>
+      </param>
       <param name="heatingEnabledAvailable" type="Boolean" mandatory="false">
       </param>
       <param name="coolingEnabledAvailable" type="Boolean" mandatory="false">
@@ -1945,6 +2021,9 @@
    <param name="moduleName" type="String" maxlength="100" mandatory="true" >
      <description>The short name or a short description of the radio control module.</description>
    </param>
+   <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+       <description>Information about a RC module, including its id. </description>
+   </param>
    <param name="radioEnableAvailable" type="Boolean" mandatory="false">
      <description>
        Availability of the control of enable/disable radio.
@@ -2097,6 +2176,9 @@
    <param name="moduleName" type="String" maxlength="100" mandatory="true" >
      <description>The short name or a short description of the climate control module.</description>
    </param>
+   <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+       <description>Information about a RC module, including its id. </description>
+   </param>
    <param name="currentTemperatureAvailable" type="Boolean" mandatory="false">
      <description>
        Availability of the reading of current temperature.
@@ -2240,6 +2322,9 @@
            It should not be used to identify a module by mobile application.
          </description>
      </param>
+     <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+         <description>Information about a RC module, including its id. </description>
+     </param>
      <param name="sourceAvailable" type="Boolean" mandatory="false">
          <description>Availability of the control of audio source. </description>
      </param>
@@ -2399,6 +2484,9 @@
            It should not be used to identify a module by mobile application.
          </description>
      </param>
+     <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+         <description>Information about a RC module, including its id. </description>
+     </param>
      <param name="supportedLights" type="LightCapabilities" minsize="1" maxsize="100" array="true" mandatory="true">
      <description> An array of available light names that are controllable. </description>
      </param>
@@ -2443,6 +2531,9 @@
            It should not be used to identify a module by mobile application.
          </description>
      </param>
+     <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+         <description>Information about a RC module, including its id. </description>
+     </param>
      <param name="distanceUnitAvailable" type="Boolean" mandatory="false">
          <description>Availability of the control of distance unit. </description>
      </param>
@@ -2458,6 +2549,9 @@
    <description>The moduleType indicates which type of data should be changed and identifies which data object exists in this struct. For example, if the moduleType is CLIMATE then a "climateControlData" should exist</description>
    <param name="moduleType" type="Common.ModuleType" mandatory="true" >
    </param>
+   <param name="moduleId" type="String" maxlength="100" mandatory="false">
+       <description>Id of a module, published by System Capability. </description>
+   </param>
    <param name="radioControlData" type="Common.RadioControlData" mandatory="false">
    </param>
    <param name="climateControlData" type="Common.ClimateControlData" mandatory="false">
@@ -2500,6 +2594,9 @@
     <param name="name" type="Common.ButtonName" mandatory="true">
         <description>The name of the Button from the ButtonName enum</description>
     </param>
+    <param name="moduleInfo" type="ModuleInfo" mandatory="false">
+        <description>Information about a RC module, including its id. </description>
+    </param>
     <param name="shortPressAvailable" type="Boolean" mandatory="true">
         <description>The button supports a short press. Whenever the button is pressed short, onButtonPressed(SHORT) should be invoked.</description>
     </param>
@@ -2632,6 +2729,17 @@
   </param>
 </struct>
 
+<struct name="TemplateConfiguration">
+  <param name="template" type="String" maxlength="500" mandatory="true">
+    <description>
+      Predefined or dynamically created window template.
+      Currently only predefined window template layouts are defined.
+    </description>
+  </param>
+  <param name="dayColorScheme" type="TemplateColorScheme" mandatory="false" />
+  <param name="nightColorScheme" type="TemplateColorScheme" mandatory="false" />
+</struct>
+
 <struct name="HMIApplication">
     <description>Data type containing information about application needed by HMI.</description>
     <param name="appName" type="String" maxlength="100" mandatory="true">
@@ -2665,7 +2773,7 @@
     <param name="vrSynonyms" type="String" maxlength="40" minsize="1" maxsize="100" array="true" mandatory="false">
       <description>
         Defines an additional voice recognition command.
-        Must not interfere with any name of previously registered applications(SDL makes check).
+        Must not interfere with any name of previously registered applications from the same device.
       </description>
     </param>
     <param name="appID" type="Integer" mandatory="true">
@@ -2723,6 +2831,12 @@
   </param>
 </struct>
 
+<enum name="MenuLayout">
+    <description>How the main menu or submenu is laid out on screen</description>
+    <element name="LIST" />
+    <element name="TILES" />
+</enum>
+
 <struct name="Choice">
   <description>A choice is an option given to the user which can be selected either by menu, or through voice recognition system.</description>
   <param name="choiceID" type="Integer" minvalue="0" maxvalue="65535" mandatory="true">
@@ -2883,6 +2997,12 @@
   <param name="imageSupported" type="Boolean" mandatory="true">
     <description>Must be true if the button supports referencing a static or dynamic image.</description>
   </param>
+  <param name="textSupported" type="Boolean" mandatory="false" >
+    <description>
+      The button supports the use of text.
+      If not included, the default value should be considered true that the button will support text.
+    </description>
+  </param>
 </struct>
 
 <struct name="HMICapabilities">
@@ -3210,8 +3330,13 @@
   <param name="rolloverEvent" type="Common.VehicleDataEventStatus" mandatory="true">
     <description>References signal "VedsEvntRoll_D_Ltchd". See VehicleDataEventStatus.</description>
   </param>
-  <param name="maximumChangeVelocity" type="Common.VehicleDataEventStatus" mandatory="true">
-    <description>References signal "VedsMaxDeltaV_D_Ltchd". See VehicleDataEventStatus.</description>
+  <param name="maximumChangeVelocity" type="Integer" minvalue="0" maxvalue="255" mandatory="true">
+    <description>
+      References signal "VedsMaxDeltaV_D_Ltchd". Change in velocity in KPH.  Additional reserved values:
+      0x00 No event
+      0xFE Not supported
+      0xFF Fault
+    </description>
   </param>
   <param name="multipleEvents" type="Common.VehicleDataEventStatus" mandatory="true">
     <description>References signal "VedsMultiEvnt_D_Ltchd". See VehicleDataEventStatus.</description>
@@ -3359,6 +3484,77 @@
     <param name="hapticSpatialDataSupported" type="Boolean" mandatory="false">
       <description>True if the system can utilize the haptic spatial data from the source being streamed. </description>
     </param>
+    <param name="diagonalScreenSize" type="Float" minvalue="0" mandatory="false">
+      <description>The diagonal screen size in inches.</description>
+    </param>
+    <param name="pixelPerInch" type="Float" minvalue="0" mandatory="false">
+      <description>PPI is the diagonal resolution in pixels divided by the diagonal screen size in inches.</description>
+    </param>
+    <param name="scale" type="Float" minvalue="1" maxvalue="10" mandatory="false">
+      <description>The scaling factor the app should use to change the size of the projecting view.</description>
+    </param>
+  </struct>
+
+
+  <struct name="WindowTypeCapabilities">
+    <param name="type" type="Common.WindowType" mandatory="true" />
+    <param name="maximumNumberOfWindows" type="Integer" mandatory="true" />
+  </struct>
+
+  <struct name="WindowCapability">
+    <param name="windowID" type="Integer" mandatory="false">
+      <description>
+        The specified ID of the window. Can be set to a predefined window,
+        or omitted for the main window on the main display.
+      </description>
+    </param>
+    <param name="textFields" type="TextField" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>A set of all fields that support text data. See TextField</description>
+    </param>
+    <param name="imageFields" type="ImageField" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>A set of all fields that support images. See ImageField</description>
+    </param>
+    <param name="imageTypeSupported" type="ImageType" array="true" minsize="0" maxsize="1000" mandatory="false">
+      <description>Provides information about image types supported by the system.</description>
+    </param>
+    <param name="templatesAvailable" type="String" minsize="0" maxsize="100" maxlength="100" array="true" mandatory="false">
+      <description>A set of all window templates available on the head unit.</description>
+    </param>
+    <param name="numCustomPresetsAvailable" type="Integer" minvalue="1" maxvalue="100" mandatory="false">
+      <description>The number of on-window custom presets available (if any); otherwise omitted.</description>
+    </param>
+    <param name="buttonCapabilities" type="ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>The number of buttons and the capabilities of each on-window button.</description>
+    </param>
+    <param name="softButtonCapabilities" type="SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>The number of soft buttons available on-window and the capabilities for each button.</description>
+    </param>
+    <param name="menuLayoutsAvailable" type="Common.MenuLayout" array="true" minsize="1" maxsize="1000" mandatory="false">
+      <description>An array of available menu layouts. If this parameter is not provided, only the `LIST` layout is assumed to be available</description>
+    </param>
+  </struct>
+
+  <struct name="DisplayCapability">
+    <description>Contains information about the display capabilities.</description>
+    <param name="displayName" type="String" mandatory="false" />
+    <param name="windowTypeSupported" type="WindowTypeCapabilities" array="true" minsize="1" mandatory="false">
+      <description>
+        Informs the application how many windows the app is allowed to create per type.
+      </description>
+    </param>
+    <param name="windowCapabilities" type="WindowCapability" array="true" minsize="1" maxsize="1000" mandatory="false">
+      <description>
+        Contains a list of capabilities of all windows related to the app.
+        Once the app has registered the capabilities of all windows are provided.
+        GetSystemCapability still allows requesting window capabilities of all windows.
+        After registration, only windows with capabilities changed will be included.
+        Following cases will cause only affected windows to be included:
+        1. App creates a new window. After the window is created, a system capability notification will be sent
+        related only to the created window.
+        2. App sets a new layout to the window. The new layout changes window capabilties.
+        The notification will reflect those changes to the single window.
+      </description>
+    </param>
   </struct>
 
   <struct name="DriverDistractionCapability" >
@@ -3432,10 +3628,10 @@
       <description>The position of the haptic rectangle to be highlighted. The center of this rectangle will be "touched" when a press occurs.</description>
     </param>
   </struct>
-    
-    <struct name="SyncMsgVersion">
+
+  <struct name="SyncMsgVersion">
         <description>Specifies the version number of the SmartDeviceLink protocol that is supported by the mobile application or app service</description>
-        
+
         <param name="majorVersion" type="Integer" minvalue="1" maxvalue="10" mandatory="true">
             <description>The major version indicates versions that is not-compatible to previous versions.</description>
         </param>
@@ -3447,6 +3643,48 @@
         </param>
     </struct>
 
+  <enum name="ServiceType">
+    <element name="VIDEO" >
+      <description>Refers to the Video service.</description>
+    </element>
+    <element name="AUDIO" >
+      <description>Refers to the Audio service.</description>
+    </element>
+    <element name="RPC" >
+      <description>Refers to the RPC service.</description>
+    </element>
+  </enum>
+
+  <enum name="ServiceEvent">
+    <element name="REQUEST_RECEIVED" >
+      <description>When a request for a Service is received.</description>
+    </element>
+    <element name="REQUEST_ACCEPTED" >
+      <description>When a request for a Service is Accepted.</description>
+    </element>
+    <element name="REQUEST_REJECTED" >
+      <description>When a request for a Service is Rejected.</description>
+    </element>
+  </enum>
+
+  <enum name="ServiceStatusUpdateReason">
+    <element name="PTU_FAILED" >
+      <description>When a Service is rejected because the system was unable to get a required Policy Table Update.</description>
+    </element>
+    <element name="INVALID_CERT" >
+      <description>When a Service is rejected because the security certificate is invalid/expired.</description>
+    </element>
+    <element name="INVALID_TIME" >
+      <description>When a Service is rejected because the system was unable to get a valid SystemTime from HMI, which is required for certificate authentication.</description>
+    </element>
+    <element name="PROTECTION_ENFORCED" >
+      <description>When a Service is rejected because the system configuration ini file requires the service must be protected, but the app asks for an unprotected service.</description>
+    </element>
+    <element name="PROTECTION_DISABLED" >
+      <description>When a mobile app requests a protected service, but the system starts an unprotected service instead.</description>
+    </element>
+  </enum>
+
     <!-- App Services -->
 
     <enum name="AppServiceType">
@@ -3589,7 +3827,7 @@
         <param name="apparentTemperature" type="Common.Temperature" mandatory="false"/>
         <param name="apparentTemperatureHigh" type="Common.Temperature" mandatory="false"/>
         <param name="apparentTemperatureLow" type="Common.Temperature" mandatory="false"/>
-    
+
         <param name="weatherSummary" type="String" mandatory="false"/>
         <param name="time" type="Common.DateTime" mandatory="false"/>
         <param name="humidity" type="Float" minvalue="0" maxvalue="1" mandatory="false">
@@ -3660,7 +3898,7 @@
             <description> Using this action plus a supplied direction can give the type of turn. </description>
         </element>
         <element name="EXIT"/>
-        <element name="STAY"/>    
+        <element name="STAY"/>
         <element name="MERGE"/>
         <element name="FERRY"/>
         <element name="CAR_SHUTTLE_TRAIN"/>
@@ -3861,11 +4099,19 @@
         <element name="VIDEO_STREAMING"/>
         <element name="REMOTE_CONTROL"/>
         <element name="APP_SERVICES" />
+<<<<<<< HEAD
         <element name="DRIVER_DISTRACTION" />
+=======
+        <element name="SEAT_LOCATION"/>
+        <element name="DISPLAYS"/>
+>>>>>>> origin/develop
     </enum>
 
     <struct name="SystemCapability">
-        <description>The systemCapabilityType identifies which data object exists in this struct. For example, if the SystemCapability Type is NAVIGATION then a "navigationCapability" should exist</description>
+        <description>
+          The systemCapabilityType identifies which data object exists in this struct. For example,
+          if the SystemCapability Type is NAVIGATION then a "navigationCapability" should exist
+        </description>
         <param name="systemCapabilityType" type="Common.SystemCapabilityType" mandatory="true">
             <description>Used as a descriptor of what data to expect in this struct. The corresponding param to this enum should be included and the only other param included.</description>
         </param>
@@ -3882,11 +4128,59 @@
             <description>Describes extended capabilities of the module's phone feature</description>
         </param>
         <param name="appServicesCapabilities" type="Common.AppServicesCapabilities" mandatory="false">
+<<<<<<< HEAD
             <description>An array of currently available services. If this is an update to the capability the affected services will include an update reason in that item</description>
         </param>
         <param name="driverDistractionCapability" type="DriverDistractionCapability" mandatory="false" since="6.0">
             <description>Describes capabilities when the driver is distracted</description>
         </param>      
+=======
+            <description>
+              An array of currently available services.
+              If this is an update to the capability the affected services will include
+              an update reason in that item
+            </description>
+        </param>
+        <param name="displayCapabilities" type="Common.DisplayCapability" array="true" minsize="1" maxsize="1000" mandatory="false"/>
+        <param name="seatLocationCapability" type="SeatLocationCapability" mandatory="false">
+            <description>Contains information about the locations of each seat</description>
+        </param>
+    </struct>
+    
+    <enum name="HybridAppPreference">
+        <description>Enumeration for the user's preference of which app type to use when both are available</description>
+        <element name="MOBILE" />
+        <element name="CLOUD" />
+        <element name="BOTH"/>
+    </enum>
+
+    <struct name="AppProperties">
+      <param name="nicknames" type="String" minlength="0" maxlength="100" array="true" minsize="0" maxsize="100" mandatory="false">
+          <description>An array of app names an app is allowed to register with. If included in a SetAppProperties request, this value will overwrite the existing "nicknames" field in the app policies section of the policy table.</description>
+      </param>
+      <param name="policyAppID" type="String" maxlength="100" minlength="1" mandatory="true" />
+      <param name="enabled" type="Boolean" mandatory="false">
+          <description>If true, the app will be marked as "available" or "installed" and will be included in HMI RPC UpdateAppList.</description>
+      </param>
+      <param name="authToken" type="String" maxlength="65535" mandatory="false">
+          <description>Used to authenticate connection on app activation</description>
+      </param>
+      <param name="transportType" type="String" maxlength="100" mandatory="false">
+          <description>
+            Specifies the connection type Core should use. The Core role (server or client) is dependent of "endpoint" being specified.
+            See "endpoint" for details.
+          </description>
+      </param>
+      <param name="hybridAppPreference" type="Common.HybridAppPreference" mandatory="false">
+          <description>Specifies the user preference to use one specific app type or all available types</description>
+      </param>
+      <param name="endpoint" type="String" maxlength="65535" mandatory="false">
+          <description>
+            If specified, which Core uses a client implementation of the connection type and attempts to connect to the endpoint when this app is selected (activated).
+            If omitted, Core won't attempt to connect as the app selection (activation) is managed outside of Core. Instead it uses a server implementation of the connection type and expects the app to connect.
+          </description>
+      </param>
+>>>>>>> origin/develop
     </struct>
 
 </interface>
@@ -3909,6 +4203,9 @@
       <param name="moduleType" type="Common.ModuleType" mandatory="true" >
         <description>The module where the button should be pressed</description>
       </param>
+      <param name="moduleId" type="String" maxlength="100" mandatory="false">
+        <description>Id of a module, published by System Capability. </description>
+      </param>
       <param name="buttonName" type="Common.ButtonName" mandatory="true" />
       <param name="buttonPressMode" type="Common.ButtonPressMode" mandatory="true" >
         <description>Indicates whether this is a LONG or SHORT button press event.</description>
@@ -3976,6 +4273,26 @@
 </interface>
 
 <interface name="BasicCommunication" version="2.1.0" date="2019-03-18">
+<function name="OnServiceUpdate" messagetype="notification">
+  <description>
+    Must be sent by SDL to HMI when there is an update on status of certain services.
+    Services supported with current version: Video
+  </description>
+  <param name="serviceType" type="Common.ServiceType" mandatory="true">
+    <description>Specifies the service which has been updated.</description>
+  </param>
+  <param name="serviceEvent" type="Common.ServiceEvent" mandatory="false">
+    <description>Specifies service update event.</description>
+  </param>
+  <param name="reason" type="Common.ServiceStatusUpdateReason" mandatory="false">
+    <description>
+      The reason for a service event. Certain events may not have a reason, such as when a service is ACCEPTED (which is the normal expected behavior).
+    </description>
+  </param>
+   <param name="appID" type="Integer" mandatory="false">
+       <description>ID of the application which triggered the update.</description>
+   </param>
+</function>
     <function name="GetSystemTime" messagetype="request">
       <description>Request from SDL to HMI to obtain current UTC time.</description>
     </function>
@@ -4069,12 +4386,22 @@
       <param name="appID" type="Integer" mandatory="true">
         <description>ID of selected application.</description>
       </param>
+      <param name="windowID" type="Integer" mandatory="false">
+        <description>
+          This is the unique ID assigned to the window that this RPC is intended. If this param is not included, it will be assumed that this request is specifically for the main window on the main display. See PredefinedWindows enum.
+        </description>
+      </param>
     </function>
     <function name="OnAppDeactivated" messagetype="notification">
       <description>Must be sent by HU system when the user switches to any functionality which is not other mobile application.</description>
       <param name="appID" type="Integer" mandatory="true">
         <description>ID of deactivated application.</description>
       </param>
+      <param name="windowID" type="Integer" mandatory="false">
+        <description>
+          This is the unique ID assigned to the window that this RPC is intended. If this param is not included, it will be assumed that this request is specifically for the main window on the main display. See PredefinedWindows enum.
+        </description>
+      </param>
     </function>
     <function name="OnAppRegistered" messagetype="notification">
       <description>Issued by SDL to notify HMI about new application registered.</description>
@@ -4093,7 +4420,7 @@
       <param name="vrSynonyms" type="String" maxlength="40" minsize="1" maxsize="100" array="true" mandatory="false">
         <description>
           Defines an additional voice recognition command.
-          Must not interfere with any name of previously registered applications(SDL makes check).
+          Must not interfere with any name of previously registered applications from the same device.
         </description>
       </param>
       <param name="resumeVrGrammars" type="Boolean" mandatory="false">
@@ -4150,7 +4477,10 @@
     <function name="DialNumber" messagetype="request">
       <description>Request from SDL to call a specific number.</description>
       <param name="number" type="String" maxlength="40" mandatory="true">
-        <description>The number to dial. Only the character + and numbers are allowed.</description>
+        <description>
+            Phone number is a string, which can be up to 40 chars.
+            All characters shall be stripped from string except digits 0-9 and * # , ; +
+        </description>
       </param>
       <param name="appID" type="Integer" mandatory="true">
         <description>ID of application that concerns this RPC.</description>
@@ -4316,7 +4646,7 @@
       <description>Selected file type.</description>
     </param>
   </function>
-  
+
 <!-- Policies -->
   <function name="GetSystemInfo" messagetype="request">
     <description>Request from SDL to HMI to obtain information about head unit system.</description>
@@ -4359,11 +4689,59 @@
      </param>
    </function>
   <function name="OnSystemCapabilityUpdated" messagetype="notification">
-    <description>A notification to inform the HMI that a specific system capability has changed.</description>
+    <description>
+      A notification between HMI and SDL that a specific system capability has been changed.
+      It can be sent in both directions SDL to HMI and HMI to SDL. Direction is dependent on
+      the point where capabilities have been changed
+    </description>
     <param name="systemCapability" type="Common.SystemCapability" mandatory="true">
       <description>The system capability that has been updated</description>
     </param>
+    <param name="appID" type="Integer" mandatory="false">
+      <description>ID of application that is related to this RPC.</description>
+    </param>
+  </function>
+  
+  <function name="SetAppProperties" messagetype="request">
+    <description>
+      HMI >SDL. RPC used to enable/disable an application and set authentication data
+    </description>
+    <param name="properties" type="Common.AppProperties" mandatory="true">
+      <description>The new application properties</description>
+    </param>
   </function> 
+  
+  <function name="SetAppProperties" messagetype="response">
+    <description>The response to SetAppProperties</description>
+  </function>
+  
+  <function name="GetAppProperties" messagetype="request">
+    <description>
+      HMI >SDL. RPC used to get the current properties of an application
+    </description>
+    <param name="policyAppID" type="String" maxlength="100" mandatory="false">
+      <description>
+        If specified the response will contain the properties of the specified app ID.
+        Otherwise if omitted all app properties will be returned at once.
+      </description>
+    </param>
+  </function>
+  
+  <function name="GetAppProperties" messagetype="response">
+    <description>The response to GetAppProperties</description>
+    <param name="properties" type="Common.AppProperties" array="true" minsize="1" mandatory="false">
+      <description>The requested application properties</description>
+    </param>
+  </function>
+  
+  <function name="OnAppPropertiesChange" messagetype="notification">
+    <description>
+      SDL >HMI. RPC used to inform HMI about app properties change (such as auth token).
+    </description>
+    <param name="properties" type="Common.AppProperties" mandatory="true">
+      <description>The new application properties</description>
+    </param>
+  </function>
 </interface>
 
 <interface name="VR" version="1.1.0" date="2017-04-27">
@@ -4450,6 +4828,11 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application related to this RPC.</description>
     </param>
+    <param name="cancelID" type="Integer" mandatory="false">
+      <description>
+        An ID for this specific alert to allow cancellation through the `CancelInteraction` RPC.
+      </description>
+    </param>
   </function>
   <function name="PerformInteraction" messagetype="response">
     <param name="choiceID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
@@ -4473,7 +4856,7 @@
       <description>
         Request new VR synonyms registration
         Defines an additional voice recognition command.
-        Must not interfere with any name of previously registered applications(SDL makes check).
+        Must not interfere with any name of previously registered applications from the same device.
       </description>
     </param>
     <param name="language" type="Common.Language" mandatory="true">
@@ -4641,7 +5024,7 @@
   </function>
 </interface>
 
-<interface name="UI" version="1.3.0" date="2018-09-05">
+<interface name="UI" version="1.4.0" date="2019-07-24">
   <function name="Alert" messagetype="request">
     <description>Request from SDL to show an alert message on the display.</description>
     <param name="alertStrings" type="Common.TextFieldStruct" mandatory="true" array="true" minsize="0" maxsize="3">
@@ -4662,6 +5045,11 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application requested this RPC.</description>
     </param>
+    <param name="cancelID" type="Integer" mandatory="false">
+      <description>
+        An ID for this specific alert to allow cancellation through the `CancelInteraction` RPC.
+      </description>
+    </param>
     <param name="alertIcon" type="Common.Image" mandatory="false" >
       <description>
         Image to be displayed for the corresponding alert. See Image. 
@@ -4669,11 +5057,44 @@
       </description>
     </param>
   </function>
+
   <function name="Alert" messagetype="response">
     <param name="tryAgainTime" type="Integer" mandatory="false" minvalue="0" maxvalue="2000000000">
       <description>Amount of time (in milliseconds) that SDL must wait before resending an alert. Must be provided if another system event or overlay currently has a higher priority than this alert.</description>
     </param>
   </function>
+
+  <function name="SetDisplayLayout" messagetype="request">
+    <description>This RPC is deprecated. Use Show RPC to change layout.</description>
+    <param name="displayLayout" type="String" maxlength="500" mandatory="true">
+      <description>
+        Predefined or dynamically created screen layout.
+        Currently only predefined screen layouts are defined.
+      </description>
+    </param>
+    <param name="appID" type="Integer" mandatory="true">
+      <description>ID of application related to this RPC.</description>
+    </param>
+    <param name="dayColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param>
+    <param name="nightColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param>
+  </function>
+
+  <function name="SetDisplayLayout" messagetype="response">
+    <description>This RPC is deprecated. Use Show RPC to change layout.</description>
+    <param name="displayCapabilities" type="Common.DisplayCapabilities" mandatory="false">
+      <description>See DisplayCapabilities</description>
+    </param>
+    <param name="buttonCapabilities" type="Common.ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>See ButtonCapabilities</description >
+    </param>
+    <param name="softButtonCapabilities" type="Common.SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>If returned, the platform supports on-screen SoftButtons; see SoftButtonCapabilities.</description >
+    </param>
+    <param name="presetBankCapabilities" type="Common.PresetBankCapabilities" mandatory="false">
+      <description>If returned, the platform supports custom on-screen Presets; see PresetBankCapabilities.</description >
+    </param>
+  </function>
+
   <function name="Show" messagetype="request">
     <param name="showStrings" type="Common.TextFieldStruct" mandatory="true" array="true" minsize="0" maxsize="8">
       <description>Array of lines of show text fields. See TextFieldStruct. If some field is not set, the corresponding text should stay unchanged. If field's text is empty "", the field must be cleared.
@@ -4711,16 +5132,105 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>Id of application related to this RPC.</description>
     </param>
+    <param name="windowID" type="Integer" mandatory="false" >
+      <description>
+        This is the unique ID assigned to the window that this RPC is intended.
+        If this param is not included,
+        it will be assumed that this request is specifically for the main window
+        on the main display.
+        See PredefinedWindows enum.
+      </description>
+    </param>
+
+    <param name="templateConfiguration" type="Common.TemplateConfiguration" mandatory="false">
+        <description>
+          Used to set an alternate template layout to a window.
+        </description>
+    </param>
   </function>
+
   <function name="Show" messagetype="response">
   </function>
+
+  <function name="CreateWindow" messagetype="request">
+    <description>
+      Create a new window on the display with the specified window type.
+    </description>
+    <param name="windowID" type="Integer" mandatory="true">
+      <description>
+        A unique ID to identify the window. The value of '0' will always be the default main window on the main display and should not be used in this context as it will already be created for the app. See PredefinedWindows enum. Creating a window with an ID that is already in use will be rejected with `INVALID_ID`.
+      </description>
+    </param>
+
+    <param name="windowName" type="String" maxlength="100" mandatory="true">
+      <description>
+        The window name to be used by the HMI. The name of the pre-created default window will match the app name.
+        Multiple apps can share the same window name except for the default main window.
+        Creating a window with a name which is already in use by the app will result in `DUPLICATE_NAME`.
+      </description>
+    </param>
+
+    <param name="type" type="Common.WindowType" mandatory="true">
+      <description>The type of the window to be created. Main window or widget.</description>
+    </param>
+
+    <param name="associatedServiceType" type="String" mandatory="false">
+      <description>
+        Allows an app to create a widget related to a specific service type.
+        As an example if a `MEDIA` app becomes active, this app becomes audible and is allowed to play audio.
+        Actions such as skip or play/pause will be directed to this active media app.
+        In case of widgets, the system can provide a single "media" widget which will act as a placeholder for the active media app.
+        It is only allowed to have one window per service type. This means that a media app can only have a single MEDIA widget.
+        Still the app can create widgets omitting this parameter.
+        Those widgets would be available as app specific widgets that are permanently included in the HMI.
+        This parameter is related to widgets only. The default main window, which is pre-created during app registration,
+        will be created based on the HMI types specified in the app registration request.
+      </description>
+    </param>
+
+    <param name="duplicateUpdatesFromWindowID" type="Integer" mandatory="false">
+      <description>
+        Optional parameter. Specify whether the content sent to an existing window
+        should be duplicated to the created window.
+        If there isn't a window with the ID, the request will be rejected with `INVALID_DATA`.
+      </description>
+    </param>
+    <param name="appID" type="Integer" mandatory="true">
+      <description>ID of application that concerns this RPC.</description>
+    </param>
+  </function>
+
+  <function name="CreateWindow" messagetype="response">
+  </function>
+
+  <function name="DeleteWindow" messagetype="request">
+    <description>
+      Deletes previously created window of the SDL application.
+    </description>
+    <param name="windowID" type="Integer" mandatory="true">
+      <description>
+        A unique ID to identify the window. The value of '0' will always be the default main window
+        on the main display and cannot be deleted.
+        See PredefinedWindows enum.
+      </description>
+    </param>
+    <param name="appID" type="Integer" mandatory="true">
+      <description>ID of application that concerns this RPC.</description>
+    </param>
+  </function>
+
+  <function name="DeleteWindow" messagetype="response">
+  </function>
+
   <function name="AddCommand" messagetype="request">
     <description>Request from SDL to add a command to the application menu.</description>
     <param name="cmdID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="true">
       <description>ID of the command to be added.</description>
     </param>
     <param name="menuParams" type="Common.MenuParams" mandatory="false">
-      <description>Optional sub value containing parameters of the command (position, name, etc.). See MenuParams. If omitted the command should be added to the end of the list of commands.</description>
+      <description>
+        Optional sub value containing parameters of the command (position, name, etc.). See MenuParams.
+        If omitted the command should be added to the end of the list of commands.</description>
     </param>
     <param name="cmdIcon" type="Common.Image" mandatory="false">
       <description>Image to be displayed for representing the command. See Image.</description>
@@ -4730,8 +5240,10 @@
       <description>ID of application that concerns this RPC.</description>
     </param>
   </function>
+
   <function name="AddCommand" messagetype="response">
-    </function>
+  </function>
+
   <function name="DeleteCommand" messagetype="request">
     <description>Request from SDL to delete a command from the in-application menu with the specified command id.</description>
     <param name="cmdID" type="Integer" mandatory="true" minvalue="0" maxvalue="2000000000">
@@ -4741,8 +5253,10 @@
       <description>ID of application that concerns this RPC.</description>
     </param>
   </function>
+
   <function name="DeleteCommand" messagetype="response">
   </function>
+
   <function name="AddSubMenu" messagetype="request">
     <description>Request from SDL to add a sub menu to the in-application menu.</description>
     <param name="menuID" type="Integer" minvalue="1" maxvalue="2000000000" mandatory="true">
@@ -4757,6 +5271,9 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application that requested this RPC.</description>
     </param>
+    <param name="menuLayout" type="Common.MenuLayout" mandatory="false">
+      <description>Sets the layout of the submenu screen.</description>
+    </param>
   </function>
   <function name="AddSubMenu" messagetype="response">
   </function>
@@ -4809,6 +5326,11 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application that concerns this RPC.</description>
     </param>
+    <param name="cancelID" type="Integer" mandatory="false">
+      <description>
+        An ID for this specific alert to allow cancellation through the `CancelInteraction` RPC.
+      </description>
+    </param>
   </function>
   <function name="PerformInteraction" messagetype="response">
     <param name="choiceID" type="Integer" minvalue="0" maxvalue="2000000000" mandatory="false">
@@ -4821,6 +5343,23 @@
       </description>
     </param>
   </function>
+  <function name="CancelInteraction" messagetype="request">
+    <param name="cancelID" type="Integer" mandatory="false">
+      <description>
+        The ID of the specific interaction you want to dismiss. If not set, the most recent of the RPC type set in functionID will be dismissed.
+      </description>
+    </param>
+    <param name="functionID" type="Integer" mandatory="true">
+      <description>
+        The ID of the type of interaction the developer wants to dismiss. Only values 10, (PerformInteractionID), 12 (AlertID), 25 (ScrollableMessageID), and 26 (SliderID) are permitted.
+      </description>
+    </param>
+    <param name="appID" type="Integer" mandatory="true">
+      <description>ID of application requested this RPC.</description>
+    </param>
+  </function>
+  <function name="CancelInteraction" messagetype="response">
+  </function>
   <function name="SetMediaClockTimer" messagetype="request">
     <description>Sets the initial media clock value and automatic update method.</description>
     <param name="startTime" type="Common.TimeFormat" mandatory="false">
@@ -4868,6 +5407,9 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application that concerns this RPC.</description>
     </param>
+    <param name="menuLayout" type="Common.MenuLayout" mandatory="false">
+      <description>Sets the layout of the main menu screen. If this is sent while a menu is already on-screen, the head unit will change the display to the new layout type.</description>
+    </param>
   </function>
   <function name="SetGlobalProperties" messagetype="response">
   </function>
@@ -4891,6 +5433,11 @@
     <param name="appID" type="Integer" mandatory="false">
       <description>ID of application that is related to this RPC.</description>
     </param>
+    <param name="windowID" type="Integer" mandatory="false">
+      <description>
+        This is the unique ID assigned to the window that this RPC is intended. If this param is not included, it will be assumed that this request is specifically for the main window on the main display. See PredefinedWindows enum.
+      </description>
+    </param>
   </function>
   <function name="GetCapabilities" messagetype="request">
     <description>Method is invoked at system startup by SDL to request information about UI capabilities of HMI.</description>
@@ -4899,7 +5446,17 @@
     <param name="displayCapabilities" type="Common.DisplayCapabilities" mandatory="true">
       <description>Information about the capabilities of the display: its type, text field supported, etc. See DisplayCapabilities. </description>
     </param>
-    <param name="audioPassThruCapabilities" type="Common.AudioPassThruCapabilities" mandatory="true"/>
+    <param name="audioPassThruCapabilities" type="Common.AudioPassThruCapabilities" mandatory="true">
+      <description>
+        Describes an audio configuration that the system supports for PerformAudioPassThru.
+        Note: please fill out both audioPassThruCapabilities and audioPassThruCapabilitiesList parameters, as:
+        - Newer SDL Core uses audioPassThruCapabilitiesList instead of audioPassThruCapabilities, and
+        - audioPassThruCapabilities is a mandatory field and cannot be omitted.
+      </description>
+    </param>
+    <param name="audioPassThruCapabilitiesList" type="Common.AudioPassThruCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
+      <description>Describes the audio configurations that the system supports for PerformAudioPassThru.</description>
+    </param>
     <param name="hmiZoneCapabilities" type="Common.HmiZoneCapabilities" mandatory="true"/>
     <param name="softButtonCapabilities" type="Common.SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
       <description>Must be returned if the platform supports on-screen SoftButtons.</description>
@@ -4916,10 +5473,10 @@
     <param name="appName" type="String" maxlength="100" mandatory="false">
       <description>
         Request new app name registration
-        Needs to be unique over all applications.
+        Needs to be unique over all applications from the same device.
         May not be empty. May not start with a new line character.
-        May not interfere with any name or synonym of any registered applications.
-        Applications with the same name will be rejected. (SDL makes all the checks)
+        May not interfere with any name or synonym of any registered applications from the same device.
+        Additional applications with the same name from the same device will be rejected.
       </description>
     </param>
     <param name="ngnMediaScreenAppName" type="String" maxlength="100" mandatory="false">
@@ -4976,66 +5533,6 @@
   </function>
   <function name="SetAppIcon" messagetype="response">
   </function>
-  <function name="SetDisplayLayout" messagetype="request">
-    <param name="displayLayout" type="String" maxlength="500" mandatory="true">
-      <description>
-        Predefined or dynamically created screen layout.
-        Currently only predefined screen layouts are defined.
-      </description>
-    </param>
-    <param name="appID" type="Integer" mandatory="true">
-      <description>ID of application related to this RPC.</description>
-    </param>
-    <param name="dayColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param>
-    <param name="nightColorScheme" type="Common.TemplateColorScheme" mandatory="false"></param>
-  </function>
-  <function name="SetDisplayLayout" messagetype="response">
-    <param name="displayCapabilities" type="Common.DisplayCapabilities" mandatory="false">
-      <description>See DisplayCapabilities</description>
-    </param>
-    <param name="buttonCapabilities" type="Common.ButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>See ButtonCapabilities</description >
-    </param>
-    <param name="softButtonCapabilities" type="Common.SoftButtonCapabilities" minsize="1" maxsize="100" array="true" mandatory="false">
-      <description>If returned, the platform supports on-screen SoftButtons; see SoftButtonCapabilities.</description >
-    </param>
-    <param name="presetBankCapabilities" type="Common.PresetBankCapabilities" mandatory="false">
-      <description>If returned, the platform supports custom on-screen Presets; see PresetBankCapabilities.</description >
-    </param>
-  </function>
-  <function name="ShowCustomForm" messagetype="request">
-    <description>Used to show a custom form; it can be a parent or child screen. If no parent screen is designated, it is set as a parent screen.</description>
-    <param name="customFormID" type="String" maxlength="500" mandatory="true">
-      <description>
-            Predefined or dynamically created screen layout.
-            Currently only predefined forms are defined.
-            Predefined layouts include:
-                "DEFAULT" - Default media / non-media screen
-                "ONSCREEN_PRESETS" - Custom root media screen containing app-defined onscreen presets.
-                "KEYBOARD_SEARCH" - Custom template containing app-configured on-screen keyboard with active search updating; user also can trigger voice search.
-                "NAV_FULLSCREEN_MAP" - Custom root template screen containing full screen map with navigation controls.
-                "NAV_POI_MENU" - Custom template containing app-defined POI options.
-                "NAV_SEARCH_RESULTS" - Custom template containing a list of app-defined search results
-                "NAV_POI_INFO" - Custom template containing app-defined POI information (and potentially map data).
-      </description>
-    </param>
-    <param name="parentFormID" type="String" maxlength="500" defvalue="DEFAULT" mandatory="false">
-      <description>
-            Parent screen of predefined form to display.
-            Currently only predefined forms are defined.
-            If not provided, then set to "DEFAULT".
-            Predefined layouts include:
-                "DEFAULT" - Default media / non-media screen
-                "ONSCREEN_PRESETS" - Custom root media screen containing app-defined onscreen presets.
-                "NAV_FULLSCREEN_MAP" - Custom template containing full screen map with navigation controls.
-      </description>
-    </param>
-  </function>
-  <function name="ShowCustomForm" messagetype="response">
-    <param name="info" type="String" maxlength="1000" mandatory="false" platform="documentation">
-      <description>Provides additional human readable info regarding the result.</description>
-    </param>
-  </function>
   <function name="OnKeyboardInput" messagetype="notification">
     <description>On-screen keyboard event.</description>
     <description>Can be full string or individual keypresses depending on keyboard mode.</description>
@@ -5082,6 +5579,11 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application that concerns this RPC.</description>
     </param>
+    <param name="cancelID" type="Integer" mandatory="false">
+      <description>
+        An ID for this specific alert to allow cancellation through the `CancelInteraction` RPC.
+      </description>
+    </param>
   </function>
   <function name="Slider" messagetype="response">
     <param name="sliderPosition" type="Integer" minvalue="1" maxvalue="26" mandatory="false">
@@ -5103,6 +5605,11 @@
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of application related to this RPC.</description>
     </param>
+    <param name="cancelID" type="Integer" mandatory="false">
+      <description>
+        An ID for this specific alert to allow cancellation through the `CancelInteraction` RPC.
+      </description>
+    </param>
   </function>
   <function name="ScrollableMessage" messagetype="response">
   </function>
@@ -5684,9 +6191,6 @@
     <description>
       This function is used to unsubscribe the notifications from the subscribeVehicleData function.
     </description>
-    <param name="appID" type="Integer" mandatory="true">
-      <description>ID of application that requested this RPC.</description>
-    </param>
     <param name="gps" type="Boolean" mandatory="false">
       <description>See GPSData</description>
     </param>
@@ -6139,6 +6643,9 @@
     <param name="cloudAppVehicleID" type="String" mandatory="false">
       <description>Parameter used by cloud apps to identify a head unit</description>
     </param>
+    <param name="engineOilLife" type="Float" minvalue="0" maxvalue="100" mandatory="false">
+      <description>The estimated percentage of remaining oil life of the engine.</description>
+    </param>
 
         <!-- Ford Specific Data Items -->
     <param name="eCallInfo" type="Common.ECallInfo" mandatory="false">
@@ -6321,18 +6828,26 @@
       <param name="statisticType" type="Common.StatisticsType" mandatory="true"/>
     </function>
 
-    <function name="GetURLS" messagetype="request" scope="internal">
-      <description>Sent by system to SDL to get list of URL for specified service type and optionally policy's application id.</description>
-      <param name="service" type="Integer" minvalue="0" maxvalue="100" mandatory="true"/>
-    </function>
-    <function name="GetURLS" messagetype="response" scope="internal">
-      <param name="urls" type="Common.ServiceInfo" array="true" mandatory="false" minsize="1" maxsize="100"/>
-    </function>
     <function name="OnDeviceStateChanged" messagetype="notification" scope="internal">
       <param name="deviceState" type="Common.DeviceState" mandatory="true" />
       <param name="deviceInternalId" type="String" mandatory="true" minlength="0" maxlength="500" />
       <param name="deviceId" type="Common.DeviceInfo" mandatory="false"/>
     </function>
+
+    <function name="GetPolicyConfigurationData" messagetype="request" scope="internal">
+      <description>Request from HMI to SDL core to get policy configuration data (i.e. OEM Network Mapping table file version etc.) from Policy Table.</description>
+      <param name="policyType" type="String" minlength="1" maxlength="1000" mandatory="true">
+        <description>Name of the Struct where configuration data is located in Policy Table, i.e. module_config etc.</description>
+      </param>
+      <param name="property" type="String" minlength="1" maxlength="1000" mandatory="true">
+        <description>Name of the property located within the policyType Struct, i.e. vehicle_year etc.</description>
+      </param>
+    </function>
+    <function name="GetPolicyConfigurationData" messagetype="response">
+      <param name="value" type="String" array="true" maxlength="1000" minsize="1" maxsize="100" mandatory="false">
+        <description>Value of requested property from policyType in PT. If no value is found in PT for specified policyType and property, this parameter will be omitted.</description>
+      </param>
+    </function>
 </interface>
 
 <interface name="RC" version="2.0.0" date="2018-09-05">
@@ -6352,7 +6867,23 @@
     <param name="remoteControlCapability" type="Common.RemoteControlCapabilities" mandatory="false">
       <description>See RemoteControlCapabilities, all available RC modules and buttons shall be returned.</description>
     </param>
+    <param name="seatLocationCapability" type="Common.SeatLocationCapability" mandatory="false">
+      <description>See SeatLocationCapability, all available seat locations shall be returned.</description>
+    </param>
   </function>
+  
+<function name="SetGlobalProperties" messagetype="request">
+    <description>Sets some properties for the application initiated request.</description>
+    <param name="userLocation" type="Common.SeatLocation" mandatory="false">
+      <description>Location of the user's seat. Default is driver's seat location if it is not set yet.</description>
+    </param>
+    <param name="appID" type="Integer" mandatory="true">
+      <description>ID of application related to this RPC.</description>
+    </param>
+</function>
+
+<function name="SetGlobalProperties" messagetype="response">
+</function>
 
  <function name="SetInteriorVehicleData" functionID="SetInteriorVehicleDataID" messagetype="request">
     <param name="moduleData" type="Common.ModuleData" mandatory="true" >
@@ -6373,8 +6904,11 @@
   <param name="moduleType" type="Common.ModuleType" mandatory="true" >
     <description>The module data to retrieve from the vehicle for that type</description>
   </param>
+  <param name="moduleId" type="String" maxlength="100" mandatory="false">
+      <description>Id of a module, published by System Capability. </description>
+  </param>
   <param name="subscribe" type="Boolean" mandatory="false">
-    <description>If subscribe is true, the head unit will send OnInteriorVehicleData notifications for the module type</description>
+    <description>If subscribe is true, the head unit will send OnInteriorVehicleData notifications for the requested module (moduleId and moduleType)</description>
   </param>
 </function>
 
@@ -6389,20 +6923,23 @@
 </function>
 
 <function name="GetInteriorVehicleDataConsent" messagetype="request">
-    <description>Sender: SDL->HMI. </description>
     <description>HMI is expected to display a permission prompt to the driver showing the RC module and app details (for example, app's name).
     The driver is expected to have an ability to grant or deny the permission.</description>
     <param name="moduleType" type="Common.ModuleType" mandatory="true">
       <description>The module type that the app requests to control.</description>
     </param>
+    <param name="moduleIds" type="String" maxlength="100" array="true" mandatory="false">
+        <description>Ids of a module, published by System Capability. </description>
+    </param>
     <param name="appID" type="Integer" mandatory="true">
       <description>ID of the application that triggers the permission prompt.</description>
     </param>
   </function>
   <function name="GetInteriorVehicleDataConsent" messagetype="response">
-    <param name="allowed" type="Boolean" mandatory="true">
-      <description>"true" - if the driver grants the permission for controlling to the named app;
-      "false" - in case the driver denies the permission for controlling to the named app.</description>
+    <param name="allowed" type="Boolean" array="true" mandatory="true">
+      <description>This array has the same size as "moduleIds" in the request; each element corresponding to one moduleId 
+      "true" - if the driver grants the permission for controlling the named app;
+      "false" - in case the driver denies the permission for controlling the named app.</description>
     </param>
 </function>
 
@@ -6477,18 +7014,18 @@
 
     <function name="GetAppServiceData" messagetype="request">
         <description> This request asks the module for current data related to the specific service. It also includes an option to subscribe to that service for future updates</description>
-        
+
         <param name="serviceType" type="String" mandatory="true">
             <description>The type of service that is to be offered by this app. See AppServiceType for known enum equivalent types. Parameter is a string to allow for new service types to be used by apps on older versions of SDL Core.</description>
         </param>
-        
+
         <param name="subscribe" type="Boolean" mandatory="false">
             <description> If true, the consumer is requesting to subscribe to all future updates from the service publisher. If false, the consumer doesn't wish to subscribe and should be unsubscribed if it was previously subscribed.</description>
-        </param>      
+        </param>
     </function>
 
     <function name="GetAppServiceData" messagetype="response">
-        <description> This response includes the data that was requested from the specific service</description>    
+        <description> This response includes the data that was requested from the specific service</description>
         <param name="serviceData" type="Common.AppServiceData" mandatory="false"/>
     </function>
 
@@ -6496,15 +7033,15 @@
         <param name="serviceUri" type="String"  mandatory="true">
             <description>Fully qualified URI based on a predetermined scheme provided by the app service. SDL makes no guarantee that this URI is correct.</description>
         </param>
-        
+
         <param name="serviceID" type="String" mandatory="true">
             <description>The service ID that the app consumer wishes to send this URI.</description>
         </param>
-        
+
         <param name="originApp" type="String" mandatory="false">
             <description>This string is the appID of the app requesting the app service provider take the specific action. This will automatically be set by SDL Core in requests originating from the HMI</description>
         </param>
-        
+
         <param name="requestServiceActive" type="Boolean" mandatory="false">
             <description>This flag signals the requesting consumer would like this service to become the active primary service of the destination's type.</description>
         </param>
@@ -6549,7 +7086,7 @@
         </param>
         <param name="setAsDefault" type="Boolean" mandatory="false">
             <description>True if the service was set to the default service of this type. False if the app was not to be the default</description>
-        </param> 
+        </param>
     </function>
 
     <function name="GetActiveServiceConsent" messagetype="request">
@@ -6560,7 +7097,7 @@
             <description>The ID of the service to be activated</description>
         </param>
     </function>
-    
+
     <function name="GetActiveServiceConsent" messagetype="response">
         <param name="activate" type="Boolean" mandatory="true">
             <description>
diff --git a/src/components/interfaces/HMI_API.xsd b/src/components/interfaces/HMI_API.xsd
new file mode 100644
index 0000000000..7324995dbf
--- /dev/null
+++ b/src/components/interfaces/HMI_API.xsd
@@ -0,0 +1,125 @@
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="interfaces" type="interfacesType">
+        <xs:annotation>
+            <xs:documentation>* Copyright (c) 2016, Ford Motor Company
+                * All rights reserved.
+                *
+                * Redistribution and use in source and binary forms, with or without
+                * modification, are permitted provided that the following conditions are met:
+                *
+                * Redistributions of source code must retain the above copyright notice, this
+                * list of conditions and the following disclaimer.
+                *
+                * Redistributions in binary form must reproduce the above copyright notice,
+                * this list of conditions and the following
+                * disclaimer in the documentation and/or other materials provided with the
+                * distribution.
+                *
+                * Neither the name of the Ford Motor Company nor the names of its contributors
+                * may be used to endorse or promote products derived from this software
+                * without specific prior written permission.
+                *
+                * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+                * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+                * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+                * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+                * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+                * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+                * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+                * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+                * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+                * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+                * POSSIBILITY OF SUCH DAMAGE.</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:complexType name="elementType" mixed="true">
+        <xs:sequence>
+            <xs:element type="xs:string" name="description" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:short" name="value" use="optional"/>
+        <xs:attribute type="xs:string" name="internal_name" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="enumType" mixed="true">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="xs:string" name="description"/>
+            <xs:element type="elementType" name="element">
+                <xs:annotation>
+                    <xs:documentation>Climate Buttons  Radio Buttons  Navigation Subscription Buttons  TO DO to be removed  Common Single Light 0~500  Exterior Lights by common function groups 501~800  Interior Lights by common function groups 801~900  Lights by location 901~1000</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element type="paramType" name="param"/>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="scope" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="paramType" mixed="true">
+        <xs:sequence>
+            <xs:element type="xs:string" name="description" maxOccurs="unbounded" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:short" name="minvalue" use="optional"/>
+        <xs:attribute type="xs:float" name="maxvalue" use="optional"/>
+        <xs:attribute type="xs:string" name="type" use="optional"/>
+        <xs:attribute type="xs:string" name="mandatory" use="optional"/>
+        <xs:attribute type="xs:string" name="defvalue" use="optional"/>
+        <xs:attribute type="xs:int" name="maxlength" use="optional"/>
+        <xs:attribute type="xs:string" name="array" use="optional"/>
+        <xs:attribute type="xs:byte" name="minsize" use="optional"/>
+        <xs:attribute type="xs:int" name="maxsize" use="optional"/>
+        <xs:attribute type="xs:byte" name="minlength" use="optional"/>
+        <xs:attribute type="xs:string" name="scope" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="structType" mixed="true">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="xs:string" name="description" minOccurs="0"/>
+            <xs:element type="paramType" name="param"/>
+            <xs:element type="elementType" name="element">
+                <xs:annotation>
+                    <xs:documentation>Climate Buttons  Radio Buttons  Navigation Subscription Buttons  TO DO to be removed  Common Single Light 0~500  Exterior Lights by common function groups 501~800  Interior Lights by common function groups 801~900  Lights by location 901~1000</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="scope" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="interfaceType">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="enumType" name="enum"/>
+            <xs:element type="structType" name="struct"/>
+            <xs:element type="functionType" name="function">
+                <xs:annotation>
+                    <xs:documentation>Policies  SyncP RPC End of SyncP RPC Policies  End of Policies  / Ford Specific Data Items  / Ford Specific Data Items  / Ford Specific Data Items  / Ford Specific Data Items  / Ford Specific Data Items  / Ford Specific Data Items  / Ford Specific Data Items  SyncP RPC End of SyncP RPC</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element type="xs:string" name="description"/>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="version" use="optional"/>
+        <xs:attribute type="xs:date" name="date" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="functionType" mixed="true">
+        <xs:sequence>
+            <xs:element type="xs:string" name="description" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="paramType" name="param" maxOccurs="unbounded" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Ford Specific Data Items  Ford Specific Data Items  Ford Specific Data Items  Ford Specific Data Items  Ford Specific Data Items  Ford Specific Data Items  Ford Specific Data Items</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="messagetype" use="optional"/>
+        <xs:attribute type="xs:string" name="functionID" use="optional"/>
+        <xs:attribute type="xs:string" name="scope" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="interfacesType">
+        <xs:sequence>
+            <xs:element type="interfaceType" name="interface" maxOccurs="unbounded" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Policies</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name"/>
+    </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/src/components/interfaces/v4_protocol_v1_2_no_extra.xsd b/src/components/interfaces/v4_protocol_v1_2_no_extra.xsd
new file mode 100644
index 0000000000..3da28ea238
--- /dev/null
+++ b/src/components/interfaces/v4_protocol_v1_2_no_extra.xsd
@@ -0,0 +1,83 @@
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="interface" type="interfaceType">
+        <xs:annotation>
+            <xs:documentation>edited with XMLSpy v2011 rel. 3 sp1 (x64) (http://www.altova.com) by Olesksandr Leshchenko (HP)</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:complexType name="elementType" mixed="true">
+        <xs:sequence>
+            <xs:element type="xs:string" name="description" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="xs:string" name="designdescription" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="internal_name" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="enumType">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="xs:string" name="description"/>
+            <xs:element type="elementType" name="element"/>
+            <xs:element type="issueType" name="issue"/>
+            <xs:element type="paramType" name="param"/>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="platform" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="issueType">
+        <xs:simpleContent>
+            <xs:extension base="xs:string">
+                <xs:attribute type="xs:string" name="creator" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="paramType" mixed="true">
+        <xs:sequence>
+            <xs:element type="issueType" name="issue" minOccurs="0"/>
+            <xs:element type="xs:string" name="description" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="elementType" name="element" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="xs:string" name="todo" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="type" use="optional"/>
+        <xs:attribute type="xs:short" name="minvalue" use="optional"/>
+        <xs:attribute type="xs:int" name="maxvalue" use="optional"/>
+        <xs:attribute type="xs:string" name="mandatory" use="optional"/>
+        <xs:attribute type="xs:short" name="maxlength" use="optional"/>
+        <xs:attribute type="xs:byte" name="minsize" use="optional"/>
+        <xs:attribute type="xs:byte" name="maxsize" use="optional"/>
+        <xs:attribute type="xs:string" name="array" use="optional"/>
+        <xs:attribute type="xs:string" name="platform" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="structType">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="xs:string" name="description" minOccurs="0"/>
+            <xs:element type="paramType" name="param"/>
+            <xs:element type="elementType" name="element"/>
+            <xs:element type="issueType" name="issue"/>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="platform" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="functionType">
+        <xs:sequence>
+            <xs:element type="xs:string" name="description" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="paramType" name="param" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="issueType" name="issue" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute type="xs:string" name="name" use="optional"/>
+        <xs:attribute type="xs:string" name="messagetype" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="interfaceType">
+        <xs:choice maxOccurs="unbounded" minOccurs="0">
+            <xs:element type="enumType" name="enum" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="structType" name="struct" maxOccurs="unbounded" minOccurs="0"/>
+            <xs:element type="functionType" name="function" maxOccurs="unbounded" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Requests/Responses  Notifications</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+        <xs:attribute type="xs:string" name="name"/>
+        <xs:attribute type="xs:float" name="version"/>
+        <xs:attribute type="xs:date" name="date"/>
+    </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt
index 6a582b4e3b..50c9fce20a 100644
--- a/src/components/media_manager/CMakeLists.txt
+++ b/src/components/media_manager/CMakeLists.txt
@@ -65,6 +65,7 @@ set(EXCLUDE_PATHS
 set(LIBRARIES
   MOBILE_API
   ProtocolLibrary
+  PolicyStatic
   Utils
 )
 
diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h
index 30b05d5c6b..408fa12655 100644
--- a/src/components/media_manager/include/media_manager/media_manager_impl.h
+++ b/src/components/media_manager/include/media_manager/media_manager_impl.h
@@ -33,6 +33,7 @@
 #ifndef SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_IMPL_H_
 #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_MEDIA_MANAGER_IMPL_H_
 
+#include <chrono>
 #include <map>
 #include <string>
 #include "media_manager/media_adapter_impl.h"
@@ -81,6 +82,8 @@ class MediaManagerImpl : public MediaManager,
 
   virtual const MediaManagerSettings& settings() const OVERRIDE;
 
+  virtual uint32_t DataSizeToMilliseconds(uint64_t data_size) const OVERRIDE;
+
 #ifdef BUILD_TESTS
   void set_mock_a2dp_player(MediaAdapter* media_adapter);
   void set_mock_mic_listener(MediaListenerPtr media_listener);
@@ -106,6 +109,12 @@ class MediaManagerImpl : public MediaManager,
   std::map<protocol_handler::ServiceType, MediaAdapterImplPtr> streamer_;
   std::map<protocol_handler::ServiceType, MediaListenerPtr> streamer_listener_;
 
+  uint32_t bits_per_sample_;
+  uint32_t sampling_rate_;
+  uint64_t stream_data_size_;
+  std::chrono::time_point<std::chrono::system_clock>
+      socket_audio_stream_start_time_;
+
   application_manager::ApplicationManager& application_manager_;
 
  private:
diff --git a/src/components/media_manager/include/media_manager/streamer_adapter.h b/src/components/media_manager/include/media_manager/streamer_adapter.h
index 16696e81d1..a35e680b6a 100644
--- a/src/components/media_manager/include/media_manager/streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/streamer_adapter.h
@@ -60,6 +60,7 @@ class StreamerAdapter : public MediaAdapterImpl {
   virtual void SendData(int32_t application_key,
                         const ::protocol_handler::RawMessagePtr msg);
   virtual bool is_app_performing_activity(int32_t application_key) const;
+  virtual size_t GetMsgQueueSize();
 
  protected:
   // TODO(AN): APPLINK-15203 Use MessageLoopThread
diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc
index 90b891133d..b04381605d 100644
--- a/src/components/media_manager/src/media_manager_impl.cc
+++ b/src/components/media_manager/src/media_manager_impl.cc
@@ -35,6 +35,7 @@
 #include "application_manager/application_impl.h"
 #include "application_manager/application_manager.h"
 #include "application_manager/message_helper.h"
+#include "application_manager/smart_object_keys.h"
 #include "media_manager/audio/from_mic_recorder_listener.h"
 #include "media_manager/streamer_listener.h"
 #include "protocol_handler/protocol_handler.h"
@@ -64,6 +65,9 @@ MediaManagerImpl::MediaManagerImpl(
     , protocol_handler_(NULL)
     , a2dp_player_(NULL)
     , from_mic_recorder_(NULL)
+    , bits_per_sample_(16)
+    , sampling_rate_(16000)
+    , stream_data_size_(0ull)
     , application_manager_(application_manager) {
   Init();
 }
@@ -160,6 +164,23 @@ void MediaManagerImpl::Init() {
     streamer_[ServiceType::kAudio]->AddListener(
         streamer_listener_[ServiceType::kAudio]);
   }
+
+  if (application_manager_.hmi_capabilities().pcm_stream_capabilities()) {
+    const auto pcm_caps =
+        application_manager_.hmi_capabilities().pcm_stream_capabilities();
+
+    if (pcm_caps->keyExists(application_manager::strings::bits_per_sample)) {
+      bits_per_sample_ =
+          pcm_caps->getElement(application_manager::strings::bits_per_sample)
+              .asUInt();
+    }
+
+    if (pcm_caps->keyExists(application_manager::strings::sampling_rate)) {
+      sampling_rate_ =
+          pcm_caps->getElement(application_manager::strings::sampling_rate)
+              .asUInt();
+    }
+  }
 }
 
 void MediaManagerImpl::PlayA2DPSource(int32_t application_key) {
@@ -263,6 +284,8 @@ void MediaManagerImpl::StopStreaming(
     int32_t application_key, protocol_handler::ServiceType service_type) {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  stream_data_size_ = 0ull;
+
   if (streamer_[service_type]) {
     streamer_[service_type]->StopActivity(application_key);
   }
@@ -290,15 +313,35 @@ void MediaManagerImpl::OnMessageReceived(
   }
 
   if (!application_manager_.CanAppStream(streaming_app_id, service_type)) {
-    application_manager_.ForbidStreaming(streaming_app_id);
+    application_manager_.ForbidStreaming(streaming_app_id, service_type);
     LOG4CXX_ERROR(logger_,
-                  "The application trying to stream when it should not.");
+                  "The application is trying to stream when it should not."
+                  " service type: "
+                      << service_type);
     return;
   }
 
   ApplicationSharedPtr app = application_manager_.application(streaming_app_id);
   if (app) {
-    app->WakeUpStreaming(service_type);
+    if (ServiceType::kAudio == service_type &&
+        "socket" == settings().audio_server_type()) {
+      if (stream_data_size_ == 0) {
+        socket_audio_stream_start_time_ = std::chrono::system_clock::now();
+      }
+
+      stream_data_size_ += message->data_size();
+      uint32_t ms_for_all_data = DataSizeToMilliseconds(stream_data_size_);
+      uint32_t ms_since_stream_start =
+          std::chrono::duration_cast<std::chrono::milliseconds>(
+              std::chrono::system_clock::now() -
+              socket_audio_stream_start_time_)
+              .count();
+      uint32_t ms_stream_remaining = ms_for_all_data - ms_since_stream_start;
+
+      app->WakeUpStreaming(service_type, ms_stream_remaining);
+    } else {
+      app->WakeUpStreaming(service_type);
+    }
     streamer_[service_type]->SendData(streaming_app_id, message);
   }
 }
@@ -311,10 +354,46 @@ void MediaManagerImpl::FramesProcessed(int32_t application_key,
   if (protocol_handler_) {
     protocol_handler_->SendFramesNumber(application_key, frame_number);
   }
+
+  application_manager::ApplicationSharedPtr app =
+      application_manager_.application(application_key);
+
+  if (app) {
+    auto audio_stream = std::dynamic_pointer_cast<StreamerAdapter>(
+        streamer_[protocol_handler::ServiceType::kAudio]);
+    auto video_stream = std::dynamic_pointer_cast<StreamerAdapter>(
+        streamer_[protocol_handler::ServiceType::kMobileNav]);
+
+    if (audio_stream.use_count() != 0 &&
+        "pipe" == settings().audio_server_type()) {
+      size_t audio_queue_size = audio_stream->GetMsgQueueSize();
+      LOG4CXX_DEBUG(logger_,
+                    "# Messages in audio queue = " << audio_queue_size);
+      if (audio_queue_size > 0) {
+        app->WakeUpStreaming(protocol_handler::ServiceType::kAudio);
+      }
+    }
+
+    if (video_stream.use_count() != 0 &&
+        "pipe" == settings().video_server_type()) {
+      size_t video_queue_size = video_stream->GetMsgQueueSize();
+      LOG4CXX_DEBUG(logger_,
+                    "# Messages in video queue = " << video_queue_size);
+      if (video_queue_size > 0) {
+        app->WakeUpStreaming(protocol_handler::ServiceType::kMobileNav);
+      }
+    }
+  }
 }
 
 const MediaManagerSettings& MediaManagerImpl::settings() const {
   return settings_;
 }
 
+uint32_t MediaManagerImpl::DataSizeToMilliseconds(uint64_t data_size) const {
+  constexpr uint16_t latency_compensation = 500;
+  return 1000 * data_size / (sampling_rate_ * bits_per_sample_ / 8) +
+         latency_compensation;
+}
+
 }  //  namespace media_manager
diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc
index c692a0e266..bda106721f 100644
--- a/src/components/media_manager/src/pipe_streamer_adapter.cc
+++ b/src/components/media_manager/src/pipe_streamer_adapter.cc
@@ -82,7 +82,7 @@ PipeStreamerAdapter::PipeStreamer::~PipeStreamer() {
 bool PipeStreamerAdapter::PipeStreamer::Connect() {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  pipe_fd_ = open(named_pipe_path_.c_str(), O_RDWR, 0);
+  pipe_fd_ = open(named_pipe_path_.c_str(), O_RDWR | O_NONBLOCK, 0);
   if (-1 == pipe_fd_) {
     LOG4CXX_ERROR(logger_, "Cannot open pipe for writing " << named_pipe_path_);
     return false;
@@ -106,16 +106,51 @@ void PipeStreamerAdapter::PipeStreamer::Disconnect() {
 bool PipeStreamerAdapter::PipeStreamer::Send(
     protocol_handler::RawMessagePtr msg) {
   LOG4CXX_AUTO_TRACE(logger_);
-  ssize_t ret = write(pipe_fd_, msg->data(), msg->data_size());
-  if (-1 == ret) {
-    LOG4CXX_ERROR(logger_, "Failed writing data to pipe " << named_pipe_path_);
-    return false;
-  }
-
-  if (static_cast<uint32_t>(ret) != msg->data_size()) {
-    LOG4CXX_WARN(logger_,
-                 "Couldn't write all the data to pipe " << named_pipe_path_);
-  }
+  fd_set wfds;
+  FD_ZERO(&wfds);
+  FD_SET(pipe_fd_, &wfds);
+  struct timeval tv;
+  tv.tv_sec = 10;
+  tv.tv_usec = 0;
+  ssize_t write_ret = 0;
+  bool data_remaining = false;
+  do {
+    int select_ret = select(pipe_fd_ + 1, NULL, &wfds, NULL, &tv);
+    // Most likely pipe closed, fail stream
+    if (select_ret == -1) {
+      LOG4CXX_ERROR(logger_,
+                    "Failed writing data to pipe "
+                        << named_pipe_path_ << ". Errno: " << strerror(errno));
+      return false;
+      // Select success, attempt to write
+    } else if (select_ret) {
+      ssize_t temp_ret = write(
+          pipe_fd_, msg->data() + write_ret, msg->data_size() - write_ret);
+      if (-1 == temp_ret) {
+        LOG4CXX_ERROR(logger_,
+                      "Failed writing data to pipe "
+                          << named_pipe_path_
+                          << ". Errno: " << strerror(errno));
+        return false;
+      }
+      write_ret += temp_ret;
+      // Select timed out, fail stream.
+    } else {
+      LOG4CXX_ERROR(logger_,
+                    "Failed writing data to pipe " << named_pipe_path_
+                                                   << ". Error: TIMEOUT");
+      return false;
+    }
+    // Check that all data was written to the pipe.
+    data_remaining = static_cast<uint32_t>(write_ret) != msg->data_size();
+    if (data_remaining) {
+      LOG4CXX_WARN(logger_,
+                   "Couldn't write all the data to pipe "
+                       << named_pipe_path_ << ". "
+                       << msg->data_size() - write_ret << " bytes remaining");
+    }
+    // Loop to send remaining data if there is any.
+  } while (data_remaining);
 
   LOG4CXX_INFO(logger_, "Streamer::sent " << msg->data_size());
   return true;
diff --git a/src/components/media_manager/src/streamer_adapter.cc b/src/components/media_manager/src/streamer_adapter.cc
index 37cb1426dc..3ef12e3ed5 100644
--- a/src/components/media_manager/src/streamer_adapter.cc
+++ b/src/components/media_manager/src/streamer_adapter.cc
@@ -74,6 +74,10 @@ void StreamerAdapter::StartActivity(int32_t application_key) {
   current_application_ = application_key;
 }
 
+size_t StreamerAdapter::GetMsgQueueSize() {
+  return messages_.size();
+}
+
 void StreamerAdapter::StopActivity(int32_t application_key) {
   LOG4CXX_AUTO_TRACE(logger);
   if (!is_app_performing_activity(application_key)) {
diff --git a/src/components/media_manager/test/CMakeLists.txt b/src/components/media_manager/test/CMakeLists.txt
index f5d596f681..265a62a0d8 100644
--- a/src/components/media_manager/test/CMakeLists.txt
+++ b/src/components/media_manager/test/CMakeLists.txt
@@ -58,7 +58,7 @@ set(LIBRARIES
     connectionHandler
     encryption
     Resumption
-    Policy
+    PolicyStatic
     ${SecurityManagerLibrary}
 )
 
diff --git a/src/components/media_manager/test/media_manager_impl_test.cc b/src/components/media_manager/test/media_manager_impl_test.cc
index 9d721fd7cf..627e2f57ed 100644
--- a/src/components/media_manager/test/media_manager_impl_test.cc
+++ b/src/components/media_manager/test/media_manager_impl_test.cc
@@ -35,6 +35,7 @@
 #include "application_manager/message.h"
 #include "application_manager/mock_application.h"
 #include "application_manager/mock_application_manager.h"
+#include "application_manager/mock_hmi_capabilities.h"
 #include "application_manager/resumption/resume_ctrl.h"
 #include "application_manager/state_controller.h"
 #include "gmock/gmock.h"
@@ -109,6 +110,10 @@ class MediaManagerImplTest : public ::testing::Test {
         .WillByDefault(ReturnRef(kDefaultValue));
     ON_CALL(mock_media_manager_settings_, audio_server_type())
         .WillByDefault(ReturnRef(kDefaultValue));
+    ON_CALL(mock_hmi_capabilities_, pcm_stream_capabilities())
+        .WillByDefault(Return(nullptr));
+    ON_CALL(app_mngr_, hmi_capabilities())
+        .WillByDefault(ReturnRef(mock_hmi_capabilities_));
     mock_app_ = std::make_shared<MockApp>();
     media_manager_impl_.reset(
         new MediaManagerImpl(app_mngr_, mock_media_manager_settings_));
@@ -176,7 +181,7 @@ class MediaManagerImplTest : public ::testing::Test {
         .WillOnce(Return(true));
     EXPECT_CALL(app_mngr_, application(kConnectionKey))
         .WillOnce(Return(mock_app_));
-    EXPECT_CALL(*mock_app_, WakeUpStreaming(service_type));
+    EXPECT_CALL(*mock_app_, WakeUpStreaming(service_type, 0ull));
     MockMediaAdapterImplPtr mock_media_streamer =
         std::make_shared<MockMediaAdapterImpl>();
     media_manager_impl_->set_mock_streamer(service_type, mock_media_streamer);
@@ -194,6 +199,7 @@ class MediaManagerImplTest : public ::testing::Test {
                                            kProtocolVersion,
                                            data_sending,
                                            data_sending_size,
+                                           false,
                                            serviceType));
     media_manager_impl_->OnMessageReceived(raw_message_ptr);
     media_manager_impl_->OnMobileMessageSent(raw_message_ptr);
@@ -205,6 +211,7 @@ class MediaManagerImplTest : public ::testing::Test {
   const ::testing::NiceMock<MockMediaManagerSettings>
       mock_media_manager_settings_;
   std::shared_ptr<MediaManagerImpl> media_manager_impl_;
+  application_manager_test::MockHMICapabilities mock_hmi_capabilities_;
 };
 
 TEST_F(MediaManagerImplTest,
@@ -239,7 +246,7 @@ TEST_F(MediaManagerImplTest,
   const ServiceType audio_type = ServiceType::kAudio;
   EXPECT_CALL(app_mngr_, CanAppStream(kConnectionKey, audio_type))
       .WillOnce(Return(false));
-  EXPECT_CALL(app_mngr_, ForbidStreaming(kConnectionKey));
+  EXPECT_CALL(app_mngr_, ForbidStreaming(kConnectionKey, audio_type));
   EmulateMobileMessage(audio_type);
 }
 
@@ -248,7 +255,7 @@ TEST_F(MediaManagerImplTest,
   const ServiceType video_type = ServiceType::kMobileNav;
   EXPECT_CALL(app_mngr_, CanAppStream(kConnectionKey, video_type))
       .WillOnce(Return(false));
-  EXPECT_CALL(app_mngr_, ForbidStreaming(kConnectionKey));
+  EXPECT_CALL(app_mngr_, ForbidStreaming(kConnectionKey, video_type));
   EmulateMobileMessage(video_type);
 }
 
@@ -403,6 +410,8 @@ TEST_F(MediaManagerImplTest,
   const int32_t frame_number = 10;
   EXPECT_CALL(mock_protocol_handler,
               SendFramesNumber(kApplicationKey, frame_number));
+  EXPECT_CALL(app_mngr_, application(kConnectionKey))
+      .WillOnce(Return(mock_app_));
   media_manager_impl_->FramesProcessed(kApplicationKey, frame_number);
 }
 
diff --git a/src/components/policy/policy_external/CMakeLists.txt b/src/components/policy/policy_external/CMakeLists.txt
index bd05291245..361c48a598 100644
--- a/src/components/policy/policy_external/CMakeLists.txt
+++ b/src/components/policy/policy_external/CMakeLists.txt
@@ -28,22 +28,26 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/generators.cmake)
+
 # --- Policy
-set(target Policy)
 set(install_destination bin)
 set(copy_destination ${CMAKE_BINARY_DIR}/src/appMain)
-set(library_name ${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
+set(library_name ${CMAKE_SHARED_LIBRARY_PREFIX}Policy${CMAKE_SHARED_LIBRARY_SUFFIX})
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
 include_directories (
-  include
-  ${COMPONENTS_DIR}/rpc_base/include
+  ${POLICY_PATH}/include/
+  ${COMPONENTS_DIR}/
   ${COMPONENTS_DIR}/utils/include/
   ${COMPONENTS_DIR}/config_profile/include
+  ${COMPONENTS_DIR}/smart_objects/include/
+  ${COMPONENTS_DIR}/rpc_base/include
+  ${CMAKE_BINARY_DIR}/src/components/
   ${POLICY_GLOBAL_INCLUDE_PATH}/
-  ${LOG4CXX_INCLUDE_DIRECTORY}
   ${BOOST_INCLUDE_DIR}
+  ${LOG4CXX_INCLUDE_DIRECTORY}
   ${JSONCPP_INCLUDE_DIRECTORY}
 )
 
@@ -60,12 +64,54 @@ set(SOURCES
   ${COMPONENTS_DIR}/rpc_base/src/rpc_base/rpc_base.cc
 )
 
+set(GENERATED_MOBILE_POLICY_TYPES_CPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_MOBILE_API_policy_types.cc"
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_MOBILE_API_enum_schema_factory.cc")
+
+set(GENERATED_MOBILE_POLICY_TYPES_HPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_MOBILE_API_policy_types.h")
+
+set(GENERATED_MOBILE_POLICY_TYPES
+  ${GENERATED_MOBILE_POLICY_TYPES_HPP}
+  ${GENERATED_MOBILE_POLICY_TYPES_CPP})
+
+generate_policy_types("${GENERATED_MOBILE_POLICY_TYPES}"
+                      "${COMPONENTS_DIR}/interfaces/MOBILE_API.xml"
+                      "rpc::policy_table_interface_base"
+                      "mobile-policy-types")
+
+set(GENERATED_HMI_POLICY_TYPES_CPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_HMI_API_policy_types.cc")
+
+set(GENERATED_HMI_POLICY_TYPES_HPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_HMI_API_policy_types.h")
+
+set(GENERATED_HMI_POLICY_TYPES
+  ${GENERATED_HMI_POLICY_TYPES_HPP}
+  ${GENERATED_HMI_POLICY_TYPES_CPP})
+
+
+generate_policy_types("${GENERATED_HMI_POLICY_TYPES}"
+                    "${COMPONENTS_DIR}/interfaces/HMI_API.xml"
+                    "rpc::policy_table_interface_base"
+                    "hmi-policy-types")
+
+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
 )
 
-set(LIBRARIES ConfigProfile policy_struct dbms jsoncpp Utils)
+set(LIBRARIES 
+  ConfigProfile 
+  policy_struct 
+  dbms jsoncpp 
+  Utils
+)
+
 if (CMAKE_SYSTEM_NAME STREQUAL "QNX")
   # --- QDB Wrapper
   include_directories (${COMPONENTS_DIR}/utils/include/utils)
@@ -75,21 +121,25 @@ else ()
   list(APPEND LIBRARIES sqlite3)
 endif ()
 
-add_library(${target} SHARED ${SOURCES})
-target_link_libraries(${target} ${LIBRARIES} )
+add_library(PolicyStatic ${SOURCES})
+target_link_libraries(PolicyStatic ${LIBRARIES})
+
+
+add_library(Policy SHARED "src/policy_manager_impl.cc")
+target_link_libraries(Policy PolicyStatic)
 
 if (ENABLE_LOG)
-  target_link_libraries(${target} log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
+  target_link_libraries(Policy log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
 
-add_custom_target(copy_library_${target} ALL
+add_custom_target(copy_library_Policy ALL
   COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_BINARY_DIR}/${library_name}
     ${copy_destination}
-    DEPENDS ${target}
+    DEPENDS Policy
     COMMENT "Copying library ${library_name}")
 
-install(TARGETS ${target}
+install(TARGETS Policy
   DESTINATION ${install_destination}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
     GROUP_READ GROUP_EXECUTE
@@ -100,13 +150,22 @@ install(TARGETS ${target}
 set(struct_target policy_struct)
 
 set(TABLE_STRUCT_SOURCES
+  ${GENERATED_MOBILE_POLICY_TYPES_CPP}  
+  ${GENERATED_HMI_POLICY_TYPES_CPP}
   ${POLICY_PATH}/src/policy_table/enums.cc
   ${POLICY_PATH}/src/policy_table/types.cc
   ${POLICY_PATH}/src/policy_table/validation.cc
 )
 
 add_library(${struct_target} ${TABLE_STRUCT_SOURCES})
-target_link_libraries(${struct_target} Utils)
+target_link_libraries(${struct_target}
+MOBILE_API
+HMI_API
+Utils
+SmartObjects
+formatters
+jsoncpp
+)
 
 # --- Usage statistics
 set(USAGE_STATISTICS_SOURCES
diff --git a/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt
index a031e9fd86..d4be0ce490 100644
--- a/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt
+++ b/src/components/policy/policy_external/doc/doxygen/components/SmartObjects/Smart Objects Validation/Schema Structure.txt
@@ -19,7 +19,7 @@ ns_smart_device_link::ns_smart_objects::CArraySchemaItem provides validation for
 ns_smart_device_link::ns_smart_objects::CObjectSchemaItem used in case when Schema Item includes another Schema Item. Actually this is only way to create tree node of new Schema. All other Schema Items will be used only to become leafs of validation tree.
 
 After creation of all required Schema Items (which is actually bind in the tree) it is possible to create Schema.
-Schema can be initialized not only by raw root Schema Item, but also by special abstraction called Member (defined by ns_smart_device_link::ns_smart_objects::CObjectSchemaItem::SMember class). So every root item (ns_smart_device_link::ns_smart_objects::CObjectSchemaItem) firstly should be wrapped as Member. This wrapping process also allows to set "is mandatory" status for every Member.
+Schema can be initialized not only by raw root Schema Item, but also by special abstraction called Member (defined by ns_smart_device_link::ns_smart_objects::SMember class). So every root item (ns_smart_device_link::ns_smart_objects::CObjectSchemaItem) firstly should be wrapped as Member. This wrapping process also allows to set "is mandatory" status for every Member.
 
  and pass root Schema Item as initial parameter to the new Schema.
 
@@ -69,29 +69,29 @@ TSharedPtr<ISchemaItem> resultCode_SchemaItem = TEnumSchemaItem<Result::eType>::
 // Provides additional human readable info regarding the result.
 TSharedPtr<ISchemaItem> info_SchemaItem = CStringSchemaItem::create(TSchemaItemParameter<size_t>(1000), TSchemaItemParameter<std::string>());
 
-schemaMembersMap["success"] = CObjectSchemaItem::SMember(success_SchemaItem, true);
+schemaMembersMap["success"] = SMember(success_SchemaItem, true);
 
-schemaMembersMap["resultCode"] = CObjectSchemaItem::SMember(resultCode_SchemaItem, true);
+schemaMembersMap["resultCode"] = SMember(resultCode_SchemaItem, true);
 
-schemaMembersMap["info"] = CObjectSchemaItem::SMember(info_SchemaItem, false);
+schemaMembersMap["info"] = SMember(info_SchemaItem, false);
 
-std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap;
+std::map<std::string, SMember> paramsMembersMap;
 
-paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(FunctionIDItems), true);
+paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(FunctionIDItems), true);
 
-paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(MessageTypeItems), true);
+paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(MessageTypeItems), true);
 
-paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);
 
-paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(1, 2), true);
+paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(1, 2), true);
 
-paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+paramsMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
 
-std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap;
+std::map<std::string, SMember> rootMembersMap;
 
-rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schemaMembersMap), true);
+rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schemaMembersMap), true);
 
-rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(paramsMembersMap), true);
+rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(paramsMembersMap), true);
 
 
 CSmartSchema(CObjectSchemaItem::create(rootMembersMap));
diff --git a/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/How To Use.txt b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/How To Use.txt
index 0f9e340bc5..e7b14b0da1 100644
--- a/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/How To Use.txt
+++ b/src/components/policy/policy_external/doc/doxygen/tools/InterfaceGenerator/How To Use.txt
@@ -1,6 +1,6 @@
 /*! \page tools_interfacegenerator_usage How to use InterfaceGenerator
 
-To run InterfaceGenerator the Python 2.7 interpreter should be installed. As input InterfaceGenerator requires full path to the source XML file, namespace to generate result code in, full path to the output directory where result source code C++ will be created and optionally explicit specification of parser type.
+To run InterfaceGenerator the Python 3.5+ interpreter should be installed. As input InterfaceGenerator requires full path to the source XML file, namespace to generate result code in, full path to the output directory where result source code C++ will be created and optionally explicit specification of parser type.
 
 Example1 (Run Generator.py to display help):
 
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 19a475371d..b826f4e5ce 100644
--- a/src/components/policy/policy_external/include/policy/cache_manager.h
+++ b/src/components/policy/policy_external/include/policy/cache_manager.h
@@ -33,6 +33,7 @@
 #ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_H_
 #define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_CACHE_MANAGER_H_
 
+#include <atomic>
 #include <map>
 #include "boost/optional.hpp"
 
@@ -154,47 +155,44 @@ class CacheManager : public CacheManagerInterface {
    */
   virtual bool SecondsBetweenRetries(std::vector<int>& seconds);
 
-  /**
-   * @brief Gets information about vehicle
-   */
-  virtual const VehicleInfo GetVehicleInfo() const;
-
   const boost::optional<bool> LockScreenDismissalEnabledState() const OVERRIDE;
 
   const boost::optional<std::string> LockScreenDismissalWarningMessage(
       const std::string& language) const OVERRIDE;
 
   /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const OVERRIDE;
+
+  std::vector<policy_table::VehicleDataItem> GetRemovedVehicleDataItems()
+      const OVERRIDE;
+
+  /**
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
+   */
+  virtual Json::Value GetPolicyTableData() const OVERRIDE;
+
+  /**
    * @brief Get a list of enabled cloud applications
    * @param enabled_apps List filled with the policy app id of each enabled
    * cloud application
    */
-  virtual void GetEnabledCloudApps(
-      std::vector<std::string>& enabled_apps) const;
+  void GetEnabledCloudApps(
+      std::vector<std::string>& enabled_apps) const OVERRIDE;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
-   * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(const std::string& policy_app_id,
-                                     bool& enabled,
-                                     std::string& endpoint,
-                                     std::string& certificate,
-                                     std::string& auth_token,
-                                     std::string& cloud_transport_type,
-                                     std::string& hybrid_app_preference) const;
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id
+   * of each enabled local application
+   */
+  std::vector<std::string> GetEnabledLocalApps() const OVERRIDE;
+
+  bool GetAppProperties(const std::string& policy_app_id,
+                        AppProperties& out_app_properties) const OVERRIDE;
 
   /**
    * Initializes a new cloud application with default policies
@@ -292,14 +290,6 @@ class CacheManager : public CacheManagerInterface {
       const std::string& active_hmi_language) const;
 
   /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   *
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const;
-
-  /**
    * @brief Get Icon Url used for showing a cloud apps icon before the intial
    *registration
    *
@@ -313,11 +303,11 @@ class CacheManager : public CacheManagerInterface {
    * @param service_type If URLs for specific service are preset,
    * return them otherwise default URLs.
    */
-  virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points);
+  void GetUpdateUrls(const std::string& service_type,
+                     EndpointUrls& out_end_points) const OVERRIDE;
 
-  virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points);
+  void GetUpdateUrls(const uint32_t service_type,
+                     EndpointUrls& out_end_points) const OVERRIDE;
 
   /**
    * @brief Gets allowed number of notifications
@@ -414,6 +404,12 @@ class CacheManager : public CacheManagerInterface {
   bool GetFunctionalGroupings(policy_table::FunctionalGroupings& groups);
 
   /**
+   * @brief Get policy app names from PT
+   * @return container of strings representing policy application names
+   */
+  const policy_table::Strings GetPolicyAppIDs() const OVERRIDE;
+
+  /**
    * Checks if the application is represented in policy table
    * @param app_id application id
    * @return true if application is represented in policy table
@@ -853,6 +849,14 @@ class CacheManager : public CacheManagerInterface {
   void OnDeviceSwitching(const std::string& device_id_from,
                          const std::string& device_id_to) OVERRIDE;
 
+  /**
+   * @brief Method for separate standard vehicle data items from custom
+   * @param full vehicle data items during PTU
+   * @return array with only custom vehicle items
+   */
+  static policy_table::VehicleDataItems CollectCustomVDItems(
+      const policy_table::VehicleDataItems& vd_items);
+
  private:
   std::string currentDateTime();
   struct AppHMITypeToString {
@@ -871,6 +875,24 @@ class CacheManager : public CacheManagerInterface {
    */
   void CheckSnapshotInitialization();
 
+  /**
+   * @brief Calculates difference between two provided custom vehicle data items
+   * @param items_before list of vehicle data items before PTU was applied
+   * @param items_after list of vehicle data items after PTU was applied
+   * @return list with calculated difference or empty list if two input lists
+   * are equal
+   */
+  policy_table::VehicleDataItems CalculateCustomVdItemsDiff(
+      const policy_table::VehicleDataItems& items_before,
+      const policy_table::VehicleDataItems& items_after) const;
+
+  /**
+   * @brief Sets the custom vehicle data items
+   * @param removed_items list of vehicle data items to set
+   */
+  void SetRemovedCustomVdItems(
+      const policy_table::VehicleDataItems& removed_items);
+
   void PersistData();
 
   /**
@@ -898,6 +920,16 @@ class CacheManager : public CacheManagerInterface {
                                const std::string& policy_app_id,
                                policy::Permissions& permission);
 
+  EncryptionRequired GetAppEncryptionRequiredFlag(
+      const std::string& application_policy_name) const OVERRIDE;
+
+  EncryptionRequired GetFunctionalGroupingEncryptionRequiredFlag(
+      const std::string& functional_group) const OVERRIDE;
+
+  void GetApplicationParams(
+      const std::string& application_name,
+      policy_table::ApplicationParams& application_policies) const OVERRIDE;
+
  private:
   std::shared_ptr<policy_table::Table> pt_;
   std::shared_ptr<policy_table::Table> snapshot_;
@@ -906,6 +938,7 @@ class CacheManager : public CacheManagerInterface {
   bool update_required;
   typedef std::set<std::string> UnpairedDevices;
   UnpairedDevices is_unpaired_;
+  policy_table::VehicleDataItems removed_custom_vd_items_;
 
   mutable sync_primitives::RecursiveLock cache_lock_;
   sync_primitives::Lock unpaired_lock_;
@@ -1027,6 +1060,24 @@ class CacheManager : public CacheManagerInterface {
   void MergeCFM(const policy_table::PolicyTable& new_pt,
                 policy_table::PolicyTable& pt);
 
+  /**
+   * @brief MergeVD allows to merge VehicleDataItems section by
+   *definite rules.
+   *
+   * The rules are:
+   * 1. If vehicle_data_items key is not presented in the updated PolicyTable,
+   * update for VehicleDataItems should be ignored.
+   * 2. If vehicle_data_items presented in updated PolicyTable, the
+   * VehicleDataItems in the database (LocalPT) should be overwritten with
+   * updated data.
+   *
+   * @param new_pt the policy table loaded from updated preload JSON file.
+   *
+   * @param pt the exists database
+   */
+  void MergeVD(const policy_table::PolicyTable& new_pt,
+               policy_table::PolicyTable& pt);
+
   void InitBackupThread();
 
   /**
@@ -1057,12 +1108,28 @@ class CacheManager : public CacheManagerInterface {
     ~BackgroundBackuper();
     virtual void threadMain();
     virtual void exitThreadMain();
+
+    /**
+     * @brief Notifies BackgroundBackuper thread that new data is available and
+     * new backup iteration should be scheduled
+     */
     void DoBackup();
 
+    /**
+     * @brief Waits for BackgroundBackuper thread finish its own backup
+     * iteration. If currently no backup iteration in progress - function just
+     * returns the control back
+     */
+    void WaitForBackupIsDone();
+
    private:
     void InternalBackup();
     CacheManager* cache_manager_;
     sync_primitives::ConditionalVariable backup_notifier_;
+    sync_primitives::ConditionalVariable backup_done_;
+    sync_primitives::Lock backup_done_lock_;
+
+    std::atomic_bool backup_is_in_progress_;
     volatile bool stop_flag_;
     volatile bool new_data_available_;
 
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 0cbbb6df1f..3e3de694d6 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
@@ -162,9 +162,24 @@ class CacheManagerInterface {
   virtual bool SecondsBetweenRetries(std::vector<int>& seconds) = 0;
 
   /**
-   * @brief Get information about vehicle
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
    */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
+  virtual Json::Value GetPolicyTableData() const = 0;
+
+  /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const = 0;
+
+  /**
+   * @brief Gets vehicle data items removed after the last PTU
+   * @return List of removed vehicle data items
+   */
+  virtual std::vector<policy_table::VehicleDataItem>
+  GetRemovedVehicleDataItems() const = 0;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -175,29 +190,21 @@ class CacheManagerInterface {
       std::vector<std::string>& enabled_apps) const = 0;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  virtual std::vector<std::string> GetEnabledLocalApps() const = 0;
+
+  /**
+   * @brief Get app policy information, all fields that aren't set for a
    * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(
-      const std::string& policy_app_id,
-      bool& enabled,
-      std::string& endpoint,
-      std::string& certificate,
-      std::string& auth_token,
-      std::string& cloud_transport_type,
-      std::string& hybrid_app_preference) const = 0;
+   * @param policy_app_id policy app id
+   * @param out_app_properties application properties
+   * @return true if application presents in database, otherwise - false
+   */
+  virtual bool GetAppProperties(const std::string& policy_app_id,
+                                AppProperties& out_app_properties) const = 0;
 
   /**
    * Initializes a new cloud application with default policies
@@ -317,18 +324,10 @@ class CacheManagerInterface {
    * return them otherwise default URLs.
    */
   virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points) = 0;
+                             EndpointUrls& out_end_points) const = 0;
 
   virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points) = 0;
-
-  /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   *
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const = 0;
+                             EndpointUrls& out_end_points) const = 0;
 
   /**
    * @brief Get Icon Url used for showing a cloud apps icon before the intial
@@ -436,6 +435,12 @@ class CacheManagerInterface {
       policy_table::FunctionalGroupings& groups) = 0;
 
   /**
+   * @brief Get policy app names from PT
+   * @return container of strings representing policy application names
+   */
+  virtual const policy_table::Strings GetPolicyAppIDs() const = 0;
+
+  /**
    * Checks if the application is represented in policy table
    * @param app_id application id
    * @return true if application is represented in policy table
@@ -954,6 +959,37 @@ class CacheManagerInterface {
   virtual void OnDeviceSwitching(const std::string& device_id_from,
                                  const std::string& device_id_to) = 0;
 
+  /**
+   * @brief GetAppEncryptionRequiredFlag retrieves encryption required flag
+   * for
+   * given application
+   * @param application policy application name
+   * @return optional object containing encryption required flag
+   */
+  virtual rpc::Optional<rpc::Boolean> GetAppEncryptionRequiredFlag(
+      const std::string& application_policy_name) const = 0;
+
+  /**
+   * @brief GetFunctionalGroupingEncryptionRequiredFlag retrieves encryption
+   * required flag
+   * for
+   * given functional grouping
+   * @param functional_group policy functional group name
+   * @return optional object containing encryption required flag
+   */
+  virtual rpc::Optional<rpc::Boolean>
+  GetFunctionalGroupingEncryptionRequiredFlag(
+      const std::string& functional_group) const = 0;
+
+  /**
+   * @brief retreives application params
+   * @param application_name policy applicatoin name
+   * @param application_params application params
+   */
+  virtual void GetApplicationParams(
+      const std::string& application_name,
+      policy_table::ApplicationParams& application_params) const = 0;
+
 #ifdef BUILD_TESTS
   /**
    * @brief GetPT allows to obtain std::shared_ptr to PT.
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 bce2559431..69ba8806d4 100644
--- a/src/components/policy/policy_external/include/policy/policy_helper.h
+++ b/src/components/policy/policy_external/include/policy/policy_helper.h
@@ -1,4 +1,4 @@
-/*
+/*
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
@@ -129,6 +129,15 @@ struct CheckAppPolicy {
   bool HasNewGroups(const AppPoliciesValueType& app_policy,
                     policy_table::Strings* new_groups = NULL) const;
   /**
+   * @brief Checks whether updated application policy contains group content
+   * update in compare to current one
+   * @param app_policy Reference to updated application policy
+   * @param updated_groups List of updated groups if any
+   * @return True if updated groups found, otherwise - false
+   */
+  bool HasUpdatedGroups(const policy::AppPoliciesValueType& app_policy,
+                        policy_table::Strings* updated_groups = NULL) const;
+  /**
    * @brief Checks whether updated policy has groups which require user consent
    * @param app_policy Reference to updated application policy
    * @return True if has groups requiring user consents, otherwise - false
@@ -202,6 +211,15 @@ struct CheckAppPolicy {
   bool IsRequestSubTypeChanged(const AppPoliciesValueType& app_policy) const;
 
   /**
+   * @brief IsEncryptionRequiredFlagChanged check if encryption_needed flag was
+   * changed for application or application groups
+   * @param app_policy application policies
+   * @return true if encryption_needed state was changed otherwise - false
+   */
+  bool IsEncryptionRequiredFlagChanged(
+      const AppPoliciesValueType& app_policy) const;
+
+  /**
    * @brief Helper function that inserts permissions into app_permissions_diff_
    * map.
    * udpated
@@ -213,6 +231,10 @@ struct CheckAppPolicy {
   void InsertPermission(const std::string& app_id,
                         const AppPermissions& permissions_diff);
 
+  bool IsAppPropertiesChanged(const AppPoliciesValueType& app_policy) const;
+
+  bool IsAppPropertiesProvided(const AppPoliciesValueType& app_policy) const;
+
  private:
   PolicyManagerImpl* pm_;
   const std::shared_ptr<policy_table::Table> update_;
@@ -307,6 +329,14 @@ struct ProcessFunctionalGroup {
 
  private:
   GroupConsent GetGroupState(const std::string& group_name);
+  /*
+   * @brief Fills encryption required flags for all rpcs in functional group
+   * @param encryption_required Optional object containing encryption required
+   * flag
+   */
+  void FillEncryptionFlagForRpcs(
+      const policy_table::Rpc& rpcs,
+      const policy::EncryptionRequired encryption_required);
   const policy_table::FunctionalGroupings& fg_;
   const std::vector<FunctionalGroupPermission>& group_permissions_;
   Permissions& data_;
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 9dd2b3c6ec..5c55be50d1 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
@@ -44,6 +44,7 @@
 #include "policy/update_status_manager.h"
 #include "policy/usage_statistics/statistics_manager.h"
 #include "utils/lock.h"
+#include "utils/timer.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
 
@@ -54,7 +55,47 @@ class PolicyManagerImpl : public PolicyManager {
  public:
   PolicyManagerImpl();
   explicit PolicyManagerImpl(bool in_memory);
+  /*
+   * \param policy_app_id policy app id
+   * \return true if the app need encryption
+   */
+  bool AppNeedEncryption(const std::string& policy_app_id) const OVERRIDE;
+
+  /*
+   * \param policy_app_id policy app id
+   * \return Optional app need encryption
+   */
+  const rpc::Optional<rpc::Boolean> GetAppEncryptionRequired(
+      const std::string& policy_app_id) const OVERRIDE;
 
+  /*
+   * \param policy_app_id policy app id
+   * \return groups that exist for app
+   */
+  const std::vector<std::string> GetFunctionalGroupsForApp(
+      const std::string& policy_app_id) const OVERRIDE;
+
+  const std::vector<std::string> GetApplicationPolicyIDs() const OVERRIDE;
+
+  /*
+   * \param policy_group group
+   * \return true if the group need encryption
+   */
+  bool FunctionGroupNeedEncryption(
+      const std::string& policy_group) const OVERRIDE;
+
+  /*
+   * \param policy_group group\
+   * \return RPCs that exists in group
+   */
+  const std::vector<std::string> GetRPCsForFunctionGroup(
+      const std::string& group) const OVERRIDE;
+  /*
+   * \param function_id function id
+   * \return policy function name
+   */
+  const std::string GetPolicyFunctionName(
+      const uint32_t function_id) const OVERRIDE;
   /**
    * @brief set_listener set new policy listener instance
    * @param listener new policy listener
@@ -86,8 +127,10 @@ class PolicyManagerImpl : public PolicyManager {
    * @param pt_content PTU as binary string
    * @return true if successfully
    */
-  bool LoadPT(const std::string& file,
-              const BinaryMessage& pt_content) OVERRIDE;
+  PtProcessingResult LoadPT(const std::string& file,
+                            const BinaryMessage& pt_content) OVERRIDE;
+
+  void OnPTUFinished(const PtProcessingResult ptu_result) OVERRIDE;
 
   /**
    * @brief Resets Policy Table
@@ -109,9 +152,9 @@ class PolicyManagerImpl : public PolicyManager {
    * @param out_end_points output vector of urls
    */
   void GetUpdateUrls(const uint32_t service_type,
-                     EndpointUrls& out_end_points) OVERRIDE;
+                     EndpointUrls& out_end_points) const OVERRIDE;
   void GetUpdateUrls(const std::string& service_type,
-                     EndpointUrls& out_end_points) OVERRIDE;
+                     EndpointUrls& out_end_points) const OVERRIDE;
 
   /**
    * @brief PTU is needed, for this PTS has to be formed and sent.
@@ -122,6 +165,7 @@ class PolicyManagerImpl : public PolicyManager {
    * @brief Check if specified RPC for specified application
    * has permission to be executed in specified HMI Level
    * and also its permitted params.
+   * @param device_id device identifier
    * @param app_id Id of application provided during registration
    * @param hmi_level Current HMI Level of application
    * @param rpc Name of RPC
@@ -129,7 +173,8 @@ class PolicyManagerImpl : public PolicyManager {
    * @param result containing flag if HMI Level is allowed
    * and list of allowed params.
    */
-  void CheckPermissions(const PTString& app_id,
+  void CheckPermissions(const PTString& device_id,
+                        const PTString& app_id,
                         const PTString& hmi_level,
                         const PTString& rpc,
                         const RPCParams& rpc_params,
@@ -164,6 +209,8 @@ class PolicyManagerImpl : public PolicyManager {
    */
   std::string ForcePTExchange() OVERRIDE;
 
+  void StopRetrySequence() OVERRIDE;
+
   /**
    * @brief Exchange by user request
    * @return Current status of policy table
@@ -178,8 +225,10 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Resets retry sequence
+   * @param send_event - if true corresponding event is sent to
+   * UpdateStatusManager
    */
-  void ResetRetrySequence() OVERRIDE;
+  void ResetRetrySequence(const ResetRetryCountType reset_type) OVERRIDE;
 
   /**
    * @brief Gets timeout to wait before next retry updating PT
@@ -207,13 +256,6 @@ class PolicyManagerImpl : public PolicyManager {
   void OnExceededTimeout() OVERRIDE;
 
   /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  std::string GetLockScreenIconUrl() const OVERRIDE;
-
-  /**
    * @brief Get Icon Url used for showing a cloud apps icon before the intial
    *registration
    *
@@ -267,12 +309,15 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Update Application Policies as reaction
    * on User allowing/disallowing device this app is running on.
+   * @param device_handle device identifier
    * @param app_id Unique application id
    * @param is_device_allowed true if user allowing device otherwise false
    * @return true if operation was successful
    */
-  bool ReactOnUserDevConsentForApp(const std::string& app_id,
-                                   const bool is_device_allowed) OVERRIDE;
+  bool ReactOnUserDevConsentForApp(
+      const transport_manager::DeviceHandle& device_handle,
+      const std::string& app_id,
+      const bool is_device_allowed) OVERRIDE;
 
   /**
    * @brief Retrieves data from app_policies about app on its registration:
@@ -315,12 +360,14 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Get default HMI level for application
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @param default_hmi Default HMI level for application or empty, if value
    * was not set
    * @return true, if succedeed, otherwise - false
    */
-  bool GetDefaultHmi(const std::string& policy_app_id,
+  bool GetDefaultHmi(const std::string& device_id,
+                     const std::string& policy_app_id,
                      std::string* default_hmi) const OVERRIDE;
 
   /**
@@ -365,9 +412,11 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Return device id, which hosts specific application
+   * @param device_id device identifier
    * @param policy_app_id Application id, which is required to update device id
    */
   std::string& GetCurrentDeviceId(
+      const transport_manager::DeviceHandle& device_id,
       const std::string& policy_app_id) const OVERRIDE;
 
   /**
@@ -387,13 +436,6 @@ class PolicyManagerImpl : public PolicyManager {
                      const std::string& language) OVERRIDE;
 
   /**
-   * @brief Runs necessary operations, which is depends on external system
-   * state, e.g. getting system-specific parameters which are need to be
-   * filled into policy table
-   */
-  void OnSystemReady() OVERRIDE;
-
-  /**
    * @brief Get number of notification by priority
    * @param priority Specified priority
    * @return notification number
@@ -409,11 +451,12 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Gets specific application permissions changes since last policy
    * table update
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @return Permissions changes
    */
   AppPermissions GetAppPermissionsChanges(
-      const std::string& policy_app_id) OVERRIDE;
+      const std::string& device_id, const std::string& policy_app_id) OVERRIDE;
 
   /**
    * @brief Removes specific application permissions changes
@@ -423,10 +466,11 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Send OnPermissionsUpdated for choosen application
+   * @param device_id device identifier
    * @param application_id Unique application id
    */
   void SendNotificationOnPermissionsUpdated(
-      const std::string& application_id) OVERRIDE;
+      const std::string& device_id, const std::string& application_id) OVERRIDE;
 
   /**
    * @brief Removes unpaired device records and related records from DB
@@ -457,20 +501,24 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Adds, application to the db or update existed one
    * run PTU if policy update is necessary for application.
+   * @param device_id device identifier
    * @param application_id Unique application id
    * @param hmi_types application HMI types
    * @return function that will notify update manager about new application
    */
   StatusNotifier AddApplication(
+      const std::string& device_id,
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE;
 
   /**
    * @brief Assigns new HMI types for specified application
+   * @param device_handle device identifier
    * @param application_id Unique application id
    * @param hmi_types new HMI types list
    */
-  void SetDefaultHmiTypes(const std::string& application_id,
+  void SetDefaultHmiTypes(const transport_manager::DeviceHandle& device_handle,
+                          const std::string& application_id,
                           const std::vector<int>& hmi_types) OVERRIDE;
 
   /**
@@ -546,6 +594,8 @@ class PolicyManagerImpl : public PolicyManager {
    */
   void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
 
+  void UpdatePTUReadyAppsCount(const uint32_t new_app_count) OVERRIDE;
+
   /**
    * @brief Get state of request types for given application
    * @param policy_app_id Unique application id
@@ -564,10 +614,12 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Gets request types for application
+   * @param device_handle device identifier
    * @param policy_app_id Unique application id
    * @return request types of application
    */
   const std::vector<std::string> GetAppRequestTypes(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string policy_app_id) const OVERRIDE;
 
   /**
@@ -579,10 +631,20 @@ class PolicyManagerImpl : public PolicyManager {
       const std::string& policy_app_id) const OVERRIDE;
 
   /**
-   * @brief Get information about vehicle
-   * @return vehicle information
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
+   */
+  Json::Value GetPolicyTableData() const OVERRIDE;
+
+  /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
    */
-  const VehicleInfo GetVehicleInfo() const OVERRIDE;
+  const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const OVERRIDE;
+
+  std::vector<policy_table::VehicleDataItem> GetRemovedVehicleDataItems()
+      const OVERRIDE;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -593,28 +655,14 @@ class PolicyManagerImpl : public PolicyManager {
       std::vector<std::string>& enabled_apps) const OVERRIDE;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
-   * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  bool GetCloudAppParameters(const std::string& policy_app_id,
-                             bool& enabled,
-                             std::string& endpoint,
-                             std::string& certificate,
-                             std::string& auth_token,
-                             std::string& cloud_transport_type,
-                             std::string& hybrid_app_preference) const OVERRIDE;
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  std::vector<std::string> GetEnabledLocalApps() const OVERRIDE;
+
+  bool GetAppProperties(const std::string& policy_app_id,
+                        AppProperties& out_app_properties) const OVERRIDE;
 
   /**
    * @ brief Initialize new cloud app in the policy table
@@ -689,10 +737,13 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
    * succesfully registered on mobile device.
-   * It will send OnAppPermissionSend notification and will try to start PTU. *
+   * It will send OnAppPermissionSend notification and will try to start PTU.
+   *
+   * @param device_id device identifier
    * @param application_id registered application.
    */
-  void OnAppRegisteredOnMobile(const std::string& application_id) OVERRIDE;
+  void OnAppRegisteredOnMobile(const std::string& device_id,
+                               const std::string& application_id) OVERRIDE;
 
   void OnDeviceSwitching(const std::string& device_id_from,
                          const std::string& device_id_to) OVERRIDE;
@@ -735,7 +786,7 @@ class PolicyManagerImpl : public PolicyManager {
    * @return Pair of policy application id and application url id from the
    * urls vector
    */
-  AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) OVERRIDE;
+  DEPRECATED AppIdURL GetNextUpdateUrl(const EndpointUrls& urls) OVERRIDE;
 
   /**
    * @brief Checks if there is existing URL in the EndpointUrls vector with
@@ -781,14 +832,11 @@ class PolicyManagerImpl : public PolicyManager {
   }
 
   /**
-   * @brief Setter for send_on_update_sent_out and wrong_ptu_update_received
+   * @brief Setter for send_on_update_sent_out
    * @param send_on_update_sent_out new value of this flag
-   * @param wrong_ptu_update_received new value of this flag
    */
-  inline void SetSendOnUpdateFlags(const bool send_on_update_sent_out,
-                                   const bool wrong_ptu_update_received) {
+  inline void SetSendOnUpdateFlags(const bool send_on_update_sent_out) {
     send_on_update_sent_out_ = send_on_update_sent_out;
-    wrong_ptu_update_received_ = wrong_ptu_update_received;
   }
 #endif  // BUILD_TESTS
 
@@ -825,8 +873,32 @@ class PolicyManagerImpl : public PolicyManager {
   void Add(const std::string& app_id,
            usage_statistics::AppStopwatchId type,
            int32_t timespan_seconds) OVERRIDE;
+
   // Interface StatisticsManager (end)
 
+  /**
+   * @brief Check whether allowed retry sequence count is exceeded
+   * @return bool value - true is allowed count is exceeded, otherwise - false
+   */
+  bool IsAllowedRetryCountExceeded() const OVERRIDE;
+
+  /**
+   * @brief Finish PTU retry requence
+   */
+  void RetrySequenceFailed() OVERRIDE;
+
+  /**
+   * @brief In EXTERNAL_PROPRIETARY_MODE PTU sequence is driven by HMI and
+   * begins with OnSystemRequest from HMI. Following function is called when
+   * this notification is received to track number of PTU retries and react
+   * accordingly once allowed retry count is exceeded
+   */
+  void OnSystemRequestReceived() OVERRIDE;
+
+  void OnLocalAppAdded() OVERRIDE;
+
+  bool IsNewApplication(const std::string& application_id) const OVERRIDE;
+
  protected:
   /**
    * @brief Parse policy table content and convert to PT object
@@ -838,6 +910,11 @@ class PolicyManagerImpl : public PolicyManager {
 
  private:
   /**
+   * @brief Increments PTU retry index for external flow
+   */
+  void IncrementRetryIndex();
+
+  /**
    * @brief Checks if PT update should be started and schedules it if needed
    */
   void CheckTriggers();
@@ -918,29 +995,26 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Allows to process case when added application is not present in
    * policy db.
+   * @param device_id device identifier
    * @param policy application id.
    * @param cuuren consent for application's device.
    */
-  void AddNewApplication(const std::string& application_id,
+  void AddNewApplication(const std::string& device_id,
+                         const std::string& application_id,
                          DeviceConsent device_consent);
 
   /**
    * @brief Allows to process case when added application is already
    * in policy db.
+   * @param device_id device identifier
    * @param policy application id.
    * @param cuuren consent for application's device.
    */
-  void PromoteExistedApplication(const std::string& application_id,
+  void PromoteExistedApplication(const std::string& device_id,
+                                 const std::string& application_id,
                                  DeviceConsent device_consent);
 
   /**
-   * @brief Check if certain application already in policy db.
-   * @param policy application id.
-   * @return true if application presents false otherwise.
-   */
-  bool IsNewApplication(const std::string& application_id) const;
-
-  /**
    * Checks existing and permissions of AppStorageFolder
    * @return true if AppStorageFolder exists and has permissions read/write
    */
@@ -948,9 +1022,12 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Checks whether need ask the permission of users
+   * @param device_id device identifier
+   * @param appid policy application id
    * @return true if user consent is needed
    */
-  virtual bool IsConsentNeeded(const std::string& app_id);
+  virtual bool IsConsentNeeded(const std::string& device_id,
+                               const std::string& app_id);
 
   /**
    * @brief Changes isConsentNeeded for app pending permissions, in case
@@ -991,6 +1068,11 @@ class PolicyManagerImpl : public PolicyManager {
                  policy_table::PolicyTableType type) const;
 
   /**
+   * @brief Check that new applications for PTU were registered
+   */
+  bool HasApplicationForPTU() const;
+
+  /**
    * @brief Get resulting RPCs permissions for application which started on
    * specific device
    * @param device_id Device id
@@ -1018,6 +1100,9 @@ class PolicyManagerImpl : public PolicyManager {
   void SendAppPermissionsChanged(const std::string& device_id,
                                  const std::string& application_id) OVERRIDE;
 
+  void SendOnAppPropertiesChangeNotification(
+      const std::string& policy_app_id) const OVERRIDE;
+
   /**
    * @brief notify listener of updated auth token for a given policy id
    * @param policy_app_id the app id that has an updated auth token
@@ -1033,14 +1118,18 @@ class PolicyManagerImpl : public PolicyManager {
   bool GetModuleTypes(const std::string& policy_app_id,
                       std::vector<std::string>* modules) const OVERRIDE;
 
+  void ResetTimeout() OVERRIDE;
+
   /**
    * @brief Notify application about its permissions changes by preparing and
    * sending OnPermissionsChanged notification
+   * @param device_id device identifier
    * @param policy_app_id Application id to send notification to
    * @param app_group_permissons Current permissions for groups assigned to
    * application
    */
   void NotifyPermissionsChanges(
+      const std::string& device_id,
       const std::string& policy_app_id,
       const std::vector<FunctionalGroupPermission>& app_group_permissions);
 
@@ -1065,11 +1154,13 @@ class PolicyManagerImpl : public PolicyManager {
    * user consents (if any) and ExternalConsent consents (if any) will be
    * updated
    * appropiately to current ExternalConsent status stored by policy table
+   * @param device_id device identifier
    * @param application_id Application id
    * @param processing_policy Defines whether consents timestamps must be
    * considered or external consents take over
    */
   void ProcessExternalConsentStatusForApp(
+      const std::string& device_id,
       const std::string& application_id,
       const ConsentProcessingPolicy processing_policy);
   /**
@@ -1097,16 +1188,26 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Notifies system by sending OnAppPermissionChanged notification
+   * @param device_id device identifier
    * @param app_policy Reference to application policy
    */
-  void NotifySystem(const AppPoliciesValueType& app_policy) const;
+  void NotifySystem(const std::string& device_id,
+                    const AppPoliciesValueType& app_policy) const;
 
   /**
    * @brief Sends OnPermissionChange notification to application if its
    * currently registered
+   * @param device_id device identifier
    * @param app_policy Reference to application policy
    */
-  void SendPermissionsToApp(const AppPoliciesValueType& app_policy);
+  void SendPermissionsToApp(const std::string& device_id,
+                            const AppPoliciesValueType& app_policy);
+
+  /**
+   * @brief Resumes all policy actions for all apps, suspended during
+   * PTU applying
+   */
+  void ResumePendingAppPolicyActions();
 
   /**
    * @brief Gets groups names from collection of groups permissions
@@ -1186,9 +1287,14 @@ class PolicyManagerImpl : public PolicyManager {
   uint32_t retry_sequence_index_;
 
   /**
+   * @brief Applications pending count ready for PTU
+   */
+  uint32_t applications_pending_ptu_count_;
+
+  /**
    * @brief Lock for guarding retry sequence
    */
-  sync_primitives::Lock retry_sequence_lock_;
+  mutable sync_primitives::Lock retry_sequence_lock_;
 
   /**
    * @brief Device id, which is used during PTU handling for specific
@@ -1215,19 +1321,42 @@ class PolicyManagerImpl : public PolicyManager {
   friend struct ProccessAppGroups;
 
   /**
-   * @brief Flag for notifying that invalid PTU was received
-   */
-  bool wrong_ptu_update_received_;
-
-  /**
    * @brief Flag for notifying that PTU was started
    */
   bool send_on_update_sent_out_;
 
+  std::vector<std::string> app_properties_changed_list_;
+
   /**
    * @brief Flag for notifying that invalid PTU should be triggered
    */
   bool trigger_ptu_;
+
+  /**
+   * @brief Flag for notifying that PTU was requested
+   */
+  bool ptu_requested_;
+
+  /**
+   * @brief Flag that indicates whether a PTU sequence (including retries) is in
+   * progress
+   */
+  bool is_ptu_in_progress_;
+
+  typedef std::list<std::pair<std::string, AppPoliciesValueType> >
+      PendingAppPolicyActionsList;
+
+  /**
+   * @brief List containing device_id and pending permissions structure pairs
+   * which can be processed later on demand
+   */
+  PendingAppPolicyActionsList notify_system_list_;
+
+  /**
+   * @brief List containing device_id and pending permissions structure pairs
+   * which can be processed later on demand
+   */
+  PendingAppPolicyActionsList send_permissions_list_;
 };
 
 }  // 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 5a21539b17..a74eb1f886 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
@@ -35,133 +35,12 @@
 
 #include <string>
 
+#include "generated_HMI_API_policy_types.h"
+#include "generated_MOBILE_API_policy_types.h"
+
 namespace rpc {
 namespace policy_table_interface_base {
 
-enum Priority {
-  P_EMERGENCY,
-  P_NAVIGATION,
-  P_VOICECOM,
-  P_COMMUNICATION,
-  P_NORMAL,
-  P_PROJECTION,
-  P_NONE,
-};
-
-bool IsValidEnum(Priority val);
-const char* EnumToJsonString(Priority val);
-bool EnumFromJsonString(const std::string& literal, Priority* result);
-
-enum HmiLevel {
-  HL_BACKGROUND,
-  HL_FULL,
-  HL_LIMITED,
-  HL_NONE,
-};
-bool IsValidEnum(HmiLevel val);
-const char* EnumToJsonString(HmiLevel val);
-bool EnumFromJsonString(const std::string& literal, HmiLevel* result);
-
-enum Parameter {
-  P_GPS,
-  P_SPEED,
-  P_ENGINETORQUE,
-  P_EXTERNALTEMPERATURE,
-  P_TURNSIGNAL,
-  P_FUELLEVEL,
-  P_FUELLEVEL_STATE,
-  P_HEADLAMPSTATUS,
-  P_INSTANTFUELCONSUMPTION,
-  P_FUELRANGE,
-  P_ODOMETER,
-  P_TIREPRESSURE,
-  P_WIPERSTATUS,
-  P_VIN,
-  P_ACCPEDALPOSITION,
-  P_BELTSTATUS,
-  P_ELECTRONICPARKBRAKESTATUS,
-  P_DRIVERBRAKING,
-  P_PRNDL,
-  P_RPM,
-  P_STEERINGWHEELANGLE,
-  P_ENGINEOILLIFE,
-  P_MYKEY,
-  P_AIRBAGSTATUS,
-  P_BODYINFORMATION,
-  P_CLUSTERMODESTATUS,
-  P_DEVICESTATUS,
-  P_EMERGENCYEVENT,
-  P_ECALLINFO,
-  P_ABS_STATE,
-  P_FUEL_RANGE,
-  P_TIRE_PRESSURE_VALUE,
-  P_TPMS,
-  P_CLOUD_APP_VEHICLE_ID,
-  P_LONGTITUDE_DEGREES,
-  P_LATITUDE_DEGREES,
-  P_LOCATION_NAME,
-  P_LOCATION_DESCRIPTION,
-  P_ADDRESS_LINES,
-  P_PHONE_NUMBER,
-  P_LOCATION_IMAGE,
-  P_DELIVERY_MODE,
-  P_TIMESTAMP,
-  P_ADDRESS,
-  P_EMPTY  // Added to allow empty parameters handling
-};
-
-bool IsValidEnum(Parameter val);
-const char* EnumToJsonString(Parameter val);
-bool EnumFromJsonString(const std::string& literal, Parameter* result);
-
-enum AppHMIType {
-  AHT_DEFAULT,
-  AHT_COMMUNICATION,
-  AHT_MEDIA,
-  AHT_MESSAGING,
-  AHT_NAVIGATION,
-  AHT_INFORMATION,
-  AHT_SOCIAL,
-  AHT_BACKGROUND_PROCESS,
-  AHT_TESTING,
-  AHT_SYSTEM,
-  AHT_PROJECTION,
-  AHT_REMOTE_CONTROL,
-};
-bool IsValidEnum(AppHMIType val);
-const char* EnumToJsonString(AppHMIType val);
-bool EnumFromJsonString(const std::string& literal, AppHMIType* result);
-
-enum RequestType {
-  RT_HTTP,
-  RT_FILE_RESUME,
-  RT_AUTH_REQUEST,
-  RT_AUTH_CHALLENGE,
-  RT_AUTH_ACK,
-  RT_PROPRIETARY,
-  RT_QUERY_APPS,
-  RT_LAUNCH_APP,
-  RT_LOCK_SCREEN_ICON_URL,
-  RT_TRAFFIC_MESSAGE_CHANNEL,
-  RT_DRIVER_PROFILE,
-  RT_VOICE_SEARCH,
-  RT_NAVIGATION,
-  RT_PHONE,
-  RT_CLIMATE,
-  RT_SETTINGS,
-  RT_VEHICLE_DIAGNOSTICS,
-  RT_EMERGENCY,
-  RT_MEDIA,
-  RT_FOTA,
-  RT_OEM_SPECIFIC,
-  RT_ICON_URL,
-  RT_EMPTY  // Added to allow empty Request Types handling
-};
-
-bool IsValidEnum(RequestType val);
-const char* EnumToJsonString(RequestType val);
-bool EnumFromJsonString(const std::string& literal, RequestType* result);
-
 enum Input {
   I_GUI,
   I_VUI,
@@ -170,446 +49,6 @@ bool IsValidEnum(Input val);
 const char* EnumToJsonString(Input val);
 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);
-bool EnumFromJsonString(const std::string& literal, ModuleType* result);
-
-enum HybridAppPreference { HAP_MOBILE, HAP_CLOUD, HAP_BOTH };
-bool IsValidEnum(HybridAppPreference val);
-const char* EnumToJsonString(HybridAppPreference val);
-bool EnumFromJsonString(const std::string& literal,
-                        HybridAppPreference* result);
-
-/**
- * @brief Enumeration FunctionID.
- *
- * Enumeration linking function names with function IDs in AppLink protocol.
- * Assumes enumeration starts at value 0.
- */
-enum FunctionID {
-  /**
-   * @brief RESERVED.
-   */
-  RESERVED = 0,
-
-  /**
-   * @brief RegisterAppInterfaceID.
-   */
-  RegisterAppInterfaceID = 1,
-
-  /**
-   * @brief UnregisterAppInterfaceID.
-   */
-  UnregisterAppInterfaceID = 2,
-
-  /**
-   * @brief SetGlobalPropertiesID.
-   */
-  SetGlobalPropertiesID = 3,
-
-  /**
-   * @brief ResetGlobalPropertiesID.
-   */
-  ResetGlobalPropertiesID = 4,
-
-  /**
-   * @brief AddCommandID.
-   */
-  AddCommandID = 5,
-
-  /**
-   * @brief DeleteCommandID.
-   */
-  DeleteCommandID = 6,
-
-  /**
-   * @brief AddSubMenuID.
-   */
-  AddSubMenuID = 7,
-
-  /**
-   * @brief DeleteSubMenuID.
-   */
-  DeleteSubMenuID = 8,
-
-  /**
-   * @brief CreateInteractionChoiceSetID.
-   */
-  CreateInteractionChoiceSetID = 9,
-
-  /**
-   * @brief PerformInteractionID.
-   */
-  PerformInteractionID = 10,
-
-  /**
-   * @brief DeleteInteractionChoiceSetID.
-   */
-  DeleteInteractionChoiceSetID = 11,
-
-  /**
-   * @brief AlertID.
-   */
-  AlertID = 12,
-
-  /**
-   * @brief ShowID.
-   */
-  ShowID = 13,
-
-  /**
-   * @brief SpeakID.
-   */
-  SpeakID = 14,
-
-  /**
-   * @brief SetMediaClockTimerID.
-   */
-  SetMediaClockTimerID = 15,
-
-  /**
-   * @brief PerformAudioPassThruID.
-   */
-  PerformAudioPassThruID = 16,
-
-  /**
-   * @brief EndAudioPassThruID.
-   */
-  EndAudioPassThruID = 17,
-
-  /**
-   * @brief SubscribeButtonID.
-   */
-  SubscribeButtonID = 18,
-
-  /**
-   * @brief UnsubscribeButtonID.
-   */
-  UnsubscribeButtonID = 19,
-
-  /**
-   * @brief SubscribeVehicleDataID.
-   */
-  SubscribeVehicleDataID = 20,
-
-  /**
-   * @brief UnsubscribeVehicleDataID.
-   */
-  UnsubscribeVehicleDataID = 21,
-
-  /**
-   * @brief GetVehicleDataID.
-   */
-  GetVehicleDataID = 22,
-
-  /**
-   * @brief ReadDIDID.
-   */
-  ReadDIDID = 23,
-
-  /**
-   * @brief GetDTCsID.
-   */
-  GetDTCsID = 24,
-
-  /**
-   * @brief ScrollableMessageID.
-   */
-  ScrollableMessageID = 25,
-
-  /**
-   * @brief SliderID.
-   */
-  SliderID = 26,
-
-  /**
-   * @brief ShowConstantTBTID.
-   */
-  ShowConstantTBTID = 27,
-
-  /**
-   * @brief AlertManeuverID.
-   */
-  AlertManeuverID = 28,
-
-  /**
-   * @brief UpdateTurnListID.
-   */
-  UpdateTurnListID = 29,
-
-  /**
-   * @brief ChangeRegistrationID.
-   */
-  ChangeRegistrationID = 30,
-
-  /**
-   * @brief GenericResponseID.
-   */
-  GenericResponseID = 31,
-
-  /**
-   * @brief PutFileID.
-   */
-  PutFileID = 32,
-
-  /**
-   * @brief DeleteFileID.
-   */
-  DeleteFileID = 33,
-
-  /**
-   * @brief ListFilesID.
-   */
-  ListFilesID = 34,
-
-  /**
-   * @brief SetAppIconID.
-   */
-  SetAppIconID = 35,
-
-  /**
-   * @brief SetDisplayLayoutID.
-   */
-  SetDisplayLayoutID = 36,
-
-  /**
-   * @brief DiagnosticMessageID.
-   */
-  DiagnosticMessageID = 37,
-
-  /**
-   * @brief SystemRequestID.
-   */
-  SystemRequestID = 38,
-
-  /**
-   * @brief SendLocationID.
-   */
-  SendLocationID = 39,
-
-  /**
-   * @brief DialNumberID.
-   */
-  DialNumberID = 40,
-
-  /**
-   * @brief ButtonPressID.
-   */
-  ButtonPressID = 41,
-
-  /**
-   * @brief GetInteriorVehicleDataID.
-   */
-  GetInteriorVehicleDataID = 43,
-
-  /**
-   * @brief SetInteriorVehicleDataID.
-   */
-  SetInteriorVehicleDataID = 44,
-
-  /**
-   * @brief GetWayPointsID.
-   */
-  GetWayPointsID = 45,
-
-  /**
-   * @brief SubscribeWayPointsID.
-   */
-  SubscribeWayPointsID = 46,
-
-  /**
-   * @brief UnsubscribeWayPointsID.
-   */
-  UnsubscribeWayPointsID = 47,
-
-  /**
-   * @brief GetSystemCapabilityID.
-   */
-  GetSystemCapabilityID = 48,
-
-  /**
-   * @brief SendHapticDataID.
-   */
-  SendHapticDataID = 49,
-
-  /**
-   * @brief SetCloudAppPropertiesID.
-   */
-  SetCloudAppPropertiesID = 50,
-
-  /**
-   * @brief GetCloudAppPropertiesID.
-   */
-  GetCloudAppPropertiesID = 51,
-
-  /**
-   * @brief PublishAppServiceID.
-   */
-  PublishAppServiceID = 52,
-
-  /**
-   * @brief GetAppServiceDataID.
-   */
-  GetAppServiceDataID = 53,
-
-  /**
-   * @brief GetFileID
-   */
-  GetFileID = 54,
-
-  /**
-   * @brief PerformAppServiceInteractionID.
-   */
-  PerformAppServiceInteractionID = 55,
-
-  /**
-   * @brief UnpublishAppServiceID.
-   */
-  UnpublishAppServiceID = 56,
-
-  /**
-   * @brief CloseApplicationID.
-   */
-  CloseApplicationID = 58,
-
-  /**
-   * @brief ShowAppMenuID.
-   */
-  ShowAppMenuID = 59,
-
-  /**
-   * @brief OnHMIStatusID.
-   */
-  OnHMIStatusID = 32768,
-
-  /**
-   * @brief OnAppInterfaceUnregisteredID.
-   */
-  OnAppInterfaceUnregisteredID = 32769,
-
-  /**
-   * @brief OnButtonEventID.
-   */
-  OnButtonEventID = 32770,
-
-  /**
-   * @brief OnButtonPressID.
-   */
-  OnButtonPressID = 32771,
-
-  /**
-   * @brief OnVehicleDataID.
-   */
-  OnVehicleDataID = 32772,
-
-  /**
-   * @brief OnCommandID.
-   */
-  OnCommandID = 32773,
-
-  /**
-   * @brief OnTBTClientStateID.
-   */
-  OnTBTClientStateID = 32774,
-
-  /**
-   * @brief OnDriverDistractionID.
-   */
-  OnDriverDistractionID = 32775,
-
-  /**
-   * @brief OnPermissionsChangeID.
-   */
-  OnPermissionsChangeID = 32776,
-
-  /**
-   * @brief OnAudioPassThruID.
-   */
-  OnAudioPassThruID = 32777,
-
-  /**
-   * @brief OnLanguageChangeID.
-   */
-  OnLanguageChangeID = 32778,
-
-  /**
-   * @brief OnKeyboardInputID.
-   */
-  OnKeyboardInputID = 32779,
-
-  /**
-   * @brief OnTouchEventID.
-   */
-  OnTouchEventID = 32780,
-
-  /**
-   * @brief OnSystemRequestID.
-   */
-  OnSystemRequestID = 32781,
-
-  /**
-   * @brief OnHashChangeID.
-   */
-  OnHashChangeID = 32782,
-
-  /**
-   * @brief OnInteriorVehicleDataID.
-   */
-  OnInteriorVehicleDataID = 32783,
-
-  /**
-   * @brief OnWayPointChangeID.
-   */
-  OnWayPointChangeID = 32784,
-
-  /**
-   * @brief OnRCStatusID.
-   */
-  OnRCStatusID = 32785,
-
-  /**
-   * @brief OnAppServiceDataID.
-   */
-  OnAppServiceDataID = 32786,
-
-  /**
-   * @brief OnSystemCapabilityUpdatedID
-   */
-  OnSystemCapabilityUpdatedID = 32787,
-
-  /**
-   * @brief EncodedSyncPDataID.
-   */
-  EncodedSyncPDataID = 65536,
-
-  /**
-   * @brief SyncPDataID.
-   */
-  SyncPDataID = 65537,
-
-  /**
-   * @brief OnEncodedSyncPDataID.
-   */
-  OnEncodedSyncPDataID = 98304,
-
-  /**
-   * @brief OnSyncPDataID.
-   */
-  OnSyncPDataID = 98305
-};
-bool IsValidEnum(FunctionID val);
-const char* EnumToJsonString(FunctionID val);
-bool EnumFromJsonString(const std::string& literal, FunctionID* result);
-
 extern const std::string kDefaultApp;
 extern const std::string kPreDataConsentApp;
 extern const std::string kDeviceApp;
diff --git a/src/components/policy/policy_external/include/policy/policy_table/policy_enum_schema_factory.h b/src/components/policy/policy_external/include/policy/policy_table/policy_enum_schema_factory.h
new file mode 100644
index 0000000000..4871179342
--- /dev/null
+++ b/src/components/policy/policy_external/include/policy/policy_table/policy_enum_schema_factory.h
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2017, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_POLICY_ENUM_SCHEMA_FACTORY_H
+#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_POLICY_ENUM_SCHEMA_FACTORY_H
+
+#include <memory>
+#include <string>
+
+#include "smart_objects/smart_schema.h"
+
+namespace rpc {
+namespace policy_table_interface_base {
+
+class EnumSchemaItemFactory {
+ public:
+  /**
+   * @brief Get enum schema from enum name
+   * Implementation of this function should be generated from MOBILE_API.xml
+   * @param enum_name enum name to get schema factory for
+   * @return shared pointer to schema factory or empty shared pointer if
+   * enum_name is wrong
+   */
+  static std::shared_ptr<ns_smart_device_link::ns_smart_objects::ISchemaItem>
+  Get(const std::string& enum_name);
+
+  static bool IsRPCSpecVehicleDataType(const std::string& vd_name);
+};
+
+}  // namespace policy_table_interface_base
+}  // namespace rpc
+
+#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TABLE_POLICY_ENUM_SCHEMA_FACTORY_H
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 8795e2690f..11c76bdd68 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
@@ -37,7 +37,9 @@
 #include "utils/macro.h"
 
 #include "policy/policy_table/enums.h"
+#include "policy/policy_table/policy_enum_schema_factory.h"
 #include "rpc_base/rpc_message.h"
+#include "utils/helpers.h"
 
 namespace Json {
 class Value;
@@ -48,6 +50,7 @@ struct AppLevel;
 struct ApplicationParams;
 struct ConsentRecords;
 struct DeviceParams;
+struct EndpointProperty;
 struct MessageLanguages;
 struct MessageString;
 struct RpcParameters;
@@ -69,16 +72,18 @@ typedef Array<Enum<AppHMIType>, 0, 255> AppHMITypes;
 
 typedef Array<Enum<HmiLevel>, 0, 4> HmiLevels;
 
-typedef Array<Enum<Parameter>, 0, 100> Parameters;
+typedef Array<String<0, 255>, 0, 100> Parameters;
 
 typedef Map<RpcParameters, 0, UINT_MAX> Rpc;
 
-typedef Array<String<10, 255>, 1, 3> URL;
+typedef Array<String<10, INT_MAX>, 1, 3> URL;
 
 typedef Map<URL, 1, 255> URLList;
 
 typedef Map<URLList, 1, 255> ServiceEndpoints;
 
+typedef Map<EndpointProperty, 0, 255> ServiceEndpointProperties;
+
 typedef uint8_t NumberOfNotificationsType;
 typedef Map<Integer<NumberOfNotificationsType, 0, 255>, 0, 7>
     NumberOfNotificationsPerMinute;
@@ -116,7 +121,6 @@ typedef Integer<int32_t, 0, INT32_MAX> FunctionIDInt;
 typedef Map<Strings, 0, 255> RemoteRpcs;
 typedef Map<RemoteRpcs, 0, 255> AccessModules;
 typedef Array<Enum<ModuleType>, 0, 255> ModuleTypes;
-
 typedef AppHMIType AppHmiType;
 typedef std::vector<AppHMIType> AppHmiTypes;
 
@@ -237,6 +241,7 @@ struct ApplicationParams : PolicyBase {
   // App Service Params
   Optional<AppServiceParameters> app_service_parameters;
   Optional<Boolean> allow_unknown_rpc_passthrough;
+  Optional<Boolean> encryption_required;
 
  public:
   ApplicationParams();
@@ -331,6 +336,7 @@ struct Rpcs : CompositeType {
       disallowed_by_external_consent_entities_on;
   Optional<DisallowedByExternalConsentEntities>
       disallowed_by_external_consent_entities_off;
+  Optional<Boolean> encryption_required;
 
  public:
   Rpcs();
@@ -348,6 +354,24 @@ struct Rpcs : CompositeType {
   bool Validate() const;
 };
 
+struct EndpointProperty : CompositeType {
+ public:
+  Optional<String<0, 100> > version;
+
+  EndpointProperty();
+  ~EndpointProperty();
+  explicit EndpointProperty(const Json::Value* value__);
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  void SetPolicyTableType(PolicyTableType pt_type) OVERRIDE;
+
+ private:
+  bool Validate() const;
+};
+
 struct ModuleConfig : CompositeType {
  public:
   Integer<uint8_t, 0, 255> exchange_after_x_ignition_cycles;
@@ -356,6 +380,7 @@ struct ModuleConfig : CompositeType {
   Integer<uint16_t, 0, 65535> timeout_after_x_seconds;
   SecondsBetweenRetries seconds_between_retries;
   ServiceEndpoints endpoints;
+  Optional<ServiceEndpointProperties> endpoint_properties;
   NumberOfNotificationsPerMinute notifications_per_minute_by_priority;
   Optional<String<0, 100> > vehicle_make;
   Optional<String<0, 100> > vehicle_model;
@@ -366,6 +391,8 @@ struct ModuleConfig : CompositeType {
   Optional<Boolean> full_app_id_supported;
   Optional<Boolean> lock_screen_dismissal_enabled;
 
+  static const std::string kDefaultOemMappingServiceName;
+
  public:
   ModuleConfig();
   ModuleConfig(uint8_t exchange_after_x_ignition_cycles,
@@ -374,6 +401,7 @@ struct ModuleConfig : CompositeType {
                uint16_t timeout_after_x_seconds,
                const SecondsBetweenRetries& seconds_between_retries,
                const ServiceEndpoints& endpoints,
+               const ServiceEndpointProperties& endpoint_properties,
                const NumberOfNotificationsPerMinute&
                    notifications_per_minute_by_priority);
   ~ModuleConfig();
@@ -600,6 +628,88 @@ struct DeviceParams : CompositeType {
   bool Validate() const;
 };
 
+struct VehicleDataItem : CompositeType {
+ public:
+  static const std::vector<std::string> kPODTypes;
+
+  static const std::string kInteger;
+  static const std::string kStruct;
+  static const std::string kString;
+  static const std::string kFloat;
+  static const std::string kDouble;
+  static const std::string kBoolean;
+  static const std::string kName;
+  static const std::string kParams;
+
+  String<1, 255> name;
+  String<0, 255> type;
+  String<1, 255> key;
+  Boolean mandatory;
+  Optional<Array<VehicleDataItem, 0, 255> > params;
+
+  Optional<Boolean> array;
+  Optional<String<0, 255> > since;
+  Optional<String<0, 255> > until;
+  Optional<Boolean> removed;
+  Optional<Boolean> deprecated;
+  Optional<Float<-INT32_MAX, INT32_MAX> > minvalue;
+  Optional<Float<-INT32_MAX, INT32_MAX> > maxvalue;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > minsize;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > maxsize;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > minlength;
+  Optional<Integer<uint32_t, 0, UINT_MAX> > maxlength;
+
+  VehicleDataItem();
+  VehicleDataItem(const VehicleDataItem& policy_table);
+  explicit VehicleDataItem(const Json::Value* value__);
+
+  bool operator==(const VehicleDataItem& vd);
+
+  ~VehicleDataItem();
+
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_not_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  virtual void SetPolicyTableType(PolicyTableType pt_type);
+
+  /**
+   * @brief Validates type of vehicle data item according to
+   * POD types and generated from API enums.
+   * @return true if type is valid.
+   */
+  bool ValidateTypes() const;
+  bool IsPrimitiveType() const;
+  bool ValidateNaming(std::string str) const;
+
+ private:
+  bool Validate() const;
+};
+
+typedef Array<VehicleDataItem, 0, 255> VehicleDataItems;
+
+struct VehicleData : CompositeType {
+ public:
+  Optional<String<0, 100> > schema_version;
+  Optional<VehicleDataItems> schema_items;
+
+  VehicleData();
+  VehicleData(const VehicleData& vehicle_data);
+  VehicleData(const Json::Value* value__);
+  ~VehicleData();
+
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  virtual void SetPolicyTableType(PolicyTableType pt_type);
+
+ private:
+  bool Validate() const;
+};
+
 struct PolicyTable : CompositeType {
  public:
   ApplicationPoliciesSection app_policies_section;
@@ -609,6 +719,7 @@ struct PolicyTable : CompositeType {
   Optional<ModuleMeta> module_meta;
   Optional<UsageAndErrorCounts> usage_and_error_counts;
   Optional<DeviceData> device_data;
+  Optional<VehicleData> vehicle_data;
 
  public:
   PolicyTable();
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 46c8f40a01..af7effd97f 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
@@ -114,6 +114,7 @@
         <param name="service_type" type="String" mandatory="false" />
         <param name="handled_rpcs" array="true"  mandatory="false" />
         <param name="allow_unknown_rpc_passthrough" type="Boolean" mandatory="false" />
+        <param name="encryption_required" type="Boolean" mandatory="false"/>
     </struct>
 
     <typedef name="HmiLevels" type="HmiLevel" array="true"
@@ -135,6 +136,7 @@
         <param name="user_consent_prompt" type="String" minlegth="1"
             maxlength="255" mandatory="false"/>
         <param name="rpcs" type="Rpc" null_values_allowed="true"/>
+        <param name="encryption_required" type="Boolean" mandatory="false"/>
     </struct>
     <!-- app_policies section end -->
 
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 7247995f48..7e8abd5989 100644
--- a/src/components/policy/policy_external/include/policy/policy_types.h
+++ b/src/components/policy/policy_external/include/policy/policy_types.h
@@ -41,6 +41,7 @@
 #include <utility>
 #include <vector>
 
+#include "policy/policy_table/types.h"
 #include "transport_manager/common.h"
 #include "utils/helpers.h"
 
@@ -74,7 +75,8 @@ enum PolicyTableStatus {
   StatusUpToDate = 0,
   StatusUpdatePending,
   StatusUpdateRequired,
-  StatusUnknown
+  StatusUnknown,
+  StatusProcessingSnapshot
 };
 
 // Code generator uses String class name, so this typedef was renamed to PTSring
@@ -87,6 +89,8 @@ typedef std::string Parameter;
 typedef std::string RpcName;
 typedef std::set<std::string> RPCParams;
 
+typedef rpc::Optional<rpc::Boolean> EncryptionRequired;
+
 typedef std::map<std::string, std::set<policy::HMILevel> > HMIPermissions;
 struct ParameterPermissions
     : std::map<std::string, std::set<policy::Parameter> > {
@@ -102,6 +106,7 @@ struct ParameterPermissions
 struct RpcPermissions {
   HMIPermissions hmi_permissions;
   ParameterPermissions parameter_permissions;
+  EncryptionRequired require_encryption;
 };
 
 typedef std::map<RpcName, RpcPermissions> Permissions;
@@ -118,6 +123,8 @@ typedef std::vector<std::string> StringArray;
 
 enum PermitResult { kRpcAllowed = 0, kRpcDisallowed, kRpcUserDisallowed };
 
+enum class ResetRetryCountType { kResetWithStatusUpdate = 0, kResetInternally };
+
 /**
  * @struct Stores result of check:
  * if HMI Level was allowed for RPC to work in
@@ -225,8 +232,11 @@ struct DeviceInfo {
     using namespace helpers;
     static const std::string bluetooth("BLUETOOTH");
     static const std::string wifi("WIFI");
+    static const std::string webengine("WEBENGINE_WEBSOCKET");
     if (Compare<std::string, EQ, ONE>(deviceType, bluetooth, wifi)) {
       connection_type.assign("BTMAC");
+    } else if (Compare<std::string, EQ, ONE>(deviceType, webengine)) {
+      connection_type.assign("");
     }
   }
 };
@@ -445,11 +455,13 @@ struct ApplicationPolicyActions {
   ApplicationPolicyActions()
       : is_notify_system(false)
       , is_send_permissions_to_app(false)
-      , is_consent_needed(false) {}
+      , is_consent_needed(false)
+      , app_properties_changed(false) {}
 
   bool is_notify_system;
   bool is_send_permissions_to_app;
   bool is_consent_needed;
+  bool app_properties_changed;
 };
 
 /**
@@ -505,10 +517,12 @@ enum PermissionsCheckResult {
   RESULT_NICKNAME_MISMATCH,
   RESULT_PERMISSIONS_REVOKED,
   RESULT_CONSENT_NEEDED,
-  RESULT_CONSENT_NOT_REQIURED,
+  RESULT_CONSENT_NOT_REQUIRED,
   RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED,
   RESULT_REQUEST_TYPE_CHANGED,
-  RESULT_REQUEST_SUBTYPE_CHANGED
+  RESULT_REQUEST_SUBTYPE_CHANGED,
+  RESULT_ENCRYPTION_REQUIRED_FLAG_CHANGED,
+  RESULT_APP_PROPERTIES_CHANGED
 };
 
 /**
@@ -531,6 +545,68 @@ enum ConsentPriorityType { kUserConsentPrio, kExternalConsentPrio };
  */
 enum ConsentProcessingPolicy { kTimestampBased, kExternalConsentBased };
 
+/**
+ * @brief The AppProperties struct contains application properties
+ */
+struct AppProperties {
+  AppProperties()
+      : endpoint()
+      , certificate()
+      , enabled(false)
+      , auth_token()
+      , transport_type()
+      , hybrid_app_preference() {}
+
+  AppProperties(std::string endpoint,
+                std::string certificate,
+                bool enabled,
+                std::string auth_token,
+                std::string transport_type,
+                std::string hybrid_app_preference)
+      : endpoint(endpoint)
+      , certificate(certificate)
+      , enabled(enabled)
+      , auth_token(auth_token)
+      , transport_type(transport_type)
+      , hybrid_app_preference(hybrid_app_preference) {}
+
+  /**
+   * @brief endpoint Filled with the endpoint used to connect to the cloud
+   * application.
+   * @note should be absent for local applications
+   */
+  std::string endpoint;
+
+  /**
+   * @brief certificate Filled with the certificate used for creation
+   * of a secure connection to the cloud application
+   */
+  std::string certificate;
+
+  /**
+   * @brief enabled Whether or not the app is enabled
+   */
+  bool enabled;
+
+  /**
+   * @brief auth_token Filled with the token used for authentication when
+   * reconnecting to the cloud app
+   */
+  std::string auth_token;
+
+  /**
+   * @brief transport_type Filled with the transport type used by the
+   * cloud/local application (ex. "WSS")
+   */
+  std::string transport_type;
+
+  /**
+   * @brief hybrid_app_preference Filled with the hybrid app preference for the
+   * application set by the user
+   */
+  std::string hybrid_app_preference;
+};
+
 }  //  namespace policy
 
 #endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_
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 6eaa718cf0..459b689393 100644
--- a/src/components/policy/policy_external/include/policy/pt_representation.h
+++ b/src/components/policy/policy_external/include/policy/pt_representation.h
@@ -71,14 +71,6 @@ class PTRepresentation {
   virtual bool IsPTPreloaded() = 0;
 
   /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   *
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const = 0;
-
-  /**
    * @brief Re-creates schema in DB, drops all data
    * @return true, if succedeed, otherwise - false
    */
@@ -134,11 +126,6 @@ class PTRepresentation {
   virtual bool SecondsBetweenRetries(std::vector<int>* seconds) = 0;
 
   /**
-   * @brief Get information about vehicle
-   */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
-
-  /**
    * @brief Allows to update 'vin' field in module_meta table.
    *
    * @param new 'vin' value.
diff --git a/src/components/policy/policy_external/include/policy/ptu_retry_handler.h b/src/components/policy/policy_external/include/policy/ptu_retry_handler.h
new file mode 100644
index 0000000000..79623124e3
--- /dev/null
+++ b/src/components/policy/policy_external/include/policy/ptu_retry_handler.h
@@ -0,0 +1,57 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_PTU_RETRY_HANDLER_H_
+#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_PTU_RETRY_HANDLER_H_
+
+namespace policy {
+
+class PTURetryHandler {
+ public:
+  /**
+   * @brief Check whether allowed retry sequence count is exceeded
+   * @return bool value - true is allowed count is exceeded, otherwise - false
+   */
+  virtual bool IsAllowedRetryCountExceeded() const = 0;
+
+  /**
+   * @brief Begins new retry sequence
+   */
+  virtual void OnSystemRequestReceived() = 0;
+
+  /**
+   * @brief Handle OnSystemRequest from HMI timeout
+   */
+  virtual void RetrySequenceFailed() = 0;
+};
+}  // namespace policy
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_POLICIES_PTU_RETRY_HANDLER_H_
diff --git a/src/components/policy/policy_external/include/policy/sql_pt_queries.h b/src/components/policy/policy_external/include/policy/sql_pt_queries.h
index 5382ff2d6b..8a3ad1f7df 100644
--- a/src/components/policy/policy_external/include/policy/sql_pt_queries.h
+++ b/src/components/policy/policy_external/include/policy/sql_pt_queries.h
@@ -49,7 +49,6 @@ extern const std::string kSelectPreloaded;
 extern const std::string kIsFirstRun;
 extern const std::string kSetNotFirstRun;
 extern const std::string kSelectEndpoint;
-extern const std::string kSelectLockScreenIcon;
 extern const std::string kSelectModuleConfig;
 extern const std::string kSelectEndpoints;
 extern const std::string kSelectNotificationsPerMin;
@@ -142,6 +141,21 @@ extern const std::string kDeleteModuleTypes;
 extern const std::string kDeleteAllDevices;
 extern const std::string kSelectDBVersion;
 extern const std::string kUpdateDBVersion;
+extern const std::string kSelectVehicleDataItem;
+extern const std::string kInsertVehicleDataItem;
+extern const std::string kDeleteVehicleDataItems;
+extern const std::string kInsertVehicleDataItemParams;
+extern const std::string kSelectVehicleDataItemParams;
+extern const std::string kDeleteVehicleDataItemParams;
+extern const std::string kSelectVehicleDataItemWithVersion;
+extern const std::string kSelectPrimitiveVehicleDataItems;
+extern const std::string kSelectCompositeVehicleDataItemsKey;
+extern const std::string kSelectOEMMappingVersion;
+extern const std::string kSelectVehicleDataSchemaVersion;
+extern const std::string kInsertVehicleDataSchemaVersion;
+extern const std::string kSelectEndpointProperties;
+extern const std::string kInsertEndpointVersion;
+
 }  // namespace sql_pt
 }  // namespace policy
 
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 826c9b3b6e..574806b3fb 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
@@ -44,6 +44,7 @@ namespace policy_table = rpc::policy_table_interface_base;
 namespace utils {
 namespace dbms {
 class SQLDatabase;
+class SQLQuery;
 }  // namespace dbms
 }  // namespace utils
 
@@ -70,8 +71,6 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual int TimeoutResponse();
   virtual bool SecondsBetweenRetries(std::vector<int>* seconds);
   virtual bool RefreshDB();
-  virtual const VehicleInfo GetVehicleInfo() const;
-
   virtual std::vector<UserFriendlyMessage> GetUserFriendlyMsg(
       const std::vector<std::string>& msg_codes, const std::string& language);
 
@@ -124,6 +123,9 @@ class SQLPTRepresentation : public virtual PTRepresentation {
       policy_table::ConsumerFriendlyMessages* messages) const;
   virtual bool GatherApplicationPoliciesSection(
       policy_table::ApplicationPoliciesSection* policies) const;
+  virtual bool GatherVehicleDataItems(
+      policy_table::VehicleDataItems* vehicle_data_items) const;
+  virtual bool GatherVehicleData(policy_table::VehicleData* vehicle_data) const;
 
   bool GatherAppGroup(const std::string& app_id,
                       policy_table::Strings* app_groups) const;
@@ -159,6 +161,9 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual bool SaveSpecificAppPolicy(
       const policy_table::ApplicationPolicies::value_type& app);
   virtual bool SaveDevicePolicy(const policy_table::DevicePolicy& device);
+  virtual bool SaveVehicleDataItems(
+      const policy_table::VehicleDataItems& vehicle_data_items);
+  virtual bool SaveVehicleData(const policy_table::VehicleData& vehicle_data);
 
   virtual bool SaveMessageString(const std::string& type,
                                  const std::string& lang,
@@ -180,7 +185,6 @@ class SQLPTRepresentation : public virtual PTRepresentation {
       const policy_table::AppServiceParameters& app_service_parameters);
 
  public:
-  virtual std::string GetLockScreenIconUrl() const;
   bool UpdateRequired() const;
   void SaveUpdateRequired(bool value);
 
@@ -203,6 +207,26 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual bool IsDBVersionActual() const OVERRIDE;
   virtual bool UpdateDBVersion() const OVERRIDE;
 
+  policy_table::VehicleDataItems GetVehicleDataItem(
+      const std::string& name, const std::string& key) const;
+  bool InsertVehicleDataItem(
+      const policy_table::VehicleDataItem& vehicle_data_item);
+  bool VehicleDataItemExists(
+      const policy_table::VehicleDataItem& vehicle_data_item) const;
+
+  /**
+   * @brief Retrieves vehicle data items of type Struct (which contains params)
+   * from the database including these parameters.
+   * @return Array of parameterized VehicleDataItems (including params)
+   */
+  policy_table::VehicleDataItems SelectCompositeVehicleDataItems() const;
+
+  /**
+   * @brief Retrieves vehicle data items of non Struct type from the database.
+   * @return Array of primitive VehicleDataItems
+   */
+  policy_table::VehicleDataItems SelectPrimitiveVehicleDataItems() const;
+
  private:
   utils::dbms::SQLDatabase* db_;
 
@@ -220,12 +244,17 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   const int32_t GetDBVersion() const;
   bool SaveRpcs(int64_t group_id, const policy_table::Rpc& rpcs);
   bool SaveServiceEndpoints(const policy_table::ServiceEndpoints& endpoints);
+  bool SaveServiceEndpointProperties(
+      const policy_table::ServiceEndpointProperties& endpoint_properties);
   bool SaveSecondsBetweenRetries(
       const policy_table::SecondsBetweenRetries& seconds);
   bool SaveNumberOfNotificationsPerMinute(
       const policy_table::NumberOfNotificationsPerMinute& notifications);
   bool SaveMessageType(const std::string& type);
   bool SaveLanguage(const std::string& code);
+  policy_table::VehicleDataItem PopulateVDIFromQuery(
+      const utils::dbms::SQLQuery& query) const;
+  bool DeleteVehicleDataItems() const;
 
   bool is_in_memory;
   bool SaveExternalConsentEntities(
diff --git a/src/components/policy/policy_external/include/policy/status.h b/src/components/policy/policy_external/include/policy/status.h
index 336d59e869..f51888c853 100644
--- a/src/components/policy/policy_external/include/policy/status.h
+++ b/src/components/policy/policy_external/include/policy/status.h
@@ -52,6 +52,7 @@ enum UpdateEvent {
   kOnResetPolicyTableRequireUpdate,
   kOnResetPolicyTableNoUpdate,
   kScheduleUpdate,
+  kPendingUpdate,
   kScheduleManualUpdate,
   kOnResetRetrySequence,
   kNoEvent
@@ -162,6 +163,38 @@ class UpdateNeededStatus : public Status {
 };
 
 /**
+ * @brief The UpdatePendingStatus class represents cases when SDL knows that an
+ * update is required and but before the snapshot is sent to the HMI
+ */
+class UpdatePendingStatus : public Status {
+ public:
+  /**
+   * @brief Constructor
+   */
+  UpdatePendingStatus();
+
+  /**
+   * @brief Process event by setting next status in case event can affect
+   * current status or ignores the event
+   * @param manager Status manager pointer
+   * @param event Event which needs to be processed
+   */
+  void ProcessEvent(UpdateStatusManager* manager, UpdateEvent event) OVERRIDE;
+
+  /**
+   * @brief Check whether update is required in terms of status
+   * @return True if update is required, otherwise - false
+   */
+  bool IsUpdateRequired() const OVERRIDE;
+
+  /**
+   * @brief Check whether update is pending in terms of status
+   * @return True if update is pending, otherwise - false
+   */
+  bool IsUpdatePending() const OVERRIDE;
+};
+
+/**
  * @brief The UpdatingStatus class represents 'updating' status
  */
 class UpdatingStatus : public Status {
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 9c0e29407e..018bab7f99 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
@@ -92,6 +92,12 @@ class UpdateStatusManager {
   void OnUpdateTimeoutOccurs();
 
   /**
+   * @brief Update status for next in queue application
+   * after previous update been has finished
+   */
+  void OnUpdateForNextInQueue();
+
+  /**
    * @brief Update status handler for valid PTU receiving
    */
   void OnValidUpdateReceived();
@@ -150,6 +156,12 @@ class UpdateStatusManager {
   void ScheduleUpdate();
 
   /**
+   * @brief PendingUpdate will change state from Update_Needed
+   * to Update_Pending
+   */
+  void PendingUpdate();
+
+  /**
    * @brief ScheduleUpdate allows to schedule next update.
    * It will change state to Update_Needed, that's is
    * and will not send any notifications about updating to HMI
@@ -179,6 +191,8 @@ class UpdateStatusManager {
    */
   bool IsAppsSearchInProgress();
 
+  void ResetTimeout(uint32_t update_timeout);
+
 #ifdef BUILD_TESTS
   PolicyTableStatus GetLastUpdateStatus() const {
     return current_status_->get_status();
@@ -214,6 +228,7 @@ class UpdateStatusManager {
   UpdateEvent last_processed_event_;
   bool apps_search_in_progress_;
   bool app_registered_from_non_consented_device_;
+  bool last_update_was_failed_;
   sync_primitives::Lock apps_search_in_progress_lock_;
 
   class UpdateThreadDelegate : public threads::ThreadDelegate {
diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc
index 4170e7aaa6..d8819b6bad 100644
--- a/src/components/policy/policy_external/src/cache_manager.cc
+++ b/src/components/policy/policy_external/src/cache_manager.cc
@@ -33,6 +33,7 @@
 #include "policy/cache_manager.h"
 
 #include <algorithm>
+#include <boost/algorithm/string.hpp>
 #include <cmath>
 #include <ctime>
 #include <functional>
@@ -40,8 +41,6 @@
 #include <utility>
 #include <vector>
 
-#include "json/features.h"
-#include "json/reader.h"
 #include "json/writer.h"
 #include "policy/policy_helper.h"
 #include "policy/policy_table/enums.h"
@@ -51,6 +50,7 @@
 #include "utils/file_system.h"
 #include "utils/gen_hash.h"
 #include "utils/helpers.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/logger.h"
 #include "utils/threads/thread.h"
 #include "utils/threads/thread_delegate.h"
@@ -268,7 +268,8 @@ CacheManager::CacheManager()
     : CacheManagerInterface()
     , pt_(new policy_table::Table)
     , backup_(new SQLPTExtRepresentation())
-    , update_required(false) {
+    , update_required(false)
+    , removed_custom_vd_items_() {
   InitBackupThread();
 }
 
@@ -325,6 +326,20 @@ const policy_table::Strings& CacheManager::GetGroups(const PTString& app_id) {
   return pt_->policy_table.app_policies_section.apps[app_id].groups;
 }
 
+const policy_table::Strings CacheManager::GetPolicyAppIDs() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  const auto apps = pt_->policy_table.app_policies_section.apps;
+
+  policy_table::Strings policy_app_ids;
+  for (const auto& app : apps) {
+    policy_app_ids.push_back(app.first);
+  }
+
+  return policy_app_ids;
+}
+
 bool CacheManager::CanAppKeepContext(const std::string& app_id) const {
   CACHE_MANAGER_CHECK(false);
   sync_primitives::AutoLock auto_lock(cache_lock_);
@@ -738,6 +753,38 @@ bool CacheManager::ApplyUpdate(const policy_table::Table& update_pt) {
   pt_->policy_table.consumer_friendly_messages.assign_if_valid(
       update_pt.policy_table.consumer_friendly_messages);
 
+  pt_->policy_table.module_config.endpoint_properties =
+      update_pt.policy_table.module_config.endpoint_properties;
+
+  // Apply update for vehicle data
+  if (update_pt.policy_table.vehicle_data.is_initialized()) {
+    policy_table::VehicleDataItems custom_items_before_apply;
+    if (pt_->policy_table.vehicle_data->schema_items.is_initialized()) {
+      custom_items_before_apply =
+          CollectCustomVDItems(*pt_->policy_table.vehicle_data->schema_items);
+    }
+
+    if (!update_pt.policy_table.vehicle_data->schema_items.is_initialized() ||
+        update_pt.policy_table.vehicle_data->schema_items->empty()) {
+      pt_->policy_table.vehicle_data->schema_items =
+          rpc::Optional<policy_table::VehicleDataItems>();
+    } else {
+      policy_table::VehicleDataItems custom_items = CollectCustomVDItems(
+          *update_pt.policy_table.vehicle_data->schema_items);
+
+      pt_->policy_table.vehicle_data->schema_version =
+          update_pt.policy_table.vehicle_data->schema_version;
+      pt_->policy_table.vehicle_data->schema_items =
+          rpc::Optional<policy_table::VehicleDataItems>(custom_items);
+    }
+
+    policy_table::VehicleDataItems custom_items_after_apply =
+        *pt_->policy_table.vehicle_data->schema_items;
+    const auto& items_diff = CalculateCustomVdItemsDiff(
+        custom_items_before_apply, custom_items_after_apply);
+    SetRemovedCustomVdItems(items_diff);
+  }
+
   ResetCalculatedPermissions();
   Backup();
 
@@ -748,6 +795,21 @@ bool CacheManager::ApplyUpdate(const policy_table::Table& update_pt) {
   return true;
 }
 
+policy_table::VehicleDataItems CacheManager::CollectCustomVDItems(
+    const policy_table::VehicleDataItems& vd_items) {
+  policy_table::VehicleDataItems result_items;
+  for (auto& item : vd_items) {
+    const std::string i_name = "VEHICLEDATA_" + std::string(item.name);
+    const std::string vd_name = boost::to_upper_copy<std::string>(i_name);
+    const bool is_standard =
+        policy_table::EnumSchemaItemFactory::IsRPCSpecVehicleDataType(vd_name);
+    if (!is_standard) {
+      result_items.push_back(item);
+    }
+  }
+  return result_items;
+}
+
 void CacheManager::GetHMIAppTypeAfterUpdate(
     std::map<std::string, StringArray>& app_hmi_types) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1217,14 +1279,8 @@ void CacheManager::CheckPermissions(const PTString& app_id,
         if (rpc_param.hmi_levels.end() != hmi_iter) {
           result.hmi_level_permitted = PermitResult::kRpcAllowed;
 
-          policy_table::Parameters::const_iterator params_iter =
-              rpc_param.parameters->begin();
-          policy_table::Parameters::const_iterator params_iter_end =
-              rpc_param.parameters->end();
-
-          for (; params_iter != params_iter_end; ++params_iter) {
-            result.list_of_allowed_params.insert(
-                policy_table::EnumToJsonString(*params_iter));
+          for (const auto& param : *rpc_param.parameters) {
+            result.list_of_allowed_params.insert(std::string(param));
           }
         }
       }
@@ -1373,20 +1429,27 @@ bool CacheManager::SecondsBetweenRetries(std::vector<int>& seconds) {
   return true;
 }
 
-const policy::VehicleInfo CacheManager::GetVehicleInfo() const {
-  CACHE_MANAGER_CHECK(VehicleInfo());
+const std::vector<policy_table::VehicleDataItem>
+CacheManager::GetVehicleDataItems() const {
+  CACHE_MANAGER_CHECK(std::vector<policy_table::VehicleDataItem>());
   sync_primitives::AutoLock auto_lock(cache_lock_);
-  policy_table::ModuleConfig& module_config = pt_->policy_table.module_config;
-  VehicleInfo vehicle_info;
-  vehicle_info.vehicle_make = *module_config.vehicle_make;
-  vehicle_info.vehicle_model = *module_config.vehicle_model;
-  vehicle_info.vehicle_year = *module_config.vehicle_year;
-  LOG4CXX_DEBUG(
-      logger_,
-      "Vehicle info (make, model, year):" << vehicle_info.vehicle_make << ","
-                                          << vehicle_info.vehicle_model << ","
-                                          << vehicle_info.vehicle_year);
-  return vehicle_info;
+
+  if (pt_->policy_table.vehicle_data.is_initialized() &&
+      pt_->policy_table.vehicle_data->schema_items.is_initialized()) {
+    return *(pt_->policy_table.vehicle_data->schema_items);
+  }
+
+  return std::vector<policy_table::VehicleDataItem>();
+}
+
+std::vector<policy_table::VehicleDataItem>
+CacheManager::GetRemovedVehicleDataItems() const {
+  CACHE_MANAGER_CHECK(std::vector<policy_table::VehicleDataItem>());
+  return removed_custom_vd_items_;
+}
+
+Json::Value CacheManager::GetPolicyTableData() const {
+  return pt_->policy_table.ToJsonValue();
 }
 
 void CacheManager::GetEnabledCloudApps(
@@ -1408,40 +1471,60 @@ void CacheManager::GetEnabledCloudApps(
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 }
 
-bool CacheManager::GetCloudAppParameters(
-    const std::string& policy_app_id,
-    bool& enabled,
-    std::string& endpoint,
-    std::string& certificate,
-    std::string& auth_token,
-    std::string& cloud_transport_type,
-    std::string& hybrid_app_preference) const {
+bool CacheManager::GetAppProperties(const std::string& policy_app_id,
+                                    AppProperties& out_app_properties) const {
   const policy_table::ApplicationPolicies& policies =
       pt_->policy_table.app_policies_section.apps;
   policy_table::ApplicationPolicies::const_iterator policy_iter =
       policies.find(policy_app_id);
   if (policies.end() != policy_iter) {
     auto app_policy = (*policy_iter).second;
-    endpoint = app_policy.endpoint.is_initialized() ? *app_policy.endpoint
-                                                    : std::string();
-    auth_token = app_policy.auth_token.is_initialized() ? *app_policy.auth_token
-                                                        : std::string();
-    cloud_transport_type = app_policy.cloud_transport_type.is_initialized()
-                               ? *app_policy.cloud_transport_type
-                               : std::string();
-    certificate = app_policy.certificate.is_initialized()
-                      ? *app_policy.certificate
-                      : std::string();
-    hybrid_app_preference =
+    out_app_properties.endpoint = app_policy.endpoint.is_initialized()
+                                      ? *app_policy.endpoint
+                                      : std::string();
+    out_app_properties.auth_token = app_policy.auth_token.is_initialized()
+                                        ? *app_policy.auth_token
+                                        : std::string();
+    out_app_properties.transport_type =
+        app_policy.cloud_transport_type.is_initialized()
+            ? *app_policy.cloud_transport_type
+            : std::string();
+    out_app_properties.certificate = app_policy.certificate.is_initialized()
+                                         ? *app_policy.certificate
+                                         : std::string();
+    out_app_properties.hybrid_app_preference =
         app_policy.hybrid_app_preference.is_initialized()
             ? EnumToJsonString(*app_policy.hybrid_app_preference)
             : std::string();
-    enabled = app_policy.enabled.is_initialized() && *app_policy.enabled;
+    out_app_properties.enabled =
+        app_policy.enabled.is_initialized() && *app_policy.enabled;
     return true;
   }
   return false;
 }
 
+std::vector<std::string> CacheManager::GetEnabledLocalApps() const {
+#if !defined(WEBSOCKET_SERVER_TRANSPORT_SUPPORT)
+  return std::vector<std::string>();
+#else
+  std::vector<std::string> enabled_apps;
+  const policy_table::ApplicationPolicies& app_policies =
+      pt_->policy_table.app_policies_section.apps;
+  for (const auto& app_policies_item : app_policies) {
+    const auto app_policy = app_policies_item.second;
+    // Local (WebEngine) applications
+    // should not have "endpoint" field
+    if (app_policy.endpoint.is_initialized()) {
+      continue;
+    }
+    if (app_policy.enabled.is_initialized() && *app_policy.enabled) {
+      enabled_apps.push_back(app_policies_item.first);
+    }
+  }
+  return enabled_apps;
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+}
+
 void CacheManager::InitCloudApp(const std::string& policy_app_id) {
   CACHE_MANAGER_CHECK_VOID();
   sync_primitives::AutoLock auto_lock(cache_lock_);
@@ -1654,16 +1737,24 @@ std::vector<UserFriendlyMessage> CacheManager::GetUserFriendlyMsg(
 }
 
 void CacheManager::GetUpdateUrls(const uint32_t service_type,
-                                 EndpointUrls& out_end_points) {
-  std::stringstream service_type_stream;
-  service_type_stream << (service_type <= 9 ? "0x0" : "0x") << service_type;
-
-  const std::string service_type_str = service_type_stream.str();
-  GetUpdateUrls(service_type_str, out_end_points);
+                                 EndpointUrls& out_end_points) const {
+  auto find_hexademical =
+      [service_type](policy_table::ServiceEndpoints::value_type end_point) {
+        uint32_t decimal;
+        std::istringstream(end_point.first) >> std::hex >> decimal;
+        return end_point.first.compare(0, 2, "0x") == 0 &&
+               decimal == service_type;
+      };
+  auto& end_points = pt_->policy_table.module_config.endpoints;
+  const auto end_point =
+      std::find_if(end_points.begin(), end_points.end(), find_hexademical);
+  if (end_point != end_points.end()) {
+    GetUpdateUrls(end_point->first, out_end_points);
+  }
 }
 
 void CacheManager::GetUpdateUrls(const std::string& service_type,
-                                 EndpointUrls& out_end_points) {
+                                 EndpointUrls& out_end_points) const {
   LOG4CXX_AUTO_TRACE(logger_);
   CACHE_MANAGER_CHECK_VOID();
 
@@ -1690,13 +1781,6 @@ void CacheManager::GetUpdateUrls(const std::string& service_type,
   }
 }
 
-std::string CacheManager::GetLockScreenIconUrl() const {
-  if (backup_) {
-    return backup_->GetLockScreenIconUrl();
-  }
-  return std::string("");
-}
-
 std::string CacheManager::GetIconUrl(const std::string& policy_app_id) const {
   CACHE_MANAGER_CHECK(std::string());
   std::string url;
@@ -1869,6 +1953,46 @@ void CacheManager::CheckSnapshotInitialization() {
   }
 }
 
+policy_table::VehicleDataItems CacheManager::CalculateCustomVdItemsDiff(
+    const policy_table::VehicleDataItems& items_before,
+    const policy_table::VehicleDataItems& items_after) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (items_before.empty()) {
+    LOG4CXX_DEBUG(logger_, "No custom VD items found in policy");
+    return policy_table::VehicleDataItems();
+  }
+
+  if (items_after.empty()) {
+    LOG4CXX_DEBUG(logger_,
+                  "All custom VD items were removed after policy update");
+    return items_before;
+  }
+
+  policy_table::VehicleDataItems removed_items;
+  for (auto& item_to_search : items_before) {
+    auto item_predicate =
+        [&item_to_search](const policy_table::VehicleDataItem& item_to_check) {
+          return item_to_search.name == item_to_check.name;
+        };
+
+    auto it =
+        std::find_if(items_after.begin(), items_after.end(), item_predicate);
+    if (items_after.end() == it) {
+      removed_items.push_back(item_to_search);
+    }
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Found " << removed_items.size() << " removed VD items");
+  return removed_items;
+}
+
+void CacheManager::SetRemovedCustomVdItems(
+    const policy_table::VehicleDataItems& removed_items) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  removed_custom_vd_items_ = removed_items;
+}
+
 void CacheManager::PersistData() {
   LOG4CXX_AUTO_TRACE(logger_);
   if (backup_.use_count() != 0) {
@@ -2000,6 +2124,14 @@ std::shared_ptr<policy_table::Table> CacheManager::GenerateSnapshot() {
   sync_primitives::AutoLock auto_lock(cache_lock_);
   snapshot_->policy_table = pt_->policy_table;
 
+  if (pt_->policy_table.vehicle_data.is_initialized()) {
+    snapshot_->policy_table.vehicle_data =
+        rpc::Optional<policy_table::VehicleData>();
+    snapshot_->policy_table.vehicle_data->mark_initialized();
+    snapshot_->policy_table.vehicle_data->schema_version =
+        pt_->policy_table.vehicle_data->schema_version;
+  }
+
   snapshot_->SetPolicyTableType(policy_table::PT_SNAPSHOT);
 
   CheckSnapshotInitialization();
@@ -2510,6 +2642,10 @@ bool CacheManager::Init(const std::string& file_name,
       LOG4CXX_DEBUG(logger_,
                     "Check if snapshot valid: " << std::boolalpha << result);
 
+      if (!UnwrapAppPolicies(pt_->policy_table.app_policies_section.apps)) {
+        LOG4CXX_ERROR(logger_, "Cannot unwrap application policies");
+      }
+
       if (result) {
         backup_->UpdateDBVersion();
         Backup();
@@ -2517,6 +2653,8 @@ bool CacheManager::Init(const std::string& file_name,
       } else {
         rpc::ValidationReport report("policy_table");
         snapshot->ReportErrors(&report);
+        LOG4CXX_DEBUG(logger_,
+                      "Validation report: " << rpc::PrettyFormat(report));
         ex_backup_->RemoveDB();
       }
     } break;
@@ -2582,13 +2720,12 @@ bool CacheManager::LoadFromFile(const std::string& file_name,
     return false;
   }
 
+  utils::JsonReader reader;
   Json::Value value;
-  Json::Reader reader(Json::Features::strictMode());
+
   std::string json(json_string.begin(), json_string.end());
-  if (!reader.parse(json.c_str(), value)) {
-    LOG4CXX_FATAL(
-        logger_,
-        "Preloaded PT is corrupted: " << reader.getFormattedErrorMessages());
+  if (!reader.parse(json, &value)) {
+    LOG4CXX_FATAL(logger_, "Preloaded PT is corrupted.");
     return false;
   }
 
@@ -2599,10 +2736,10 @@ bool CacheManager::LoadFromFile(const std::string& file_name,
   table = policy_table::Table(&value);
 
 #ifdef ENABLE_LOG
-  Json::StyledWriter s_writer;
-  LOG4CXX_DEBUG(
-      logger_,
-      "Policy table content loaded:" << s_writer.write(table.ToJsonValue()));
+  Json::StreamWriterBuilder writer_builder;
+  LOG4CXX_DEBUG(logger_,
+                "Policy table content loaded:" << Json::writeString(
+                    writer_builder, table.ToJsonValue()));
 #endif  // ENABLE_LOG
 
   MakeLowerCaseAppNames(table);
@@ -2620,10 +2757,14 @@ bool CacheManager::LoadFromFile(const std::string& file_name,
 bool CacheManager::ResetPT(const std::string& file_name) {
   LOG4CXX_AUTO_TRACE(logger_);
   is_unpaired_.clear();
+
+  backuper_->WaitForBackupIsDone();
+
   if (!backup_->RefreshDB()) {
     LOG4CXX_ERROR(logger_, "Can't re-create policy database. Reset failed.");
     return false;
   }
+
   sync_primitives::AutoLock lock(cache_lock_);
   pt_.reset(new policy_table::Table());
   const bool result = LoadFromFile(file_name, *pt_);
@@ -2920,6 +3061,7 @@ bool CacheManager::MergePreloadPT(const std::string& file_name) {
     MergeFG(new_table, current);
     MergeAP(new_table, current);
     MergeCFM(new_table, current);
+    MergeVD(new_table, current);
     Backup();
   }
   return true;
@@ -2987,6 +3129,12 @@ void CacheManager::MergeCFM(const policy_table::PolicyTable& new_pt,
   }
 }
 
+void CacheManager::MergeVD(const policy_table::PolicyTable& new_pt,
+                           policy_table::PolicyTable& pt) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  pt.vehicle_data.assign_if_valid(new_pt.vehicle_data);
+}
+
 void CacheManager::InitBackupThread() {
   LOG4CXX_AUTO_TRACE(logger_);
   backuper_ = new BackgroundBackuper(this);
@@ -3028,6 +3176,7 @@ void CacheManager::OnDeviceSwitching(const std::string& device_id_from,
 CacheManager::BackgroundBackuper::BackgroundBackuper(
     CacheManager* cache_manager)
     : cache_manager_(cache_manager)
+    , backup_is_in_progress_(false)
     , stop_flag_(false)
     , new_data_available_(false) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -3052,13 +3201,23 @@ void CacheManager::BackgroundBackuper::threadMain() {
   LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(need_backup_lock_);
   while (!stop_flag_) {
+    backup_is_in_progress_.exchange(true);
     {
       sync_primitives::AutoUnlock need_backup_lock(need_backup_lock_);
       InternalBackup();
     }
+
+    {
+      LOG4CXX_DEBUG(logger_, "Backup is done");
+      sync_primitives::AutoLock auto_lock(backup_done_lock_);
+      backup_is_in_progress_.exchange(false);
+      backup_done_.Broadcast();
+    }
+
     if (new_data_available_ || stop_flag_) {
       continue;
     }
+
     LOG4CXX_DEBUG(logger_, "Wait for a next backup");
     backup_notifier_.Wait(need_backup_lock_);
   }
@@ -3078,4 +3237,54 @@ void CacheManager::BackgroundBackuper::DoBackup() {
   backup_notifier_.NotifyOne();
 }
 
+void CacheManager::BackgroundBackuper::WaitForBackupIsDone() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(backup_done_lock_);
+  if (backup_is_in_progress_) {
+    backup_done_.Wait(auto_lock);
+  }
+}
+
+EncryptionRequired CacheManager::GetAppEncryptionRequiredFlag(
+    const std::string& application) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  return pt_->policy_table.app_policies_section.apps[application]
+      .encryption_required;
+}
+
+EncryptionRequired CacheManager::GetFunctionalGroupingEncryptionRequiredFlag(
+    const std::string& functional_group) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  const auto& functional_groupings = pt_->policy_table.functional_groupings;
+
+  const auto& grouping_itr = functional_groupings.find(functional_group);
+  if (grouping_itr == functional_groupings.end()) {
+    LOG4CXX_WARN(logger_, "Group " << functional_group << " not found");
+    return rpc::Optional<rpc::Boolean>(rpc::Boolean(false));
+  }
+
+  return (*grouping_itr).second.encryption_required;
+}
+
+void CacheManager::GetApplicationParams(
+    const std::string& application_name,
+    policy_table::ApplicationParams& application_params) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  const auto apps = pt_->policy_table.app_policies_section.apps;
+  const auto it = apps.find(application_name);
+  if (apps.end() == it) {
+    LOG4CXX_WARN(logger_,
+                 "Application " << application_name << " was not found");
+    return;
+  }
+
+  application_params = (*it).second;
+}
+
 }  // namespace policy
diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc
index e8855bb11a..b8bbb1682c 100644
--- a/src/components/policy/policy_external/src/policy_helper.cc
+++ b/src/components/policy/policy_external/src/policy_helper.cc
@@ -46,7 +46,8 @@ namespace {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "Policy")
 
-bool Compare(const StringsValueType& first, const StringsValueType& second) {
+bool CompareStrings(const StringsValueType& first,
+                    const StringsValueType& second) {
   const std::string& first_str = first;
   const std::string& second_str = second;
   return (strcasecmp(first_str.c_str(), second_str.c_str()) < 0);
@@ -113,7 +114,7 @@ bool operator!=(const policy_table::ApplicationParams& first,
   for (; it_first != it_first_end; ++it_first) {
     CompareGroupName gp(*it_first);
     StringsConstItr it = std::find_if(it_second, it_second_end, gp);
-    if (it_first_end == it) {
+    if (it_second_end == it) {
       return true;
     }
   }
@@ -137,10 +138,10 @@ bool policy::CheckAppPolicy::HasRevokedGroups(
       snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
 
   policy_table::Strings groups_new = app_policy.second.groups;
-  std::sort(groups_new.begin(), groups_new.end(), Compare);
+  std::sort(groups_new.begin(), groups_new.end(), CompareStrings);
 
   policy_table::Strings groups_curr = (*it).second.groups;
-  std::sort(groups_curr.begin(), groups_curr.end(), Compare);
+  std::sort(groups_curr.begin(), groups_curr.end(), CompareStrings);
 
   StringsConstItr it_groups_new = groups_new.begin();
   StringsConstItr it_groups_new_end = groups_new.end();
@@ -154,7 +155,7 @@ bool policy::CheckAppPolicy::HasRevokedGroups(
                       it_groups_new,
                       it_groups_new_end,
                       std::back_inserter(revoked_group_list),
-                      Compare);
+                      CompareStrings);
 
   // Remove groups which are not required user consent
   policy_table::Strings::iterator it_revoked = revoked_group_list.begin();
@@ -174,6 +175,76 @@ bool policy::CheckAppPolicy::HasRevokedGroups(
   return !revoked_group_list.empty();
 }
 
+bool policy::CheckAppPolicy::HasUpdatedGroups(
+    const policy::AppPoliciesValueType& app_policy,
+    policy_table::Strings* updated_groups) const {
+  AppPoliciesConstItr it =
+      snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
+
+  policy_table::Strings groups_new = app_policy.second.groups;
+  std::sort(groups_new.begin(), groups_new.end(), CompareStrings);
+
+  policy_table::Strings groups_curr = (*it).second.groups;
+  std::sort(groups_curr.begin(), groups_curr.end(), CompareStrings);
+
+  policy_table::Strings intersection_list;
+  std::set_intersection(groups_new.begin(),
+                        groups_new.end(),
+                        groups_curr.begin(),
+                        groups_curr.end(),
+                        std::back_inserter(intersection_list));
+
+  auto IsGroupContentUpdated =
+      [this](const StringsValueType& groupName) -> bool {
+    const auto& func_group_from_update =
+        update_->policy_table.functional_groupings.find(groupName);
+    const auto& func_group_from_snapshot =
+        snapshot_->policy_table.functional_groupings.find(groupName);
+
+    const auto& update_fg_rpcs = func_group_from_update->second.rpcs;
+    const auto& snapshot_fg_rpcs = func_group_from_snapshot->second.rpcs;
+
+    if (update_fg_rpcs.is_null() || snapshot_fg_rpcs.is_null()) {
+      return !(update_fg_rpcs.is_null() && snapshot_fg_rpcs.is_null());
+    }
+
+    if (update_fg_rpcs.size() != snapshot_fg_rpcs.size()) {
+      return true;
+    }
+
+    for (const auto& rpc : update_fg_rpcs) {
+      const auto& old_rpc = snapshot_fg_rpcs.find(rpc.first);
+      if (snapshot_fg_rpcs.end() == old_rpc) {
+        return true;
+      }
+
+      const bool hmi_levels_same =
+          old_rpc->second.hmi_levels == rpc.second.hmi_levels;
+      const bool parameters_same =
+          *(old_rpc->second.parameters) == *(rpc.second.parameters);
+
+      if (!hmi_levels_same || !parameters_same) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+  policy_table::Strings updated_group_list;
+  for (const auto& item : intersection_list) {
+    if (IsGroupContentUpdated(item)) {
+      updated_group_list.push_back(item);
+    }
+  }
+
+  if (updated_groups) {
+    *updated_groups = updated_group_list;
+  }
+
+  return !updated_group_list.empty();
+}
+
 bool policy::CheckAppPolicy::HasNewGroups(
     const policy::AppPoliciesValueType& app_policy,
     policy_table::Strings* new_groups) const {
@@ -181,10 +252,10 @@ bool policy::CheckAppPolicy::HasNewGroups(
       snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
 
   policy_table::Strings groups_new = app_policy.second.groups;
-  std::sort(groups_new.begin(), groups_new.end(), Compare);
+  std::sort(groups_new.begin(), groups_new.end(), CompareStrings);
 
   policy_table::Strings groups_curr = (*it).second.groups;
-  std::sort(groups_curr.begin(), groups_curr.end(), Compare);
+  std::sort(groups_curr.begin(), groups_curr.end(), CompareStrings);
 
   StringsConstItr it_groups_new = groups_new.begin();
   StringsConstItr it_groups_new_end = groups_new.end();
@@ -192,13 +263,55 @@ bool policy::CheckAppPolicy::HasNewGroups(
   StringsConstItr it_groups_curr = groups_curr.begin();
   StringsConstItr it_groups_curr_end = groups_curr.end();
 
+  auto CompareGroupContent =
+      [this](const StringsValueType& update_group_name,
+             const StringsValueType& snapshot_group_name) -> bool {
+    if (CompareStrings(update_group_name, snapshot_group_name)) {
+      return true;
+    }
+
+    const auto& func_group_from_update =
+        update_->policy_table.functional_groupings.find(update_group_name);
+    const auto& func_group_from_snapshot =
+        snapshot_->policy_table.functional_groupings.find(snapshot_group_name);
+
+    const auto& update_fg_rpcs = func_group_from_update->second.rpcs;
+    const auto& snapshot_fg_rpcs = func_group_from_snapshot->second.rpcs;
+
+    if (update_fg_rpcs.is_null() || snapshot_fg_rpcs.is_null()) {
+      return !(update_fg_rpcs.is_null() && snapshot_fg_rpcs.is_null());
+    }
+
+    if (update_fg_rpcs.size() != snapshot_fg_rpcs.size()) {
+      return true;
+    }
+
+    for (const auto& rpc : update_fg_rpcs) {
+      const auto& old_rpc = snapshot_fg_rpcs.find(rpc.first);
+      if (snapshot_fg_rpcs.end() == old_rpc) {
+        return true;
+      }
+
+      const bool hmi_levels_same =
+          old_rpc->second.hmi_levels == rpc.second.hmi_levels;
+      const bool parameters_same =
+          *(old_rpc->second.parameters) == *(rpc.second.parameters);
+
+      if (!hmi_levels_same || !parameters_same) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
   policy_table::Strings new_group_list;
   std::set_difference(it_groups_new,
                       it_groups_new_end,
                       it_groups_curr,
                       it_groups_curr_end,
                       std::back_inserter(new_group_list),
-                      Compare);
+                      CompareGroupContent);
 
   if (new_groups) {
     *new_groups = new_group_list;
@@ -210,14 +323,23 @@ bool policy::CheckAppPolicy::HasNewGroups(
 bool policy::CheckAppPolicy::HasConsentNeededGroups(
     const policy::AppPoliciesValueType& app_policy) const {
   policy_table::Strings new_groups;
-  if (!HasNewGroups(app_policy, &new_groups)) {
+  policy_table::Strings updated_groups;
+  if (!HasNewGroups(app_policy, &new_groups) &&
+      !HasUpdatedGroups(app_policy, &updated_groups)) {
     return false;
   }
 
-  StringsConstItr it_new = new_groups.begin();
-  StringsConstItr it_new_end = new_groups.end();
-  for (; it_new != it_new_end; ++it_new) {
-    if (IsConsentRequired(app_policy.first, *it_new)) {
+  policy_table::Strings groups_to_check_consent;
+  std::set_union(new_groups.begin(),
+                 new_groups.end(),
+                 updated_groups.begin(),
+                 updated_groups.end(),
+                 std::back_inserter(groups_to_check_consent));
+
+  StringsConstItr it = groups_to_check_consent.begin();
+  StringsConstItr it_end = groups_to_check_consent.end();
+  for (; it != it_end; ++it) {
+    if (IsConsentRequired(app_policy.first, *it)) {
       return true;
     }
   }
@@ -312,6 +434,13 @@ void CheckAppPolicy::InsertPermission(const std::string& app_id,
 
 bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
   const std::string app_id = app_policy.first;
+
+  const bool app_properties_changed = IsAppPropertiesChanged(app_policy);
+  const bool is_predefined_app = IsPredefinedApp(app_policy);
+  if (!is_predefined_app && app_properties_changed) {
+    AddResult(app_id, RESULT_APP_PROPERTIES_CHANGED);
+  }
+
   AppPermissions permissions_diff(app_id);
   if (!IsKnownAppication(app_id)) {
     LOG4CXX_WARN(logger_,
@@ -452,14 +581,20 @@ PermissionsCheckResult CheckAppPolicy::CheckPermissionsChanges(
 
   bool has_new_groups = HasNewGroups(app_policy);
 
+  const bool encryption_required_flag_changed =
+      IsEncryptionRequiredFlagChanged(app_policy);
+  bool has_updated_groups = HasUpdatedGroups(app_policy);
+
   if (has_revoked_groups && has_consent_needed_groups) {
     return RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED;
   } else if (has_revoked_groups) {
     return RESULT_PERMISSIONS_REVOKED;
   } else if (has_consent_needed_groups) {
     return RESULT_CONSENT_NEEDED;
-  } else if (has_new_groups) {
-    return RESULT_CONSENT_NOT_REQIURED;
+  } else if (has_new_groups || has_updated_groups) {
+    return RESULT_CONSENT_NOT_REQUIRED;
+  } else if (encryption_required_flag_changed) {
+    return RESULT_ENCRYPTION_REQUIRED_FLAG_CHANGED;
   }
 
   return RESULT_NO_CHANGES;
@@ -540,11 +675,166 @@ bool CheckAppPolicy::IsRequestSubTypeChanged(
   return diff.size();
 }
 
+bool CheckAppPolicy::IsAppPropertiesProvided(
+    const AppPoliciesValueType& app_policy) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (app_policy.second.hybrid_app_preference.is_initialized() ||
+      app_policy.second.endpoint.is_initialized() ||
+      app_policy.second.enabled.is_initialized() ||
+      app_policy.second.auth_token.is_initialized() ||
+      app_policy.second.cloud_transport_type.is_initialized() ||
+      app_policy.second.nicknames.is_initialized()) {
+    return true;
+  }
+  return false;
+}
+
+bool CheckAppPolicy::IsAppPropertiesChanged(
+    const AppPoliciesValueType& app_policy) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!IsAppPropertiesProvided(app_policy)) {
+    return false;
+  }
+
+  if (!IsKnownAppication(app_policy.first)) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "AppProperties provided for new application: " << app_policy.first);
+    return true;
+  }
+
+  policy::AppPoliciesConstItr it =
+      snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
+  const auto snapshot_properties = *it;
+
+  if (app_policy.second.enabled.is_initialized() &&
+      app_policy.second.enabled != snapshot_properties.second.enabled) {
+    LOG4CXX_DEBUG(logger_, "\"enabled\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.endpoint.is_initialized() &&
+      app_policy.second.endpoint != snapshot_properties.second.endpoint) {
+    LOG4CXX_DEBUG(logger_, "\"endpoint\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.hybrid_app_preference.is_initialized() &&
+      app_policy.second.hybrid_app_preference !=
+          snapshot_properties.second.hybrid_app_preference) {
+    LOG4CXX_DEBUG(logger_, "\"hybrid_app_preference\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.auth_token.is_initialized() &&
+      app_policy.second.auth_token != snapshot_properties.second.auth_token) {
+    LOG4CXX_DEBUG(logger_, "\"auth_token\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.cloud_transport_type.is_initialized() &&
+      app_policy.second.cloud_transport_type !=
+          snapshot_properties.second.cloud_transport_type) {
+    LOG4CXX_DEBUG(logger_, "\"cloud_transport_type\" was changed");
+    return true;
+  }
+
+  return false;
+}
+
+bool CheckAppPolicy::IsEncryptionRequiredFlagChanged(
+    const AppPoliciesValueType& app_policy) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto get_app_encryption_needed =
+      [](const std::string& policy_app_id,
+         policy_table::ApplicationPolicies& policies)
+      -> rpc::Optional<rpc::Boolean> {
+    auto it = policies.find(policy_app_id);
+    if (policies.end() == it) {
+      LOG4CXX_WARN(logger_, "App is not present in policies" << policy_app_id);
+      return rpc::Optional<rpc::Boolean>(false);
+    }
+    return it->second.encryption_required;
+  };
+
+  auto get_app_groups =
+      [](const std::string& policy_app_id,
+         policy_table::ApplicationPolicies& policies) -> policy_table::Strings {
+    policy_table::Strings result;
+    auto it = policies.find(policy_app_id);
+    if (policies.end() == it) {
+      LOG4CXX_WARN(logger_, "App is not present in policies" << policy_app_id);
+      return result;
+    }
+    auto& groups = it->second.groups;
+    std::copy(groups.begin(), groups.end(), std::back_inserter(result));
+    return result;
+  };
+
+  auto get_app_rpcs = [](const std::string group_name,
+                         const FunctionalGroupings& groups)
+      -> rpc::Optional<policy_table::Rpcs> {
+    auto it = groups.find(group_name);
+    if (it == groups.end()) {
+      return rpc::Optional<policy_table::Rpcs>();
+    }
+    return rpc::Optional<policy_table::Rpcs>(it->second);
+  };
+
+  const auto snapshot_groups = get_app_groups(
+      app_policy.first, snapshot_->policy_table.app_policies_section.apps);
+  const auto update_groups = get_app_groups(
+      app_policy.first, update_->policy_table.app_policies_section.apps);
+
+  auto get_resulting_encryption_required_flag_for_app_groups =
+      [this, &get_app_rpcs](
+          const rpc::policy_table_interface_base::Strings& app_groups,
+          const std::shared_ptr<rpc::policy_table_interface_base::Table> pt) {
+        for (const auto& group : app_groups) {
+          const auto rpcs =
+              get_app_rpcs(group, pt->policy_table.functional_groupings);
+          if (*rpcs->encryption_required) {
+            return true;
+          }
+        }
+
+        return false;
+      };
+
+  auto group_res_en_flag_changed =
+      [this, &get_resulting_encryption_required_flag_for_app_groups](
+          const rpc::policy_table_interface_base::Strings& snapshot_groups,
+          const rpc::policy_table_interface_base::Strings& update_groups) {
+        return get_resulting_encryption_required_flag_for_app_groups(
+                   snapshot_groups, snapshot_) !=
+               get_resulting_encryption_required_flag_for_app_groups(
+                   update_groups, update_);
+      };
+
+  const auto snapshot_app_encryption_needed = get_app_encryption_needed(
+      app_policy.first, snapshot_->policy_table.app_policies_section.apps);
+  const auto update_app_encryption_needed = get_app_encryption_needed(
+      app_policy.first, update_->policy_table.app_policies_section.apps);
+
+  const bool app_encryption_needed_changed =
+      (snapshot_app_encryption_needed.is_initialized() !=
+       update_app_encryption_needed.is_initialized()) ||
+      (*snapshot_app_encryption_needed != *update_app_encryption_needed);
+
+  if ((!update_app_encryption_needed.is_initialized() ||
+       *update_app_encryption_needed) &&
+      group_res_en_flag_changed(snapshot_groups, update_groups)) {
+    return true;
+  }
+
+  return app_encryption_needed_changed;
+}
+
 void FillActionsForAppPolicies::operator()(
     const policy::CheckAppPolicyResults::value_type& value) {
   const std::string app_id = value.first;
-  const policy_table::ApplicationPolicies::const_iterator app_policy =
-      app_policies_.find(app_id);
+  const auto app_policy = app_policies_.find(app_id);
 
   if (app_policies_.end() == app_policy) {
     return;
@@ -563,10 +853,14 @@ void FillActionsForAppPolicies::operator()(
     case RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED:
       actions_[app_id].is_consent_needed = true;
       break;
-    case RESULT_CONSENT_NOT_REQIURED:
+    case RESULT_APP_PROPERTIES_CHANGED:
+      actions_[app_id].app_properties_changed = true;
+      break;
+    case RESULT_CONSENT_NOT_REQUIRED:
     case RESULT_PERMISSIONS_REVOKED:
     case RESULT_REQUEST_TYPE_CHANGED:
     case RESULT_REQUEST_SUBTYPE_CHANGED:
+    case RESULT_ENCRYPTION_REQUIRED_FLAG_CHANGED:
       break;
     case RESULT_NO_CHANGES:
     default:
@@ -641,9 +935,11 @@ void FillNotificationData::UpdateParameters(
   // 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
+  // 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
+  // among 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
@@ -668,8 +964,7 @@ void FillNotificationData::UpdateParameters(
   }
 
   for (; it_parameters != it_parameters_end; ++it_parameters) {
-    out_parameter[current_key_].insert(
-        policy_table::EnumToJsonString(*it_parameters));
+    out_parameter[current_key_].insert(*it_parameters);
   }
 
   // We should reset ALL DISALLOWED flags if at least one parameter is allowed
@@ -734,7 +1029,8 @@ void FillNotificationData::ExcludeSame(RpcPermissions& rpc) {
     }
   }
 
-  // Removing disallowed parameters from allowed and undefined (by user consent)
+  // Removing disallowed parameters from allowed and undefined (by user
+  // consent)
   if (rpc.parameter_permissions.end() != it_parameter_user_disallowed) {
     if (rpc.parameter_permissions.end() != it_parameter_allowed) {
       ExcludeSameParameters(rpc.parameter_permissions[kAllowedKey],
@@ -841,10 +1137,31 @@ bool ProcessFunctionalGroup::operator()(const StringsValueType& group_name) {
                                 undefined_group_consent_,
                                 does_require_user_consent);
     std::for_each(rpcs.begin(), rpcs.end(), filler);
+    const auto encryption_required = (*it).second.encryption_required;
+    FillEncryptionFlagForRpcs(rpcs, encryption_required);
   }
   return true;
 }
 
+void ProcessFunctionalGroup::FillEncryptionFlagForRpcs(
+    const policy_table::Rpc& rpcs,
+    const EncryptionRequired encryption_required) {
+  auto update_encryption_required = [](EncryptionRequired& current,
+                                       const EncryptionRequired& incoming) {
+    if (!incoming.is_initialized()) {
+      return;
+    }
+    if (current.is_initialized() && *current) {
+      return;
+    }
+    current = incoming;
+  };
+  for (const auto& rpc : rpcs) {
+    auto& item = data_[rpc.first];
+    update_encryption_required(item.require_encryption, encryption_required);
+  }
+}
+
 GroupConsent ProcessFunctionalGroup::GetGroupState(
     const std::string& group_name) {
   std::vector<FunctionalGroupPermission>::const_iterator it =
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 42b67734ae..082d4a37ba 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -39,7 +39,6 @@
 #include <set>
 #include <vector>
 #include "config_profile/profile.h"
-#include "json/reader.h"
 #include "json/writer.h"
 #include "policy/cache_manager.h"
 #include "policy/policy_helper.h"
@@ -48,17 +47,13 @@
 #include "policy/update_status_manager.h"
 #include "utils/date_time.h"
 #include "utils/file_system.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/logger.h"
 
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
+#include "utils/timer_task_impl.h"
 
-policy::PolicyManager* CreateManager() {
-  return new policy::PolicyManagerImpl();
-}
-void DeleteManager(policy::PolicyManager* pm) {
-  delete pm;
-}
 namespace {
 
 /**
@@ -217,8 +212,11 @@ PolicyManagerImpl::PolicyManagerImpl()
           new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(60)
     , retry_sequence_index_(0)
+    , applications_pending_ptu_count_(0)
     , ignition_check(true)
-    , retry_sequence_url_(0, 0, "") {}
+    , retry_sequence_url_(0, 0, "")
+    , ptu_requested_(false)
+    , is_ptu_in_progress_(false) {}
 
 PolicyManagerImpl::PolicyManagerImpl(bool in_memory)
     : PolicyManager()
@@ -228,11 +226,13 @@ PolicyManagerImpl::PolicyManagerImpl(bool in_memory)
           new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(60)
     , retry_sequence_index_(0)
+    , applications_pending_ptu_count_(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)
+    , ptu_requested_(false)
+    , is_ptu_in_progress_(false) {}
 
 void PolicyManagerImpl::set_listener(PolicyListener* listener) {
   listener_ = listener;
@@ -242,9 +242,10 @@ void PolicyManagerImpl::set_listener(PolicyListener* listener) {
 std::shared_ptr<policy_table::Table> PolicyManagerImpl::Parse(
     const BinaryMessage& pt_content) {
   std::string json(pt_content.begin(), pt_content.end());
+  utils::JsonReader reader;
   Json::Value value;
-  Json::Reader reader;
-  if (reader.parse(json.c_str(), value)) {
+
+  if (reader.parse(json, &value)) {
     return std::make_shared<policy_table::Table>(&value);
   } else {
     return std::make_shared<policy_table::Table>();
@@ -267,10 +268,6 @@ void PolicyManagerImpl::CheckTriggers() {
   }
 }
 
-std::string PolicyManagerImpl::GetLockScreenIconUrl() const {
-  return cache_->GetLockScreenIconUrl();
-}
-
 std::string PolicyManagerImpl::GetIconUrl(
     const std::string& policy_app_id) const {
   return cache_->GetIconUrl(policy_app_id);
@@ -297,7 +294,9 @@ void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
  * schema
  * @param rpc_parameters parameters to filter
  */
-void FilterInvalidRPCParameters(policy_table::RpcParameters& rpc_parameters) {
+void FilterInvalidRPCParameters(
+    policy_table::RpcParameters& rpc_parameters,
+    const std::vector<policy_table::VehicleDataItem>& vehicle_data_items) {
   policy_table::HmiLevels valid_hmi_levels;
   for (const auto& hmi_level : rpc_parameters.hmi_levels) {
     if (hmi_level.is_valid()) {
@@ -306,10 +305,31 @@ void FilterInvalidRPCParameters(policy_table::RpcParameters& rpc_parameters) {
   }
   rpc_parameters.hmi_levels.swap(valid_hmi_levels);
 
+  auto ParamExists =
+      [&vehicle_data_items](const rpc::String<0, 255>& param_name) {
+        policy_table::Parameter parameter_enum;
+        if (policy_table::EnumFromJsonString(param_name, &parameter_enum)) {
+          return true;
+        }
+
+        // In case when this collection is empty that means collection is not
+        // initialized
+        if (vehicle_data_items.empty()) {
+          return false;
+        }
+
+        for (const auto& vdi : vehicle_data_items) {
+          if (param_name == vdi.name) {
+            return true;
+          }
+        }
+        return false;
+      };
+
   policy_table::Parameters valid_params;
   const policy_table::Parameters& params = *(rpc_parameters.parameters);
   for (const auto& param : params) {
-    if (param.is_valid()) {
+    if (param.is_valid() && ParamExists(param)) {
       valid_params.push_back(param);
     }
   }
@@ -399,7 +419,9 @@ void FilterInvalidApplicationParameters(
  * @brief FilterPolicyTable filter values that not present in schema
  * @param pt policy table to filter
  */
-void FilterPolicyTable(policy_table::PolicyTable& pt) {
+void FilterPolicyTable(
+    policy_table::PolicyTable& pt,
+    const std::vector<policy_table::VehicleDataItem>& current_vd_items) {
   policy_table::ModuleConfig& module_config = pt.module_config;
   if (module_config.is_initialized() &&
       module_config.notifications_per_minute_by_priority.is_initialized()) {
@@ -418,14 +440,24 @@ void FilterPolicyTable(policy_table::PolicyTable& pt) {
     policy_table::Rpc& rpcs = group.second.rpcs;
     FilterInvalidFunctions(rpcs);
 
+    policy_table::VehicleDataItems vehicle_data_items;
+
+    if (!pt.vehicle_data->struct_empty()) {
+      vehicle_data_items =
+          pt.vehicle_data.is_initialized() &&
+                  pt.vehicle_data->schema_items.is_initialized()
+              ? *pt.vehicle_data->schema_items
+              : current_vd_items;
+    }
+
     for (auto& func : rpcs) {
-      FilterInvalidRPCParameters(func.second);
+      FilterInvalidRPCParameters(func.second, vehicle_data_items);
     }
   }
 }
 
-bool PolicyManagerImpl::LoadPT(const std::string& file,
-                               const BinaryMessage& pt_content) {
+PolicyManager::PtProcessingResult PolicyManagerImpl::LoadPT(
+    const std::string& file, const BinaryMessage& pt_content) {
   LOG4CXX_INFO(logger_, "LoadPT of size " << pt_content.size());
   LOG4CXX_DEBUG(
       logger_,
@@ -435,98 +467,117 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
   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();
-    return false;
+    return PtProcessingResult::kWrongPtReceived;
   }
 
   file_system::DeleteFile(file);
-  FilterPolicyTable(pt_update->policy_table);
+  auto current_vd_items = GetVehicleDataItems();
+
+  FilterPolicyTable(pt_update->policy_table, current_vd_items);
   if (!IsPTValid(pt_update, policy_table::PT_UPDATE)) {
-    wrong_ptu_update_received_ = true;
-    update_status_manager_.OnWrongUpdateReceived();
-    return false;
+    LOG4CXX_WARN(logger_, "Received policy table update is not valid");
+    return PtProcessingResult::kWrongPtReceived;
   }
 
-  update_status_manager_.OnValidUpdateReceived();
   cache_->SaveUpdateRequired(false);
+  sync_primitives::AutoLock lock(apps_registration_lock_);
 
-  {
-    sync_primitives::AutoLock lock(apps_registration_lock_);
+  // Get current DB data, since it could be updated during awaiting of PTU
+  auto policy_table_snapshot = cache_->GenerateSnapshot();
+  if (!policy_table_snapshot) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Failed to create snapshot of policy table, trying another exchange");
+    return PtProcessingResult::kNewPtRequired;
+  }
 
-    // Get current DB data, since it could be updated during awaiting of PTU
-    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, trying another exchange");
-      ForcePTExchange();
-      return false;
-    }
+  // Checking of difference between PTU and current policy state
+  // Must to be done before PTU applying since it is possible, that functional
+  // groups, which had been present before are absent in PTU and will be
+  // removed after update. So in case of revoked groups system has to know
+  // names and ids of revoked groups before they will be removed.
+  CheckAppPolicyResults results =
+      CheckPermissionsChanges(pt_update, policy_table_snapshot);
 
-    // Checking of difference between PTU and current policy state
-    // Must to be done before PTU applying since it is possible, that functional
-    // groups, which had been present before are absent in PTU and will be
-    // removed after update. So in case of revoked groups system has to know
-    // names and ids of revoked groups before they will be removed.
-    CheckAppPolicyResults results =
-        CheckPermissionsChanges(pt_update, policy_table_snapshot);
-
-    // Replace current data with updated
-    if (!cache_->ApplyUpdate(*pt_update)) {
-      LOG4CXX_WARN(
-          logger_,
-          "Unsuccessful save of updated policy table, trying another exchange");
-      ForcePTExchange();
-      return false;
-    }
+  // Replace current data with updated
+  if (!cache_->ApplyUpdate(*pt_update)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Unsuccessful save of updated policy table, trying another exchange");
+    return PtProcessingResult::kNewPtRequired;
+  }
 
-    ExternalConsentStatus status = cache_->GetExternalConsentStatus();
-    GroupsByExternalConsentStatus groups_by_status =
-        cache_->GetGroupsWithSameEntities(status);
+  ExternalConsentStatus status = cache_->GetExternalConsentStatus();
+  GroupsByExternalConsentStatus groups_by_status =
+      cache_->GetGroupsWithSameEntities(status);
 
-    ProcessExternalConsentStatusUpdate(
-        groups_by_status, ConsentProcessingPolicy::kExternalConsentBased);
+  ProcessExternalConsentStatusUpdate(
+      groups_by_status, ConsentProcessingPolicy::kExternalConsentBased);
 
-    ProcessAppPolicyCheckResults(
-        results, pt_update->policy_table.app_policies_section.apps);
+  ProcessAppPolicyCheckResults(
+      results, pt_update->policy_table.app_policies_section.apps);
 
-    CheckPermissionsChangesAfterUpdate(*pt_update, *policy_table_snapshot);
+  CheckPermissionsChangesAfterUpdate(*pt_update, *policy_table_snapshot);
 
-    listener_->OnCertificateUpdated(
-        *(pt_update->policy_table.module_config.certificate));
+  listener_->OnCertificateUpdated(
+      *(pt_update->policy_table.module_config.certificate));
 
-    std::map<std::string, StringArray> app_hmi_types;
-    cache_->GetHMIAppTypeAfterUpdate(app_hmi_types);
-    if (!app_hmi_types.empty()) {
-      LOG4CXX_INFO(logger_, "app_hmi_types is full calling OnUpdateHMIAppType");
-      listener_->OnUpdateHMIAppType(app_hmi_types);
-    } else {
-      LOG4CXX_INFO(logger_, "app_hmi_types empty");
-    }
+  std::map<std::string, StringArray> app_hmi_types;
+  cache_->GetHMIAppTypeAfterUpdate(app_hmi_types);
+  if (!app_hmi_types.empty()) {
+    LOG4CXX_INFO(logger_, "app_hmi_types is full calling OnUpdateHMIAppType");
+    listener_->OnUpdateHMIAppType(app_hmi_types);
+  } else {
+    LOG4CXX_INFO(logger_, "app_hmi_types empty");
+  }
 
-    std::vector<std::string> enabled_apps;
-    cache_->GetEnabledCloudApps(enabled_apps);
-    for (auto it = enabled_apps.begin(); it != enabled_apps.end(); ++it) {
-      SendAuthTokenUpdated(*it);
-    }
+  std::vector<std::string> enabled_apps;
+  cache_->GetEnabledCloudApps(enabled_apps);
+  for (auto it = enabled_apps.begin(); it != enabled_apps.end(); ++it) {
+    SendAuthTokenUpdated(*it);
   }
 
+  return PtProcessingResult::kSuccess;
+}
+
+void PolicyManagerImpl::OnPTUFinished(const PtProcessingResult ptu_result) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  ptu_requested_ = false;
+  if (PtProcessingResult::kWrongPtReceived == ptu_result) {
+    LOG4CXX_DEBUG(logger_, "Wrong PT was received");
+    update_status_manager_.OnWrongUpdateReceived();
+    return;
+  }
+
+  update_status_manager_.OnValidUpdateReceived();
+
+  if (HasApplicationForPTU()) {
+    update_status_manager_.OnExistedApplicationAdded(true);
+  } else if (PtProcessingResult::kNewPtRequired == ptu_result) {
+    LOG4CXX_DEBUG(logger_, "New PTU interation is required");
+    ForcePTExchange();
+    return;
+  }
+
+  ResumePendingAppPolicyActions();
+
   // If there was a user request for policy table update, it should be started
   // right after current update is finished
   if (update_status_manager_.IsUpdateRequired()) {
+    LOG4CXX_DEBUG(logger_,
+                  "PTU was successful and new PTU iteration was scheduled");
     StartPTExchange();
-    return true;
+    return;
   }
 
   RefreshRetrySequence();
-  return true;
 }
 
 CheckAppPolicyResults PolicyManagerImpl::CheckPermissionsChanges(
     const std::shared_ptr<policy_table::Table> pt_update,
     const std::shared_ptr<policy_table::Table> snapshot) {
-  LOG4CXX_INFO(logger_, "Checking incoming permissions.");
+  LOG4CXX_AUTO_TRACE(logger_);
 
   // Replace predefined policies with its actual setting, e.g. "123":"default"
   // to actual values of default section
@@ -565,33 +616,43 @@ void PolicyManagerImpl::ProcessAppPolicyCheckResults(
 void PolicyManagerImpl::ProcessActionsForAppPolicies(
     const ApplicationsPoliciesActions& actions,
     const policy_table::ApplicationPolicies& app_policies) {
-  ApplicationsPoliciesActions::const_iterator it_actions = actions.begin();
-  for (; it_actions != actions.end(); ++it_actions) {
-    policy_table::ApplicationPolicies::const_iterator app_policy =
-        app_policies.find(it_actions->first);
+  notify_system_list_.clear();
+  send_permissions_list_.clear();
+
+  for (const auto& action : actions) {
+    const auto& app_policy = app_policies.find(action.first);
     if (app_policies.end() == app_policy) {
       continue;
     }
 
-    if (it_actions->second.is_consent_needed) {
-      // Post-check after ExternalConsent consent changes
-      const std::string& policy_app_id = app_policy->first;
-      if (!IsConsentNeeded(policy_app_id)) {
-        sync_primitives::AutoLock lock(app_permissions_diff_lock_);
+    if (action.second.app_properties_changed) {
+      app_properties_changed_list_.push_back(app_policy->first);
+    }
+
+    const auto devices_ids = listener()->GetDevicesIds(app_policy->first);
+    for (const auto& device_id : devices_ids) {
+      if (action.second.is_consent_needed) {
+        // Post-check after ExternalConsent consent changes
+        const auto& policy_app_id = app_policy->first;
+        if (!IsConsentNeeded(device_id, policy_app_id)) {
+          sync_primitives::AutoLock lock(app_permissions_diff_lock_);
 
-        PendingPermissions::iterator app_id_diff =
-            app_permissions_diff_.find(policy_app_id);
+          const auto& app_id_diff = app_permissions_diff_.find(policy_app_id);
 
-        if (app_permissions_diff_.end() != app_id_diff) {
-          app_id_diff->second.appPermissionsConsentNeeded = false;
+          if (app_permissions_diff_.end() != app_id_diff) {
+            app_id_diff->second.appPermissionsConsentNeeded = false;
+          }
         }
       }
-    }
-    if (it_actions->second.is_notify_system) {
-      NotifySystem(*app_policy);
-    }
-    if (it_actions->second.is_send_permissions_to_app) {
-      SendPermissionsToApp(*app_policy);
+
+      if (action.second.is_notify_system) {
+        notify_system_list_.push_back(std::make_pair(device_id, *app_policy));
+      }
+
+      if (action.second.is_send_permissions_to_app) {
+        send_permissions_list_.push_back(
+            std::make_pair(device_id, *app_policy));
+      }
     }
   }
 }
@@ -628,12 +689,12 @@ std::string PolicyManagerImpl::GetUpdateUrl(int service_type) {
 }
 
 void PolicyManagerImpl::GetUpdateUrls(const std::string& service_type,
-                                      EndpointUrls& out_end_points) {
+                                      EndpointUrls& out_end_points) const {
   LOG4CXX_AUTO_TRACE(logger_);
   cache_->GetUpdateUrls(service_type, out_end_points);
 }
 void PolicyManagerImpl::GetUpdateUrls(const uint32_t service_type,
-                                      EndpointUrls& out_end_points) {
+                                      EndpointUrls& out_end_points) const {
   LOG4CXX_AUTO_TRACE(logger_);
   cache_->GetUpdateUrls(service_type, out_end_points);
 }
@@ -649,13 +710,14 @@ void PolicyManagerImpl::RequestPTUpdate() {
 
   if (IsPTValid(policy_table_snapshot, policy_table::PT_SNAPSHOT)) {
     Json::Value value = policy_table_snapshot->ToJsonValue();
-    Json::FastWriter writer;
-    std::string message_string = writer.write(value);
+    Json::StreamWriterBuilder writer_builder;
+    writer_builder["indentation"] = "";
+    std::string message_string = Json::writeString(writer_builder, value);
 
     LOG4CXX_DEBUG(logger_, "Snapshot contents is : " << message_string);
 
     BinaryMessage update(message_string.begin(), message_string.end());
-
+    ptu_requested_ = true;
     listener_->OnSnapshotCreated(
         update, RetrySequenceDelaysSeconds(), TimeoutExchangeMSec());
   } else {
@@ -689,9 +751,10 @@ void PolicyManagerImpl::StartPTExchange() {
     return;
   }
   LOG4CXX_INFO(logger_, "Policy want to  call RequestPTUpdate");
-  if (listener_ && listener_->CanUpdate()) {
+  if (listener_) {
     LOG4CXX_INFO(logger_, "Listener CanUpdate");
     if (update_status_manager_.IsUpdateRequired()) {
+      update_status_manager_.PendingUpdate();
       LOG4CXX_INFO(logger_, "IsUpdateRequired");
       RequestPTUpdate();
     }
@@ -714,11 +777,16 @@ void PolicyManagerImpl::OnAppsSearchCompleted(const bool trigger_ptu) {
   }
 }
 
+void PolicyManagerImpl::UpdatePTUReadyAppsCount(const uint32_t new_app_count) {
+  applications_pending_ptu_count_ = new_app_count;
+}
+
 const std::vector<std::string> PolicyManagerImpl::GetAppRequestTypes(
+    const transport_manager::DeviceHandle& device_handle,
     const std::string policy_app_id) const {
   std::vector<std::string> request_types;
-  if (kDeviceDisallowed ==
-      cache_->GetDeviceConsent(GetCurrentDeviceId(policy_app_id))) {
+  if (kDeviceAllowed != cache_->GetDeviceConsent(
+                            GetCurrentDeviceId(device_handle, policy_app_id))) {
     cache_->GetAppRequestTypes(kPreDataConsentId, request_types);
   } else {
     cache_->GetAppRequestTypes(policy_app_id, request_types);
@@ -745,8 +813,18 @@ const std::vector<std::string> PolicyManagerImpl::GetAppRequestSubTypes(
   return request_subtypes;
 }
 
-const VehicleInfo PolicyManagerImpl::GetVehicleInfo() const {
-  return cache_->GetVehicleInfo();
+const std::vector<policy_table::VehicleDataItem>
+PolicyManagerImpl::GetVehicleDataItems() const {
+  return cache_->GetVehicleDataItems();
+}
+
+std::vector<policy_table::VehicleDataItem>
+PolicyManagerImpl::GetRemovedVehicleDataItems() const {
+  return cache_->GetRemovedVehicleDataItems();
+}
+
+Json::Value PolicyManagerImpl::GetPolicyTableData() const {
+  return cache_->GetPolicyTableData();
 }
 
 void PolicyManagerImpl::GetEnabledCloudApps(
@@ -754,21 +832,13 @@ void PolicyManagerImpl::GetEnabledCloudApps(
   cache_->GetEnabledCloudApps(enabled_apps);
 }
 
-bool PolicyManagerImpl::GetCloudAppParameters(
-    const std::string& policy_app_id,
-    bool& enabled,
-    std::string& endpoint,
-    std::string& certificate,
-    std::string& auth_token,
-    std::string& cloud_transport_type,
-    std::string& hybrid_app_preference) const {
-  return cache_->GetCloudAppParameters(policy_app_id,
-                                       enabled,
-                                       endpoint,
-                                       certificate,
-                                       auth_token,
-                                       cloud_transport_type,
-                                       hybrid_app_preference);
+std::vector<std::string> PolicyManagerImpl::GetEnabledLocalApps() const {
+  return cache_->GetEnabledLocalApps();
+}
+
+bool PolicyManagerImpl::GetAppProperties(
+    const std::string& policy_app_id, AppProperties& out_app_properties) const {
+  return cache_->GetAppProperties(policy_app_id, out_app_properties);
 }
 
 void PolicyManagerImpl::InitCloudApp(const std::string& policy_app_id) {
@@ -818,7 +888,8 @@ bool PolicyManagerImpl::UnknownRPCPassthroughAllowed(
   return cache_->UnknownRPCPassthroughAllowed(policy_app_id);
 }
 
-void PolicyManagerImpl::CheckPermissions(const PTString& app_id,
+void PolicyManagerImpl::CheckPermissions(const PTString& device_id,
+                                         const PTString& app_id,
                                          const PTString& hmi_level,
                                          const PTString& rpc,
                                          const RPCParams& rpc_params,
@@ -827,8 +898,6 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id,
                "CheckPermissions for " << app_id << " and rpc " << rpc
                                        << " for " << hmi_level << " level.");
 
-  const std::string device_id = GetCurrentDeviceId(app_id);
-
   Permissions rpc_permissions;
 
   // Check, if there are calculated permission present in cache
@@ -979,7 +1048,12 @@ void PolicyManagerImpl::CheckPermissions(const PTString& app_id,
     result.hmi_level_permitted = kRpcUserDisallowed;
   } else if (!result.IsAnyAllowed(rpc_params)) {
     LOG4CXX_DEBUG(logger_, "There are no parameters allowed.");
-    result.hmi_level_permitted = kRpcDisallowed;
+
+    if (!result.list_of_undefined_params.empty()) {
+      result.hmi_level_permitted = kRpcAllowed;
+    } else {
+      result.hmi_level_permitted = kRpcDisallowed;
+    }
   }
 }
 
@@ -998,9 +1072,8 @@ policy_table::Strings PolicyManagerImpl::GetGroupsNames(
 }
 
 void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
-    const std::string& application_id) {
+    const std::string& device_id, const std::string& application_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(application_id);
   if (device_id.empty()) {
     LOG4CXX_WARN(logger_,
                  "Couldn't find device info for application id "
@@ -1028,15 +1101,16 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
 
   const ApplicationOnDevice who = {device_id, application_id};
   if (access_remote_->IsAppRemoteControl(who)) {
-    listener()->OnPermissionsUpdated(application_id, notification_data);
+    listener()->OnPermissionsUpdated(
+        device_id, application_id, notification_data);
     return;
   }
 
   std::string default_hmi;
-  GetDefaultHmi(application_id, &default_hmi);
+  GetDefaultHmi(device_id, application_id, &default_hmi);
 
   listener()->OnPermissionsUpdated(
-      application_id, notification_data, default_hmi);
+      device_id, application_id, notification_data, default_hmi);
 }
 
 bool PolicyManagerImpl::CleanupUnpairedDevices() {
@@ -1062,21 +1136,25 @@ void PolicyManagerImpl::SetUserConsentForDevice(const std::string& device_id,
                  "Event listener is not initialized. "
                  "Can't call OnDeviceConsentChanged");
   }
-  if (is_allowed) {
+  if (is_allowed && listener_->CanUpdate()) {
     update_status_manager_.OnDeviceConsented();
   }
   StartPTExchange();
 }
 
 bool PolicyManagerImpl::ReactOnUserDevConsentForApp(
-    const std::string& app_id, const bool is_device_allowed) {
-  std::vector<std::string> current_request_types = GetAppRequestTypes(app_id);
+    const transport_manager::DeviceHandle& device_handle,
+    const std::string& app_id,
+    const bool is_device_allowed) {
+  std::vector<std::string> current_request_types =
+      GetAppRequestTypes(device_handle, app_id);
   std::string current_priority, new_priority;
   GetPriority(app_id, &current_priority);
 
   bool result = cache_->ReactOnUserDevConsentForApp(app_id, is_device_allowed);
 
-  std::vector<std::string> new_request_types = GetAppRequestTypes(app_id);
+  std::vector<std::string> new_request_types =
+      GetAppRequestTypes(device_handle, app_id);
   GetPriority(app_id, &new_priority);
   std::sort(current_request_types.begin(), current_request_types.end());
   std::sort(new_request_types.begin(), new_request_types.end());
@@ -1101,7 +1179,8 @@ bool PolicyManagerImpl::ReactOnUserDevConsentForApp(
   }
 
   if (permissions.requestTypeChanged || (!permissions.priority.empty())) {
-    listener_->SendOnAppPermissionsChanged(permissions, app_id);
+    const auto& device_id = GetCurrentDeviceId(device_handle, app_id);
+    listener_->SendOnAppPermissionsChanged(permissions, device_id, app_id);
   }
   return result;
 }
@@ -1126,6 +1205,12 @@ void PolicyManagerImpl::AddDevice(const std::string& device_id,
   }
 }
 
+void PolicyManagerImpl::OnLocalAppAdded() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  update_status_manager_.ScheduleUpdate();
+  StartPTExchange();
+}
+
 void PolicyManagerImpl::SetDeviceInfo(const std::string& device_id,
                                       const DeviceInfo& device_info) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1219,6 +1304,7 @@ void PolicyManagerImpl::CheckPendingPermissionsChanges(
 }
 
 void PolicyManagerImpl::NotifyPermissionsChanges(
+    const std::string& device_id,
     const std::string& policy_app_id,
     const std::vector<FunctionalGroupPermission>& app_group_permissions) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1234,7 +1320,7 @@ void PolicyManagerImpl::NotifyPermissionsChanges(
   PrepareNotificationData(
       functional_groups, app_groups, app_group_permissions, notification_data);
 
-  listener()->OnPermissionsUpdated(policy_app_id, notification_data);
+  listener()->OnPermissionsUpdated(device_id, policy_app_id, notification_data);
 }
 
 void PolicyManagerImpl::SetUserConsentForApp(
@@ -1273,14 +1359,64 @@ void PolicyManagerImpl::SetUserConsentForApp(
   CheckPendingPermissionsChanges(verified_permissions.policy_app_id,
                                  updated_app_group_permissons);
 
-  NotifyPermissionsChanges(verified_permissions.policy_app_id,
+  NotifyPermissionsChanges(verified_permissions.device_id,
+                           verified_permissions.policy_app_id,
                            updated_app_group_permissons);
 }
 
-bool PolicyManagerImpl::GetDefaultHmi(const std::string& policy_app_id,
+bool PolicyManagerImpl::IsAllowedRetryCountExceeded() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
+
+  return retry_sequence_index_ > retry_sequence_seconds_.size();
+}
+
+void PolicyManagerImpl::IncrementRetryIndex() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
+
+  if (!is_ptu_in_progress_) {
+    LOG4CXX_TRACE(logger_,
+                  "First PTU iteration, skipping incrementing retry index");
+    is_ptu_in_progress_ = true;
+    return;
+  }
+
+  ++retry_sequence_index_;
+  LOG4CXX_DEBUG(logger_,
+                "current retry_sequence_index_ is: " << retry_sequence_index_);
+}
+
+void PolicyManagerImpl::RetrySequenceFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  listener_->OnPTUFinished(false);
+  ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate);
+
+  ptu_requested_ = false;
+  if (HasApplicationForPTU()) {
+    update_status_manager_.OnExistedApplicationAdded(true);
+    StartPTExchange();
+  }
+}
+
+void PolicyManagerImpl::ResetTimeout() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (update_status_manager_.IsUpdatePending()) {
+    uint32_t update_timeout = TimeoutExchangeMSec();
+    update_status_manager_.ResetTimeout(update_timeout);
+  }
+}
+
+void PolicyManagerImpl::OnSystemRequestReceived() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  IncrementRetryIndex();
+}
+
+bool PolicyManagerImpl::GetDefaultHmi(const std::string& device_id,
+                                      const std::string& policy_app_id,
                                       std::string* default_hmi) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(policy_app_id);
   DeviceConsent device_consent = GetUserConsentForDevice(device_id);
   const std::string app_id = policy::kDeviceAllowed != device_consent
                                  ? kPreDataConsentId
@@ -1385,11 +1521,13 @@ void PolicyManagerImpl::GetPermissionsForApp(
   }
 
   bool allowed_by_default = false;
-  if (cache_->IsDefaultPolicy(policy_app_id)) {
+  const auto device_consent = GetUserConsentForDevice(device_id);
+  if ((policy::kDeviceAllowed == device_consent) &&
+      cache_->IsDefaultPolicy(policy_app_id)) {
     app_id_to_check = kDefaultId;
     allowed_by_default = true;
   } else if (cache_->IsPredataPolicy(policy_app_id) ||
-             policy::kDeviceDisallowed == GetUserConsentForDevice(device_id)) {
+             policy::kDeviceAllowed != device_consent) {
     app_id_to_check = kPreDataConsentId;
     allowed_by_default = true;
   }
@@ -1473,9 +1611,11 @@ void PolicyManagerImpl::GetPermissionsForApp(
 }
 
 std::string& PolicyManagerImpl::GetCurrentDeviceId(
+    const transport_manager::DeviceHandle& device_handle,
     const std::string& policy_app_id) const {
   LOG4CXX_INFO(logger_, "GetDeviceInfo");
-  last_device_id_ = listener()->OnCurrentDeviceIdUpdateRequired(policy_app_id);
+  last_device_id_ =
+      listener()->OnCurrentDeviceIdUpdateRequired(device_handle, policy_app_id);
   return last_device_id_;
 }
 
@@ -1490,13 +1630,6 @@ void PolicyManagerImpl::SetSystemInfo(const std::string& ccpu_version,
   cache_->SetMetaInfo(ccpu_version, wers_country_code, language);
 }
 
-void PolicyManagerImpl::OnSystemReady() {
-  // Update policy table for the first time with system information
-  if (!cache_->IsMetaInfoPresent()) {
-    listener()->OnSystemInfoUpdateRequired();
-  }
-}
-
 uint32_t PolicyManagerImpl::GetNotificationsNumber(
     const std::string& priority) const {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1521,6 +1654,10 @@ bool PolicyManagerImpl::IsPTValid(
   return true;
 }
 
+bool PolicyManagerImpl::HasApplicationForPTU() const {
+  return applications_pending_ptu_count_ > 0;
+}
+
 const PolicySettings& PolicyManagerImpl::get_settings() const {
   DCHECK(settings_);
   return *settings_;
@@ -1578,16 +1715,42 @@ void PolicyManagerImpl::UpdateAppConsentWithExternalConsent(
   cache_->SetExternalConsentForApp(updated_external_consent_permissions);
 }
 
+void PolicyManagerImpl::SendOnAppPropertiesChangeNotification(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  listener_->SendOnAppPropertiesChangeNotification(policy_app_id);
+}
+
+void PolicyManagerImpl::ResumePendingAppPolicyActions() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  for (auto& notify_system_params : notify_system_list_) {
+    NotifySystem(notify_system_params.first, notify_system_params.second);
+  }
+  notify_system_list_.clear();
+
+  for (auto& send_permissions_params : send_permissions_list_) {
+    SendPermissionsToApp(send_permissions_params.first,
+                         send_permissions_params.second);
+  }
+
+  for (auto& app : app_properties_changed_list_) {
+    SendOnAppPropertiesChangeNotification(app);
+  }
+  send_permissions_list_.clear();
+}
+
 void PolicyManagerImpl::NotifySystem(
+    const std::string& device_id,
     const PolicyManagerImpl::AppPoliciesValueType& app_policy) const {
-  listener()->OnPendingPermissionChange(app_policy.first);
+  listener()->OnPendingPermissionChange(device_id, app_policy.first);
 }
 
 void PolicyManagerImpl::SendPermissionsToApp(
+    const std::string& device_id,
     const PolicyManagerImpl::AppPoliciesValueType& app_policy) {
   const std::string app_id = app_policy.first;
 
-  const std::string device_id = GetCurrentDeviceId(app_id);
   if (device_id.empty()) {
     LOG4CXX_WARN(logger_,
                  "Couldn't find device info for application id: " << app_id);
@@ -1610,6 +1773,7 @@ void PolicyManagerImpl::SendPermissionsToApp(
 
   LOG4CXX_INFO(logger_, "Send notification for application_id: " << app_id);
   listener()->OnPermissionsUpdated(
+      device_id,
       app_id,
       notification_data,
       policy_table::EnumToJsonString(app_policy.second.default_hmi));
@@ -1774,6 +1938,14 @@ std::string PolicyManagerImpl::ForcePTExchange() {
   return update_status_manager_.StringifiedUpdateStatus();
 }
 
+void policy::PolicyManagerImpl::StopRetrySequence() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (cache_->UpdateRequired()) {
+    ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate);
+  }
+}
+
 std::string PolicyManagerImpl::ForcePTExchangeAtUserRequest() {
   LOG4CXX_AUTO_TRACE(logger_);
   update_status_manager_.ScheduleManualUpdate();
@@ -1789,10 +1961,11 @@ int PolicyManagerImpl::NextRetryTimeout() {
   sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
   LOG4CXX_DEBUG(logger_, "Index: " << retry_sequence_index_);
   int next = 0;
+
   if (!retry_sequence_seconds_.empty() &&
       retry_sequence_index_ < retry_sequence_seconds_.size()) {
-    next = retry_sequence_seconds_[retry_sequence_index_];
-    ++retry_sequence_index_;
+    next = retry_sequence_seconds_[retry_sequence_index_] *
+           date_time::MILLISECONDS_IN_SECOND;
   }
   return next;
 }
@@ -1804,10 +1977,15 @@ void PolicyManagerImpl::RefreshRetrySequence() {
   cache_->SecondsBetweenRetries(retry_sequence_seconds_);
 }
 
-void PolicyManagerImpl::ResetRetrySequence() {
+void PolicyManagerImpl::ResetRetrySequence(
+    const ResetRetryCountType reset_type) {
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
   retry_sequence_index_ = 0;
-  update_status_manager_.OnResetRetrySequence();
+  is_ptu_in_progress_ = false;
+  if (ResetRetryCountType::kResetWithStatusUpdate == reset_type) {
+    update_status_manager_.OnResetRetrySequence();
+  }
 }
 
 uint32_t PolicyManagerImpl::TimeoutExchangeMSec() {
@@ -1820,6 +1998,8 @@ const std::vector<int> PolicyManagerImpl::RetrySequenceDelaysSeconds() {
 }
 
 void PolicyManagerImpl::OnExceededTimeout() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
   update_status_manager_.OnUpdateTimeoutOccurs();
 }
 
@@ -1827,7 +2007,8 @@ void PolicyManagerImpl::OnUpdateStarted() {
   uint32_t update_timeout = TimeoutExchangeMSec();
   LOG4CXX_DEBUG(logger_,
                 "Update timeout will be set to (milisec): " << update_timeout);
-  send_on_update_sent_out_ = !update_status_manager_.IsUpdatePending();
+  send_on_update_sent_out_ =
+      policy::kUpdating != update_status_manager_.StringifiedUpdateStatus();
 
   if (send_on_update_sent_out_) {
     update_status_manager_.OnUpdateSentOut(update_timeout);
@@ -1870,10 +2051,10 @@ bool PolicyManagerImpl::IsApplicationRevoked(const std::string& app_id) const {
   return cache_->IsApplicationRevoked(app_id);
 }
 
-bool PolicyManagerImpl::IsConsentNeeded(const std::string& app_id) {
+bool PolicyManagerImpl::IsConsentNeeded(const std::string& device_id,
+                                        const std::string& app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(app_id);
-  int count = cache_->CountUnconsentedGroups(app_id, device_id);
+  const int count = cache_->CountUnconsentedGroups(app_id, device_id);
   LOG4CXX_DEBUG(logger_, "There are: " << count << " unconsented groups.");
   return count != 0;
 }
@@ -1883,7 +2064,7 @@ void PolicyManagerImpl::SetVINValue(const std::string& value) {
 }
 
 AppPermissions PolicyManagerImpl::GetAppPermissionsChanges(
-    const std::string& policy_app_id) {
+    const std::string& device_id, const std::string& policy_app_id) {
   PendingPermissions::iterator app_id_diff =
       app_permissions_diff_.find(policy_app_id);
 
@@ -1892,8 +2073,10 @@ AppPermissions PolicyManagerImpl::GetAppPermissionsChanges(
   if (app_permissions_diff_.end() != app_id_diff) {
     permissions = app_id_diff->second;
   } else {
-    permissions.appPermissionsConsentNeeded = IsConsentNeeded(policy_app_id);
+    permissions.appPermissionsConsentNeeded =
+        IsConsentNeeded(device_id, policy_app_id);
     permissions.appRevoked = IsApplicationRevoked(policy_app_id);
+    permissions.isSDLAllowed = false;
     GetPriority(permissions.application_id, &permissions.priority);
   }
   return permissions;
@@ -1921,9 +2104,11 @@ void PolicyManagerImpl::MarkUnpairedDevice(const std::string& device_id) {
 }
 
 void PolicyManagerImpl::OnAppRegisteredOnMobile(
-    const std::string& application_id) {
-  StartPTExchange();
-  SendNotificationOnPermissionsUpdated(application_id);
+    const std::string& device_id, const std::string& application_id) {
+  if (!is_ptu_in_progress_) {
+    StartPTExchange();
+  }
+  SendNotificationOnPermissionsUpdated(device_id, application_id);
 }
 
 void PolicyManagerImpl::OnDeviceSwitching(const std::string& device_id_from,
@@ -2012,21 +2197,26 @@ class CallStatusChange : public utils::Callable {
 };
 
 StatusNotifier PolicyManagerImpl::AddApplication(
+    const std::string& device_id,
     const std::string& application_id,
     const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(application_id);
-  DeviceConsent device_consent = GetUserConsentForDevice(device_id);
+  auto device_consent = GetUserConsentForDevice(device_id);
+  LOG4CXX_DEBUG(logger_,
+                "check_device_id: " << device_id << " check_device_consent: "
+                                    << device_consent);
   sync_primitives::AutoLock lock(apps_registration_lock_);
   if (IsNewApplication(application_id)) {
     LOG4CXX_DEBUG(logger_, "Adding new application");
-    AddNewApplication(application_id, device_consent);
+    AddNewApplication(device_id, application_id, device_consent);
     return std::make_shared<CallStatusChange>(update_status_manager_,
                                               device_consent);
   }
   LOG4CXX_DEBUG(logger_, "Promote existed application");
-  PromoteExistedApplication(application_id, device_consent);
-  update_status_manager_.OnExistedApplicationAdded(cache_->UpdateRequired());
+  PromoteExistedApplication(device_id, application_id, device_consent);
+  if (!ptu_requested_) {
+    update_status_manager_.OnExistedApplicationAdded(cache_->UpdateRequired());
+  }
   return std::make_shared<utils::CallNothing>();
 }
 
@@ -2042,6 +2232,7 @@ bool PolicyManagerImpl::IsPredataPolicy(
 }
 
 void PolicyManagerImpl::ProcessExternalConsentStatusForApp(
+    const std::string& device_id,
     const std::string& application_id,
     const ConsentProcessingPolicy processing_policy) {
   ExternalConsentStatus status = cache_->GetExternalConsentStatus();
@@ -2053,7 +2244,7 @@ void PolicyManagerImpl::ProcessExternalConsentStatusForApp(
   CalculateGroupsConsentFromExternalConsent(
       groups_by_status, allowed_groups, disallowed_groups);
 
-  const std::string device_id = GetCurrentDeviceId(application_id);
+  LOG4CXX_DEBUG(logger_, "check device_id: " << device_id);
   UpdateAppConsentWithExternalConsent(device_id,
                                       application_id,
                                       allowed_groups,
@@ -2061,7 +2252,8 @@ void PolicyManagerImpl::ProcessExternalConsentStatusForApp(
                                       processing_policy);
 }
 
-void PolicyManagerImpl::AddNewApplication(const std::string& application_id,
+void PolicyManagerImpl::AddNewApplication(const std::string& device_id,
+                                          const std::string& application_id,
                                           DeviceConsent device_consent) {
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -2081,19 +2273,31 @@ void PolicyManagerImpl::AddNewApplication(const std::string& application_id,
   }
 
   ProcessExternalConsentStatusForApp(
-      application_id, ConsentProcessingPolicy::kExternalConsentBased);
+      device_id,
+      application_id,
+      ConsentProcessingPolicy::kExternalConsentBased);
 }
 
 void PolicyManagerImpl::PromoteExistedApplication(
-    const std::string& application_id, DeviceConsent device_consent) {
+    const std::string& device_id,
+    const std::string& application_id,
+    DeviceConsent device_consent) {
   // If device consent changed to allowed during application being
   // disconnected, app permissions should be changed also
+  LOG4CXX_DEBUG(logger_,
+                "kDeviceAllowed == device_consent: "
+                    << (kDeviceAllowed == device_consent)
+                    << " device_consent: " << device_consent);
   if (kDeviceAllowed == device_consent &&
       cache_->IsPredataPolicy(application_id)) {
+    LOG4CXX_INFO(logger_,
+                 "Setting "
+                     << policy::kDefaultId
+                     << " permissions for application id: " << application_id);
     cache_->SetDefaultPolicy(application_id);
   }
-  ProcessExternalConsentStatusForApp(application_id,
-                                     ConsentProcessingPolicy::kTimestampBased);
+  ProcessExternalConsentStatusForApp(
+      device_id, application_id, ConsentProcessingPolicy::kTimestampBased);
 }
 
 bool PolicyManagerImpl::IsNewApplication(
@@ -2141,10 +2345,10 @@ bool PolicyManagerImpl::InitPT(const std::string& file_name,
   const bool ret = cache_->Init(file_name, settings);
   if (ret) {
     RefreshRetrySequence();
-    std::vector<std::string> enabled_apps;
-    cache_->GetEnabledCloudApps(enabled_apps);
-    for (auto it = enabled_apps.begin(); it != enabled_apps.end(); ++it) {
-      SendAuthTokenUpdated(*it);
+    std::vector<std::string> enabled_cloud_apps;
+    cache_->GetEnabledCloudApps(enabled_cloud_apps);
+    for (auto app : enabled_cloud_apps) {
+      SendAuthTokenUpdated(app);
     }
   }
   return ret;
@@ -2155,6 +2359,11 @@ uint32_t PolicyManagerImpl::HeartBeatTimeout(const std::string& app_id) const {
 }
 
 void PolicyManagerImpl::SaveUpdateStatusRequired(bool is_update_needed) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!is_update_needed) {
+    ResetRetrySequence(ResetRetryCountType::kResetInternally);
+  }
   cache_->SaveUpdateRequired(is_update_needed);
 }
 
@@ -2173,10 +2382,12 @@ std::ostream& operator<<(std::ostream& output,
   return output;
 }
 
-void PolicyManagerImpl::SetDefaultHmiTypes(const std::string& application_id,
-                                           const std::vector<int>& hmi_types) {
+void PolicyManagerImpl::SetDefaultHmiTypes(
+    const transport_manager::DeviceHandle& device_handle,
+    const std::string& application_id,
+    const std::vector<int>& hmi_types) {
   LOG4CXX_INFO(logger_, "SetDefaultHmiTypes");
-  const std::string device_id = GetCurrentDeviceId(application_id);
+  const auto device_id = GetCurrentDeviceId(device_handle, application_id);
   ApplicationOnDevice who = {device_id, application_id};
   access_remote_->SetDefaultHmiTypes(who, hmi_types);
 }
@@ -2214,7 +2425,7 @@ bool PolicyManagerImpl::CheckModule(const PTString& app_id,
 
 void PolicyManagerImpl::SendHMILevelChanged(const ApplicationOnDevice& who) {
   std::string default_hmi("NONE");
-  if (GetDefaultHmi(who.app_id, &default_hmi)) {
+  if (GetDefaultHmi(who.dev_id, who.app_id, &default_hmi)) {
     listener()->OnUpdateHMIStatus(who.dev_id, who.app_id, default_hmi);
   } else {
     LOG4CXX_WARN(
@@ -2251,16 +2462,14 @@ void PolicyManagerImpl::SendAppPermissionsChanged(
     const std::string& device_id, const std::string& application_id) {
   Permissions notification_data;
   GetPermissions(device_id, application_id, &notification_data);
-  listener()->OnPermissionsUpdated(application_id, notification_data);
+  listener()->OnPermissionsUpdated(
+      device_id, application_id, notification_data);
 }
 
 void PolicyManagerImpl::SendAuthTokenUpdated(const std::string policy_app_id) {
-  bool enabled = false;
-  std::string end, cert, ctt, hap;
-  std::string auth_token;
-  cache_->GetCloudAppParameters(
-      policy_app_id, enabled, end, cert, auth_token, ctt, hap);
-  listener_->OnAuthTokenUpdated(policy_app_id, auth_token);
+  AppProperties app_properties;
+  cache_->GetAppProperties(policy_app_id, app_properties);
+  listener_->OnAuthTokenUpdated(policy_app_id, app_properties.auth_token);
 }
 
 void PolicyManagerImpl::OnPrimaryGroupsChanged(
@@ -2288,4 +2497,104 @@ void PolicyManagerImpl::set_access_remote(
   access_remote_ = access_remote;
 }
 
+bool PolicyManagerImpl::AppNeedEncryption(
+    const std::string& policy_app_id) const {
+  const auto encryption_required =
+      cache_->GetAppEncryptionRequiredFlag(policy_app_id);
+
+  return encryption_required.is_initialized() ? *encryption_required : true;
+}
+
+const rpc::Optional<rpc::Boolean> PolicyManagerImpl::GetAppEncryptionRequired(
+    const std::string& policy_app_id) const {
+  return cache_->GetAppEncryptionRequiredFlag(policy_app_id);
+}
+
+const std::vector<std::string> PolicyManagerImpl::GetFunctionalGroupsForApp(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace rpc::policy_table_interface_base;
+  DCHECK(kDeviceId != policy_app_id);
+
+  std::vector<std::string> function_groups;
+
+  ApplicationParams app_params;
+  cache_->GetApplicationParams(policy_app_id, app_params);
+
+  const auto& policy_function_group = app_params.groups;
+
+  for (const auto& group : policy_function_group) {
+    function_groups.push_back(group);
+  }
+
+  return function_groups;
+}
+
+const std::vector<std::string> PolicyManagerImpl::GetApplicationPolicyIDs()
+    const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  std::vector<std::string> policy_app_ids;
+
+  const auto apps = cache_->GetPolicyAppIDs();
+
+  for (const auto& app : apps) {
+    policy_app_ids.push_back(app);
+  }
+
+  return policy_app_ids;
+}
+
+bool PolicyManagerImpl::FunctionGroupNeedEncryption(
+    const std::string& policy_group) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  FunctionalGroupings functional_groupings;
+  cache_->GetFunctionalGroupings(functional_groupings);
+
+  const auto& grouping_itr = functional_groupings.find(policy_group);
+
+  if (grouping_itr == functional_groupings.end()) {
+    LOG4CXX_WARN(logger_, "Group " << policy_group << " not found");
+    return false;
+  }
+
+  const auto& grouping = (*grouping_itr).second;
+
+  return grouping.encryption_required.is_initialized()
+             ? *grouping.encryption_required
+             : false;
+}
+
+const std::string PolicyManagerImpl::GetPolicyFunctionName(
+    const uint32_t function_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return policy_table::EnumToJsonString(
+      static_cast<policy_table::FunctionID>(function_id));
+}
+
+const std::vector<std::string> PolicyManagerImpl::GetRPCsForFunctionGroup(
+    const std::string& group) const {
+  std::vector<std::string> rpcs_for_group;
+
+  FunctionalGroupings functional_groupings;
+  cache_->GetFunctionalGroupings(functional_groupings);
+
+  const auto& rpcs = functional_groupings[group].rpcs;
+
+  for (const auto& rpc : rpcs) {
+    rpcs_for_group.push_back(rpc.first);
+  }
+
+  return rpcs_for_group;
+}
+
 }  //  namespace policy
+
+__attribute__((visibility("default"))) policy::PolicyManager* CreateManager() {
+  return new policy::PolicyManagerImpl();
+}
+
+__attribute__((visibility("default"))) void DeleteManager(
+    policy::PolicyManager* pm) {
+  delete pm;
+  DELETE_THREAD_LOGGER(policy::logger_);
+}
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 4c95f62eca..8f5d58aad2 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -3,555 +3,6 @@
 
 namespace rpc {
 namespace policy_table_interface_base {
-bool IsValidEnum(Priority val) {
-  switch (val) {
-    case P_EMERGENCY:
-      return true;
-    case P_NAVIGATION:
-      return true;
-    case P_VOICECOM:
-      return true;
-    case P_COMMUNICATION:
-      return true;
-    case P_NORMAL:
-      return true;
-    case P_PROJECTION:
-      return true;
-    case P_NONE:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(Priority val) {
-  switch (val) {
-    case P_EMERGENCY:
-      return "EMERGENCY";
-    case P_NAVIGATION:
-      return "NAVIGATION";
-    case P_VOICECOM:
-      return "VOICECOM";
-    case P_COMMUNICATION:
-      return "COMMUNICATION";
-    case P_NORMAL:
-      return "NORMAL";
-    case P_PROJECTION:
-      return "PROJECTION";
-    case P_NONE:
-      return "NONE";
-    default:
-      return "";
-  }
-}
-bool EnumFromJsonString(const std::string& literal, Priority* result) {
-  if ("EMERGENCY" == literal) {
-    *result = P_EMERGENCY;
-    return true;
-  } else if ("NAVIGATION" == literal) {
-    *result = P_NAVIGATION;
-    return true;
-  } else if ("VOICECOM" == literal) {
-    *result = P_VOICECOM;
-    return true;
-  } else if ("COMMUNICATION" == literal) {
-    *result = P_COMMUNICATION;
-    return true;
-  } else if ("NORMAL" == literal) {
-    *result = P_NORMAL;
-    return true;
-  } else if ("PROJECTION" == literal) {
-    *result = P_PROJECTION;
-    return true;
-  } else if ("NONE" == literal) {
-    *result = P_NONE;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(HmiLevel val) {
-  switch (val) {
-    case HL_BACKGROUND:
-      return true;
-    case HL_FULL:
-      return true;
-    case HL_LIMITED:
-      return true;
-    case HL_NONE:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(HmiLevel val) {
-  switch (val) {
-    case HL_BACKGROUND:
-      return "BACKGROUND";
-    case HL_FULL:
-      return "FULL";
-    case HL_LIMITED:
-      return "LIMITED";
-    case HL_NONE:
-      return "NONE";
-    default:
-      return "";
-  }
-}
-bool EnumFromJsonString(const std::string& literal, HmiLevel* result) {
-  if ("BACKGROUND" == literal) {
-    *result = HL_BACKGROUND;
-    return true;
-  } else if ("FULL" == literal) {
-    *result = HL_FULL;
-    return true;
-  } else if ("LIMITED" == literal) {
-    *result = HL_LIMITED;
-    return true;
-  } else if ("NONE" == literal) {
-    *result = HL_NONE;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(Parameter val) {
-  switch (val) {
-    case P_GPS:
-      return true;
-    case P_SPEED:
-      return true;
-    case P_ENGINETORQUE:
-      return true;
-    case P_EXTERNALTEMPERATURE:
-      return true;
-    case P_TURNSIGNAL:
-      return true;
-    case P_FUELLEVEL:
-      return true;
-    case P_FUELLEVEL_STATE:
-      return true;
-    case P_HEADLAMPSTATUS:
-      return true;
-    case P_INSTANTFUELCONSUMPTION:
-      return true;
-    case P_FUELRANGE:
-      return true;
-    case P_CLOUD_APP_VEHICLE_ID:
-      return true;
-    case P_ODOMETER:
-      return true;
-    case P_TIREPRESSURE:
-      return true;
-    case P_WIPERSTATUS:
-      return true;
-    case P_VIN:
-      return true;
-    case P_ACCPEDALPOSITION:
-      return true;
-    case P_BELTSTATUS:
-      return true;
-    case P_ELECTRONICPARKBRAKESTATUS:
-      return true;
-    case P_DRIVERBRAKING:
-      return true;
-    case P_PRNDL:
-      return true;
-    case P_RPM:
-      return true;
-    case P_STEERINGWHEELANGLE:
-      return true;
-    case P_ENGINEOILLIFE:
-      return true;
-    case P_MYKEY:
-      return true;
-    case P_AIRBAGSTATUS:
-      return true;
-    case P_BODYINFORMATION:
-      return true;
-    case P_CLUSTERMODESTATUS:
-      return true;
-    case P_DEVICESTATUS:
-      return true;
-    case P_EMERGENCYEVENT:
-      return true;
-    case P_ECALLINFO:
-      return true;
-    case P_ABS_STATE:
-      return true;
-    case P_FUEL_RANGE:
-      return true;
-    case P_TIRE_PRESSURE_VALUE:
-      return true;
-    case P_TPMS:
-      return true;
-    case P_LONGTITUDE_DEGREES:
-      return true;
-    case P_LATITUDE_DEGREES:
-      return true;
-    case P_LOCATION_NAME:
-      return true;
-    case P_LOCATION_DESCRIPTION:
-      return true;
-    case P_ADDRESS_LINES:
-      return true;
-    case P_PHONE_NUMBER:
-      return true;
-    case P_LOCATION_IMAGE:
-      return true;
-    case P_DELIVERY_MODE:
-      return true;
-    case P_TIMESTAMP:
-      return true;
-    case P_ADDRESS:
-      return true;
-    case P_EMPTY:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const char* EnumToJsonString(Parameter val) {
-  switch (val) {
-    case P_GPS:
-      return "gps";
-    case P_SPEED:
-      return "speed";
-    case P_ENGINETORQUE:
-      return "engineTorque";
-    case P_EXTERNALTEMPERATURE:
-      return "externalTemperature";
-    case P_TURNSIGNAL:
-      return "turnSignal";
-    case P_FUELLEVEL:
-      return "fuelLevel";
-    case P_FUELLEVEL_STATE:
-      return "fuelLevel_State";
-    case P_HEADLAMPSTATUS:
-      return "headLampStatus";
-    case P_INSTANTFUELCONSUMPTION:
-      return "instantFuelConsumption";
-    case P_FUELRANGE:
-      return "fuelRange";
-    case P_CLOUD_APP_VEHICLE_ID:
-      return "cloudAppVehicleID";
-    case P_ODOMETER:
-      return "odometer";
-    case P_TIREPRESSURE:
-      return "tirePressure";
-    case P_WIPERSTATUS:
-      return "wiperStatus";
-    case P_VIN:
-      return "vin";
-    case P_ACCPEDALPOSITION:
-      return "accPedalPosition";
-    case P_BELTSTATUS:
-      return "beltStatus";
-    case P_ELECTRONICPARKBRAKESTATUS:
-      return "electronicParkBrakeStatus";
-    case P_DRIVERBRAKING:
-      return "driverBraking";
-    case P_PRNDL:
-      return "prndl";
-    case P_RPM:
-      return "rpm";
-    case P_STEERINGWHEELANGLE:
-      return "steeringWheelAngle";
-    case P_ENGINEOILLIFE:
-      return "engineOilLife";
-    case P_MYKEY:
-      return "myKey";
-    case P_AIRBAGSTATUS:
-      return "airbagStatus";
-    case P_BODYINFORMATION:
-      return "bodyInformation";
-    case P_CLUSTERMODESTATUS:
-      return "clusterModeStatus";
-    case P_DEVICESTATUS:
-      return "deviceStatus";
-    case P_EMERGENCYEVENT:
-      return "emergencyEvent";
-    case P_ECALLINFO:
-      return "eCallInfo";
-    case P_ABS_STATE:
-      return "abs_State";
-    case P_FUEL_RANGE:
-      return "fuelRange";
-    case P_TIRE_PRESSURE_VALUE:
-      return "tirePressureValue";
-    case P_TPMS:
-      return "tpms";
-    case P_LONGTITUDE_DEGREES:
-      return "longitudeDegrees";
-    case P_LATITUDE_DEGREES:
-      return "latitudeDegrees";
-    case P_LOCATION_NAME:
-      return "locationName";
-    case P_LOCATION_DESCRIPTION:
-      return "locationDescription";
-    case P_ADDRESS_LINES:
-      return "addressLines";
-    case P_PHONE_NUMBER:
-      return "phoneNumber";
-    case P_LOCATION_IMAGE:
-      return "locationImage";
-    case P_DELIVERY_MODE:
-      return "deliveryMode";
-    case P_TIMESTAMP:
-      return "timeStamp";
-    case P_ADDRESS:
-      return "address";
-    case P_EMPTY:
-      return "EMPTY";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal, Parameter* result) {
-  if ("gps" == literal) {
-    *result = P_GPS;
-    return true;
-  } else if ("speed" == literal) {
-    *result = P_SPEED;
-    return true;
-  } else if ("engineTorque" == literal) {
-    *result = P_ENGINETORQUE;
-    return true;
-  } 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;
-  } else if ("fuelLevel_State" == literal) {
-    *result = P_FUELLEVEL_STATE;
-    return true;
-  } else if ("headLampStatus" == literal) {
-    *result = P_HEADLAMPSTATUS;
-    return true;
-  } else if ("instantFuelConsumption" == literal) {
-    *result = P_INSTANTFUELCONSUMPTION;
-    return true;
-  } else if ("fuelRange" == literal) {
-    *result = P_FUELRANGE;
-    return true;
-  } else if ("cloudAppVehicleID" == literal) {
-    *result = P_CLOUD_APP_VEHICLE_ID;
-    return true;
-  } else if ("odometer" == literal) {
-    *result = P_ODOMETER;
-    return true;
-  } else if ("tirePressure" == literal) {
-    *result = P_TIREPRESSURE;
-    return true;
-  } else if ("wiperStatus" == literal) {
-    *result = P_WIPERSTATUS;
-    return true;
-  } else if ("vin" == literal) {
-    *result = P_VIN;
-    return true;
-  } else if ("accPedalPosition" == literal) {
-    *result = P_ACCPEDALPOSITION;
-    return true;
-  } 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;
-  } else if ("prndl" == literal) {
-    *result = P_PRNDL;
-    return true;
-  } else if ("rpm" == literal) {
-    *result = P_RPM;
-    return true;
-  } else if ("steeringWheelAngle" == literal) {
-    *result = P_STEERINGWHEELANGLE;
-    return true;
-  } else if ("engineOilLife" == literal) {
-    *result = P_ENGINEOILLIFE;
-    return true;
-  } else if ("myKey" == literal) {
-    *result = P_MYKEY;
-    return true;
-  } else if ("airbagStatus" == literal) {
-    *result = P_AIRBAGSTATUS;
-    return true;
-  } else if ("bodyInformation" == literal) {
-    *result = P_BODYINFORMATION;
-    return true;
-  } else if ("clusterModeStatus" == literal) {
-    *result = P_CLUSTERMODESTATUS;
-    return true;
-  } else if ("deviceStatus" == literal) {
-    *result = P_DEVICESTATUS;
-    return true;
-  } else if ("emergencyEvent" == literal) {
-    *result = P_EMERGENCYEVENT;
-    return true;
-  } else if ("eCallInfo" == literal) {
-    *result = P_ECALLINFO;
-    return true;
-  } else if ("abs_State" == literal) {
-    *result = P_ABS_STATE;
-    return true;
-  } else if ("fuelRange" == literal) {
-    *result = P_FUEL_RANGE;
-    return true;
-  } else if ("tirePressureValue" == literal) {
-    *result = P_TIRE_PRESSURE_VALUE;
-    return true;
-  } else if ("tpms" == literal) {
-    *result = P_TPMS;
-    return true;
-  } else if ("longitudeDegrees" == literal) {
-    *result = P_LONGTITUDE_DEGREES;
-    return true;
-  } else if ("latitudeDegrees" == literal) {
-    *result = P_LATITUDE_DEGREES;
-    return true;
-  } else if ("locationName" == literal) {
-    *result = P_LOCATION_NAME;
-    return true;
-  } else if ("locationDescription" == literal) {
-    *result = P_LOCATION_DESCRIPTION;
-    return true;
-  } else if ("addressLines" == literal) {
-    *result = P_ADDRESS_LINES;
-    return true;
-  } else if ("phoneNumber" == literal) {
-    *result = P_PHONE_NUMBER;
-    return true;
-  } else if ("locationImage" == literal) {
-    *result = P_LOCATION_IMAGE;
-    return true;
-  } else if ("deliveryMode" == literal) {
-    *result = P_DELIVERY_MODE;
-    return true;
-  } else if ("timeStamp" == literal) {
-    *result = P_TIMESTAMP;
-    return true;
-  } else if ("address" == literal) {
-    *result = P_ADDRESS;
-    return true;
-  } else if ("EMPTY" == literal) {
-    *result = P_EMPTY;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(AppHMIType val) {
-  switch (val) {
-    case AHT_DEFAULT:
-      return true;
-    case AHT_COMMUNICATION:
-      return true;
-    case AHT_MEDIA:
-      return true;
-    case AHT_MESSAGING:
-      return true;
-    case AHT_NAVIGATION:
-      return true;
-    case AHT_INFORMATION:
-      return true;
-    case AHT_SOCIAL:
-      return true;
-    case AHT_BACKGROUND_PROCESS:
-      return true;
-    case AHT_TESTING:
-      return true;
-    case AHT_SYSTEM:
-      return true;
-    case AHT_PROJECTION:
-      return true;
-    case AHT_REMOTE_CONTROL:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(AppHMIType val) {
-  switch (val) {
-    case AHT_DEFAULT:
-      return "DEFAULT";
-    case AHT_COMMUNICATION:
-      return "COMMUNICATION";
-    case AHT_MEDIA:
-      return "MEDIA";
-    case AHT_MESSAGING:
-      return "MESSAGING";
-    case AHT_NAVIGATION:
-      return "NAVIGATION";
-    case AHT_INFORMATION:
-      return "INFORMATION";
-    case AHT_SOCIAL:
-      return "SOCIAL";
-    case AHT_BACKGROUND_PROCESS:
-      return "BACKGROUND_PROCESS";
-    case AHT_TESTING:
-      return "TESTING";
-    case AHT_SYSTEM:
-      return "SYSTEM";
-    case AHT_PROJECTION:
-      return "PROJECTION";
-    case AHT_REMOTE_CONTROL:
-      return "REMOTE_CONTROL";
-    default:
-      return "";
-  }
-}
-bool EnumFromJsonString(const std::string& literal, AppHMIType* result) {
-  if ("DEFAULT" == literal) {
-    *result = AHT_DEFAULT;
-    return true;
-  } else if ("COMMUNICATION" == literal) {
-    *result = AHT_COMMUNICATION;
-    return true;
-  } else if ("MEDIA" == literal) {
-    *result = AHT_MEDIA;
-    return true;
-  } else if ("MESSAGING" == literal) {
-    *result = AHT_MESSAGING;
-    return true;
-  } else if ("NAVIGATION" == literal) {
-    *result = AHT_NAVIGATION;
-    return true;
-  } else if ("INFORMATION" == literal) {
-    *result = AHT_INFORMATION;
-    return true;
-  } else if ("SOCIAL" == literal) {
-    *result = AHT_SOCIAL;
-    return true;
-  } else if ("BACKGROUND_PROCESS" == literal) {
-    *result = AHT_BACKGROUND_PROCESS;
-    return true;
-  } else if ("TESTING" == literal) {
-    *result = AHT_TESTING;
-    return true;
-  } else if ("SYSTEM" == literal) {
-    *result = AHT_SYSTEM;
-    return true;
-  } else if ("PROJECTION" == literal) {
-    *result = AHT_PROJECTION;
-    return true;
-  } else if ("REMOTE_CONTROL" == literal) {
-    *result = AHT_REMOTE_CONTROL;
-    return true;
-  } else {
-    return false;
-  }
-}
 
 bool IsValidEnum(Input val) {
   switch (val) {
@@ -563,6 +14,7 @@ bool IsValidEnum(Input val) {
       return false;
   }
 }
+
 const char* EnumToJsonString(Input val) {
   switch (val) {
     case I_GUI:
@@ -585,717 +37,6 @@ bool EnumFromJsonString(const std::string& literal, Input* result) {
   }
 }
 
-bool IsValidEnum(RequestType val) {
-  switch (val) {
-    case RT_HTTP:
-      return true;
-    case RT_FILE_RESUME:
-      return true;
-    case RT_AUTH_REQUEST:
-      return true;
-    case RT_AUTH_CHALLENGE:
-      return true;
-    case RT_AUTH_ACK:
-      return true;
-    case RT_PROPRIETARY:
-      return true;
-    case RT_QUERY_APPS:
-      return true;
-    case RT_LAUNCH_APP:
-      return true;
-    case RT_LOCK_SCREEN_ICON_URL:
-      return true;
-    case RT_TRAFFIC_MESSAGE_CHANNEL:
-      return true;
-    case RT_DRIVER_PROFILE:
-      return true;
-    case RT_VOICE_SEARCH:
-      return true;
-    case RT_NAVIGATION:
-      return true;
-    case RT_PHONE:
-      return true;
-    case RT_CLIMATE:
-      return true;
-    case RT_SETTINGS:
-      return true;
-    case RT_VEHICLE_DIAGNOSTICS:
-      return true;
-    case RT_EMERGENCY:
-      return true;
-    case RT_MEDIA:
-      return true;
-    case RT_FOTA:
-      return true;
-    case RT_OEM_SPECIFIC:
-      return true;
-    case RT_ICON_URL:
-      return true;
-    case RT_EMPTY:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const char* EnumToJsonString(RequestType val) {
-  switch (val) {
-    case RT_HTTP:
-      return "HTTP";
-    case RT_FILE_RESUME:
-      return "FILE_RESUME";
-    case RT_AUTH_REQUEST:
-      return "AUTH_REQUEST";
-    case RT_AUTH_CHALLENGE:
-      return "AUTH_CHALLENGE";
-    case RT_AUTH_ACK:
-      return "AUTH_ACK";
-    case RT_PROPRIETARY:
-      return "PROPRIETARY";
-    case RT_QUERY_APPS:
-      return "QUERY_APPS";
-    case RT_LAUNCH_APP:
-      return "LAUNCH_APP";
-    case RT_LOCK_SCREEN_ICON_URL:
-      return "LOCK_SCREEN_ICON_URL";
-    case RT_TRAFFIC_MESSAGE_CHANNEL:
-      return "TRAFFIC_MESSAGE_CHANNEL";
-    case RT_DRIVER_PROFILE:
-      return "DRIVER_PROFILE";
-    case RT_VOICE_SEARCH:
-      return "VOICE_SEARCH";
-    case RT_NAVIGATION:
-      return "NAVIGATION";
-    case RT_PHONE:
-      return "PHONE";
-    case RT_CLIMATE:
-      return "CLIMATE";
-    case RT_SETTINGS:
-      return "SETTINGS";
-    case RT_VEHICLE_DIAGNOSTICS:
-      return "VEHICLE_DIAGNOSTICS";
-    case RT_EMERGENCY:
-      return "EMERGENCY";
-    case RT_MEDIA:
-      return "MEDIA";
-    case RT_FOTA:
-      return "FOTA";
-    case RT_OEM_SPECIFIC:
-      return "OEM_SPECIFIC";
-    case RT_ICON_URL:
-      return "ICON_URL";
-    case RT_EMPTY:
-      return "EMPTY";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal, RequestType* result) {
-  if ("HTTP" == literal) {
-    *result = RT_HTTP;
-    return true;
-  }
-  if ("FILE_RESUME" == literal) {
-    *result = RT_FILE_RESUME;
-    return true;
-  }
-  if ("AUTH_REQUEST" == literal) {
-    *result = RT_AUTH_REQUEST;
-    return true;
-  }
-  if ("AUTH_CHALLENGE" == literal) {
-    *result = RT_AUTH_CHALLENGE;
-    return true;
-  }
-  if ("AUTH_ACK" == literal) {
-    *result = RT_AUTH_ACK;
-    return true;
-  }
-  if ("PROPRIETARY" == literal) {
-    *result = RT_PROPRIETARY;
-    return true;
-  }
-  if ("QUERY_APPS" == literal) {
-    *result = RT_QUERY_APPS;
-    return true;
-  }
-  if ("LAUNCH_APP" == literal) {
-    *result = RT_LAUNCH_APP;
-    return true;
-  }
-  if ("LOCK_SCREEN_ICON_URL" == literal) {
-    *result = RT_LOCK_SCREEN_ICON_URL;
-    return true;
-  }
-  if ("TRAFFIC_MESSAGE_CHANNEL" == literal) {
-    *result = RT_TRAFFIC_MESSAGE_CHANNEL;
-    return true;
-  }
-  if ("DRIVER_PROFILE" == literal) {
-    *result = RT_DRIVER_PROFILE;
-    return true;
-  }
-  if ("VOICE_SEARCH" == literal) {
-    *result = RT_VOICE_SEARCH;
-    return true;
-  }
-  if ("NAVIGATION" == literal) {
-    *result = RT_NAVIGATION;
-    return true;
-  }
-  if ("PHONE" == literal) {
-    *result = RT_PHONE;
-    return true;
-  }
-  if ("CLIMATE" == literal) {
-    *result = RT_CLIMATE;
-    return true;
-  }
-  if ("SETTINGS" == literal) {
-    *result = RT_SETTINGS;
-    return true;
-  }
-  if ("VEHICLE_DIAGNOSTICS" == literal) {
-    *result = RT_VEHICLE_DIAGNOSTICS;
-    return true;
-  }
-  if ("EMERGENCY" == literal) {
-    *result = RT_EMERGENCY;
-    return true;
-  }
-  if ("MEDIA" == literal) {
-    *result = RT_MEDIA;
-    return true;
-  }
-  if ("FOTA" == literal) {
-    *result = RT_FOTA;
-    return true;
-  }
-  if ("OEM_SPECIFIC" == literal) {
-    *result = RT_OEM_SPECIFIC;
-    return true;
-  }
-  if ("ICON_URL" == literal) {
-    *result = RT_ICON_URL;
-    return true;
-  }
-  if ("EMPTY" == literal) {
-    *result = RT_EMPTY;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-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;
-  }
-}
-const char* EnumToJsonString(ModuleType val) {
-  switch (val) {
-    case MT_CLIMATE:
-      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 "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal, ModuleType* result) {
-  if ("CLIMATE" == literal) {
-    *result = MT_CLIMATE;
-    return true;
-  } 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;
-  }
-}
-
-bool IsValidEnum(HybridAppPreference val) {
-  return strlen(EnumToJsonString(val)) > 0;
-}
-
-const char* EnumToJsonString(HybridAppPreference val) {
-  switch (val) {
-    case HAP_MOBILE:
-      return "MOBILE";
-    case HAP_CLOUD:
-      return "CLOUD";
-    case HAP_BOTH:
-      return "BOTH";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal,
-                        HybridAppPreference* result) {
-  if ("MOBILE" == literal) {
-    *result = HAP_MOBILE;
-    return true;
-  } else if ("CLOUD" == literal) {
-    *result = HAP_CLOUD;
-    return true;
-  } else if ("BOTH" == literal) {
-    *result = HAP_BOTH;
-    return true;
-  }
-  return false;
-}
-
-bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
-  if ("RegisterAppInterface" == literal) {
-    *result = RegisterAppInterfaceID;
-    return true;
-  }
-
-  if ("UnregisterAppInterface" == literal) {
-    *result = UnregisterAppInterfaceID;
-    return true;
-  }
-
-  if ("SetGlobalProperties" == literal) {
-    *result = SetGlobalPropertiesID;
-    return true;
-  }
-
-  if ("ResetGlobalProperties" == literal) {
-    *result = ResetGlobalPropertiesID;
-    return true;
-  }
-
-  if ("AddCommand" == literal) {
-    *result = AddCommandID;
-    return true;
-  }
-
-  if ("DeleteCommand" == literal) {
-    *result = DeleteCommandID;
-    return true;
-  }
-
-  if ("AddSubMenu" == literal) {
-    *result = AddSubMenuID;
-    return true;
-  }
-
-  if ("DeleteSubMenu" == literal) {
-    *result = DeleteSubMenuID;
-    return true;
-  }
-
-  if ("CreateInteractionChoiceSet" == literal) {
-    *result = CreateInteractionChoiceSetID;
-    return true;
-  }
-
-  if ("PerformInteraction" == literal) {
-    *result = PerformInteractionID;
-    return true;
-  }
-
-  if ("DeleteInteractionChoiceSet" == literal) {
-    *result = DeleteInteractionChoiceSetID;
-    return true;
-  }
-
-  if ("Alert" == literal) {
-    *result = AlertID;
-    return true;
-  }
-
-  if ("Show" == literal) {
-    *result = ShowID;
-    return true;
-  }
-
-  if ("Speak" == literal) {
-    *result = SpeakID;
-    return true;
-  }
-
-  if ("SetMediaClockTimer" == literal) {
-    *result = SetMediaClockTimerID;
-    return true;
-  }
-
-  if ("PerformAudioPassThru" == literal) {
-    *result = PerformAudioPassThruID;
-    return true;
-  }
-
-  if ("EndAudioPassThru" == literal) {
-    *result = EndAudioPassThruID;
-    return true;
-  }
-
-  if ("SubscribeButton" == literal) {
-    *result = SubscribeButtonID;
-    return true;
-  }
-
-  if ("UnsubscribeButton" == literal) {
-    *result = UnsubscribeButtonID;
-    return true;
-  }
-
-  if ("SubscribeVehicleData" == literal) {
-    *result = SubscribeVehicleDataID;
-    return true;
-  }
-
-  if ("UnsubscribeVehicleData" == literal) {
-    *result = UnsubscribeVehicleDataID;
-    return true;
-  }
-
-  if ("GetVehicleData" == literal) {
-    *result = GetVehicleDataID;
-    return true;
-  }
-
-  if ("ReadDID" == literal) {
-    *result = ReadDIDID;
-    return true;
-  }
-
-  if ("GetDTCs" == literal) {
-    *result = GetDTCsID;
-    return true;
-  }
-
-  if ("ScrollableMessage" == literal) {
-    *result = ScrollableMessageID;
-    return true;
-  }
-
-  if ("Slider" == literal) {
-    *result = SliderID;
-    return true;
-  }
-
-  if ("ShowConstantTBT" == literal) {
-    *result = ShowConstantTBTID;
-    return true;
-  }
-
-  if ("AlertManeuver" == literal) {
-    *result = AlertManeuverID;
-    return true;
-  }
-
-  if ("UpdateTurnList" == literal) {
-    *result = UpdateTurnListID;
-    return true;
-  }
-
-  if ("ChangeRegistration" == literal) {
-    *result = ChangeRegistrationID;
-    return true;
-  }
-
-  if ("GenericResponse" == literal) {
-    *result = GenericResponseID;
-    return true;
-  }
-
-  if ("PutFile" == literal) {
-    *result = PutFileID;
-    return true;
-  }
-
-  if ("DeleteFile" == literal) {
-    *result = DeleteFileID;
-    return true;
-  }
-
-  if ("ListFiles" == literal) {
-    *result = ListFilesID;
-    return true;
-  }
-
-  if ("SetAppIcon" == literal) {
-    *result = SetAppIconID;
-    return true;
-  }
-
-  if ("SetDisplayLayout" == literal) {
-    *result = SetDisplayLayoutID;
-    return true;
-  }
-
-  if ("DiagnosticMessage" == literal) {
-    *result = DiagnosticMessageID;
-    return true;
-  }
-
-  if ("SystemRequest" == literal) {
-    *result = SystemRequestID;
-    return true;
-  }
-
-  if ("SendLocation" == literal) {
-    *result = SendLocationID;
-    return true;
-  }
-
-  if ("DialNumber" == literal) {
-    *result = DialNumberID;
-    return true;
-  }
-
-  if ("ButtonPress" == literal) {
-    *result = ButtonPressID;
-    return true;
-  }
-
-  if ("GetInteriorVehicleData" == literal) {
-    *result = GetInteriorVehicleDataID;
-    return true;
-  }
-
-  if ("SetInteriorVehicleData" == literal) {
-    *result = SetInteriorVehicleDataID;
-    return true;
-  }
-
-  if ("GetWayPoints" == literal) {
-    *result = GetWayPointsID;
-    return true;
-  }
-
-  if ("SubscribeWayPoints" == literal) {
-    *result = SubscribeWayPointsID;
-    return true;
-  }
-
-  if ("UnsubscribeWayPoints" == literal) {
-    *result = UnsubscribeWayPointsID;
-    return true;
-  }
-
-  if ("GetSystemCapability" == literal) {
-    *result = GetSystemCapabilityID;
-    return true;
-  }
-
-  if ("SendHapticData" == literal) {
-    *result = SendHapticDataID;
-    return true;
-  }
-
-  if ("SetCloudAppProperties" == literal) {
-    *result = SetCloudAppPropertiesID;
-    return true;
-  }
-
-  if ("GetCloudAppProperties" == literal) {
-    *result = GetCloudAppPropertiesID;
-    return true;
-  }
-
-  if ("PublishAppService" == literal) {
-    *result = PublishAppServiceID;
-    return true;
-  }
-
-  if ("GetFile" == literal) {
-    *result = GetFileID;
-    return true;
-  }
-
-  if ("GetAppServiceData" == literal) {
-    *result = GetAppServiceDataID;
-    return true;
-  }
-
-  if ("PerformAppServiceInteraction" == literal) {
-    *result = PerformAppServiceInteractionID;
-    return true;
-  }
-
-  if ("UnpublishAppService" == literal) {
-    *result = UnpublishAppServiceID;
-    return true;
-  }
-
-  if ("CloseApplication" == literal) {
-    *result = CloseApplicationID;
-    return true;
-  }
-
-  if ("ShowAppMenu" == literal) {
-    *result = ShowAppMenuID;
-    return true;
-  }
-
-  if ("OnHMIStatus" == literal) {
-    *result = OnHMIStatusID;
-    return true;
-  }
-
-  if ("OnAppInterfaceUnregistered" == literal) {
-    *result = OnAppInterfaceUnregisteredID;
-    return true;
-  }
-
-  if ("OnButtonEvent" == literal) {
-    *result = OnButtonEventID;
-    return true;
-  }
-
-  if ("OnButtonPress" == literal) {
-    *result = OnButtonPressID;
-    return true;
-  }
-
-  if ("OnVehicleData" == literal) {
-    *result = OnVehicleDataID;
-    return true;
-  }
-
-  if ("OnCommand" == literal) {
-    *result = OnCommandID;
-    return true;
-  }
-
-  if ("OnTBTClientState" == literal) {
-    *result = OnTBTClientStateID;
-    return true;
-  }
-
-  if ("OnDriverDistraction" == literal) {
-    *result = OnDriverDistractionID;
-    return true;
-  }
-
-  if ("OnPermissionsChange" == literal) {
-    *result = OnPermissionsChangeID;
-    return true;
-  }
-
-  if ("OnAudioPassThru" == literal) {
-    *result = OnAudioPassThruID;
-    return true;
-  }
-
-  if ("OnLanguageChange" == literal) {
-    *result = OnLanguageChangeID;
-    return true;
-  }
-
-  if ("OnKeyboardInput" == literal) {
-    *result = OnKeyboardInputID;
-    return true;
-  }
-
-  if ("OnTouchEvent" == literal) {
-    *result = OnTouchEventID;
-    return true;
-  }
-
-  if ("OnSystemRequest" == literal) {
-    *result = OnSystemRequestID;
-    return true;
-  }
-
-  if ("OnHashChange" == literal) {
-    *result = OnHashChangeID;
-    return true;
-  }
-
-  if ("OnInteriorVehicleData" == literal) {
-    *result = OnInteriorVehicleDataID;
-    return true;
-  }
-
-  if ("OnWayPointChange" == literal) {
-    *result = OnWayPointChangeID;
-    return true;
-  }
-
-  if ("OnRCStatus" == literal) {
-    *result = OnRCStatusID;
-    return true;
-  }
-
-  if ("OnAppServiceData" == literal) {
-    *result = OnAppServiceDataID;
-    return true;
-  }
-
-  if ("OnSystemCapabilityUpdated" == literal) {
-    *result = OnSystemCapabilityUpdatedID;
-    return true;
-  }
-
-  if ("EncodedSyncPData" == literal) {
-    *result = EncodedSyncPDataID;
-    return true;
-  }
-
-  if ("SyncPData" == literal) {
-    *result = SyncPDataID;
-    return true;
-  }
-
-  if ("OnEncodedSyncPData" == literal) {
-    *result = OnEncodedSyncPDataID;
-    return true;
-  }
-
-  if ("OnSyncPData" == literal) {
-    *result = OnSyncPDataID;
-    return true;
-  }
-  return false;
-};
-
 const std::string kDefaultApp = "default";
 const std::string kPreDataConsentApp = "pre_DataConsent";
 const std::string kDeviceApp = "device";
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 d39b3f7623..f0ea154f94 100644
--- a/src/components/policy/policy_external/src/policy_table/types.cc
+++ b/src/components/policy/policy_external/src/policy_table/types.cc
@@ -45,7 +45,6 @@ PolicyBase::PolicyBase(const Json::Value* value__)
     , default_hmi(impl::ValueMember(value__, "default_hmi"))
     , keep_context(impl::ValueMember(value__, "keep_context"))
     , steal_focus(impl::ValueMember(value__, "steal_focus")) {}
-
 Json::Value PolicyBase::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
   impl::WriteJsonField("groups", groups, &result__);
@@ -355,7 +354,8 @@ ApplicationParams::ApplicationParams(const Json::Value* value__)
     , icon_url(impl::ValueMember(value__, "icon_url"))
     , app_service_parameters(impl::ValueMember(value__, "app_services"))
     , allow_unknown_rpc_passthrough(
-          impl::ValueMember(value__, "allow_unknown_rpc_passthrough")) {}
+          impl::ValueMember(value__, "allow_unknown_rpc_passthrough"))
+    , encryption_required(impl::ValueMember(value__, "encryption_required")) {}
 
 Json::Value ApplicationParams::ToJsonValue() const {
   Json::Value result__(PolicyBase::ToJsonValue());
@@ -379,6 +379,7 @@ Json::Value ApplicationParams::ToJsonValue() const {
   impl::WriteJsonField("allow_unknown_rpc_passthrough",
                        allow_unknown_rpc_passthrough,
                        &result__);
+  impl::WriteJsonField("encryption_required", encryption_required, &result__);
   return result__;
 }
 
@@ -430,6 +431,9 @@ bool ApplicationParams::is_valid() const {
   if (!allow_unknown_rpc_passthrough.is_valid()) {
     return false;
   }
+  if (!encryption_required.is_valid()) {
+    return false;
+  }
   return Validate();
 }
 
@@ -489,6 +493,9 @@ bool ApplicationParams::struct_empty() const {
   if (allow_unknown_rpc_passthrough.is_initialized()) {
     return false;
   }
+  if (!encryption_required.is_valid()) {
+    return false;
+  }
   return true;
 }
 
@@ -567,6 +574,10 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport* report__) const {
     allow_unknown_rpc_passthrough.ReportErrors(
         &report__->ReportSubobject("allow_unknown_rpc_passthrough"));
   }
+  if (!encryption_required.is_valid()) {
+    encryption_required.ReportErrors(
+        &report__->ReportSubobject("encryption_required"));
+  }
 }
 
 void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) {
@@ -663,7 +674,8 @@ Rpcs::Rpcs(const Json::Value* value__)
     , disallowed_by_external_consent_entities_on(impl::ValueMember(
           value__, "disallowed_by_external_consent_entities_on"))
     , disallowed_by_external_consent_entities_off(impl::ValueMember(
-          value__, "disallowed_by_external_consent_entities_off")) {}
+          value__, "disallowed_by_external_consent_entities_off"))
+    , encryption_required(impl::ValueMember(value__, "encryption_required")) {}
 
 Json::Value Rpcs::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
@@ -675,6 +687,7 @@ Json::Value Rpcs::ToJsonValue() const {
   impl::WriteJsonField("disallowed_by_external_consent_entities_off",
                        disallowed_by_external_consent_entities_off,
                        &result__);
+  impl::WriteJsonField("encryption_required", encryption_required, &result__);
   return result__;
 }
 
@@ -691,6 +704,9 @@ bool Rpcs::is_valid() const {
   if (!disallowed_by_external_consent_entities_off.is_valid()) {
     return false;
   }
+  if (!encryption_required.is_valid()) {
+    return false;
+  }
   return Validate();
 }
 
@@ -711,6 +727,9 @@ bool Rpcs::struct_empty() const {
   if (disallowed_by_external_consent_entities_off.is_initialized()) {
     return false;
   }
+  if (encryption_required.is_initialized()) {
+    return false;
+  }
   return true;
 }
 
@@ -735,6 +754,10 @@ void Rpcs::ReportErrors(rpc::ValidationReport* report__) const {
         &report__->ReportSubobject(
             "disallowed_by_external_consent_entities_off"));
   }
+  if (!encryption_required.is_valid()) {
+    encryption_required.ReportErrors(
+        &report__->ReportSubobject("encryption_required"));
+  }
 }
 
 void Rpcs::SetPolicyTableType(PolicyTableType pt_type) {
@@ -745,9 +768,60 @@ void Rpcs::SetPolicyTableType(PolicyTableType pt_type) {
   disallowed_by_external_consent_entities_on.SetPolicyTableType(pt_type);
 }
 
+// EndpointProperties methods
+EndpointProperty::EndpointProperty() : CompositeType(kUninitialized) {}
+
+EndpointProperty::~EndpointProperty() {}
+
+EndpointProperty::EndpointProperty(const Json::Value* value__)
+    : CompositeType(InitHelper(value__, &Json::Value::isObject))
+    , version(impl::ValueMember(value__, "version")) {}
+
+Json::Value EndpointProperty::ToJsonValue() const {
+  Json::Value result__(Json::objectValue);
+  impl::WriteJsonField("version", version, &result__);
+  return result__;
+}
+
+bool EndpointProperty::is_valid() const {
+  if (!version.is_valid()) {
+    return false;
+  }
+  return Validate();
+}
+
+bool EndpointProperty::is_initialized() const {
+  return (initialization_state__ != kUninitialized) || (!struct_empty());
+}
+
+bool EndpointProperty::struct_empty() const {
+  if (version.is_initialized()) {
+    return false;
+  }
+
+  return true;
+}
+
+void EndpointProperty::ReportErrors(rpc::ValidationReport* report__) const {
+  if (struct_empty()) {
+    rpc::CompositeType::ReportErrors(report__);
+  }
+  if (!version.is_valid()) {
+    version.ReportErrors(&report__->ReportSubobject("version"));
+  }
+}
+
+void EndpointProperty::SetPolicyTableType(PolicyTableType pt_type) {
+  CompositeType::SetPolicyTableType(pt_type);
+  version.SetPolicyTableType(pt_type);
+}
+
 // ModuleConfig methods
 ModuleConfig::ModuleConfig() : CompositeType(kUninitialized) {}
 
+const std::string ModuleConfig::kDefaultOemMappingServiceName =
+    "custom_vehicle_data_mapping_url";
+
 ModuleConfig::ModuleConfig(
     uint8_t exchange_after_x_ignition_cycles,
     int64_t exchange_after_x_kilometers,
@@ -755,6 +829,7 @@ ModuleConfig::ModuleConfig(
     uint16_t timeout_after_x_seconds,
     const SecondsBetweenRetries& seconds_between_retries,
     const ServiceEndpoints& endpoints,
+    const ServiceEndpointProperties& endpoint_properties,
     const NumberOfNotificationsPerMinute& notifications_per_minute_by_priority)
     : CompositeType(kUninitialized)
     , exchange_after_x_ignition_cycles(exchange_after_x_ignition_cycles)
@@ -763,6 +838,7 @@ ModuleConfig::ModuleConfig(
     , timeout_after_x_seconds(timeout_after_x_seconds)
     , seconds_between_retries(seconds_between_retries)
     , endpoints(endpoints)
+    , endpoint_properties(endpoint_properties)
     , notifications_per_minute_by_priority(
           notifications_per_minute_by_priority) {}
 
@@ -780,6 +856,7 @@ ModuleConfig::ModuleConfig(const Json::Value* value__)
     , seconds_between_retries(
           impl::ValueMember(value__, "seconds_between_retries"))
     , endpoints(impl::ValueMember(value__, "endpoints"))
+    , endpoint_properties(impl::ValueMember(value__, "endpoint_properties"))
     , notifications_per_minute_by_priority(
           impl::ValueMember(value__, "notifications_per_minute_by_priority"))
     , vehicle_make(impl::ValueMember(value__, "vehicle_make"))
@@ -800,6 +877,7 @@ void ModuleConfig::SafeCopyFrom(const ModuleConfig& from) {
   timeout_after_x_seconds = from.timeout_after_x_seconds;
   seconds_between_retries = from.seconds_between_retries;
   endpoints = from.endpoints;
+  endpoint_properties = from.endpoint_properties;
   notifications_per_minute_by_priority =
       from.notifications_per_minute_by_priority;
   lock_screen_dismissal_enabled = from.lock_screen_dismissal_enabled;
@@ -828,6 +906,7 @@ Json::Value ModuleConfig::ToJsonValue() const {
   impl::WriteJsonField(
       "seconds_between_retries", seconds_between_retries, &result__);
   impl::WriteJsonField("endpoints", endpoints, &result__);
+  impl::WriteJsonField("endpoint_properties", endpoint_properties, &result__);
   impl::WriteJsonField("notifications_per_minute_by_priority",
                        notifications_per_minute_by_priority,
                        &result__);
@@ -870,6 +949,9 @@ bool ModuleConfig::is_valid() const {
   if (!endpoints.is_valid()) {
     return false;
   }
+  if (!endpoint_properties.is_valid()) {
+    return false;
+  }
   if (!notifications_per_minute_by_priority.is_valid()) {
     return false;
   }
@@ -930,6 +1012,10 @@ bool ModuleConfig::struct_empty() const {
     return false;
   }
 
+  if (endpoint_properties.is_initialized()) {
+    return false;
+  }
+
   if (notifications_per_minute_by_priority.is_initialized()) {
     return false;
   }
@@ -986,6 +1072,10 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport* report__) const {
   if (!endpoints.is_valid()) {
     endpoints.ReportErrors(&report__->ReportSubobject("endpoints"));
   }
+  if (!endpoint_properties.is_valid()) {
+    endpoint_properties.ReportErrors(
+        &report__->ReportSubobject("endpoint_properties"));
+  }
   if (!notifications_per_minute_by_priority.is_valid()) {
     notifications_per_minute_by_priority.ReportErrors(
         &report__->ReportSubobject("notifications_per_minute_by_priority"));
@@ -1051,6 +1141,7 @@ void ModuleConfig::SetPolicyTableType(PolicyTableType pt_type) {
   timeout_after_x_seconds.SetPolicyTableType(pt_type);
   seconds_between_retries.SetPolicyTableType(pt_type);
   endpoints.SetPolicyTableType(pt_type);
+  endpoint_properties.SetPolicyTableType(pt_type);
   notifications_per_minute_by_priority.SetPolicyTableType(pt_type);
   lock_screen_dismissal_enabled.SetPolicyTableType(pt_type);
   vehicle_make.SetPolicyTableType(pt_type);
@@ -2092,6 +2183,416 @@ void DeviceParams::SetPolicyTableType(PolicyTableType pt_type) {
   connection_type.SetPolicyTableType(pt_type);
 }
 
+// VehicleDataItem methods
+VehicleDataItem::VehicleDataItem() : CompositeType(kUninitialized) {}
+
+VehicleDataItem::VehicleDataItem(const VehicleDataItem& vehicle_data)
+    : CompositeType(vehicle_data.initialization_state__)
+    , name(vehicle_data.name)
+    , type(vehicle_data.type)
+    , key(vehicle_data.key)
+    , mandatory(vehicle_data.mandatory)
+    , params(vehicle_data.params)
+    , array(vehicle_data.array)
+    , since(vehicle_data.since)
+    , until(vehicle_data.until)
+    , removed(vehicle_data.removed)
+    , deprecated(vehicle_data.deprecated)
+    , minvalue(vehicle_data.minvalue)
+    , maxvalue(vehicle_data.maxvalue)
+    , minsize(vehicle_data.minsize)
+    , maxsize(vehicle_data.maxsize)
+    , minlength(vehicle_data.minlength)
+    , maxlength(vehicle_data.maxlength) {}
+
+VehicleDataItem::VehicleDataItem(const Json::Value* value__)
+    : CompositeType(InitHelper(value__, &Json::Value::isObject))
+    , name(impl::ValueMember(value__, "name"))
+    , type(impl::ValueMember(value__, "type"))
+    , key(impl::ValueMember(value__, "key"))
+    , mandatory(impl::ValueMember(value__, "mandatory"))
+    , params(impl::ValueMember(value__, "params"))
+    , array(impl::ValueMember(value__, "array"))
+    , since(impl::ValueMember(value__, "since"))
+    , until(impl::ValueMember(value__, "until"))
+    , removed(impl::ValueMember(value__, "removed"))
+    , deprecated(impl::ValueMember(value__, "deprecated"))
+    , minvalue(impl::ValueMember(value__, "minvalue"))
+    , maxvalue(impl::ValueMember(value__, "maxvalue"))
+    , minsize(impl::ValueMember(value__, "minsize"))
+    , maxsize(impl::ValueMember(value__, "maxsize"))
+    , minlength(impl::ValueMember(value__, "minlength"))
+    , maxlength(impl::ValueMember(value__, "maxlength")) {}
+
+VehicleDataItem::~VehicleDataItem() {}
+
+const std::string VehicleDataItem::kInteger = "Integer";
+const std::string VehicleDataItem::kStruct = "Struct";
+const std::string VehicleDataItem::kString = "String";
+const std::string VehicleDataItem::kFloat = "Float";
+const std::string VehicleDataItem::kDouble = "Double";
+const std::string VehicleDataItem::kBoolean = "Boolean";
+
+const std::vector<std::string> VehicleDataItem::kPODTypes = {
+    kInteger, kFloat, kDouble, kString, kBoolean};
+
+Json::Value VehicleDataItem::ToJsonValue() const {
+  Json::Value ret(Json::objectValue);
+  impl::WriteJsonField("name", name, &ret);
+  impl::WriteJsonField("type", type, &ret);
+  impl::WriteJsonField("key", key, &ret);
+  impl::WriteJsonField("array", array, &ret);
+  impl::WriteJsonField("mandatory", mandatory, &ret);
+  impl::WriteJsonField("params", params, &ret);
+  impl::WriteJsonField("since", since, &ret);
+  impl::WriteJsonField("until", until, &ret);
+  impl::WriteJsonField("removed", removed, &ret);
+  impl::WriteJsonField("deprecated", deprecated, &ret);
+  impl::WriteJsonField("minvalue", minvalue, &ret);
+  impl::WriteJsonField("maxvalue", maxvalue, &ret);
+  impl::WriteJsonField("minsize", minsize, &ret);
+  impl::WriteJsonField("maxsize", maxsize, &ret);
+  impl::WriteJsonField("minlength", minlength, &ret);
+  impl::WriteJsonField("maxlength", maxlength, &ret);
+  return ret;
+}
+
+bool VehicleDataItem::operator==(const VehicleDataItem& vd) {
+  return (name == vd.name && type == vd.type && key == vd.key &&
+          mandatory == vd.mandatory && params == vd.params &&
+          array == vd.array && since == vd.since && until == vd.until &&
+          removed == vd.removed && deprecated == vd.deprecated &&
+          minvalue == vd.minvalue && maxvalue == vd.maxvalue &&
+          minsize == vd.minsize && maxsize == vd.maxsize &&
+          minlength == vd.minlength && maxlength == vd.maxlength);
+}
+
+bool VehicleDataItem::is_valid() const {
+  if (!name.is_valid()) {
+    return false;
+  }
+  if (!type.is_valid()) {
+    return false;
+  }
+  if (!key.is_valid()) {
+    return false;
+  }
+  if (!array.is_valid()) {
+    return false;
+  }
+  if (!mandatory.is_valid()) {
+    return false;
+  }
+  if (!params.is_valid()) {
+    return false;
+  }
+  if (!since.is_valid()) {
+    return false;
+  }
+  if (!until.is_valid()) {
+    return false;
+  }
+  if (!removed.is_valid()) {
+    return false;
+  }
+  if (!deprecated.is_valid()) {
+    return false;
+  }
+  if (!minvalue.is_valid()) {
+    return false;
+  }
+  if (!maxvalue.is_valid()) {
+    return false;
+  }
+  if (!minsize.is_valid()) {
+    return false;
+  }
+  if (!maxsize.is_valid()) {
+    return false;
+  }
+  if (!minlength.is_valid()) {
+    return false;
+  }
+  if (!maxlength.is_valid()) {
+    return false;
+  }
+  return Validate();
+}
+
+bool VehicleDataItem::is_initialized() const {
+  return (initialization_state__ != kUninitialized) || (struct_not_empty());
+}
+
+bool VehicleDataItem::struct_not_empty() const {
+  if (!name.is_initialized()) {
+    return false;
+  }
+  if (!type.is_initialized()) {
+    return false;
+  }
+  if (!key.is_initialized()) {
+    return false;
+  }
+  if (!array.is_initialized()) {
+    return false;
+  }
+  if (!mandatory.is_initialized()) {
+    return false;
+  }
+  if (!params.is_initialized()) {
+    return false;
+  }
+  if (!since.is_initialized()) {
+    return false;
+  }
+  if (!until.is_initialized()) {
+    return false;
+  }
+  if (!removed.is_initialized()) {
+    return false;
+  }
+  if (!deprecated.is_initialized()) {
+    return false;
+  }
+  if (!minvalue.is_initialized()) {
+    return false;
+  }
+  if (!maxvalue.is_initialized()) {
+    return false;
+  }
+  if (!minsize.is_initialized()) {
+    return false;
+  }
+  if (!maxsize.is_initialized()) {
+    return false;
+  }
+  if (!minlength.is_initialized()) {
+    return false;
+  }
+  if (!maxlength.is_initialized()) {
+    return false;
+  }
+  return true;
+}
+
+void VehicleDataItem::ReportErrors(rpc::ValidationReport* report__) const {
+  if (!struct_not_empty()) {
+    rpc::CompositeType::ReportErrors(report__);
+  }
+  if (!name.is_valid()) {
+    name.ReportErrors(&report__->ReportSubobject("name"));
+  }
+
+  if (!ValidateNaming(std::string(name))) {
+    report__->set_validation_info(
+        "Invalid name values [" + std::string(name) +
+        "]. It should not contain spaces or invalid chars.");
+  }
+  if (!type.is_valid()) {
+    type.ReportErrors(&report__->ReportSubobject("type"));
+  }
+  if (type.is_initialized() && !ValidateTypes()) {
+    report__->set_validation_info("Unknown type [" + std::string(name) +
+                                  "]: '" + std::string(type) + "'.");
+  }
+  if (!key.is_valid()) {
+    key.ReportErrors(&report__->ReportSubobject("key"));
+  }
+  if (!ValidateNaming(std::string(key))) {
+    report__->set_validation_info(
+        "Invalid key values [" + std::string(key) +
+        "]. It should not contain spaces or invalid chars.");
+  }
+  if (!array.is_valid()) {
+    array.ReportErrors(&report__->ReportSubobject("array"));
+  }
+  if (!mandatory.is_valid()) {
+    mandatory.ReportErrors(&report__->ReportSubobject("mandatory"));
+  }
+  if (!params.is_valid()) {
+    params.ReportErrors(&report__->ReportSubobject("params"));
+  }
+  if (!since.is_valid()) {
+    since.ReportErrors(&report__->ReportSubobject("since"));
+  }
+  if (!until.is_valid()) {
+    until.ReportErrors(&report__->ReportSubobject("until"));
+  }
+  if (!removed.is_valid()) {
+    removed.ReportErrors(&report__->ReportSubobject("removed"));
+  }
+  if (!deprecated.is_valid()) {
+    deprecated.ReportErrors(&report__->ReportSubobject("deprecated"));
+  }
+  if (!minvalue.is_valid()) {
+    minvalue.ReportErrors(&report__->ReportSubobject("minvalue"));
+  }
+  if (!maxvalue.is_valid()) {
+    maxvalue.ReportErrors(&report__->ReportSubobject("maxvalue"));
+  }
+  if (!minsize.is_valid()) {
+    minsize.ReportErrors(&report__->ReportSubobject("minsize"));
+  }
+  if (!maxsize.is_valid()) {
+    maxsize.ReportErrors(&report__->ReportSubobject("maxsize"));
+  }
+  if (!minlength.is_valid()) {
+    minlength.ReportErrors(&report__->ReportSubobject("minlength"));
+  }
+  if (!maxlength.is_valid()) {
+    maxlength.ReportErrors(&report__->ReportSubobject("maxlength"));
+  }
+}
+
+void VehicleDataItem::SetPolicyTableType(PolicyTableType pt_type) {
+  CompositeType::SetPolicyTableType(pt_type);
+  name.SetPolicyTableType(pt_type);
+  type.SetPolicyTableType(pt_type);
+  key.SetPolicyTableType(pt_type);
+  array.SetPolicyTableType(pt_type);
+  mandatory.SetPolicyTableType(pt_type);
+  params.SetPolicyTableType(pt_type);
+  since.SetPolicyTableType(pt_type);
+  until.SetPolicyTableType(pt_type);
+  removed.SetPolicyTableType(pt_type);
+  deprecated.SetPolicyTableType(pt_type);
+  minvalue.SetPolicyTableType(pt_type);
+  maxvalue.SetPolicyTableType(pt_type);
+  minsize.SetPolicyTableType(pt_type);
+  maxsize.SetPolicyTableType(pt_type);
+  minlength.SetPolicyTableType(pt_type);
+  maxlength.SetPolicyTableType(pt_type);
+}
+
+bool VehicleDataItem::ValidateNaming(std::string str) const {
+  auto contains_spec_chars = [](std::string str) {
+    const auto invalid_chars = "!@#$%^&*";
+    return str.npos != str.find_first_of(invalid_chars);
+  };
+
+  auto contains_spaces = [](std::string str) {
+    const auto found_space =
+        std::find_if(str.begin(), str.end(), [](unsigned char ch) {
+          return std::isspace(ch);
+        });
+
+    return found_space != str.end();
+  };
+
+  auto empty_string = [](std::string str) {
+    str.erase(std::remove_if(str.begin(),
+                             str.end(),
+                             [](unsigned char ch) { return std::isspace(ch); }),
+              str.end());
+    return str.length() < 1;
+  };
+
+  return !empty_string(str) && !contains_spaces(str) &&
+         !contains_spec_chars(str);
+}
+
+bool VehicleDataItem::ValidateTypes() const {
+  if (VehicleDataItem::kStruct == std::string(type)) {
+    return params.is_initialized() && !(params->empty()) && params.is_valid();
+  }
+  // params should be empty for POD types and for enum values
+  return (!(params.is_initialized()) || params->empty());
+}
+
+bool VehicleDataItem::IsPrimitiveType() const {
+  return helpers::in_range(kPODTypes, std::string(type));
+}
+
+// VehicleData methods
+VehicleData::VehicleData() : CompositeType(kUninitialized) {}
+
+VehicleData::VehicleData(const VehicleData& vehicle_data)
+    : CompositeType(vehicle_data.initialization_state__)
+    , schema_version(vehicle_data.schema_version)
+    , schema_items(vehicle_data.schema_items) {}
+
+VehicleData::VehicleData(const Json::Value* value__)
+    : CompositeType(InitHelper(value__, &Json::Value::isObject))
+    , schema_version(impl::ValueMember(value__, "schema_version"))
+    , schema_items(impl::ValueMember(value__, "schema_items")) {}
+
+VehicleData::~VehicleData() {}
+
+bool VehicleData::is_valid() const {
+  if (!schema_version.is_valid()) {
+    return false;
+  }
+  if (!schema_items.is_valid()) {
+    return false;
+  }
+  return Validate();
+}
+
+bool VehicleData::is_initialized() const {
+  return (initialization_state__ != kUninitialized) || (!struct_empty());
+}
+
+bool VehicleData::struct_empty() const {
+  if (schema_version.is_initialized()) {
+    return false;
+  }
+  if (schema_items.is_initialized()) {
+    return false;
+  }
+  return true;
+}
+
+Json::Value VehicleData::ToJsonValue() const {
+  Json::Value ret(Json::objectValue);
+  impl::WriteJsonField("schema_version", schema_version, &ret);
+  impl::WriteJsonField("schema_items", schema_items, &ret);
+  return ret;
+}
+
+void VehicleData::ReportErrors(rpc::ValidationReport* report__) const {
+  if (struct_empty()) {
+    rpc::CompositeType::ReportErrors(report__);
+  }
+  const auto pt_type = GetPolicyTableType();
+  const auto pt_type_str = PolicyTableTypeToString(pt_type);
+  std::string validation_info = "";
+
+  if (PT_SNAPSHOT == pt_type) {
+    if (schema_items.is_initialized()) {
+      validation_info +=
+          "; schema_items " + omitted_validation_info + pt_type_str;
+    }
+    if (!schema_version.is_initialized()) {
+      validation_info +=
+          "; schema_version " + required_validation_info + pt_type_str;
+    }
+    report__->set_validation_info(validation_info);
+  }
+  if (PT_UPDATE == pt_type || PT_PRELOADED == pt_type) {
+    if ((schema_version.is_initialized() && !schema_items.is_initialized()) ||
+        (!schema_version.is_initialized() && schema_items.is_initialized())) {
+      validation_info +=
+          "; if schema_version exist, schema_items should "
+          "also exist in " +
+          pt_type_str;
+    }
+    report__->set_validation_info(validation_info);
+  }
+
+  if (!schema_version.is_valid()) {
+    schema_version.ReportErrors(&report__->ReportSubobject("schema_version"));
+  }
+  if (!schema_items.is_valid()) {
+    schema_items.ReportErrors(&report__->ReportSubobject("schema_items"));
+  }
+}
+
+void VehicleData::SetPolicyTableType(PolicyTableType pt_type) {
+  CompositeType::SetPolicyTableType(pt_type);
+  schema_version.SetPolicyTableType(pt_type);
+  schema_items.SetPolicyTableType(pt_type);
+}
+
 // PolicyTable methods
 PolicyTable::PolicyTable() : CompositeType(kUninitialized) {}
 
@@ -2118,7 +2619,8 @@ PolicyTable::PolicyTable(const Json::Value* value__)
     , module_meta(impl::ValueMember(value__, "module_meta"))
     , usage_and_error_counts(
           impl::ValueMember(value__, "usage_and_error_counts"))
-    , device_data(impl::ValueMember(value__, "device_data")) {}
+    , device_data(impl::ValueMember(value__, "device_data"))
+    , vehicle_data(impl::ValueMember(value__, "vehicle_data")) {}
 
 Json::Value PolicyTable::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
@@ -2131,6 +2633,7 @@ Json::Value PolicyTable::ToJsonValue() const {
   impl::WriteJsonField(
       "usage_and_error_counts", usage_and_error_counts, &result__);
   impl::WriteJsonField("device_data", device_data, &result__);
+  impl::WriteJsonField("vehicle_data", vehicle_data, &result__);
   return result__;
 }
 
@@ -2156,6 +2659,9 @@ bool PolicyTable::is_valid() const {
   if (!device_data.is_valid()) {
     return false;
   }
+  if (!vehicle_data.is_valid()) {
+    return false;
+  }
   return Validate();
 }
 
@@ -2188,6 +2694,10 @@ bool PolicyTable::struct_empty() const {
   if (device_data.is_initialized()) {
     return false;
   }
+
+  if (vehicle_data.is_initialized()) {
+    return false;
+  }
   return true;
 }
 
@@ -2230,6 +2740,9 @@ void PolicyTable::ReportErrors(rpc::ValidationReport* report__) const {
   if (!device_data.is_valid()) {
     device_data.ReportErrors(&report__->ReportSubobject("device_data"));
   }
+  if (!vehicle_data.is_valid()) {
+    vehicle_data.ReportErrors(&report__->ReportSubobject("vehicle_data"));
+  }
 }
 
 void PolicyTable::SetPolicyTableType(PolicyTableType pt_type) {
@@ -2241,6 +2754,7 @@ void PolicyTable::SetPolicyTableType(PolicyTableType pt_type) {
   module_meta.SetPolicyTableType(pt_type);
   usage_and_error_counts.SetPolicyTableType(pt_type);
   device_data.SetPolicyTableType(pt_type);
+  vehicle_data.SetPolicyTableType(pt_type);
 }
 
 // Table methods
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 f9c3f82793..12a79748d7 100644
--- a/src/components/policy/policy_external/src/policy_table/validation.cc
+++ b/src/components/policy/policy_external/src/policy_table/validation.cc
@@ -221,6 +221,15 @@ bool RpcParameters::Validate() const {
 bool Rpcs::Validate() const {
   return true;
 }
+
+bool EndpointProperty::Validate() const {
+  if (!version.is_valid()) {
+    return false;
+  }
+
+  return true;
+}
+
 bool ModuleConfig::Validate() const {
   switch (GetPolicyTableType()) {
     case PT_PRELOADED: {
@@ -258,6 +267,14 @@ bool ModuleConfig::Validate() const {
     }
   }
 
+  if (endpoint_properties.is_initialized()) {
+    const auto& endpoint_property =
+        endpoint_properties->find(kDefaultOemMappingServiceName);
+    if (endpoint_properties->end() != endpoint_property) {
+      return (*endpoint_property).second.version.is_initialized();
+    }
+  }
+
   return true;
 }
 
@@ -304,6 +321,40 @@ bool ConsentRecords::Validate() const {
 bool DeviceParams::Validate() const {
   return true;
 }
+
+bool VehicleDataItem::Validate() const {
+  if (!ValidateNaming(std::string(name))) {
+    return false;
+  };
+
+  if (!ValidateNaming(std::string(key))) {
+    return false;
+  };
+
+  if (!ValidateTypes()) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Unknown type: " << std::string(type) << " of " << std::string(key));
+    return false;
+  }
+  return true;
+}
+
+bool VehicleData::Validate() const {
+  const PolicyTableType policy_table_type = GetPolicyTableType();
+  bool result = true;
+  if (PT_SNAPSHOT == policy_table_type) {
+    result =
+        (!schema_items.is_initialized()) && schema_version.is_initialized();
+  }
+  if (PT_UPDATE == policy_table_type || PT_PRELOADED == policy_table_type) {
+    result =
+        (schema_version.is_initialized() && schema_items.is_initialized()) ||
+        (!schema_version.is_initialized() && !schema_items.is_initialized());
+  }
+  return result;
+}
+
 bool PolicyTable::Validate() const {
   PolicyTableType policy_table_type = GetPolicyTableType();
 
diff --git a/src/components/policy/policy_external/src/sql_pt_ext_queries.cc b/src/components/policy/policy_external/src/sql_pt_ext_queries.cc
index 2c24bbc522..ea323908c0 100644
--- a/src/components/policy/policy_external/src/sql_pt_ext_queries.cc
+++ b/src/components/policy/policy_external/src/sql_pt_ext_queries.cc
@@ -207,9 +207,10 @@ const std::string kInsertApplication =
     " `default_hmi`, `priority_value`, `is_revoked`, `memory_kb`, "
     " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, "
     " `endpoint`, `enabled`, `auth_token`, "
-    " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`) "
+    " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`, "
+    "`encryption_required`) "
     "VALUES "
-    "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
 const std::string kCollectFriendlyMsg = "SELECT * FROM `message`";
 
@@ -238,7 +239,8 @@ const std::string kSelectAppPolicies =
     "SELECT `id`, `priority_value`, `default_hmi`, `keep_context`, "
     " `steal_focus`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, "
     " `hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, "
-    " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough` "
+    " `cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`, "
+    "`encryption_required`"
     "FROM `application`";
 
 const std::string kSelectFunctionalGroupNames =
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 e4711a3cd2..c8a1b5d7ea 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
@@ -563,25 +563,23 @@ bool SQLPTExtRepresentation::GatherConsumerFriendlyMessages(
       msg.message_code = query.GetString(7);
 
       std::string language = query.GetString(6);
+      policy_table::Languages& languages =
+          (*messages->messages)[msg.message_code].languages;
+      policy_table::MessageString& specific_message = languages[language];
       if (!msg.tts.empty()) {
-        *(*messages->messages)[msg.message_code].languages[language].tts =
-            msg.tts;
+        *(specific_message).tts = msg.tts;
       }
       if (!msg.label.empty()) {
-        *(*messages->messages)[msg.message_code].languages[language].label =
-            msg.label;
+        *(specific_message).label = msg.label;
       }
       if (!msg.line1.empty()) {
-        *(*messages->messages)[msg.message_code].languages[language].line1 =
-            msg.line1;
+        *(specific_message).line1 = msg.line1;
       }
       if (!msg.line2.empty()) {
-        *(*messages->messages)[msg.message_code].languages[language].line2 =
-            msg.line2;
+        *(specific_message).line2 = msg.line2;
       }
       if (!msg.text_body.empty()) {
-        *(*messages->messages)[msg.message_code].languages[language].textBody =
-            msg.text_body;
+        *(specific_message).textBody = msg.text_body;
       }
     }
   } else {
@@ -796,6 +794,9 @@ bool SQLPTExtRepresentation::SaveSpecificAppPolicy(
   app.second.allow_unknown_rpc_passthrough.is_initialized()
       ? app_query.Bind(15, *app.second.allow_unknown_rpc_passthrough)
       : app_query.Bind(15);
+  app.second.encryption_required.is_initialized()
+      ? app_query.Bind(16, *app.second.encryption_required)
+      : app_query.Bind(16);
 
   if (!app_query.Exec() || !app_query.Reset()) {
     LOG4CXX_WARN(logger_, "Incorrect insert into application.");
@@ -940,6 +941,9 @@ bool SQLPTExtRepresentation::GatherApplicationPoliciesSection(
     *params.cloud_transport_type = query.GetString(12);
     *params.icon_url = query.GetString(13);
     *params.allow_unknown_rpc_passthrough = query.GetBoolean(14);
+    if (!query.IsNull(15)) {
+      *params.encryption_required = query.GetBoolean(15);
+    }
     const auto& gather_app_id = ((*policies).apps[app_id].is_string())
                                     ? (*policies).apps[app_id].get_string()
                                     : app_id;
diff --git a/src/components/policy/policy_external/src/sql_pt_queries.cc b/src/components/policy/policy_external/src/sql_pt_queries.cc
index 5592fdecd8..4f858637d7 100644
--- a/src/components/policy/policy_external/src/sql_pt_queries.cc
+++ b/src/components/policy/policy_external/src/sql_pt_queries.cc
@@ -82,7 +82,8 @@ const std::string kCreateSchema =
     "CREATE TABLE IF NOT EXISTS `functional_group`( "
     "  `id` INTEGER PRIMARY KEY NOT NULL, "
     "  `user_consent_prompt` TEXT, "
-    "  `name` VARCHAR(100) NOT NULL "
+    "  `name` VARCHAR(100) NOT NULL, "
+    "  `encryption_required` BOOLEAN "
     "); "
     "CREATE TABLE IF NOT EXISTS `external_consent_entities`( "
     "  `group_id` INTEGER NOT NULL, "
@@ -160,6 +161,7 @@ const std::string kCreateSchema =
     "  `icon_url` VARCHAR(65535), "
     "  `allow_unknown_rpc_passthrough` BOOLEAN, "
     "  `remote_control_denied` BOOLEAN NOT NULL DEFAULT 0, "
+    "  `encryption_required` BOOLEAN, "
     "  CONSTRAINT `fk_application_hmi_level1` "
     "    FOREIGN KEY(`default_hmi`) "
     "    REFERENCES `hmi_level`(`value`), "
@@ -384,6 +386,11 @@ const std::string kCreateSchema =
     "); "
     "CREATE INDEX IF NOT EXISTS `endpoint.fk_endpoint_application1_idx` "
     "  ON `endpoint`(`application_id` COLLATE NOCASE); "
+    /*endpoint properties*/
+    "CREATE TABLE IF NOT EXISTS `endpoint_properties`( "
+    "  `service` VARCHAR(100) NOT NULL, "
+    "  `version` VARCHAR(100) NOT NULL "
+    ");"
     "CREATE TABLE IF NOT EXISTS `message`( "
     "  `id` INTEGER PRIMARY KEY NOT NULL, "
     "  `tts` TEXT, "
@@ -447,6 +454,40 @@ const std::string kCreateSchema =
     "  `entity_id` INTEGER NOT NULL, "
     "  `on_off` TEXT NOT NULL "
     "  ); "
+    /*vehicle data*/
+    "CREATE TABLE IF NOT EXISTS `vehicle_data`( "
+    "  `schema_version` VARCHAR(100) NOT NULL "
+    ");"
+    /* vehicle data item definition*/
+    "CREATE TABLE IF NOT EXISTS `vehicle_data_item_definition`( "
+    "  `name` VARCHAR(255) NOT NULL, "
+    "  `type` VARCHAR(255) NOT NULL, "
+    "  `key` VARCHAR(255) NOT NULL, "
+    "  `mandatory` BOOL NOT NULL, "
+    "  `array` BOOL, "
+    "  `since` VARCHAR(45), "
+    "  `until` VARCHAR(45), "
+    "  `removed` BOOL, "
+    "  `deprecated` BOOL, "
+    "  `minvalue` INTEGER, "
+    "  `maxvalue` INTEGER, "
+    "  `minsize` INTEGER, "
+    "  `maxsize` INTEGER, "
+    "  `minlength` INTEGER, "
+    "  `maxlength` INTEGER "
+    "); "
+    "CREATE TABLE IF NOT EXISTS `vehicle_data_item_parameters`( "
+    "  `parent_name` VARCHAR(255) NOT NULL, "
+    "  `parent_key` VARCHAR(255) NOT NULL, "
+    "  `param_name` VARCHAR(255) NOT NULL, "
+    "  `param_key` VARCHAR(255) NOT NULL, "
+    "  CONSTRAINT `fk_vdi_id` "
+    "    FOREIGN KEY(`parent_name`, `parent_key`) "
+    "    REFERENCES `vehicle_data_item_definition`(`name`, `key`), "
+    "  CONSTRAINT `fk_vdi_param_id` "
+    "    FOREIGN KEY(`param_name`, `param_key`) "
+    "    REFERENCES `vehicle_data_item_definition`(`name`, `key`) "
+    "); "
     "COMMIT;";
 
 const std::string kInsertInitData =
@@ -462,6 +503,8 @@ const std::string kInsertInitData =
     "  `exchange_after_x_ignition_cycles`, `exchange_after_x_kilometers`, "
     "  `exchange_after_x_days`, `timeout_after_x_seconds`)"
     "  VALUES(1, 0, 0, 0, 0, 0); "
+    "INSERT OR IGNORE INTO `vehicle_data` ("
+    "  `schema_version`) VALUES('0'); "
     "INSERT OR IGNORE INTO `priority`(`value`) VALUES ('EMERGENCY'); "
     "INSERT OR IGNORE INTO `priority`(`value`) VALUES ('NAVIGATION'); "
     "INSERT OR IGNORE INTO `priority`(`value`) VALUES ('VOICECOMMUNICATION'); "
@@ -526,6 +569,7 @@ const std::string kDropSchema =
     "DROP TABLE IF EXISTS `message`; "
     "DROP INDEX IF EXISTS `endpoint.fk_endpoint_application1_idx`; "
     "DROP TABLE IF EXISTS `endpoint`; "
+    "DROP TABLE IF EXISTS `endpoint_properties`; "
     "DROP INDEX IF EXISTS `consent_group.fk_consent_group_device1_idx`; "
     "DROP INDEX IF EXISTS "
     "`consent_group.fk_consent_group_functional_group1_idx`; "
@@ -591,6 +635,9 @@ const std::string kDropSchema =
     "DROP TABLE IF EXISTS `device`; "
     "DROP TABLE IF EXISTS `_internal_data`; "
     "DROP TABLE IF EXISTS `_internal_external_consent_status`; "
+    "DROP TABLE IF EXISTS `vehicle_data`; "
+    "DROP TABLE IF EXISTS `vehicle_data_item_definition`; "
+    "DROP TABLE IF EXISTS `vehicle_data_item_parameters`; "
     "COMMIT; "
     "VACUUM;";
 
@@ -599,6 +646,7 @@ const std::string kDeleteData =
     "DELETE FROM `message`; "
     "DELETE FROM `module_type`; "
     "DELETE FROM `endpoint`; "
+    "DELETE FROM `endpoint_properties`; "
     "DELETE FROM `consent_group`; "
     "DELETE FROM `external_consent_status_group`; "
     "DELETE FROM `external_consent_entities`; "
@@ -625,6 +673,9 @@ const std::string kDeleteData =
     "DELETE FROM `usage_and_error_count`; "
     "DELETE FROM `device`; "
     "DELETE FROM `request_type`; "
+    "DELETE FROM `vehicle_data`; "
+    "DELETE FROM `vehicle_data_item_definition`; "
+    "DELETE FROM `vehicle_data_item_parameters`; "
     "COMMIT; "
     "VACUUM;";
 
@@ -632,6 +683,82 @@ const std::string kCheckDBIntegrity = "PRAGMA integrity_check";
 
 const std::string kCheckPgNumber = "PRAGMA page_count";
 
+const std::string kSelectEndpointProperties =
+    "SELECT `service`, `version` FROM `endpoint_properties`";
+
+const std::string kSelectVehicleDataSchemaVersion =
+    "SELECT `schema_version` FROM `vehicle_data` ";
+
+const std::string kSelectVehicleDataItem =
+    "SELECT * FROM `vehicle_data_item_definition` "
+    "WHERE `key` = ? AND `name` = ?";
+
+const std::string kSelectVehicleDataItemWithVersion =
+    "SELECT * FROM `vehicle_data_item_definition` "
+    "WHERE `name` IS ? AND `key` IS ? AND `since` IS ? AND `until` IS ?";
+
+const std::string kSelectVehicleDataItemParams =
+    "SELECT * FROM `vehicle_data_item_parameters` "
+    "WHERE `parent_name` = ? AND `parent_key` = ?";
+
+const std::string kSelectCompositeVehicleDataItemsKey =
+    "SELECT DISTINCT `parent_name`, `parent_key` FROM "
+    "`vehicle_data_item_parameters` "
+    "LEFT JOIN "
+    "(SELECT DISTINCT `param_name`, `param_key` FROM "
+    "`vehicle_data_item_parameters`) `vdi_params` ON "
+    "`vehicle_data_item_parameters`.`parent_name` = `vdi_params`.`param_name` "
+    "AND "
+    "`vehicle_data_item_parameters`.`parent_key` = `vdi_params`.`param_key` "
+    "WHERE `vdi_params`.`param_key` IS NULL";
+
+const std::string kSelectPrimitiveVehicleDataItems =
+    "SELECT * FROM `vehicle_data_item_definition` "
+    "LEFT JOIN ( "
+    "SELECT `parent_name`, `parent_key` FROM `vehicle_data_item_parameters` "
+    "UNION "
+    "SELECT `param_name`, `param_key` FROM `vehicle_data_item_parameters`) "
+    "`vdi_params` ON "
+    "`vehicle_data_item_definition`.`name` = `vdi_params`.`parent_name` "
+    "AND "
+    "`vehicle_data_item_definition`.`key` = `vdi_params`.`parent_key` "
+    "WHERE `vdi_params`.`parent_key` IS NULL";
+
+const std::string kInsertVehicleDataSchemaVersion =
+    "UPDATE `vehicle_data` SET `schema_version` = ?";
+
+const std::string kInsertEndpointVersion =
+    "INSERT OR REPLACE INTO `endpoint_properties`(`service`, "
+    "`version`) "
+    "VALUES(?, ?)";
+
+const std::string kInsertVehicleDataItem =
+    "INSERT INTO `vehicle_data_item_definition` ("
+    "  `name`, "
+    "  `type`, "
+    "  `key`, "
+    "  `mandatory`, "
+    "  `array`, "
+    "  `since`, "
+    "  `until`, "
+    "  `removed`, "
+    "  `deprecated`, "
+    "  `minvalue`, "
+    "  `maxvalue`, "
+    "  `minsize`, "
+    "  `maxsize`, "
+    "  `minlength`, "
+    "  `maxlength`) "
+    "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+
+const std::string kInsertVehicleDataItemParams =
+    "INSERT INTO `vehicle_data_item_parameters` ("
+    "  `parent_name`, "
+    "  `parent_key`, "
+    "  `param_name`, "
+    "  `param_key`) "
+    "VALUES (?, ?, ?, ?) ";
+
 const std::string kSelectRpc =
     "SELECT DISTINCT `rpc`.`parameter` FROM `rpc` "
     "  JOIN `app_group` AS `g` ON (`g`.`functional_group_id` = "
@@ -654,12 +781,10 @@ const std::string kSetNotFirstRun =
 const std::string kSelectEndpoint =
     "SELECT `url`, `application_id` FROM `endpoint` WHERE `service` = ? ";
 
-const std::string kSelectLockScreenIcon =
-    "SELECT `url` FROM `endpoint` WHERE `service` = ? AND `application_id` = ?";
-
 const std::string kInsertFunctionalGroup =
-    "INSERT INTO `functional_group` (`id`, `name`, `user_consent_prompt`) "
-    "  VALUES (?, ?, ?)";
+    "INSERT INTO `functional_group` (`id`, `name`, `user_consent_prompt`, "
+    "`encryption_required`) "
+    "  VALUES (?, ?, ?, ?)";
 
 const std::string kInsertRpc =
     "INSERT INTO `rpc` (`name`, `hmi_level_value`, `functional_group_id`) "
@@ -679,9 +804,10 @@ const std::string kInsertApplication =
     "INSERT OR IGNORE INTO `application` (`id`, `priority_value`, "
     "`is_revoked`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, "
     "`hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, "
-    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`) "
+    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`, "
+    "`encryption_required`) "
     "VALUES "
-    "(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
 const std::string kInsertAppGroup =
     "INSERT INTO `app_group` (`application_id`, `functional_group_id`)"
@@ -804,7 +930,7 @@ const std::string kSelectAppLevels = "SELECT `application_id` FROM `app_level`";
 const std::string kSelectDeviceData = "SELECT * FROM `device`";
 
 const std::string kSelectFunctionalGroups =
-    "SELECT `id`,`name`, `user_consent_prompt` "
+    "SELECT `id`,`name`, `user_consent_prompt`, `encryption_required` "
     "FROM `functional_group`";
 
 const std::string kSelectAllRpcs =
@@ -822,7 +948,7 @@ const std::string kSelectAppPolicies =
     "SELECT `id`, `priority_value`, `memory_kb`, "
     " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, "
     " `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, `icon_url`, "
-    " `allow_unknown_rpc_passthrough` "
+    " `allow_unknown_rpc_passthrough`, `encryption_required` "
     "FROM "
     " `application`";
 
@@ -920,6 +1046,12 @@ const std::string kDeleteAppServiceNames = "DELETE FROM `app_service_names`";
 const std::string kDeleteAppServiceHandledRpcs =
     "DELETE FROM `app_service_handled_rpcs`";
 
+const std::string kDeleteVehicleDataItems =
+    "DELETE FROM `vehicle_data_item_definition`";
+
+const std::string kDeleteVehicleDataItemParams =
+    "DELETE FROM `vehicle_data_item_parameters`";
+
 const std::string kSelectApplicationRevoked =
     "SELECT `is_revoked` FROM `application` WHERE `id` = ?";
 
@@ -947,8 +1079,8 @@ const std::string kInsertApplicationFull =
     " `is_predata`, `memory_kb`, `heart_beat_timeout_ms`, "
     " `certificate`, `hybrid_app_preference_value`, `endpoint`, `enabled`, "
     " `auth_token`, `cloud_transport_type`, `icon_url`, "
-    "`allow_unknown_rpc_passthrough`) "
-    "  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+    "`allow_unknown_rpc_passthrough`, `encryption_required`) "
+    "  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
 const std::string kSelectApplicationFull =
     "SELECT `keep_context`, `steal_focus`, `default_hmi`, `priority_value`, "
@@ -956,7 +1088,7 @@ const std::string kSelectApplicationFull =
     "  `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, "
     "  `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, "
     "`icon_url`, "
-    "  `allow_unknown_rpc_passthrough` "
+    "  `allow_unknown_rpc_passthrough`, `encryption_required` "
     "FROM `application` "
     "WHERE `id` = ?";
 
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 d5950f9d42..5e96d0bde0 100644
--- a/src/components/policy/policy_external/src/sql_pt_representation.cc
+++ b/src/components/policy/policy_external/src/sql_pt_representation.cc
@@ -101,28 +101,6 @@ SQLPTRepresentation::~SQLPTRepresentation() {
   delete db_;
 }
 
-std::string SQLPTRepresentation::GetLockScreenIconUrl() const {
-  utils::dbms::SQLQuery query(db());
-  std::string ret;
-  if (query.Prepare(sql_pt::kSelectLockScreenIcon)) {
-    query.Bind(0, std::string("lock_screen_icon_url"));
-    query.Bind(1, std::string("default"));
-
-    if (!query.Exec()) {
-      LOG4CXX_WARN(logger_, "Incorrect select from notifications by priority.");
-      return ret;
-    }
-
-    if (!query.IsNull(0)) {
-      ret = query.GetString(0);
-    }
-
-  } else {
-    LOG4CXX_WARN(logger_, "Invalid select endpoints statement.");
-  }
-  return ret;
-}
-
 void SQLPTRepresentation::CheckPermissions(const PTString& app_id,
                                            const PTString& hmi_level,
                                            const PTString& rpc,
@@ -451,16 +429,6 @@ bool SQLPTRepresentation::Close() {
   return db_->LastError().number() == utils::dbms::OK;
 }
 
-const VehicleInfo SQLPTRepresentation::GetVehicleInfo() const {
-  policy_table::ModuleConfig module_config;
-  GatherModuleConfig(&module_config);
-  VehicleInfo vehicle_info;
-  vehicle_info.vehicle_make = *module_config.vehicle_make;
-  vehicle_info.vehicle_model = *module_config.vehicle_model;
-  vehicle_info.vehicle_year = *module_config.vehicle_year;
-  return vehicle_info;
-}
-
 bool SQLPTRepresentation::Drop() {
   utils::dbms::SQLQuery query(db());
   if (!query.Exec(sql_pt::kDropSchema)) {
@@ -525,6 +493,11 @@ std::shared_ptr<policy_table::Table> SQLPTRepresentation::GenerateSnapshot()
   GatherConsumerFriendlyMessages(
       &*table->policy_table.consumer_friendly_messages);
   GatherApplicationPoliciesSection(&table->policy_table.app_policies_section);
+  GatherVehicleData(&*table->policy_table.vehicle_data);
+  if (!table->policy_table.vehicle_data.is_initialized()) {
+    rpc::Optional<rpc::String<0, 100> > null_version;
+    table->policy_table.vehicle_data->schema_version = null_version;
+  }
   return table;
 }
 
@@ -569,6 +542,18 @@ void SQLPTRepresentation::GatherModuleConfig(
     }
   }
 
+  utils::dbms::SQLQuery endpoint_properties(db());
+  if (!endpoint_properties.Prepare(sql_pt::kSelectEndpointProperties)) {
+    LOG4CXX_ERROR(logger_, "Incorrect statement for Endpoint properties");
+  } else {
+    while (endpoint_properties.Next()) {
+      const std::string& service = endpoint_properties.GetString(0);
+      const std::string& version = endpoint_properties.GetString(1);
+      auto& ep_properties = (*config->endpoint_properties);
+      *ep_properties[service].version = version;
+    }
+  }
+
   utils::dbms::SQLQuery notifications(db());
   if (!notifications.Prepare(sql_pt::kSelectNotificationsPerMin)) {
     LOG4CXX_WARN(logger_, "Incorrect select statement for notifications");
@@ -648,6 +633,10 @@ bool SQLPTRepresentation::GatherFunctionalGroupings(
       *rpcs_tbl.user_consent_prompt = func_group.GetString(2);
     }
 
+    if (!func_group.IsNull(3)) {
+      *rpcs_tbl.encryption_required = func_group.GetBoolean(3);
+    }
+
     const int group_id = func_group.GetInteger(0);
 
     rpcs.Bind(0, group_id);
@@ -660,16 +649,15 @@ bool SQLPTRepresentation::GatherFunctionalGroupings(
         }
       }
       if (!rpcs.IsNull(2)) {
-        policy_table::Parameter param;
-        if (policy_table::EnumFromJsonString(rpcs.GetString(2), &param)) {
-          // EMPTY is a special mark to specify that 'parameters' section is
-          // present, but has no parameters. It is not valid parameter value.
-          if (policy_table::P_EMPTY == param) {
-            (*rpcs_tbl.rpcs[rpcs.GetString(0)].parameters).mark_initialized();
-            continue;
-          }
-          InsertUnique(param, &(*rpcs_tbl.rpcs[rpcs.GetString(0)].parameters));
+        std::string param = rpcs.GetString(2);
+        // EMPTY is a special mark to specify that 'parameters' section is
+        // present, but has no parameters. It is not valid parameter value.
+        if (policy_table::EnumToJsonString(policy_table::P_EMPTY) == param) {
+          (*rpcs_tbl.rpcs[rpcs.GetString(0)].parameters).mark_initialized();
+          continue;
         }
+        InsertUnique(rpcs.GetString(2),
+                     &(*rpcs_tbl.rpcs[rpcs.GetString(0)].parameters));
       }
     }
 
@@ -715,10 +703,33 @@ bool SQLPTRepresentation::GatherConsumerFriendlyMessages(
   if (query.Prepare(sql_pt::kCollectFriendlyMsg)) {
     while (query.Next()) {
       UserFriendlyMessage msg;
+
+      msg.tts = query.GetString(1);
+      msg.label = query.GetString(2);
+      msg.line1 = query.GetString(3);
+      msg.line2 = query.GetString(4);
+      msg.text_body = query.GetString(5);
       msg.message_code = query.GetString(7);
-      std::string language = query.GetString(6);
 
-      (*messages->messages)[msg.message_code].languages[language];
+      std::string language = query.GetString(6);
+      policy_table::Languages& languages =
+          (*messages->messages)[msg.message_code].languages;
+      policy_table::MessageString& specific_message = languages[language];
+      if (!msg.tts.empty()) {
+        *(specific_message).tts = msg.tts;
+      }
+      if (!msg.label.empty()) {
+        *(specific_message).label = msg.label;
+      }
+      if (!msg.line1.empty()) {
+        *(specific_message).line1 = msg.line1;
+      }
+      if (!msg.line2.empty()) {
+        *(specific_message).line2 = msg.line2;
+      }
+      if (!msg.text_body.empty()) {
+        *(specific_message).textBody = msg.text_body;
+      }
     }
   } else {
     LOG4CXX_WARN(logger_, "Incorrect statement for select friendly messages.");
@@ -785,6 +796,10 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
     const auto& gather_app_id = ((*policies).apps[app_id].is_string())
                                     ? (*policies).apps[app_id].get_string()
                                     : app_id;
+
+    if (!query.IsNull(12)) {
+      *params.encryption_required = query.GetBoolean(12);
+    }
     // Data should be gathered from db by  "default" key if application has
     // default policies
 
@@ -824,6 +839,43 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
   return true;
 }
 
+bool SQLPTRepresentation::GatherVehicleData(
+    policy_table::VehicleData* vehicle_data) const {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kSelectVehicleDataSchemaVersion) ||
+      !query.Next()) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrect statement for vehicle data schema version");
+    return false;
+  }
+  *vehicle_data->schema_version = query.GetString(0);
+
+  vehicle_data->mark_initialized();
+  return GatherVehicleDataItems(&*vehicle_data->schema_items);
+}
+
+bool SQLPTRepresentation::GatherVehicleDataItems(
+    policy_table::VehicleDataItems* vehicle_data_items) const {
+  auto parameterized_vdi = SelectCompositeVehicleDataItems();
+  if (!parameterized_vdi.is_initialized()) {
+    return false;
+  }
+
+  auto non_parameterized_vdi = SelectPrimitiveVehicleDataItems();
+  if (!non_parameterized_vdi.is_initialized()) {
+    return false;
+  }
+
+  vehicle_data_items->insert(vehicle_data_items->end(),
+                             parameterized_vdi.begin(),
+                             parameterized_vdi.end());
+  vehicle_data_items->insert(vehicle_data_items->end(),
+                             non_parameterized_vdi.begin(),
+                             non_parameterized_vdi.end());
+
+  return true;
+}
+
 bool SQLPTRepresentation::Save(const policy_table::Table& table) {
   LOG4CXX_AUTO_TRACE(logger_);
   db_->BeginTransaction();
@@ -858,6 +910,10 @@ bool SQLPTRepresentation::Save(const policy_table::Table& table) {
     db_->RollbackTransaction();
     return false;
   }
+  if (!SaveVehicleData(*table.policy_table.vehicle_data)) {
+    db_->RollbackTransaction();
+    return false;
+  }
   db_->CommitTransaction();
   return true;
 }
@@ -903,7 +959,9 @@ bool SQLPTRepresentation::SaveFunctionalGroupings(
     groups_it->second.user_consent_prompt.is_initialized()
         ? query.Bind(2, *(groups_it->second.user_consent_prompt))
         : query.Bind(2);
-
+    groups_it->second.encryption_required.is_initialized()
+        ? query.Bind(3, *(groups_it->second.encryption_required))
+        : query.Bind(3);
     if (!query.Exec() || !query.Reset()) {
       LOG4CXX_WARN(logger_, "Incorrect insert into functional groups");
       return false;
@@ -956,8 +1014,7 @@ bool SQLPTRepresentation::SaveRpcs(int64_t group_id,
           query_parameter.Bind(0, it->first);
           query_parameter.Bind(
               1, std::string(policy_table::EnumToJsonString(*hmi_it)));
-          query_parameter.Bind(
-              2, std::string(policy_table::EnumToJsonString(*ps_it)));
+          query_parameter.Bind(2, std::string(*ps_it));
           query_parameter.Bind(3, group_id);
           if (!query_parameter.Exec() || !query_parameter.Reset()) {
             LOG4CXX_WARN(logger_, "Incorrect insert into rpc with parameter");
@@ -1100,6 +1157,10 @@ bool SQLPTRepresentation::SaveSpecificAppPolicy(
       ? app_query.Bind(12, *app.second.allow_unknown_rpc_passthrough)
       : app_query.Bind(12);
 
+  app.second.encryption_required.is_initialized()
+      ? app_query.Bind(13, *app.second.encryption_required)
+      : app_query.Bind(13);
+
   if (!app_query.Exec() || !app_query.Reset()) {
     LOG4CXX_WARN(logger_, "Incorrect insert into application.");
     return false;
@@ -1171,6 +1232,44 @@ bool policy::SQLPTRepresentation::SaveDevicePolicy(
   return true;
 }
 
+bool SQLPTRepresentation::SaveVehicleDataItems(
+    const policy_table::VehicleDataItems& vehicle_data_items) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  DeleteVehicleDataItems();
+  for (const auto& item : vehicle_data_items) {
+    if (!InsertVehicleDataItem(item)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool SQLPTRepresentation::SaveVehicleData(
+    const policy_table::VehicleData& vehicle_data) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (vehicle_data.is_initialized() &&
+      vehicle_data.schema_version.is_initialized()) {
+    utils::dbms::SQLQuery query(db());
+    if (!query.Prepare(sql_pt::kInsertVehicleDataSchemaVersion)) {
+      LOG4CXX_WARN(logger_,
+                   "Incorrect insert of schema_version to vehicle_data.");
+      return false;
+    }
+    query.Bind(0, *vehicle_data.schema_version);
+    if (!query.Exec() || !query.Reset()) {
+      LOG4CXX_WARN(logger_, "Failed to insert schema_version to vehicle_data.");
+      return false;
+    }
+  }
+
+  auto vehicle_data_items = vehicle_data.is_initialized() &&
+                                    vehicle_data.schema_items.is_initialized()
+                                ? *(vehicle_data.schema_items)
+                                : policy_table::VehicleDataItems();
+
+  return SaveVehicleDataItems(vehicle_data_items);
+}
+
 bool SQLPTRepresentation::SaveAppGroup(
     const std::string& app_id, const policy_table::Strings& app_groups) {
   utils::dbms::SQLQuery query(db());
@@ -1294,7 +1393,9 @@ bool SQLPTRepresentation::SaveRequestSubType(
   } else if (request_subtypes.is_initialized()) {
     LOG4CXX_WARN(logger_, "Request subtypes empty.");
     query.Bind(0, app_id);
-    query.Bind(1, std::string("EMPTY"));
+    query.Bind(1,
+               std::string(policy_table::EnumToJsonString(
+                   policy_table::RequestType::RT_EMPTY)));
     if (!query.Exec() || !query.Reset()) {
       LOG4CXX_WARN(logger_, "Incorrect insert into request subtypes.");
       return false;
@@ -1437,6 +1538,10 @@ bool SQLPTRepresentation::SaveModuleConfig(
     return false;
   }
 
+  if (!SaveServiceEndpointProperties(*config.endpoint_properties)) {
+    return false;
+  }
+
   return true;
 }
 
@@ -1475,6 +1580,31 @@ bool SQLPTRepresentation::SaveServiceEndpoints(
   return true;
 }
 
+bool SQLPTRepresentation::SaveServiceEndpointProperties(
+    const policy_table::ServiceEndpointProperties& endpoint_properties) {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kInsertEndpointVersion)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Incorrect insert of endpoint property to endpoint_properties.");
+    return false;
+  }
+
+  for (auto& endpoint_property : endpoint_properties) {
+    query.Bind(0, endpoint_property.first);
+    query.Bind(1, endpoint_property.second.version);
+
+    if (!query.Exec() || !query.Reset()) {
+      LOG4CXX_WARN(
+          logger_,
+          "Failed to insert endpoint property into endpoint_properties.");
+      return false;
+    }
+  }
+
+  return true;
+}
+
 bool SQLPTRepresentation::SaveConsumerFriendlyMessages(
     const policy_table::ConsumerFriendlyMessages& messages) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1561,6 +1691,120 @@ bool SQLPTRepresentation::SaveLanguage(const std::string& code) {
   return true;
 }
 
+policy_table::VehicleDataItem SQLPTRepresentation::PopulateVDIFromQuery(
+    const utils::dbms::SQLQuery& query) const {
+  policy_table::VehicleDataItem result;
+
+  result.name = query.GetString(0);
+  result.type = query.GetString(1);
+  result.key = query.GetString(2);
+  result.mandatory = query.GetBoolean(3);
+
+  if (!query.IsNull(4)) {
+    *result.array = query.GetBoolean(4);
+  }
+  if (!query.IsNull(5)) {
+    *result.since = query.GetString(5);
+  }
+  if (!query.IsNull(6)) {
+    *result.until = query.GetString(6);
+  }
+  if (!query.IsNull(7)) {
+    *result.removed = query.GetBoolean(7);
+  }
+  if (!query.IsNull(8)) {
+    *result.deprecated = query.GetBoolean(8);
+  }
+  if (!query.IsNull(9)) {
+    *result.minvalue = query.GetInteger(9);
+  }
+  if (!query.IsNull(10)) {
+    *result.maxvalue = query.GetInteger(10);
+  }
+  if (!query.IsNull(11)) {
+    *result.minsize = query.GetUInteger(11);
+  }
+  if (!query.IsNull(12)) {
+    *result.maxsize = query.GetUInteger(12);
+  }
+  if (!query.IsNull(13)) {
+    *result.minlength = query.GetUInteger(13);
+  }
+  if (!query.IsNull(14)) {
+    *result.maxlength = query.GetUInteger(14);
+  }
+  result.params->mark_initialized();
+
+  result.mark_initialized();
+  return result;
+}
+
+policy_table::VehicleDataItems
+SQLPTRepresentation::SelectCompositeVehicleDataItems() const {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kSelectCompositeVehicleDataItemsKey)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrect statement for parameterized vehicle data items");
+    return policy_table::VehicleDataItems();
+  }
+
+  policy_table::VehicleDataItems result;
+  result.mark_initialized();
+
+  while (query.Next()) {
+    const auto vdi = GetVehicleDataItem(query.GetString(0), query.GetString(1));
+    if (!vdi.is_initialized()) {
+      return policy_table::VehicleDataItems();
+    }
+    for (const auto& item : vdi) {
+      result.push_back(item);
+    }
+  }
+
+  return result;
+}
+
+policy_table::VehicleDataItems
+SQLPTRepresentation::SelectPrimitiveVehicleDataItems() const {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kSelectPrimitiveVehicleDataItems)) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Incorrect statement for non parameterized vehicle data items");
+    return policy_table::VehicleDataItems();
+  }
+
+  auto result = policy_table::VehicleDataItems();
+  result.mark_initialized();
+
+  while (query.Next()) {
+    const auto vdi = PopulateVDIFromQuery(query);
+    if (!vdi.is_initialized()) {
+      return policy_table::VehicleDataItems();
+    }
+    result.push_back(vdi);
+  }
+  return result;
+}
+
+bool SQLPTRepresentation::DeleteVehicleDataItems() const {
+  utils::dbms::SQLQuery query(db());
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!query.Exec(sql_pt::kDeleteVehicleDataItems)) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed clearing database: " << query.LastError().text());
+    return false;
+  }
+
+  if (!query.Exec(sql_pt::kDeleteVehicleDataItemParams)) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed clearing database: " << query.LastError().text());
+    return false;
+  }
+  return true;
+}
+
 bool SQLPTRepresentation::SaveMessageString(
     const std::string& type,
     const std::string& lang,
@@ -1803,7 +2047,8 @@ bool SQLPTRepresentation::GatherRequestSubType(
   query.Bind(0, app_id);
   while (query.Next()) {
     const std::string request_subtype = query.GetString(0);
-    if ("EMPTY" == request_subtype) {
+    if (policy_table::EnumToJsonString(policy_table::RequestType::RT_EMPTY) ==
+        request_subtype) {
       request_subtypes->mark_initialized();
       continue;
     }
@@ -2292,6 +2537,198 @@ bool SQLPTRepresentation::UpdateDBVersion() const {
   return true;
 }
 
+policy_table::VehicleDataItems SQLPTRepresentation::GetVehicleDataItem(
+    const std::string& name, const std::string& key) const {
+  policy_table::VehicleDataItems result;
+  utils::dbms::SQLQuery query(db());
+
+  if (!query.Prepare(sql_pt::kSelectVehicleDataItem)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrent select statement of vehicle data item. "
+                      << query.LastError().text());
+    return result;
+  }
+
+  query.Bind(0, key);
+  query.Bind(1, name);
+
+  while (query.Next()) {
+    auto vdi = PopulateVDIFromQuery(query);
+    if (!vdi.is_initialized()) {
+      return policy_table::VehicleDataItems();
+    }
+
+    utils::dbms::SQLQuery param_query(db());
+    if (policy_table::VehicleDataItem::kStruct ==
+        static_cast<std::string>(vdi.type)) {
+      if (!param_query.Prepare(sql_pt::kSelectVehicleDataItemParams)) {
+        LOG4CXX_ERROR(logger_,
+                      "Incorrent select statement of vehicle data item. "
+                          << param_query.LastError().text());
+        return policy_table::VehicleDataItems();
+      }
+
+      param_query.Bind(0, name);
+      param_query.Bind(1, key);
+
+      while (param_query.Next()) {
+        const auto param_with_diff_versions = GetVehicleDataItem(
+            param_query.GetString(2), param_query.GetString(3));
+        if (!param_with_diff_versions.is_initialized()) {
+          return policy_table::VehicleDataItems();
+        }
+        for (const auto& param : param_with_diff_versions) {
+          vdi.params->push_back(param);
+        }
+      }
+    }
+    result.push_back(vdi);
+  }
+  if (!result.empty()) {
+    result.mark_initialized();
+  }
+
+  return result;
+}
+
+bool SQLPTRepresentation::InsertVehicleDataItem(
+    const policy_table::VehicleDataItem& vehicle_data_item) {
+  utils::dbms::SQLQuery query(db());
+
+  if (!vehicle_data_item.is_initialized() || !vehicle_data_item.is_valid()) {
+    LOG4CXX_ERROR(logger_, "Vehicle data item is not initialized.");
+    return false;
+  }
+
+  if (VehicleDataItemExists(vehicle_data_item)) {
+    LOG4CXX_INFO(logger_,
+                 static_cast<std::string>(vehicle_data_item.key)
+                     << " is already stored.");
+    return true;
+  }
+
+  if (!query.Prepare(sql_pt::kInsertVehicleDataItem)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrent select statement of vehicle data item. "
+                      << query.LastError().text());
+    return false;
+  }
+
+  query.Bind(0, vehicle_data_item.name);
+  query.Bind(1, vehicle_data_item.type);
+  query.Bind(2, vehicle_data_item.key);
+  query.Bind(3, vehicle_data_item.mandatory);
+  vehicle_data_item.array.is_initialized()
+      ? query.Bind(4, *vehicle_data_item.array)
+      : query.Bind(4);
+  vehicle_data_item.since.is_initialized()
+      ? query.Bind(5, *vehicle_data_item.since)
+      : query.Bind(5);
+  vehicle_data_item.until.is_initialized()
+      ? query.Bind(6, *vehicle_data_item.until)
+      : query.Bind(6);
+  vehicle_data_item.removed.is_initialized()
+      ? query.Bind(7, *vehicle_data_item.removed)
+      : query.Bind(7);
+  vehicle_data_item.deprecated.is_initialized()
+      ? query.Bind(8, *vehicle_data_item.deprecated)
+      : query.Bind(8);
+  vehicle_data_item.minvalue.is_initialized()
+      ? query.Bind(9, *vehicle_data_item.minvalue)
+      : query.Bind(9);
+  vehicle_data_item.maxvalue.is_initialized()
+      ? query.Bind(10, *vehicle_data_item.maxvalue)
+      : query.Bind(10);
+  vehicle_data_item.minsize.is_initialized()
+      ? query.Bind(11, static_cast<int64_t>(*vehicle_data_item.minsize))
+      : query.Bind(11);
+  vehicle_data_item.maxsize.is_initialized()
+      ? query.Bind(12, static_cast<int64_t>(*vehicle_data_item.maxsize))
+      : query.Bind(12);
+  vehicle_data_item.minlength.is_initialized()
+      ? query.Bind(13, static_cast<int64_t>(*vehicle_data_item.minlength))
+      : query.Bind(13);
+  vehicle_data_item.maxlength.is_initialized()
+      ? query.Bind(14, static_cast<int64_t>(*vehicle_data_item.maxlength))
+      : query.Bind(14);
+
+  if (!query.Exec() || !query.Reset()) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed to insert vehicle data item: "
+                      << static_cast<std::string>(vehicle_data_item.key)
+                      << ". Error: " << query.LastError().text());
+    return false;
+  }
+
+  if (vehicle_data_item.params->is_initialized()) {
+    std::map<std::string, std::string> stored_vehicle_data_item_params;
+    for (const auto& param : *(vehicle_data_item.params)) {
+      if (!InsertVehicleDataItem(param)) {
+        return false;
+      }
+
+      if (stored_vehicle_data_item_params.end() !=
+          stored_vehicle_data_item_params.find(param.name)) {
+        LOG4CXX_DEBUG(logger_, "Parameter already stored.");
+        continue;
+      }
+
+      if (!query.Prepare(sql_pt::kInsertVehicleDataItemParams)) {
+        LOG4CXX_ERROR(logger_,
+                      "Incorrent select statement of vehicle data item. "
+                          << query.LastError().text());
+        return false;
+      }
+
+      query.Bind(0, vehicle_data_item.name);
+      query.Bind(1, vehicle_data_item.key);
+      query.Bind(2, param.name);
+      query.Bind(3, param.key);
+
+      if (!query.Exec() || !query.Reset()) {
+        LOG4CXX_ERROR(
+            logger_,
+            "Failed to insert to vehicle data item relations helper table: "
+                << static_cast<std::string>(param.key)
+                << ". Error: " << query.LastError().text());
+        return false;
+      }
+      stored_vehicle_data_item_params[param.name] = param.key;
+    }
+  }
+
+  return true;
+}
+
+bool SQLPTRepresentation::VehicleDataItemExists(
+    const policy_table::VehicleDataItem& vehicle_data_item) const {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kSelectVehicleDataItemWithVersion)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrent select statement for vehicle data item. "
+                      << query.LastError().text());
+    return false;
+  }
+
+  query.Bind(0, vehicle_data_item.name);
+  query.Bind(1, vehicle_data_item.key);
+  vehicle_data_item.since.is_initialized()
+      ? query.Bind(2, std::string(*vehicle_data_item.since))
+      : query.Bind(2);
+  vehicle_data_item.until.is_initialized()
+      ? query.Bind(3, std::string(*vehicle_data_item.until))
+      : query.Bind(3);
+
+  if (!query.Exec()) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed to retrieve vehicle data item: "
+                      << std::string(vehicle_data_item.key)
+                      << ". Error: " << query.LastError().text());
+    return false;
+  }
+  return !query.IsNull(0);
+}
+
 const int32_t SQLPTRepresentation::GetDBVersion() const {
   return utils::Djb2HashFromString(sql_pt::kCreateSchema);
 }
@@ -2355,6 +2792,8 @@ bool SQLPTRepresentation::CopyApplication(const std::string& source,
                         : query.Bind(16, source_app.GetString(15));
   source_app.IsNull(16) ? query.Bind(17)
                         : query.Bind(17, source_app.GetBoolean(16));
+  source_app.IsNull(17) ? query.Bind(18)
+                        : query.Bind(18, source_app.GetBoolean(17));
 
   if (!query.Exec()) {
     LOG4CXX_WARN(logger_, "Failed inserting into application.");
diff --git a/src/components/policy/policy_external/src/status.cc b/src/components/policy/policy_external/src/status.cc
index c2ee4e4bbc..826cca5a2e 100644
--- a/src/components/policy/policy_external/src/status.cc
+++ b/src/components/policy/policy_external/src/status.cc
@@ -67,6 +67,9 @@ void policy::UpdateNeededStatus::ProcessEvent(
     case kOnResetPolicyTableNoUpdate:
       manager->SetNextStatus(std::make_shared<UpToDateStatus>());
       break;
+    case kPendingUpdate:
+      manager->SetNextStatus(std::make_shared<UpdatePendingStatus>());
+      break;
     default:
       break;
   }
@@ -76,6 +79,36 @@ bool policy::UpdateNeededStatus::IsUpdateRequired() const {
   return true;
 }
 
+policy::UpdatePendingStatus::UpdatePendingStatus()
+    : Status(kUpdateNeeded,
+             policy::PolicyTableStatus::StatusProcessingSnapshot) {}
+
+void policy::UpdatePendingStatus::ProcessEvent(
+    policy::UpdateStatusManager* manager, policy::UpdateEvent event) {
+  switch (event) {
+    case kOnUpdateSentOut:
+      manager->SetNextStatus(std::make_shared<UpdatingStatus>());
+      break;
+    case kOnResetPolicyTableRequireUpdate:
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
+      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
+      break;
+    case kOnResetPolicyTableNoUpdate:
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
+      break;
+    default:
+      break;
+  }
+}
+
+bool policy::UpdatePendingStatus::IsUpdatePending() const {
+  return true;
+}
+
+bool policy::UpdatePendingStatus::IsUpdateRequired() const {
+  return true;
+}
+
 policy::UpdatingStatus::UpdatingStatus()
     : Status(kUpdating, policy::PolicyTableStatus::StatusUpdatePending) {}
 
@@ -86,9 +119,6 @@ void policy::UpdatingStatus::ProcessEvent(policy::UpdateStatusManager* manager,
     case kOnResetPolicyTableNoUpdate:
       manager->SetNextStatus(std::make_shared<UpToDateStatus>());
       break;
-    case kOnNewAppRegistered:
-      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
-      break;
     case kOnWrongUpdateReceived:
     case kOnUpdateTimeout:
       manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
@@ -99,9 +129,11 @@ void policy::UpdatingStatus::ProcessEvent(policy::UpdateStatusManager* manager,
       break;
     case kScheduleUpdate:
     case kScheduleManualUpdate:
-    case kOnResetRetrySequence:
       manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
+    case kOnResetRetrySequence:
+      manager->SetNextStatus(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 b352b5ea39..d34d1b7817 100644
--- a/src/components/policy/policy_external/src/update_status_manager.cc
+++ b/src/components/policy/policy_external/src/update_status_manager.cc
@@ -32,6 +32,7 @@
 
 #include "policy/update_status_manager.h"
 #include "policy/policy_listener.h"
+#include "policy/ptu_retry_handler.h"
 #include "utils/logger.h"
 
 namespace policy {
@@ -60,6 +61,7 @@ UpdateStatusManager::~UpdateStatusManager() {
 }
 
 void UpdateStatusManager::ProcessEvent(UpdateEvent event) {
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock lock(status_lock_);
   current_status_->ProcessEvent(this, event);
   last_processed_event_ = event;
@@ -87,6 +89,14 @@ void UpdateStatusManager::OnUpdateSentOut(uint32_t update_timeout) {
 
 void UpdateStatusManager::OnUpdateTimeoutOccurs() {
   LOG4CXX_AUTO_TRACE(logger_);
+
+  auto& ptu_retry_handler = listener_->ptu_retry_handler();
+
+  if (ptu_retry_handler.IsAllowedRetryCountExceeded()) {
+    ptu_retry_handler.RetrySequenceFailed();
+    return;
+  }
+
   ProcessEvent(kOnUpdateTimeout);
   DCHECK(update_status_thread_delegate_);
   update_status_thread_delegate_->updateTimeOut(0);  // Stop Timer
@@ -98,6 +108,12 @@ void UpdateStatusManager::OnValidUpdateReceived() {
   ProcessEvent(kOnValidUpdateReceived);
 }
 
+void UpdateStatusManager::ResetTimeout(uint32_t update_timeout) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  update_status_thread_delegate_->updateTimeOut(
+      update_timeout);  // Restart Timer
+}
+
 void UpdateStatusManager::OnWrongUpdateReceived() {
   LOG4CXX_AUTO_TRACE(logger_);
   update_status_thread_delegate_->updateTimeOut(0);  // Stop Timer
@@ -136,7 +152,12 @@ void UpdateStatusManager::OnNewApplicationAdded(const DeviceConsent consent) {
   }
   LOG4CXX_DEBUG(logger_, "Application registered from consented device");
   app_registered_from_non_consented_device_ = false;
-  ProcessEvent(kOnNewAppRegistered);
+  if (kOnResetRetrySequence == last_processed_event_) {
+    current_status_.reset(new UpToDateStatus());
+    ProcessEvent(kScheduleUpdate);
+  } else {
+    ProcessEvent(kOnNewAppRegistered);
+  }
 }
 
 void UpdateStatusManager::OnDeviceConsented() {
@@ -155,10 +176,17 @@ bool UpdateStatusManager::IsUpdatePending() const {
 }
 
 void UpdateStatusManager::ScheduleUpdate() {
+  LOG4CXX_AUTO_TRACE(logger_);
   ProcessEvent(kScheduleUpdate);
 }
 
+void UpdateStatusManager::PendingUpdate() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  ProcessEvent(kPendingUpdate);
+}
+
 void UpdateStatusManager::ScheduleManualUpdate() {
+  LOG4CXX_AUTO_TRACE(logger_);
   ProcessEvent(kScheduleManualUpdate);
 }
 
@@ -193,7 +221,10 @@ void UpdateStatusManager::DoTransition() {
   current_status_ = next_status_;
   next_status_.reset();
 
-  if (last_processed_event_ != kScheduleManualUpdate) {
+  const bool is_update_pending =
+      policy::StatusProcessingSnapshot == current_status_->get_status();
+
+  if (last_processed_event_ != kScheduleManualUpdate && !is_update_pending) {
     listener_->OnUpdateStatusChanged(current_status_->get_status_string());
   }
 
diff --git a/src/components/policy/policy_external/test/CMakeLists.txt b/src/components/policy/policy_external/test/CMakeLists.txt
index 8b77c90dd2..8f1b8b2539 100644
--- a/src/components/policy/policy_external/test/CMakeLists.txt
+++ b/src/components/policy/policy_external/test/CMakeLists.txt
@@ -42,22 +42,22 @@ include_directories(
 set(testLibraries
   gmock
   Utils
-  Policy
+  PolicyStatic
   UsageStatistics
   ConfigProfile
 )
 
 file (GLOB POLICY_TEST_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/policy_manager_impl_test_base.cc
-  *.cc)
-
-# Unbuildable
-list (REMOVE_ITEM POLICY_TEST_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/policy_manager_impl_stress_test.cc)
+  ${CMAKE_CURRENT_SOURCE_DIR}/cache_manager_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/policy_manager_impl_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql_pt_ext_representation_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql_pt_representation_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/update_status_manager_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/shared_library_test.cc)
 
 create_test("policy_test" "${POLICY_TEST_SOURCES}" "${testLibraries}")
 
-#Additional test files (json)
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/json)
-file(GLOB JSON_TEST_FILES json/*.json)
-file(COPY ${JSON_TEST_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json)
+#Copy actual sdl_preloaded_pt.json
+file(COPY ${CMAKE_SOURCE_DIR}/src/appMain/sdl_preloaded_pt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/json/sdl_preloaded_pt_for_merge_initial.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/json/sdl_preloaded_pt_for_merge_latest.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json/)
diff --git a/src/components/policy/policy_external/test/cache_manager_test.cc b/src/components/policy/policy_external/test/cache_manager_test.cc
new file mode 100644
index 0000000000..7bf13c250a
--- /dev/null
+++ b/src/components/policy/policy_external/test/cache_manager_test.cc
@@ -0,0 +1,2053 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdint.h>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+#include "policy/cache_manager.h"
+#include "policy/policy_table/enums.h"
+#include "policy/policy_types.h"
+
+#include "policy/mock_policy_settings.h"
+
+#include "json/reader.h"
+#include "utils/date_time.h"
+#include "utils/file_system.h"
+#include "utils/gen_hash.h"
+#include "utils/jsoncpp_reader_wrapper.h"
+
+namespace test {
+namespace components {
+namespace policy_test {
+
+using namespace policy;
+using namespace rpc::policy_table_interface_base;
+
+using ::testing::_;
+using ::testing::NiceMock;
+using ::testing::ReturnRef;
+
+namespace {
+const std::string kDefaultHMILevel = "NONE";
+const std::string kInvalidApp = "invalid_app";
+const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json";
+const std::string kValidAppId = "1234";
+const std::string kDeviceNumber = "XXX123456789ZZZ";
+const std::string kAppStorageFolder = "app_storage_folder";
+const std::string kConnectionType = "Bluetooth";
+}  // namespace
+
+void ValidateJsonTable(const std::string& string_table,
+                       Json::Value& json_table) {
+  utils::JsonReader reader;
+  ASSERT_TRUE(reader.parse(string_table, &json_table));
+}
+
+policy_table::Table CreateCustomPT(const std::string& string_table) {
+  Json::Value json_table(Json::objectValue);
+  ValidateJsonTable(string_table, json_table);
+  policy_table::Table table(&json_table);
+  return table;
+}
+
+class CacheManagerTest : public ::testing::Test {
+ public:
+  CacheManagerTest()
+      : in_memory_(true), cache_manager_(nullptr), pt_(nullptr) {}
+
+ protected:
+  const bool in_memory_;
+  std::shared_ptr<CacheManager> cache_manager_;
+  std::shared_ptr<policy_table::Table> pt_;
+  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
+
+  void SetUp() {
+    cache_manager_ = std::make_shared<CacheManager>(in_memory_);
+    pt_ = cache_manager_->GetPT();
+
+    ON_CALL(policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
+  }
+};
+
+TEST_F(CacheManagerTest,
+       GetNotificationsNumber_PriorityExists_ReturnNumberFromPT) {
+  std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"notifications_per_minute_by_priority\": {"
+      "\"EMERGENCY\": 1,"
+      "\"NAVIGATION\": 2,"
+      "\"VOICECOM\": 3,"
+      "\"COMMUNICATION\": 4,"
+      "\"NORMAL\": 5,"
+      "\"NONE\": 6"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  std::string priority = "EMERGENCY";
+  uint32_t notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(1u, notif_number);
+
+  priority = "NAVIGATION";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(2u, notif_number);
+
+  priority = "VOICECOM";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(3u, notif_number);
+
+  priority = "NORMAL";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(5u, notif_number);
+
+  priority = "NONE";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(6u, notif_number);
+}
+
+TEST_F(CacheManagerTest, GetNotificationsNumber_PriorityNotExist_ReturnZero) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"notifications_per_minute_by_priority\": {"
+      "\"EMERGENCY\": 1,"
+      "\"NAVIGATION\": 2,"
+      "\"VOICECOM\": 3,"
+      "\"COMMUNICATION\": 4,"
+      "\"NORMAL\": 5,"
+      "\"NONE\": 6"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  const std::string priority = "OTHER_PRIORITY";
+  uint32_t notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(0u, notif_number);
+}
+
+TEST_F(CacheManagerTest,
+       GetConsentsPriority_DeviceIDNotFound_ReturnkExternalConsentPrio) {
+  const auto priority =
+      cache_manager_->GetConsentsPriority(kDeviceNumber, kValidAppId);
+
+  EXPECT_EQ(ConsentPriorityType::kExternalConsentPrio, priority);
+}
+
+TEST_F(CacheManagerTest,
+       GetConsentsPriority_AppIDNotFound_ReturnkExternalConsentPrio) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  const auto priority =
+      cache_manager_->GetConsentsPriority(kDeviceNumber, kValidAppId);
+  EXPECT_EQ(ConsentPriorityType::kExternalConsentPrio, priority);
+}
+
+TEST_F(CacheManagerTest,
+       GetConsentsPriority_UserConsentHasPriority_ReturnkUserConsentPrio) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  auto& user_record =
+      (*pt_->policy_table.device_data)[kDeviceNumber].user_consent_records;
+  (*user_record)[kValidAppId].consent_last_updated = 20;
+  (*user_record)[kValidAppId].ext_consent_last_updated = 10;
+
+  const auto priority =
+      cache_manager_->GetConsentsPriority(kDeviceNumber, kValidAppId);
+  EXPECT_EQ(ConsentPriorityType::kUserConsentPrio, priority);
+}
+
+TEST_F(
+    CacheManagerTest,
+    GetConsentsPriority_ExternalConsentHasPriority_ReturnkExternalConsentPrio) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  (*(*pt_->policy_table.device_data)[kDeviceNumber]
+        .user_consent_records)[kValidAppId]
+      .consent_last_updated = 10;
+  (*(*pt_->policy_table.device_data)[kDeviceNumber]
+        .user_consent_records)[kValidAppId]
+      .ext_consent_last_updated = 20;
+
+  auto priority =
+      cache_manager_->GetConsentsPriority(kDeviceNumber, kValidAppId);
+  EXPECT_EQ(ConsentPriorityType::kExternalConsentPrio, priority);
+}
+
+TEST_F(CacheManagerTest, CanAppKeepContext_DeviceApp_ReturnTrue) {
+  pt_->policy_table.app_policies_section.device.keep_context = true;
+  EXPECT_TRUE(cache_manager_->CanAppKeepContext(kDeviceId));
+}
+
+TEST_F(CacheManagerTest, CanAppKeepContext_ValidApp_ReturnTrue) {
+  pt_->policy_table.app_policies_section.apps[kValidAppId].keep_context = true;
+  EXPECT_TRUE(cache_manager_->CanAppKeepContext(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, CanAppKeepContext_InvalidApp_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->CanAppKeepContext(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, HeartBeatTimeout_ValueInitialized_ReturnValue) {
+  *pt_->policy_table.app_policies_section.apps[kValidAppId]
+       .heart_beat_timeout_ms = 100u;
+  EXPECT_EQ(100u, cache_manager_->HeartBeatTimeout(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, HeartBeatTimeout_ValueNotInitialized_ReturnZero) {
+  pt_->policy_table.app_policies_section.apps[kValidAppId] = {};
+  EXPECT_EQ(0u, cache_manager_->HeartBeatTimeout(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, HeartBeatTimeout_AppNotRepresented_ReturnZero) {
+  EXPECT_EQ(0u, cache_manager_->HeartBeatTimeout(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, GetHMITypes_NoSuchAppNoHmiTypes_ReturnNull) {
+  EXPECT_EQ(nullptr, cache_manager_->GetHMITypes(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, GetHMITypes_ValidApp_ReturnNotNullPtr) {
+  AppHMITypes hmi_types;
+  hmi_types.push_back(policy_table::AHT_DEFAULT);
+
+  *pt_->policy_table.app_policies_section.apps[kValidAppId].AppHMIType =
+      hmi_types;
+  EXPECT_NE(nullptr, cache_manager_->GetHMITypes(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, CanAppStealFocus_AppIdIsDevice_ReturnTrue) {
+  pt_->policy_table.app_policies_section.device.steal_focus = true;
+  EXPECT_TRUE(cache_manager_->CanAppStealFocus(kDeviceId));
+}
+
+TEST_F(CacheManagerTest, CanAppStealFocus_ValidApp_ReturnTrue) {
+  pt_->policy_table.app_policies_section.apps[kValidAppId].steal_focus = true;
+  EXPECT_TRUE(cache_manager_->CanAppStealFocus(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, CanAppStealFocus_AppNotRepresented_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->CanAppStealFocus(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, GetDefaultHMI_AppIdIsDevice_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"default_hmi\": \"NONE\""
+      "}"
+      "}"
+      "}"
+      "}");
+
+  *pt_ = CreateCustomPT(string_table);
+  std::string returned_hmi_level;
+  const std::string expected_hmi_level("NONE");
+
+  EXPECT_TRUE(cache_manager_->GetDefaultHMI(kDeviceId, returned_hmi_level));
+  EXPECT_EQ(expected_hmi_level, returned_hmi_level);
+}
+
+TEST_F(CacheManagerTest, GetDefaultHMI_ValidApp_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"default_hmi\": \"NONE\""
+      "}"
+      "}"
+      "}"
+      "}");
+
+  *pt_ = CreateCustomPT(string_table);
+  std::string returned_hmi_level;
+  const std::string expected_hmi_level("NONE");
+
+  EXPECT_TRUE(cache_manager_->GetDefaultHMI(kValidAppId, returned_hmi_level));
+  EXPECT_EQ(expected_hmi_level, returned_hmi_level);
+}
+
+TEST_F(CacheManagerTest, GetDefaultHMI_InvalidApp_ReturnFalse) {
+  std::string returned_hmi_level;
+  EXPECT_FALSE(cache_manager_->GetDefaultHMI(kInvalidApp, returned_hmi_level));
+  EXPECT_TRUE(returned_hmi_level.empty());
+}
+
+TEST_F(CacheManagerTest, GetAllAppGroups_AppIdIsDevice_AppendGroupId) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"groups\": [\"default\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetAllAppGroups(kDeviceId, group_ids);
+  EXPECT_EQ(1u, group_ids.size());
+}
+
+TEST_F(CacheManagerTest, GetAllAppGroups_InvalidAppId_EmptyVectorOfGroupId) {
+  FunctionalGroupIDs group_ids;
+  cache_manager_->GetAllAppGroups(kInvalidApp, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest, GetAllAppGroups_ValidAppId_AppendGroupID) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"default\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetAllAppGroups(kValidAppId, group_ids);
+  EXPECT_EQ(1u, group_ids.size());
+}
+
+TEST_F(CacheManagerTest, ApplyUpdate_ValidPT_ReturnTrue) {
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  ifile.close();
+  policy_table::Table update(&root);
+
+  EXPECT_TRUE(cache_manager_->ApplyUpdate(update));
+  EXPECT_FALSE(cache_manager_->IsPTPreloaded());
+}
+
+TEST_F(CacheManagerTest, AppHasHMIType_NoSuchType_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": []"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_FALSE(
+      cache_manager_->AppHasHMIType(kValidAppId, policy_table::AHT_DEFAULT));
+}
+
+TEST_F(CacheManagerTest, AppHasHMIType_TypeExists_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": [\"AHT_DEFAULT\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(
+      cache_manager_->AppHasHMIType(kValidAppId, policy_table::AHT_DEFAULT));
+}
+
+TEST_F(CacheManagerTest, AppHasHMIType_NoSuchApp_ReturnFalse) {
+  EXPECT_FALSE(
+      cache_manager_->AppHasHMIType(kInvalidApp, policy_table::AHT_DEFAULT));
+}
+
+TEST_F(CacheManagerTest, AddDevice_ReturnTrue) {
+  *pt_->policy_table.module_config.preloaded_pt = true;
+  EXPECT_TRUE(cache_manager_->AddDevice(kDeviceNumber, kConnectionType));
+  EXPECT_FALSE(cache_manager_->IsPTPreloaded());
+}
+
+TEST_F(CacheManagerTest, SetDeviceData_NoSuchDevice_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->SetDeviceData(kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest, SetDeviceData_ValidDevice_ReturnTrue) {
+  EXPECT_TRUE(cache_manager_->AddDevice(kDeviceNumber, kConnectionType));
+  EXPECT_TRUE(cache_manager_->SetDeviceData(kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest, ResetUserConsent_ConsentIsResetted_ReturnTrue) {
+  cache_manager_->AddDevice(kDeviceNumber, kConnectionType);
+  policy_table::DeviceParams& params =
+      (*(pt_->policy_table.device_data))[kDeviceNumber];
+  policy_table::UserConsentRecords user_records;
+  user_records[kDeviceNumber] = policy_table::ConsentRecords();
+  *params.user_consent_records = user_records;
+
+  EXPECT_FALSE((params.user_consent_records)->empty());
+  EXPECT_TRUE(cache_manager_->ResetUserConsent());
+  EXPECT_TRUE((params.user_consent_records)->empty());
+}
+
+TEST_F(CacheManagerTest, SetUserPermissionsForDevice_ReturnTrue) {
+  cache_manager_->AddDevice(kDeviceNumber, kConnectionType);
+
+  StringArray consented_groups;
+  StringArray disallowed_groups;
+  const std::string consented_group("DataConsent-2");
+  const std::string disallowed_group("Navigation-1");
+  consented_groups.push_back(consented_group);
+  disallowed_groups.push_back(disallowed_group);
+
+  EXPECT_TRUE(cache_manager_->SetUserPermissionsForDevice(
+      kDeviceNumber, consented_groups, disallowed_groups));
+
+  StringArray returned_consented_groups;
+  StringArray returned_disallowed_groups;
+  EXPECT_TRUE(cache_manager_->GetUserPermissionsForDevice(
+      kDeviceNumber, returned_consented_groups, returned_disallowed_groups));
+  EXPECT_EQ(consented_groups, returned_consented_groups);
+  EXPECT_EQ(disallowed_groups, returned_disallowed_groups);
+}
+
+TEST_F(CacheManagerTest, GetUserPermissionsForDevice_NoSuchDevice_ReturnFalse) {
+  StringArray consented_groups;
+  StringArray disallowed_groups;
+
+  EXPECT_FALSE(cache_manager_->GetUserPermissionsForDevice(
+      kDeviceNumber, consented_groups, disallowed_groups));
+}
+
+TEST_F(CacheManagerTest, GetPreConsentedGroups_DeviceAppId_GetGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"preconsented_groups\": [\"DataConsent-2\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetPreConsentedGroups(kDeviceId, group_ids);
+  EXPECT_EQ(1u, group_ids.size());
+  EXPECT_EQ(cache_manager_->GenerateHash("DataConsent-2"), group_ids[0]);
+}
+
+TEST_F(CacheManagerTest, GetPreConsentedGroups_NoSuchAppId_NoGroups) {
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetPreConsentedGroups(kInvalidApp, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest, GetPreConsentedGroups_ValidAppId_GetGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"preconsented_groups\": [\"DataConsent-2\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetPreConsentedGroups(kValidAppId, group_ids);
+  EXPECT_EQ(1u, group_ids.size());
+  EXPECT_EQ(cache_manager_->GenerateHash("DataConsent-2"), group_ids[0]);
+}
+
+TEST_F(CacheManagerTest, CheckPermissions_ValidParams_ReturnValidPermission) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"functional_groupings\": {"
+      "\"Base-4\": {"
+      "\"rpcs\": {"
+      "\"AddCommand\": {"
+      "\"hmi_levels\": ["
+      "\"BACKGROUND\","
+      "\"FULL\","
+      "\"LIMITED\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "},"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "\"groups\": ["
+      "\"Base-4\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  const std::string hmi_level("FULL");
+  const std::string rpc("AddCommand");
+  CheckPermissionResult result;
+
+  cache_manager_->CheckPermissions(kDefaultId, hmi_level, rpc, result);
+  EXPECT_EQ(kRpcAllowed, result.hmi_level_permitted);
+}
+
+TEST_F(CacheManagerTest, CheckPermissions_InvalidApp_ReturnInvalidPermission) {
+  const std::string hmi_level("FULL");
+  const std::string rpc("AddCommand");
+  CheckPermissionResult result;
+  cache_manager_->CheckPermissions(kInvalidApp, hmi_level, rpc, result);
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypesState_GetAllStates) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestType\": [\"PROPRIETARY\"]"
+      "},"
+      "\"default\": {"
+      "\"RequestType\": [],"
+      "},"
+      "\"pre_DataConsent\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(RequestType::State::EMPTY,
+            cache_manager_->GetAppRequestTypesState(kDefaultId));
+  EXPECT_EQ(RequestType::State::UNAVAILABLE,
+            cache_manager_->GetAppRequestTypesState(kInvalidApp));
+  EXPECT_EQ(RequestType::State::OMITTED,
+            cache_manager_->GetAppRequestTypesState(kPreDataConsentId));
+  EXPECT_EQ(RequestType::State::AVAILABLE,
+            cache_manager_->GetAppRequestTypesState(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypesState_GetAllStates) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestSubType\": [\"PROPRIETARY\"]"
+      "},"
+      "\"default\": {"
+      "\"RequestSubType\": [],"
+      "},"
+      "\"pre_DataConsent\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(RequestSubType::State::EMPTY,
+            cache_manager_->GetAppRequestSubTypesState(kDefaultId));
+  EXPECT_EQ(RequestSubType::State::UNAVAILABLE,
+            cache_manager_->GetAppRequestSubTypesState(kInvalidApp));
+  EXPECT_EQ(RequestSubType::State::OMITTED,
+            cache_manager_->GetAppRequestSubTypesState(kPreDataConsentId));
+  EXPECT_EQ(RequestSubType::State::AVAILABLE,
+            cache_manager_->GetAppRequestSubTypesState(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IgnitionCyclesBeforeExchange_GetValue) {
+  // if result of computation is positive, method returns difference between
+  // limit from pt and current number of ignition cycles
+  pt_->policy_table.module_config.exchange_after_x_ignition_cycles = 100u;
+  *(pt_->policy_table.module_meta->ignition_cycles_since_last_exchange) = 80u;
+
+  EXPECT_EQ(20, cache_manager_->IgnitionCyclesBeforeExchange());
+
+  // if result of computation is less or equal to zero, method returns 0
+  pt_->policy_table.module_config.exchange_after_x_ignition_cycles = 80u;
+  *(pt_->policy_table.module_meta->ignition_cycles_since_last_exchange) = 100u;
+
+  EXPECT_EQ(0, cache_manager_->IgnitionCyclesBeforeExchange());
+}
+
+TEST_F(CacheManagerTest, KilometersBeforeExchange_GetValue) {
+  // if result of computation is positive, method returns difference between
+  // limit from pt and actual number of kilometers
+  pt_->policy_table.module_config.exchange_after_x_kilometers = 1000u;
+  *(pt_->policy_table.module_meta->pt_exchanged_at_odometer_x) = 500u;
+
+  EXPECT_EQ(600, cache_manager_->KilometersBeforeExchange(900));
+
+  // if result of computation is less or equal to zero, method returns 0
+  pt_->policy_table.module_config.exchange_after_x_kilometers = 500u;
+  *(pt_->policy_table.module_meta->pt_exchanged_at_odometer_x) = 200u;
+
+  EXPECT_EQ(0, cache_manager_->KilometersBeforeExchange(800));
+}
+
+TEST_F(CacheManagerTest,
+       DaysBeforeExchange_DaysNotInitialized_ReturnNegativeOne) {
+  EXPECT_EQ(cache_manager_->DaysBeforeExchange(20), -1);
+}
+
+TEST_F(CacheManagerTest, DaysBeforeExchange_DaysIsInitialized_ReturnValue) {
+  *(pt_->policy_table.module_meta->pt_exchanged_x_days_after_epoch) = 5;
+  pt_->policy_table.module_config.exchange_after_x_days = 30;
+  EXPECT_EQ(15, cache_manager_->DaysBeforeExchange(20));
+}
+
+TEST_F(CacheManagerTest,
+       SetCountersPassedForSuccessfulUpdate_AllPositiveCases_ReturnTrue) {
+  EXPECT_TRUE(cache_manager_->SetCountersPassedForSuccessfulUpdate(
+      Counters::KILOMETERS, 1000));
+  EXPECT_TRUE(cache_manager_->SetCountersPassedForSuccessfulUpdate(
+      Counters::DAYS_AFTER_EPOCH, 20));
+}
+
+TEST_F(CacheManagerTest,
+       GetDeviceConsent_EmptyPermissions_ReturnDeviceAllowed) {
+  cache_manager_->AddDevice(kDeviceNumber, kConnectionType);
+  EXPECT_EQ(kDeviceAllowed, cache_manager_->GetDeviceConsent(kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest, GetPriority_DeviceAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"priority\": \"NONE\""
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::string returned_priority;
+  EXPECT_TRUE(cache_manager_->GetPriority(kDeviceId, returned_priority));
+
+  const std::string expected_priority("NONE");
+  EXPECT_EQ(expected_priority, returned_priority);
+}
+
+TEST_F(CacheManagerTest, GetPriority_ValidAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"priority\": \"NONE\""
+      "}"
+      "}"
+      "}"
+      "}");
+
+  *pt_ = CreateCustomPT(string_table);
+  std::string returned_priority;
+  EXPECT_TRUE(cache_manager_->GetPriority(kValidAppId, returned_priority));
+
+  const std::string expected_priority("NONE");
+  EXPECT_EQ(expected_priority, returned_priority);
+}
+
+TEST_F(CacheManagerTest, GetPriority_InvalidAppID_ReturnFalse) {
+  std::string priority;
+
+  EXPECT_FALSE(cache_manager_->GetPriority(kInvalidApp, priority));
+  EXPECT_TRUE(priority.empty());
+}
+
+TEST_F(CacheManagerTest, SetDefaultPolicy_DefaultAppExists_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->SetDefaultPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, IsDefaultPolicy_DefaultValidApp_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsDefaultPolicy_InvalidAppId_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, IsDefaultPolicy_NotDefaultValidAppId_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"priority\": [\"NONE\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetIsDefault_InvalidAppId_DefaultNotAssigned) {
+  EXPECT_TRUE(cache_manager_->SetIsDefault(kInvalidApp));
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, SetIsDefault_ValidAppId_ReturnTrue) {
+  EXPECT_TRUE(cache_manager_->SetIsDefault(kValidAppId));
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsPredataPolicy_InvalidAppId_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsPredataPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, IsPredataPolicy_NotPredataValidAppId_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"priority\": [\"NONE\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  EXPECT_FALSE(cache_manager_->IsPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsPredataPolicy_PredataValidAppId_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"pre_DataConsent\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->IsPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetPredataPolicy_NoPredataSection_ReturnFalse) {
+  pt_->policy_table.app_policies_section.apps.erase(kPreDataConsentId);
+  EXPECT_FALSE(cache_manager_->SetPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetPredataPolicy_ValidPredataSection_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"pre_DataConsent\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->SetPredataPolicy(kValidAppId));
+  EXPECT_TRUE(cache_manager_->IsPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetIsPredata_InvalidAppID_PredataNotAssigned) {
+  EXPECT_TRUE(cache_manager_->SetIsPredata(kInvalidApp));
+  EXPECT_FALSE(cache_manager_->IsPredataPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, SetIsPredata_ValidAppID_PredataIsAssigned) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->SetIsPredata(kValidAppId));
+  EXPECT_TRUE(cache_manager_->IsPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetUnpairedDevice_NoSuchDevice_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->SetUnpairedDevice(kDeviceNumber, true));
+}
+
+TEST_F(CacheManagerTest, SetUnpairedDevice_UnpairedDevice_ReturnTrue) {
+  cache_manager_->AddDevice(kDeviceNumber, "kConnectionType");
+  EXPECT_TRUE(cache_manager_->SetUnpairedDevice(kDeviceNumber, true));
+}
+
+TEST_F(CacheManagerTest, SetUnpairedDevice_NotUnpairedDevice_ReturnTrue) {
+  cache_manager_->AddDevice(kDeviceNumber, "kConnectionType");
+  EXPECT_TRUE(cache_manager_->SetUnpairedDevice(kDeviceNumber, false));
+}
+
+TEST_F(CacheManagerTest, GetHMIAppTypeAfterUpdate_NoAppTypes_MapIsEmpty) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": [\"AHT_DEFAULT\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::map<std::string, StringArray> app_hmi_types;
+
+  cache_manager_->GetHMIAppTypeAfterUpdate(app_hmi_types);
+  EXPECT_TRUE(!app_hmi_types.empty());
+}
+
+TEST_F(CacheManagerTest,
+       ReactOnUserDevConsentForApp_DeviceNotAllowed_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  EXPECT_TRUE(cache_manager_->ReactOnUserDevConsentForApp(kValidAppId, false));
+  EXPECT_TRUE(cache_manager_->IsPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest,
+       ReactOnUserDevConsentForApp_DeviceAllowedWithPredataPolicy_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"pre_DataConsent\","
+      "\"default\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  EXPECT_TRUE(cache_manager_->ReactOnUserDevConsentForApp(kValidAppId, true));
+  EXPECT_TRUE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest,
+       ReactOnUserDevConsentForApp_DeviceAllowedAndNoPredataPolicy_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  EXPECT_TRUE(cache_manager_->ReactOnUserDevConsentForApp(kValidAppId, true));
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, CountUnconsentedGroups_InvalidAppID_ReturnZero) {
+  EXPECT_EQ(0,
+            cache_manager_->CountUnconsentedGroups(kInvalidApp, kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest,
+       CountUnconsentedGroups_ValidAppIDIsPredata_ReturnZero) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"pre_DataConsent\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(0,
+            cache_manager_->CountUnconsentedGroups(kValidAppId, kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest,
+       CountUnconsentedGroups_ValidAppIDIsDefault_ReturnZero) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(0,
+            cache_manager_->CountUnconsentedGroups(kValidAppId, kDeviceNumber));
+}
+
+TEST_F(
+    CacheManagerTest,
+    CountUnconsentedGroups_AppIDIsDevice_AllGroupsAlreadyConsented_ReturnZero) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"groups\": [\"Location-1\"],"
+      "\"preconsented_groups\": [\"Location-1\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\","
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(0,
+            cache_manager_->CountUnconsentedGroups(kDeviceId, kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest,
+       CountUnconsentedGroups_ValidAppID_NoSuchDevice_ReturnOneGroup) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"],"
+      "\"preconsented_groups\": [\"Base-4\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\","
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(1,
+            cache_manager_->CountUnconsentedGroups(kValidAppId, kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest,
+       CountUnconsentedGroups_ValidAppID_NoUserConsentRecords_ReturnTwoGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\", \"Notifications\"],"
+      "\"preconsented_groups\": [\"Base-4\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\","
+      "},"
+      "\"Notifications\": {"
+      "\"user_consent_prompt\": \"Notifications\","
+      "},"
+      "},"
+      "\"device_data\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(2,
+            cache_manager_->CountUnconsentedGroups(kValidAppId, kDeviceNumber));
+}
+
+TEST_F(
+    CacheManagerTest,
+    CountUnconsentedGroups_ValidAppID_GroupNotInUserConsentRecords_ReturnOneGroup) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"],"
+      "\"preconsented_groups\": [\"Base-4\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\","
+      "}"
+      "},"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "\"consent_groups\":{"
+      "\"Notifications\":{"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(1,
+            cache_manager_->CountUnconsentedGroups(kValidAppId, kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest, IsMetaInfoPresent_NoMetaInfo_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsMetaInfoPresent());
+}
+
+TEST_F(CacheManagerTest, IsMetaInfoPresent_MetaInfoIsPresent_ReturnTrue) {
+  const std::string ccpu_version("ccpu_version");
+  const std::string country_code("country_code");
+  const std::string language("en-us");
+
+  EXPECT_TRUE(
+      cache_manager_->SetMetaInfo(ccpu_version, country_code, language));
+  EXPECT_TRUE(cache_manager_->IsMetaInfoPresent());
+}
+
+TEST_F(CacheManagerTest, IsApplicationRevoked_InvalidAppID_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsApplicationRevoked(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest,
+       IsApplicationRevoked_ValidAppIDNotRevoked_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_FALSE(cache_manager_->IsApplicationRevoked(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsApplicationRevoked_ValidAppIDIsRevoked_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  pt_->policy_table.app_policies_section.apps[kValidAppId].set_to_null();
+
+  EXPECT_TRUE(cache_manager_->IsApplicationRevoked(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, ResetPT_CannotRefreshDB_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->ResetPT(kSdlPreloadedPtJson));
+}
+
+TEST_F(CacheManagerTest, ResetPT_InvalidFilename_ReturnFalse) {
+  cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_);
+  const std::string invalid_filename("invalid_filename.json");
+
+  EXPECT_FALSE(cache_manager_->ResetPT(invalid_filename));
+}
+
+TEST_F(CacheManagerTest, ResetPT_InitializedTableAndValidFilename_ReturnTrue) {
+  cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_);
+  EXPECT_TRUE(cache_manager_->ResetPT(kSdlPreloadedPtJson));
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypes_DeviceAppID_NoTypes) {
+  std::vector<std::string> request_types;
+  cache_manager_->GetAppRequestTypes(kDeviceId, request_types);
+
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypes_InvalidAppID_NoTypes) {
+  std::vector<std::string> request_types;
+  cache_manager_->GetAppRequestTypes(kInvalidApp, request_types);
+
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypes_ValidAppID_AddTypesIfPresent) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestType\": [\"OnSystemRequest\", \"AddCommandRequest\"]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::vector<std::string> request_types;
+
+  cache_manager_->GetAppRequestTypes(kValidAppId, request_types);
+  EXPECT_EQ(2u, request_types.size());
+}
+
+TEST_F(CacheManagerTest, GetInitialAppData_ValidAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": [\"AHT_DEFAULT\"],"
+      "\"nicknames\": [\"Test app\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  StringArray nicknames;
+  StringArray app_hmi_types;
+
+  EXPECT_TRUE(
+      cache_manager_->GetInitialAppData(kValidAppId, nicknames, app_hmi_types));
+  EXPECT_FALSE(nicknames.empty());
+  EXPECT_FALSE(app_hmi_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetInitialAppData_InvalidAppId_ReturnTrue) {
+  StringArray nicknames;
+  StringArray app_hmi_types;
+
+  EXPECT_TRUE(
+      cache_manager_->GetInitialAppData(kInvalidApp, nicknames, app_hmi_types));
+  EXPECT_TRUE(nicknames.empty());
+  EXPECT_TRUE(app_hmi_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypes_DeviceAppID_NoTypes) {
+  std::vector<std::string> request_types;
+
+  cache_manager_->GetAppRequestSubTypes(kDeviceId, request_types);
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypes_InvalidAppID_NoTypes) {
+  std::vector<std::string> request_types;
+
+  cache_manager_->GetAppRequestSubTypes(kInvalidApp, request_types);
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypes_ValidAppID_AddSubtype) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestSubType\": [\"Some_subtype\"]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::vector<std::string> request_subtypes;
+
+  cache_manager_->GetAppRequestSubTypes(kValidAppId, request_subtypes);
+  EXPECT_FALSE(request_subtypes.empty());
+}
+
+TEST_F(CacheManagerTest, Init_TableAlreadyExistsNotMerged_ReturnFalse) {
+  EXPECT_TRUE(cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_));
+  const std::string invalid_filename("invalid_filename.json");
+
+  EXPECT_FALSE(cache_manager_->Init(invalid_filename, &policy_settings_));
+}
+
+TEST_F(CacheManagerTest, Init_TableAlreadyExistsAndIsMerged_ReturnTrue) {
+  const std::string initial_version_of_pt(
+      "json/sdl_preloaded_pt_for_merge_initial.json");
+  const std::string latest_version_of_pt(
+      "json/sdl_preloaded_pt_for_merge_latest.json");
+
+  EXPECT_TRUE(cache_manager_->Init(initial_version_of_pt, &policy_settings_));
+  EXPECT_TRUE(cache_manager_->Init(latest_version_of_pt, &policy_settings_));
+}
+
+TEST_F(CacheManagerTest, GetCertificate_NoCertificateReturnEmptyString) {
+  std::string certificate = cache_manager_->GetCertificate();
+  EXPECT_TRUE(certificate.empty());
+}
+
+TEST_F(CacheManagerTest, GetCertificate_CertificateExists_ReturnCertificate) {
+  const std::string certificate_to_set("some_certificate");
+  cache_manager_->SetDecryptedCertificate(certificate_to_set);
+
+  std::string returned_certificate = cache_manager_->GetCertificate();
+  EXPECT_EQ(certificate_to_set, returned_certificate);
+}
+
+TEST_F(CacheManagerTest, SetExternalConsentStatus_EmptyStatus_ReturnFalse) {
+  EXPECT_FALSE(
+      cache_manager_->SetExternalConsentStatus(ExternalConsentStatus()));
+}
+
+TEST_F(CacheManagerTest, SetExternalConsentStatus_ValidStatus_ReturnTrue) {
+  ExternalConsentStatus consent_status;
+  consent_status.insert(ExternalConsentStatusItem());
+
+  EXPECT_TRUE(cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_));
+  EXPECT_TRUE(cache_manager_->SetExternalConsentStatus(consent_status));
+}
+
+TEST_F(CacheManagerTest,
+       SetUserPermissionsForApp_PermissionsNotChanged_ReturnTrue) {
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
+
+  const std::string group_name("Notifications");
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupUndefined;
+
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
+
+  bool app_permissions_changed;
+  EXPECT_TRUE(cache_manager_->SetUserPermissionsForApp(
+      perm_consent, &app_permissions_changed));
+  EXPECT_FALSE(app_permissions_changed);
+}
+
+TEST_F(CacheManagerTest,
+       SetUserPermissionsForApp_PermissionsIsChanged_ReturnTrue) {
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
+
+  const std::string group_name("Notifications");
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupAllowed;
+
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
+
+  bool app_permissions_changed;
+  EXPECT_TRUE(cache_manager_->SetUserPermissionsForApp(
+      perm_consent, &app_permissions_changed));
+  EXPECT_TRUE(app_permissions_changed);
+}
+
+TEST_F(CacheManagerTest, SetDeviceConsent_ConsentIsSetted_DeviceAllowed) {
+  cache_manager_->AddDevice(kDeviceNumber, kConnectionType);
+  StringArray consented_groups, disallowed_groups;
+  const std::string consented_group("DataConsent-2");
+  consented_groups.push_back(consented_group);
+  EXPECT_TRUE(cache_manager_->SetUserPermissionsForDevice(
+      kDeviceNumber, consented_groups, disallowed_groups));
+
+  cache_manager_->SetDeviceConsent(kDeviceNumber, true);
+  EXPECT_EQ(kDeviceAllowed, cache_manager_->GetDeviceConsent(kDeviceNumber));
+}
+
+TEST_F(CacheManagerTest,
+       GetVehicleDataItems_VehicleDataIsInitialized_GotDataItems) {
+  cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_);
+  const auto items = cache_manager_->GetVehicleDataItems();
+  EXPECT_FALSE(items.empty());
+}
+
+TEST_F(CacheManagerTest,
+       GetVehicleDataItems_VehicleDataNotInitialized_ReturnEmptyVector) {
+  const auto items = cache_manager_->GetVehicleDataItems();
+  EXPECT_TRUE(items.empty());
+}
+
+TEST_F(CacheManagerTest, LockScreenDismissalWarningMessage_ReturnValidMessage) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"consumer_friendly_messages\": {"
+      "\"messages\": {"
+      "\"LockScreenDismissalWarning\": {"
+      "\"languages\": {"
+      "\"en-us\": {"
+      "\"textBody\": \"Swipe down to dismiss, acknowledging that you are not "
+      "the driver\""
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  const std::string expected_msg(
+      "Swipe down to dismiss, acknowledging that you are not the driver");
+  const std::string language("en-us");
+
+  EXPECT_EQ(expected_msg,
+            *cache_manager_->LockScreenDismissalWarningMessage(language));
+}
+
+TEST_F(CacheManagerTest,
+       LockScreenDismissalEnabledState_EnabledInPT_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"lock_screen_dismissal_enabled\": true"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(*cache_manager_->LockScreenDismissalEnabledState());
+}
+
+TEST_F(CacheManagerTest,
+       UnknownRPCPassthroughAllowed_InvalidAppID_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->UnknownRPCPassthroughAllowed(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, UnknownRPCPassthroughAllowed_ValidAppID_ReturnTrue) {
+  pt_->policy_table.app_policies_section.apps[kValidAppId]
+      .allow_unknown_rpc_passthrough = rpc::Optional<rpc::Boolean>(true);
+  EXPECT_TRUE(cache_manager_->UnknownRPCPassthroughAllowed(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, GetAppProperties_InvalidAppID_ReturnFalse) {
+  AppProperties out_app_properties;
+  EXPECT_FALSE(
+      cache_manager_->GetAppProperties(kInvalidApp, out_app_properties));
+}
+
+TEST_F(CacheManagerTest, GetAppProperties_ValidAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  AppProperties out_app_properties;
+  const std::string endpoint("endpoint");
+  const std::string auth_token("auth_token");
+  const std::string transport_type("transport_type");
+  const std::string hybrid_app_preference("CLOUD");
+
+  cache_manager_->SetAppEndpoint(kValidAppId, endpoint);
+  cache_manager_->SetAppAuthToken(kValidAppId, auth_token);
+  cache_manager_->SetAppCloudTransportType(kValidAppId, transport_type);
+  cache_manager_->SetHybridAppPreference(kValidAppId, hybrid_app_preference);
+  cache_manager_->SetCloudAppEnabled(kValidAppId, true);
+
+  EXPECT_TRUE(
+      cache_manager_->GetAppProperties(kValidAppId, out_app_properties));
+  EXPECT_EQ(endpoint, out_app_properties.endpoint);
+  EXPECT_EQ(auth_token, out_app_properties.auth_token);
+  EXPECT_EQ(transport_type, out_app_properties.transport_type);
+  EXPECT_EQ(hybrid_app_preference, out_app_properties.hybrid_app_preference);
+  EXPECT_TRUE(out_app_properties.enabled);
+}
+
+TEST_F(CacheManagerTest,
+       SetExternalConsentForApp_ConsentsSame_ConsentNotSetted) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "\"external_consent_status_groups\":{"
+      "\"Notifications\":true"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
+
+  const std::string group_name("Notifications");
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupAllowed;
+
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
+
+  policy_table::ConsentGroups initial_consent_groups =
+      *(*(*pt_->policy_table.device_data)[kDeviceNumber]
+             .user_consent_records)[kValidAppId]
+           .external_consent_status_groups;
+  cache_manager_->SetExternalConsentForApp(perm_consent);
+
+  policy_table::ConsentGroups updated_consent_groups =
+      *(*(*pt_->policy_table.device_data)[kDeviceNumber]
+             .user_consent_records)[kValidAppId]
+           .external_consent_status_groups;
+  EXPECT_EQ(initial_consent_groups, updated_consent_groups);
+}
+
+TEST_F(CacheManagerTest,
+       SetExternalConsentForApp_ConsentsNewGroup_ConsentIsSetted) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "\"external_consent_status_groups\":{"
+      "\"Notifications\":true"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
+
+  const std::string group_name("Base-4");
+
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupAllowed;
+
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
+
+  policy_table::ConsentGroups initial_consent_groups =
+      *(*(*pt_->policy_table.device_data)[kDeviceNumber]
+             .user_consent_records)[kValidAppId]
+           .external_consent_status_groups;
+  cache_manager_->SetExternalConsentForApp(perm_consent);
+
+  policy_table::ConsentGroups updated_consent_groups =
+      *(*(*pt_->policy_table.device_data)[kDeviceNumber]
+             .user_consent_records)[kValidAppId]
+           .external_consent_status_groups;
+  EXPECT_NE(initial_consent_groups, updated_consent_groups);
+}
+
+TEST_F(CacheManagerTest, Add_MinutesAreAdded) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  int result;
+  int seconds;
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_full = 0;
+  seconds = 60;
+  cache_manager_->Add(kValidAppId, usage_statistics::SECONDS_HMI_FULL, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_full);
+  EXPECT_EQ(1, result);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_limited = 0;
+  seconds = 120;
+  cache_manager_->Add(
+      kValidAppId, usage_statistics::SECONDS_HMI_LIMITED, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_limited);
+  EXPECT_EQ(2, result);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_background = 0;
+  seconds = 180;
+  cache_manager_->Add(
+      kValidAppId, usage_statistics::SECONDS_HMI_BACKGROUND, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_background);
+  EXPECT_EQ(3, result);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_none = 0;
+  seconds = 240;
+  cache_manager_->Add(kValidAppId, usage_statistics::SECONDS_HMI_NONE, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_none);
+  EXPECT_EQ(4, result);
+}
+
+TEST_F(CacheManagerTest, Set_ValuesAreSetted) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  const std::string language("eng-eng");
+
+  cache_manager_->Set(kValidAppId, usage_statistics::LANGUAGE_GUI, language);
+  EXPECT_EQ(
+      language,
+      std::string(
+          (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+              .app_registration_language_gui));
+
+  cache_manager_->Set(kValidAppId, usage_statistics::LANGUAGE_VUI, language);
+  EXPECT_EQ(
+      language,
+      std::string(
+          (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+              .app_registration_language_vui));
+}
+
+TEST_F(CacheManagerTest, Increment_GlobalCounterIsIncremented) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  *pt_->policy_table.usage_and_error_counts->count_of_iap_buffer_full = 0;
+  cache_manager_->Increment(usage_statistics::IAP_BUFFER_FULL);
+  EXPECT_EQ(
+      1, *pt_->policy_table.usage_and_error_counts->count_of_iap_buffer_full);
+
+  *pt_->policy_table.usage_and_error_counts->count_sync_out_of_memory = 0;
+  cache_manager_->Increment(usage_statistics::SYNC_OUT_OF_MEMORY);
+  EXPECT_EQ(
+      1, *pt_->policy_table.usage_and_error_counts->count_sync_out_of_memory);
+
+  *pt_->policy_table.usage_and_error_counts->count_of_sync_reboots = 0;
+  cache_manager_->Increment(usage_statistics::SYNC_REBOOTS);
+  EXPECT_EQ(1,
+            *pt_->policy_table.usage_and_error_counts->count_of_sync_reboots);
+}
+
+TEST_F(CacheManagerTest, Increment_AppCounterIsIncremented) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_user_selections = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::USER_SELECTIONS);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_user_selections);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejections_sync_out_of_memory = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::REJECTIONS_SYNC_OUT_OF_MEMORY);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejections_sync_out_of_memory);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejections_nickname_mismatch = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::REJECTIONS_NICKNAME_MISMATCH);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejections_nickname_mismatch);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejections_duplicate_name = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::REJECTIONS_DUPLICATE_NAME);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejections_duplicate_name);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejected_rpc_calls = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::REJECTED_RPC_CALLS);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejected_rpc_calls);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rpcs_sent_in_hmi_none = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::RPCS_IN_HMI_NONE);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rpcs_sent_in_hmi_none);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_removals_for_bad_behavior = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::REMOVALS_MISBEHAVED);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_removals_for_bad_behavior);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_run_attempts_while_revoked = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::RUN_ATTEMPTS_WHILE_REVOKED);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_run_attempts_while_revoked);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_tls_errors = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::COUNT_OF_TLS_ERRORS);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_tls_errors);
+}
+
+TEST_F(CacheManagerTest, GetUnconsentedGroups_InvalidAppId_ReturnNoGroups) {
+  FunctionalGroupIDs group_ids;
+  cache_manager_->GetUnconsentedGroups(kDeviceNumber, kInvalidApp, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest,
+       GetUnconsentedGroups_DeviceApp_NoSuchFunctionalGroup_NoGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"groups\": [\"Location-1\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Base-4\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetUnconsentedGroups(kDeviceNumber, kDeviceId, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest,
+       GetUnconsentedGroups_ValidApp_NoUserConsentsForGroup_NoGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"]"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetUnconsentedGroups(kDeviceNumber, kValidAppId, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest,
+       GetUnconsentedGroups_ValidAppId_NoSuchDevice_NoGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"]"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\""
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetUnconsentedGroups(kDeviceNumber, kValidAppId, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(
+    CacheManagerTest,
+    GetUnconsentedGroups_ValidAppId_NoSuchAppInUserConsentRecords_ReturnGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\","
+      "}"
+      "},"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetUnconsentedGroups(kDeviceNumber, kValidAppId, group_ids);
+  EXPECT_FALSE(group_ids.empty());
+}
+
+TEST_F(
+    CacheManagerTest,
+    GetUnconsentedGroups_ValidAppId_UserConsentPromptInitialized_ReturnGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"],"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\","
+      "}"
+      "},"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "\"consent_groups\":{"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetUnconsentedGroups(kDeviceNumber, kValidAppId, group_ids);
+  EXPECT_FALSE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest, GetConsentedGroups_NoSuchDevice_ReturnNoGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs allowed_groups;
+  FunctionalGroupIDs disallowed_groups;
+
+  cache_manager_->GetConsentedGroups(
+      kDeviceNumber, kValidAppId, allowed_groups, disallowed_groups);
+  EXPECT_TRUE(allowed_groups.empty());
+  EXPECT_TRUE(disallowed_groups.empty());
+}
+
+TEST_F(CacheManagerTest, GetConsentedGroups_NoAppForDevice_ReturnNoGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs allowed_groups;
+  FunctionalGroupIDs disallowed_groups;
+
+  cache_manager_->GetConsentedGroups(
+      kDeviceNumber, kValidAppId, allowed_groups, disallowed_groups);
+  EXPECT_TRUE(allowed_groups.empty());
+  EXPECT_TRUE(disallowed_groups.empty());
+}
+
+TEST_F(CacheManagerTest, GetConsentedGroups_GroupsExist_ReturnGroups) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "\"consent_groups\":{"
+      "\"Location-1\": true,"
+      "\"Base-4\": false,"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs allowed_groups;
+  FunctionalGroupIDs disallowed_groups;
+
+  cache_manager_->GetConsentedGroups(
+      kDeviceNumber, kValidAppId, allowed_groups, disallowed_groups);
+  EXPECT_FALSE(allowed_groups.empty());
+  EXPECT_FALSE(disallowed_groups.empty());
+}
+
+TEST_F(CacheManagerTest, RemoveAppConsentForGroup_GroupIsRemoved) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"Location-1\"]"
+      "}"
+      "},"
+      "\"functional_groupings\": {"
+      "\"Location-1\": {"
+      "\"user_consent_prompt\": \"Location\""
+      "}"
+      "},"
+      "\"device_data\": {"
+      "\"XXX123456789ZZZ\": {"
+      "\"user_consent_records\": {"
+      "\"1234\": {"
+      "\"consent_groups\":{"
+      "\"Location-1\": true"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  FunctionalGroupIDs allowed_groups_before_removal,
+      disallowed_groups_before_removal;
+  cache_manager_->GetConsentedGroups(kDeviceNumber,
+                                     kValidAppId,
+                                     allowed_groups_before_removal,
+                                     disallowed_groups_before_removal);
+  EXPECT_FALSE(allowed_groups_before_removal.empty());
+
+  FunctionalGroupIDs unconsented_groups_before_removal;
+  cache_manager_->GetUnconsentedGroups(
+      kDeviceNumber, kValidAppId, unconsented_groups_before_removal);
+  EXPECT_TRUE(unconsented_groups_before_removal.empty());
+
+  const std::string group_to_remove("Location-1");
+  cache_manager_->RemoveAppConsentForGroup(kValidAppId, group_to_remove);
+
+  FunctionalGroupIDs allowed_groups_after_removal,
+      disallowed_groups_after_removal;
+  cache_manager_->GetConsentedGroups(kDeviceNumber,
+                                     kValidAppId,
+                                     allowed_groups_after_removal,
+                                     disallowed_groups_after_removal);
+  EXPECT_TRUE(allowed_groups_after_removal.empty());
+
+  FunctionalGroupIDs unconsented_groups_after_removal;
+  cache_manager_->GetUnconsentedGroups(
+      kDeviceNumber, kValidAppId, unconsented_groups_after_removal);
+  EXPECT_FALSE(unconsented_groups_after_removal.empty());
+}
+
+}  // namespace policy_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/policy/policy_external/test/counter_test.cc b/src/components/policy/policy_external/test/counter_test.cc
deleted file mode 100644
index af166f96ad..0000000000
--- a/src/components/policy/policy_external/test/counter_test.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-/* Copyright (c) 2015, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "policy/usage_statistics/counter.h"
-#include "gtest/gtest.h"
-#include "policy/usage_statistics/mock_statistics_manager.h"
-
-using ::testing::InSequence;
-using ::testing::StrictMock;
-
-namespace test {
-namespace components {
-namespace usage_statistics_test {
-
-using namespace usage_statistics;
-
-TEST(
-    StatisticsManagerIncrementMethod1Arg,
-    GlobalCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  GlobalCounter reboots_counter(msm, SYNC_REBOOTS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment(SYNC_REBOOTS));
-
-  // Act
-  ++reboots_counter;
-}
-
-TEST(
-    StatisticsManagerIncrementMethod1Arg,
-    GlobalCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  GlobalCounter reboots_counter(msm, SYNC_REBOOTS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment(SYNC_REBOOTS)).Times(2);
-
-  // Act
-  ++reboots_counter;
-  ++reboots_counter;
-}
-
-TEST(
-    StatisticsManagerIncrementMethod2Args,
-    AppCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment("HelloApp", USER_SELECTIONS));
-
-  // Act
-  ++user_selections_counter;
-}
-
-TEST(
-    StatisticsManagerIncrementMethod2Args,
-    AppCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment("HelloApp", USER_SELECTIONS)).Times(2);
-
-  // Act
-  ++user_selections_counter;
-  ++user_selections_counter;
-}
-//---
-TEST(StatisticsManagerSetMethod,
-     AppInfoUpdateMethod_CallONCE_StatisticsManagerSetMethodCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI);
-
-  // Assert
-  EXPECT_CALL(*msm, Set("HelloApp", LANGUAGE_GUI, "Klingon"));
-
-  // Act
-  gui_language_info.Update("Klingon");
-}
-
-TEST(StatisticsManagerSetMethod,
-     AppInfoUpdateMethod_CallTWICE_StatisticsManagerSetMethodCalledTWICE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI);
-
-  // Assert
-  EXPECT_CALL(*msm, Set("HelloApp", LANGUAGE_GUI, "Klingon"));
-  EXPECT_CALL(*msm, Set("HelloApp", LANGUAGE_GUI, "UA"));
-
-  // Act
-  gui_language_info.Update("Klingon");
-  gui_language_info.Update("UA");
-}
-
-TEST(StatisticsManagerAddMethod,
-     AppStopwatchStartMethod_CallONCE_StatisticsManagerAddMethodCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  const std::uint32_t time_out = 1;
-  AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out);
-
-  hmi_full_stopwatch.Start(SECONDS_HMI_FULL);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_FULL, time_out));
-
-  // Act
-  hmi_full_stopwatch.WriteTime();
-}
-
-TEST(StatisticsManagerAddMethod,
-     AppStopwatchSwitchMethod_Call_StatisticsManagerAddMethodCalled) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp");
-  hmi_full_stopwatch.Start(SECONDS_HMI_FULL);
-
-  hmi_full_stopwatch.Switch(SECONDS_HMI_FULL);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_FULL, 60));
-
-  // Act
-  hmi_full_stopwatch.WriteTime();
-}
-
-TEST(
-    StatisticsManagerAddMethod,
-    AppStopwatchSwitchMethod_CallAnd1SecSleepAfter_StatisticsManagerAddMethodCalledWith1SecTimespan) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  const std::uint32_t time_out = 1;
-  AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out);
-
-  // Act
-  hmi_full_stopwatch.Start(SECONDS_HMI_NONE);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_NONE, time_out));
-  // Act
-  hmi_full_stopwatch.WriteTime();
-
-  hmi_full_stopwatch.Switch(SECONDS_HMI_BACKGROUND);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_BACKGROUND, time_out));
-  // Act
-  hmi_full_stopwatch.WriteTime();
-}
-}  // namespace usage_statistics_test
-}  // namespace components
-}  // namespace test
diff --git a/src/components/policy/policy_external/test/generated_code_test.cc b/src/components/policy/policy_external/test/generated_code_test.cc
deleted file mode 100644
index 15d14e3e3b..0000000000
--- a/src/components/policy/policy_external/test/generated_code_test.cc
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Copyright (c) 2013, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <fstream>
-
-#include "gtest/gtest.h"
-
-#include "json/reader.h"
-#include "json/value.h"
-#include "policy/policy_table/enums.h"
-#include "policy/policy_table/types.h"
-#include "rpc_base/gtest_support.h"
-#include "rpc_base/rpc_base.h"
-
-using rpc::Integer;
-using rpc::policy_table_interface_base::Table;
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-TEST(PolicyGeneratedCodeTest, TestValidPTPreloadJsonIsValid) {
-  std::ifstream json_file("json/sdl_preloaded_pt.json");
-  ASSERT_TRUE(json_file.is_open());
-  Json::Value valid_table;
-  Json::Reader reader;
-  ASSERT_TRUE(reader.parse(json_file, valid_table));
-  Table table(&valid_table);
-  table.SetPolicyTableType(rpc::policy_table_interface_base::PT_PRELOADED);
-  ASSERT_RPCTYPE_VALID(table);
-}
-
-TEST(PolicyGeneratedCodeTest, TestValidPTUpdateJsonIsValid) {
-  std::ifstream json_file("json/valid_sdl_pt_update.json");
-  ASSERT_TRUE(json_file.is_open());
-  Json::Value valid_table;
-  Json::Reader reader;
-  ASSERT_TRUE(reader.parse(json_file, valid_table));
-  Table table(&valid_table);
-  table.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
-  ASSERT_RPCTYPE_VALID(table);
-}
-
-TEST(PolicyGeneratedCodeTest, IntegerLimitsTest) {
-  const int32_t min_value = -5;
-  const int32_t max_value = 5;
-
-  Integer<int32_t, min_value, max_value> value;
-  EXPECT_FALSE(value.is_valid());
-
-  value = min_value;
-  EXPECT_TRUE(value.is_valid());
-
-  value = max_value;
-  EXPECT_TRUE(value.is_valid());
-
-  value = min_value + max_value;
-  EXPECT_TRUE(value.is_valid());
-
-  value = min_value - 1;
-  EXPECT_FALSE(value.is_valid());
-
-  value = max_value + 1;
-  EXPECT_FALSE(value.is_valid());
-}
-
-TEST(PolicyGeneratedCodeTest, IntegerConstructionAndAssignmentTest) {
-  const int32_t min_value = -5;
-  const int32_t max_value = 5;
-
-  const Json::Value json_null = Json::Value(Json::nullValue);
-  Integer<int32_t, min_value, max_value> value_from_json_null(&json_null);
-  EXPECT_FALSE(value_from_json_null.is_valid());
-
-  const Json::Value json_string = Json::Value("string");
-  Integer<int32_t, min_value, max_value> value_from_json_string(&json_string);
-  EXPECT_FALSE(value_from_json_string.is_valid());
-
-  const Json::Value json_float = Json::Value(10.5);
-  Integer<int32_t, min_value, max_value> value_from_json_float(&json_float);
-  EXPECT_FALSE(value_from_json_float.is_valid());
-
-  const Json::Value json_int_in_range = Json::Value(4);
-  Integer<int32_t, min_value, max_value> value_from_json_int_in_range(
-      &json_int_in_range);
-  EXPECT_TRUE(value_from_json_int_in_range.is_valid());
-
-  const Json::Value json_int_out_of_range = Json::Value(9);
-  Integer<int32_t, min_value, max_value> value_from_json_int_out_of_range(
-      &json_int_out_of_range);
-  EXPECT_FALSE(value_from_json_int_out_of_range.is_valid());
-
-  const Json::Value json_zero = Json::Value(0);
-  Integer<int32_t, min_value, max_value> value_from_json_zero(&json_zero);
-  EXPECT_TRUE(value_from_json_zero.is_valid());
-
-  Integer<int32_t, min_value, max_value> invalid_value(&json_string);
-  EXPECT_FALSE(invalid_value.is_valid());
-  Integer<int32_t, min_value, max_value> reassigned_value = invalid_value;
-  EXPECT_FALSE(reassigned_value.is_valid());
-
-  Integer<int32_t, min_value, max_value> another_invalid_value(&json_string);
-  EXPECT_FALSE(another_invalid_value.is_valid());
-  Integer<int32_t, min_value, max_value> valid_value(0);
-  EXPECT_TRUE(valid_value.is_valid());
-  valid_value = another_invalid_value;
-  EXPECT_FALSE(valid_value.is_valid());
-}
-
-TEST(PolicyGeneratedCodeTest, TestConsentsGroup_Validation) {
-  using namespace rpc::policy_table_interface_base;
-  // Need to validate CCS consents container wrapped with Optional for case w/o
-  // specific values assigned since it is of generic 'Map' type which requires
-  // to be empty + initialized in order to be valid
-  // Also Map type does not have specific validation on PT type
-
-  rpc::Optional<ConsentGroups> consent_groups;
-
-  EXPECT_TRUE(consent_groups.is_valid());
-
-  consent_groups->insert(
-      std::make_pair(std::string("Group1"), rpc::Boolean(true)));
-
-  EXPECT_TRUE(consent_groups.is_valid());
-
-  // Adds more than container maximum size
-  for (size_t number = 0; number < 256; ++number) {
-    std::stringstream name;
-    name << "Group" << number;
-    consent_groups->insert(std::make_pair(name.str(), rpc::Boolean(true)));
-  }
-
-  EXPECT_FALSE(consent_groups.is_valid());
-}
-
-TEST(PolicyGeneratedCodeTest,
-     TestConsentRecords_ExternalConsents_PT_Validation) {
-  using namespace rpc::policy_table_interface_base;
-  ConsentRecords consent_records;
-
-  // PT_SNAPSHOT does not care of consents since their type is 'optional'
-  // PT_UPDATE and PT_SNAPSHOT have consents as 'omitted' so they must be absent
-  consent_records.SetPolicyTableType(PT_UPDATE);
-  EXPECT_TRUE(consent_records.is_valid());
-
-  consent_records.SetPolicyTableType(PT_PRELOADED);
-  EXPECT_TRUE(consent_records.is_valid());
-
-  consent_records.SetPolicyTableType(PT_SNAPSHOT);
-  EXPECT_TRUE(consent_records.is_valid());
-
-  consent_records.external_consent_status_groups->insert(
-      std::make_pair(std::string("Group1"), true));
-
-  consent_records.external_consent_status_groups->insert(
-      std::make_pair(std::string("Group2"), false));
-
-  consent_records.SetPolicyTableType(PT_UPDATE);
-  EXPECT_FALSE(consent_records.is_valid());
-
-  consent_records.SetPolicyTableType(PT_PRELOADED);
-  EXPECT_FALSE(consent_records.is_valid());
-
-  consent_records.SetPolicyTableType(PT_SNAPSHOT);
-  EXPECT_TRUE(consent_records.is_valid());
-}
-
-TEST(PolicyGeneratedCodeTest,
-     ExternalConsentEntity_ConstructionValidationTest) {
-  using namespace rpc::policy_table_interface_base;
-
-  ExternalConsentEntity empty_entity;
-  EXPECT_FALSE(empty_entity.is_valid());
-
-  const std::string corrent_entity_type_field = "entityType";
-  const std::string correct_entity_id_field = "entityID";
-
-  Json::Value correct_json_entity;
-  correct_json_entity[corrent_entity_type_field] = 1;
-  correct_json_entity[correct_entity_id_field] = 2;
-
-  ExternalConsentEntity entity_from_correct_json(&correct_json_entity);
-  EXPECT_TRUE(entity_from_correct_json.is_valid());
-
-  const std::string wrong_entity_id_field = "entityId";
-
-  Json::Value wrong_json_entity;
-  wrong_json_entity[corrent_entity_type_field] = 1;
-  wrong_json_entity[wrong_entity_id_field] = 2;
-
-  ExternalConsentEntity entity_from_wrong_json(&wrong_json_entity);
-  EXPECT_FALSE(entity_from_wrong_json.is_valid());
-
-  ExternalConsentEntity entity_from_valid_ints(1, 2);
-  EXPECT_TRUE(entity_from_valid_ints.is_valid());
-}
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
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 33d4c46e64..0b3fe7aef7 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
@@ -66,7 +66,6 @@ class MockPTRepresentation : virtual public ::policy::PTRepresentation {
   MOCK_METHOD1(SecondsBetweenRetries, bool(std::vector<int>* seconds));
   MOCK_METHOD2(GetPriority,
                bool(const std::string& app_id, std::string* priority));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const ::policy::VehicleInfo());
   MOCK_METHOD1(SetVINValue, bool(const std::string& value));
   MOCK_METHOD2(GetUserFriendlyMsg,
                std::vector< ::policy::UserFriendlyMessage>(
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
deleted file mode 100644
index 65972e0a82..0000000000
--- a/src/components/policy/policy_external/test/include/policy/policy_manager_impl_test_base.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#ifndef SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
-#define SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
-
-#include <string>
-#include <vector>
-
-#include "gtest/gtest.h"
-
-#include "policy/policy_manager_impl.h"
-
-#include "policy/mock_cache_manager.h"
-#include "policy/mock_policy_listener.h"
-#include "policy/mock_policy_settings.h"
-#include "policy/mock_update_status_manager.h"
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-using ::policy::PolicyManagerImpl;
-using ::testing::NiceMock;
-
-typedef std::multimap<std::string, policy_table::Rpcs&>
-    UserConsentPromptToRpcsConnections;
-
-typedef std::shared_ptr<policy_table::Table> PolicyTableSPtr;
-
-namespace {
-const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json";
-const std::string kSdlPreloadedPtJson2 = "json/sdl_preloaded_pt1.json";
-const std::string kFilePtUpdateJson = "json/file_pt_update.json";
-const std::string kHmiLevelFull = "FULL";
-const std::string kHmiLevelLimited = "LIMITED";
-const std::string kHmiLevelBackground = "BACKGROUND";
-const std::string kHmiLevelNone = "None";
-
-const std::string kPtuJson = "json/PTU.json";
-const std::string kPtu2Json = "json/PTU2.json";
-const std::string kPtu3Json = "json/PTU3.json";
-const std::string kValidSdlPtUpdateJson = "json/valid_sdl_pt_update.json";
-const std::string kPtuRequestTypeJson = "json/ptu_requestType.json";
-const std::string kPtu2RequestTypeJson = "json/ptu2_requestType.json";
-const std::string kDummyUpdateFileName = "DummyName";
-}  // namespace
-
-struct StringsForUpdate {
-  std::string new_field_value_;
-  std::string new_field_name_;
-  std::string new_date_;
-};
-
-char GenRandomChar(char range_from, char range_to);
-struct StringsForUpdate CreateNewRandomData(StringsForUpdate& str);
-void CheckIsParamInList(const ::policy::RPCParams& list,
-                        const std::string& parameter);
-Json::Value createPTforLoad();
-void InsertRpcParametersInList(::policy::RPCParams& input_params);
-policy_table::AppHmiTypes HmiTypes(const policy_table::AppHMIType hmi_type);
-
-template <typename T>
-void SortAndCheckEquality(std::vector<T> first, std::vector<T> second) {
-  ASSERT_EQ(first.size(), second.size());
-  std::sort(first.begin(), first.end());
-  std::sort(second.begin(), second.end());
-
-  EXPECT_TRUE(std::equal(first.begin(), first.end(), second.begin()));
-}
-
-template <typename T>
-std::string NumberToString(T Number) {
-  std::ostringstream ss;
-  ss << Number;
-  return ss.str();
-}
-
-class PolicyManagerImplTest : public ::testing::Test {
- public:
-  PolicyManagerImplTest();
-
- protected:
-  const std::string unpaired_device_id_;
-
-  PolicyManagerImpl* policy_manager_;
-  MockCacheManagerInterface* cache_manager_;
-  MockUpdateStatusManager update_manager_;
-  NiceMock<MockPolicyListener> listener_;
-
-  void SetUp() OVERRIDE;
-
-  void TearDown() OVERRIDE;
-
-  ::testing::AssertionResult IsValid(const policy_table::Table& table);
-};
-
-class PolicyManagerImplTest2 : public ::testing::Test {
- public:
-  PolicyManagerImplTest2();
-
- protected:
-  const std::string app_id_1_;
-  const std::string app_id_2_;
-  const std::string app_id_3_;
-  const std::string device_id_1_;
-  const std::string device_id_2_;
-  const std::string application_id_;
-  const std::string app_storage_folder_;
-  const std::string preloaded_pt_filename_;
-  const bool in_memory_;
-
-  PolicyManagerImpl* policy_manager_;
-  NiceMock<MockPolicyListener> listener_;
-  ::policy::StringArray hmi_level_;
-  ::policy::StringArray pt_request_types_;
-  size_t ptu_request_types_size_;
-  uint32_t index_;
-  Json::Value ptu_request_types_;
-  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
-
-  void SetUp() OVERRIDE;
-
-  ::policy::StringArray JsonToVectorString(
-      const Json::Value& PTU_request_types);
-
-  const Json::Value GetPTU(const std::string& file_name);
-
-  void CreateLocalPT(const std::string& file_name);
-
-  void AddRTtoPT(const std::string& update_file_name,
-                 const std::string& section_name,
-                 const uint32_t rt_number,
-                 const uint32_t invalid_rt_number);
-
-  void AddRTtoAppSectionPT(const std::string& update_file_name,
-                           const std::string& section_name,
-                           const uint32_t rt_number,
-                           const uint32_t invalid_rt_number);
-
-  std::vector<policy_table::RequestType> PushRequestTypesToContainer(
-      const ::policy::StringArray& temp_result);
-
-  void CheckResultForValidRT();
-
-  void CheckResultForInvalidRT();
-
-  void FillMultimapFromFunctionalGroupings(
-      UserConsentPromptToRpcsConnections& input_multimap,
-      policy_table::FunctionalGroupings& fg_table);
-
-  void GetFunctionalGroupingsFromManager(
-      policy_table::FunctionalGroupings& input_functional_groupings);
-
-  void TearDown() OVERRIDE;
-
-  void ResetOutputList(::policy::CheckPermissionResult& output);
-  // To avoid duplicate test with different json files
-  void CheckPermissions_AllParamsAllowed_CheckRpcsInDiffLvls(
-      const std::string& update_file);
-
-  // To avoid duplicates in tests
-  void CheckRpcPermissions(const std::string& rpc_name,
-                           const PermitResult& expected_permission);
-
-  void CheckRpcPermissions(const std::string& app_id,
-                           const std::string& rpc_name,
-                           const policy::PermitResult& out_expected_permission);
-
-  // To avoid duplicate arrange of test
-  void AddSetDeviceData();
-
-  // Load Json File and set it as PTU
-  void LoadPTUFromJsonFile(const std::string& update_file);
-
-  void EmulatePTAppRevoked(const std::string& ptu_name);
-
-  std::shared_ptr<policy_table::Table> PreconditionForBasicValidateSnapshot();
-
-  template <typename ParentType, typename Value>
-  bool IsKeyExisted(const ParentType& parent, const Value& value) const {
-    return parent.end() != std::find(parent.begin(), parent.end(), value);
-  }
-
-  template <typename ParentType>
-  bool IsKeyExisted(const ParentType& parent, const std::string& value) const {
-    return parent.end() != parent.find(value);
-  }
-
-  template <typename ParentType, typename KeyType>
-  const KeyType& GetKeyData(const ParentType& parent,
-                            const std::string& key_name) const {
-    DCHECK(IsKeyExisted<ParentType>(parent, key_name));
-    return parent.find(key_name)->second;
-  }
-
-  bool CheckPolicyTimeStamp(const std::string& str) const;
-};
-
-class PolicyManagerImplTest_RequestTypes : public ::testing::Test {
- public:
-  PolicyManagerImplTest_RequestTypes();
-
- protected:
-  const ::policy::StringArray kJsonFiles;
-  const std::string kAppId;
-  const std::string kDefaultAppId;
-  const std::string app_storage_folder_;
-  const std::string preloaded_pt_filename_;
-
-  std::shared_ptr<PolicyManagerImpl> policy_manager_impl_sptr_;
-  NiceMock<MockPolicyListener> listener_;
-  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
-
-  void SetUp() OVERRIDE;
-
-  const Json::Value GetPTU(const std::string& file_name);
-
-  void RefreshPT(const std::string& preloaded_pt_file,
-                 const std::string& update_pt_file);
-
-  PolicyTableSPtr GetPolicyTableSnapshot();
-
-  policy_table::RequestTypes GetRequestTypesForApplication(
-      const std::string& app_id);
-
-  void CompareAppRequestTypesWithDefault(const std::string& app_id,
-                                         const std::string& ptu_file);
-
-  policy_table::RequestTypes CreateDefaultAppPTURequestValues();
-
-  policy_table::RequestTypes CreateDefaultAppDatabaseRequestValues();
-
-  policy_table::RequestTypes CreatePreDataConsentAppPTURequestValues();
-
-  void CompareRequestTypesContainers(
-      const policy_table::RequestTypes& expected_data,
-      const policy_table::RequestTypes& received_data);
-
-  void TearDown() OVERRIDE;
-};
-
-class PolicyManagerImplTest_ExternalConsent : public PolicyManagerImplTest2 {
- public:
-  PolicyManagerImplTest_ExternalConsent()
-      : PolicyManagerImplTest2()
-      , group_name_1_("Group1")
-      , group_name_2_("Group2")
-      , group_name_3_("Group3") {}
-
- protected:
-  void PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
-
-  void PreconditionExternalConsentPreparePTWithAppPolicy();
-
-  policy_table::Table PreparePTWithGroupsHavingExternalConsent();
-
-  std::string PreparePTUWithNewGroup(const uint32_t type,
-                                     const uint32_t id,
-                                     const std::string& group_name);
-
-  const uint32_t type_1_ = 0;
-  const uint32_t id_1_ = 1;
-  const uint32_t type_2_ = 2;
-  const uint32_t id_2_ = 3;
-  const uint32_t type_3_ = 4;
-  const uint32_t id_3_ = 5;
-
-  const std::string group_name_1_;
-  const std::string group_name_2_;
-  const std::string group_name_3_;
-};
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
-
-#endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_TEST_INCLUDE_POLICY_POLICY_MANAGER_IMPL_TEST_BASE_H_
diff --git a/src/components/policy/policy_external/test/json/PTU.json b/src/components/policy/policy_external/test/json/PTU.json
deleted file mode 100644
index c5f4b90120..0000000000
--- a/src/components/policy/policy_external/test/json/PTU.json
+++ /dev/null
@@ -1,2173 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.019",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?"
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada"
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible"
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-en": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-            },
-            "es-en": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?"
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push"
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "1234": "default",
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      }
-    }
-  }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU2.json b/src/components/policy/policy_external/test/json/PTU2.json
deleted file mode 100644
index 01cca4a6fd..0000000000
--- a/src/components/policy/policy_external/test/json/PTU2.json
+++ /dev/null
@@ -1,2172 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.019",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?"
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada"
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible"
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-en": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-            },
-            "es-en": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?"
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push"
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": []
-      },
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      }
-    }
-  }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU3.json b/src/components/policy/policy_external/test/json/PTU3.json
deleted file mode 100644
index f48f246114..0000000000
--- a/src/components/policy/policy_external/test/json/PTU3.json
+++ /dev/null
@@ -1,2174 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.019",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?"
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada"
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible"
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-en": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-            },
-            "es-en": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?"
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push"
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "1234": "default",
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY",
-          "INVALID_REQUEST_TYPE"
-        ]
-      }
-    }
-  }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_default_app.json b/src/components/policy/policy_external/test/json/PTU_default_app.json
deleted file mode 100644
index b036d96b50..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_default_app.json
+++ /dev/null
@@ -1,319 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY",
-              "LOCK_SCREEN_ICON_URL"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_default_app_app_invalid_values_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_app_invalid_values_RequestType_array.json
deleted file mode 100644
index 49ed46f16c..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_default_app_app_invalid_values_RequestType_array.json
+++ /dev/null
@@ -1,317 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "IVSU",
-              "BREAK_STUFF"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_default_app_empty_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_empty_RequestType_array.json
deleted file mode 100644
index 66af76309a..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_default_app_empty_RequestType_array.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [ ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_default_app_omitted_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_omitted_RequestType_array.json
deleted file mode 100644
index 0a7c059097..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_default_app_omitted_RequestType_array.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_default_app_one_invalid_value_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_default_app_one_invalid_value_RequestType_array.json
deleted file mode 100644
index 08f12a21c8..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_default_app_one_invalid_value_RequestType_array.json
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "IVSU",
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY",
-              "LOCK_SCREEN_ICON_URL"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_functional_grouping.json b/src/components/policy/policy_external/test/json/PTU_functional_grouping.json
deleted file mode 100644
index 5a8837c0bc..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_functional_grouping.json
+++ /dev/null
@@ -1,11 +0,0 @@
-"Added-Group-1": {
-                "rpcs": {
-                    "AddedFunction1": {
-                        "hmi_levels": [
-                            "BACKGROUND",
-                            "FULL",
-                            "LIMITED"
-                        ]
-                    }
-                }
-        }
\ No newline at end of file
diff --git a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app.json
deleted file mode 100644
index b036d96b50..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app.json
+++ /dev/null
@@ -1,319 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY",
-              "LOCK_SCREEN_ICON_URL"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json
deleted file mode 100644
index 6aeb637503..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_empty_RequestType_array.json
+++ /dev/null
@@ -1,314 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY",
-              "LOCK_SCREEN_ICON_URL"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [ ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json
deleted file mode 100644
index 8c68aaeb89..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_invalid_values_RequestType_array.json
+++ /dev/null
@@ -1,315 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "IVSU",
-              "BREAK_STUFF"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "IVSU",
-              "BREAK_STUFF"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json
deleted file mode 100644
index 0ae0761f27..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_omitted_RequestType_array.json
+++ /dev/null
@@ -1,307 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json b/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json
deleted file mode 100644
index 6b170089fe..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_pre_data_consent_app_one_invalid_value_RequestType_array.json
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY",
-              "LOCK_SCREEN_ICON_URL"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "IVSU",
-              "FILE_RESUME",
-              "AUTH_REQUEST",
-              "AUTH_CHALLENGE",
-              "AUTH_ACK"
-            ]
-         }
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index 1e99e7442c..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_with_empty_requestType_array.json
+++ /dev/null
@@ -1,1747 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "HTTP",
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index dc40c3a182..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_with_invalid_requestType_between_correct.json
+++ /dev/null
@@ -1,1750 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "HTTP",
-                    "IVSU",
-                    "LAUNCH_APP",
-                    "PROPRIETARY" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "HTTP",
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index 3fcc71ca72..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_with_one_invalid_requestType.json
+++ /dev/null
@@ -1,1747 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "RequestType" : [ "IVSU" ]
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "HTTP",
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index 03a5e8d203..0000000000
--- a/src/components/policy/policy_external/test/json/PTU_without_requestType_field.json
+++ /dev/null
@@ -1,1746 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester", "tester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "RequestType": [
-              "HTTP",
-              "QUERY_APPS",
-              "LAUNCH_APP",
-              "PROPRIETARY"
-            ]
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "heart_beat_timeout_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index b5dd0bfff5..0000000000
--- a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_reqestType_between_valid.json
+++ /dev/null
@@ -1,1964 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-02-12",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 70,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "QUERY_APPS",
-                  "IVSU",
-                  "PROPRIETARY"
-                ]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": ["HTTP"]
-            }
-        }
-    }
-    }
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
deleted file mode 100644
index 8fa8e6f3d0..0000000000
--- a/src/components/policy/policy_external/test/json/preloadedPT_with_invalid_default_requestType.json
+++ /dev/null
@@ -1,1962 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-02-12",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 70,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "IVSU"
-                ]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": ["HTTP"]
-            }
-        }
-    }
-    }
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
deleted file mode 100644
index 589cdc7a81..0000000000
--- a/src/components/policy/policy_external/test/json/preloadedPT_with_several_invalid_default_requestTypes.json
+++ /dev/null
@@ -1,1963 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-02-12",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 70,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "IVSU1",
-                  "IVSU2"
-                ]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": ["HTTP"]
-            }
-        }
-    }
-    }
diff --git a/src/components/policy/policy_external/test/json/ptu2_requestType.json b/src/components/policy/policy_external/test/json/ptu2_requestType.json
deleted file mode 100644
index 9b580b2a08..0000000000
--- a/src/components/policy/policy_external/test/json/ptu2_requestType.json
+++ /dev/null
@@ -1,2635 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "preloaded_date": "2015-12-02",
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        },
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Base-6": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnTBTClientState": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.021",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. \n\nSi presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. \n\nLas actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. \n\nPresione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements.\r\n\r\nVeuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "EMERGENCY",
-        "default_hmi": "LIMITED",
-        "groups": [
-          "Base-4"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ],
-        "preconsented_groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "123454321": {
-        "keep_context" : false,
-                         "steal_focus" : false,
-                                         "priority"
-                                         : "NONE",
-                                           "default_hmi"
-                                           : "NONE",
-                                             "groups" :
-                                             ["BaseBeforeDataConsent"],
-                                             "RequestType" :[
-                                               "TRAFFIC_MESSAGE_CHANNEL",
-                                               "QUERY_APPS",
-                                               "LAUNCH_APP",
-                                               "PROPRIETARY"
-                                             ]
-      }
-    }
-  }
-}
diff --git a/src/components/policy/policy_external/test/json/ptu_requestType.json b/src/components/policy/policy_external/test/json/ptu_requestType.json
deleted file mode 100644
index 8d18a9e336..0000000000
--- a/src/components/policy/policy_external/test/json/ptu_requestType.json
+++ /dev/null
@@ -1,2625 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        },
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Base-6": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnTBTClientState": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.021",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. \n\nSi presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. \n\nLas actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. \n\nPresione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements.\r\n\r\nVeuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "123454321": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "PROPRIETARY"
-        ]
-      },
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "PROPRIETARY"
-        ]
-      }
-    }
-  }
-}
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
deleted file mode 100644
index ad264c8518..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt.json
+++ /dev/null
@@ -1,1965 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-02-12",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 70,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "PROJECTION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "QUERY_APPS",
-                  "LAUNCH_APP",
-                  "PROPRIETARY"
-                ]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": ["HTTP"]
-            }
-        }
-    }
-    }
diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_initial.json
index 909fd2cb2f..909fd2cb2f 100644
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt1.json
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_initial.json
diff --git a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_latest.json b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_latest.json
new file mode 100644
index 0000000000..3260558e70
--- /dev/null
+++ b/src/components/policy/policy_external/test/json/sdl_preloaded_pt_for_merge_latest.json
@@ -0,0 +1,2433 @@
+
+{
+  "policy_table" :
+  {
+    "app_policies" :
+    {
+      "default" :
+      {
+        "default_hmi" : "NONE",
+        "groups" : [ "Base-4" ],
+        "keep_context" : false,
+        "priority" : "NONE",
+        "steal_focus" : false
+      },
+      "device" :
+      {
+        "default_hmi" : "NONE",
+        "groups" : [ "DataConsent-2" ],
+        "keep_context" : false,
+        "priority" : "NONE",
+        "steal_focus" : false
+      },
+      "pre_DataConsent" :
+      {
+        "default_hmi" : "BACKGROUND",
+        "groups" : [ "BaseBeforeDataConsent" ],
+        "keep_context" : false,
+        "priority" : "EMERGENCY",
+        "steal_focus" : false
+      }
+    },
+    "consumer_friendly_messages" :
+    {
+      "messages" :
+      {
+        "AppPermissions" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Zugriffsanfrage(n)",
+              "line2" : "erlauben?",
+              "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+            },
+            "en-au" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-gb" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "textBody" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu.",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-ie" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-us" :
+            {
+              "line1" : "Grant Requested",
+              "line2" : "Permission(s)?",
+              "textBody" : "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent.",
+              "tts" : "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny."
+            },
+            "es-en" :
+            {
+              "line1" : "¿Otorgar permiso(s)",
+              "line2" : "solicitado(s)?",
+              "textBody" : "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior.",
+              "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
+            },
+            "es-es" :
+            {
+              "line1" : "¿Conceder permisos",
+              "line2" : "solicitados?",
+              "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
+            },
+            "es-mx" :
+            {
+              "line1" : "¿Otorgar permiso(s)",
+              "line2" : "solicitado(s)?",
+              "textBody" : "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior.",
+              "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Accorder permission(s)",
+              "line2" : "demandée(s)",
+              "textBody" : "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens.",
+              "tts" : "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Accorder permission(s)",
+              "line2" : "demandée(s)",
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+            },
+            "it-it" :
+            {
+              "line1" : "Concedi autorizzaz.",
+              "line2" : "richiesta(e)?",
+              "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Aangevraagde",
+              "line2" : "permissie(s) verlenen?",
+              "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Udzielić żądanych",
+              "line2" : "pozwoleń?",
+              "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
+            },
+            "pt-br" :
+            {
+              "line1" : "Conceder permissão",
+              "line2" : "solicitada?",
+              "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Conceder permiss.",
+              "line2" : "solicitada(s)?",
+              "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Предост. заправш.",
+              "line2" : "разрешения?",
+              "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
+            },
+            "sv-se" :
+            {
+              "line1" : "Vill du ge",
+              "line2" : "tillstånd?",
+              "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
+            },
+            "tr-tr" :
+            {
+              "line1" : "İstenen izinler",
+              "line2" : "verilsin mi?",
+              "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "line1" : "是否允许请求的",
+              "line2" : "权限？",
+              "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "允許",
+              "line2" : "授權請求?",
+              "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
+            }
+          }
+        },
+        "AppPermissionsHelp" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+            },
+            "en-au" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-gb" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-ie" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-us" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
+            },
+            "es-en" :
+            {
+              "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+            },
+            "es-es" :
+            {
+              "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
+            },
+            "es-mx" :
+            {
+              "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+            },
+            "fr-ca" :
+            {
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+            },
+            "fr-fr" :
+            {
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+            },
+            "it-it" :
+            {
+              "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
+            },
+            "nl-nl" :
+            {
+              "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
+            },
+            "pl-pl" :
+            {
+              "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
+            },
+            "pt-br" :
+            {
+              "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
+            },
+            "pt-pt" :
+            {
+              "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
+            },
+            "ru-ru" :
+            {
+              "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
+            },
+            "sv-se" :
+            {
+              "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
+            },
+            "tr-tr" :
+            {
+              "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
+            },
+            "zh-tw" :
+            {
+              "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
+            }
+          }
+        },
+        "AppPermissionsRevoked" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
+            },
+            "en-au" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-gb" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-ie" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-us" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "es-en" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+            },
+            "es-es" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
+            },
+            "es-mx" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+            },
+            "fr-ca" :
+            {
+              "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+            },
+            "fr-fr" :
+            {
+              "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+            },
+            "it-it" :
+            {
+              "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
+            },
+            "nl-nl" :
+            {
+              "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
+            },
+            "pl-pl" :
+            {
+              "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
+            },
+            "pt-br" :
+            {
+              "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
+            },
+            "pt-pt" :
+            {
+              "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
+            },
+            "ru-ru" :
+            {
+              "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
+            },
+            "sv-se" :
+            {
+              "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
+            },
+            "tr-tr" :
+            {
+              "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
+            },
+            "zh-cn" :
+            {
+              "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
+            },
+            "zh-tw" :
+            {
+              "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
+            }
+          }
+        },
+        "AppUnauthorized" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "nicht autorisiert",
+              "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
+            },
+            "en-au" :
+            {
+              "line1" : "not authorized",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-gb" :
+            {
+              "line1" : "not authorized",
+              "textBody" : "This version of %appName% is not authorized and will not work with SYNC.",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-ie" :
+            {
+              "line1" : "not authorized",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-us" :
+            {
+              "line1" : "Not Authorized",
+              "textBody" : "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%.",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "es-en" :
+            {
+              "line1" : "no autorizada",
+              "textBody" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+              "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+            },
+            "es-es" :
+            {
+              "line1" : "No autorizada",
+              "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
+            },
+            "es-mx" :
+            {
+              "line1" : "no autorizada",
+              "textBody" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+              "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+            },
+            "fr-ca" :
+            {
+              "line1" : "non autorisée",
+              "textBody" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
+              "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+            },
+            "fr-fr" :
+            {
+              "line1" : "non autorisée",
+              "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+            },
+            "it-it" :
+            {
+              "line1" : "non autorizzata",
+              "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
+            },
+            "nl-nl" :
+            {
+              "line1" : "niet geautoriseerd",
+              "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
+            },
+            "pl-pl" :
+            {
+              "line1" : "brak autoryzacji",
+              "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
+            },
+            "pt-br" :
+            {
+              "line1" : "não autorizado",
+              "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
+            },
+            "pt-pt" :
+            {
+              "line1" : "não autorizada",
+              "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
+            },
+            "ru-ru" :
+            {
+              "line1" : "не авторизировано",
+              "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
+            },
+            "sv-se" :
+            {
+              "line1" : "är ej godkänd",
+              "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
+            },
+            "tr-tr" :
+            {
+              "line1" : "için izin yok",
+              "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
+            },
+            "zh-cn" :
+            {
+              "line1" : "未得到授权",
+              "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "無授權",
+              "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
+            }
+          }
+        },
+        "AppUnsupported" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "nicht unterstützt",
+              "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
+            },
+            "en-au" :
+            {
+              "line1" : "not supported",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-gb" :
+            {
+              "line1" : "not supported",
+              "textBody" : "This version of %appName% is not supported by SYNC.",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-ie" :
+            {
+              "line1" : "not supported",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-us" :
+            {
+              "line1" : "Not Supported",
+              "textBody" : "Your version of %appName% is not supported by SYNC.",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "es-en" :
+            {
+              "line1" : "no compatible",
+              "textBody" : "Esta versión de %appName% no es compatible con SYNC.",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "es-es" :
+            {
+              "line1" : "No compatible",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "es-mx" :
+            {
+              "line1" : "no compatible",
+              "textBody" : "Esta versión de %appName% no es compatible con SYNC.",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "fr-ca" :
+            {
+              "line1" : "incompatible",
+              "textBody" : "Cette version de %appName% n’est pas prise en charge par SYNC.",
+              "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
+            },
+            "fr-fr" :
+            {
+              "line1" : "incompatible",
+              "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
+            },
+            "it-it" :
+            {
+              "line1" : "non supportata",
+              "tts" : "Questa versione di %appName% non è supportata dal SYNC."
+            },
+            "nl-nl" :
+            {
+              "line1" : "niet ondersteund",
+              "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
+            },
+            "pl-pl" :
+            {
+              "line1" : "aplikacja nie obsług.",
+              "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
+            },
+            "pt-br" :
+            {
+              "line1" : "não suportado",
+              "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
+            },
+            "pt-pt" :
+            {
+              "line1" : "não suportada",
+              "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
+            },
+            "ru-ru" :
+            {
+              "line1" : "не поддерживается",
+              "tts" : "Эта версия %appName% не поддерживается SYNC."
+            },
+            "sv-se" :
+            {
+              "line1" : "stöds ej",
+              "tts" : "SYNC har inte stöd för den här versionen av %appName%."
+            },
+            "tr-tr" :
+            {
+              "line1" : "desteklenmiyor",
+              "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
+            },
+            "zh-cn" :
+            {
+              "line1" : "不受支持",
+              "tts" : "SYNC不支持此版本的%appName%。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "不支援",
+              "tts" : "SYNC 不支援此版本的%appName% 。"
+            }
+          }
+        },
+        "DataConsent" :
+        {
+          "languages" :
+          {
+            "en-gb" :
+            {
+              "textBody" : "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
+            },
+            "en-us" :
+            {
+              "line1" : "Enable Mobile Apps",
+              "line2" : "on SYNC? (Uses Data)",
+              "textBody" : "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
+            }
+          }
+        },
+        "DataConsentHelp" :
+        {
+          "languages" :
+          {
+            "en-us" :
+            {
+              "textBody" : "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
+            }
+          }
+        },
+        "DisableApps" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Auto-Update",
+              "line2" : "und Mobile Apps deaktivieren",
+              "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
+            },
+            "en-au" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-gb" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "textBody" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-ie" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-us" :
+            {
+              "line1" : "Disable Auto-Updates",
+              "line2" : "and Mobile Apps?",
+              "textBody" : "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel.",
+              "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
+            },
+            "es-en" :
+            {
+              "line1" : "¿Deshab. actualiz.",
+              "line2" : "autom. y aplic. móv.?",
+              "textBody" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+              "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+            },
+            "es-es" :
+            {
+              "line1" : "¿Desact. actual. auto",
+              "line2" : "y apl. móviles?",
+              "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
+            },
+            "es-mx" :
+            {
+              "line1" : "¿Deshab. actualiz.",
+              "line2" : "autom. y aplic. móv.?",
+              "textBody" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+              "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Désactiver màj autom.",
+              "line2" : "et app. mobiles?",
+              "textBody" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
+              "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Désactiver màj autom.",
+              "line2" : "et app. mobiles?",
+              "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+            },
+            "it-it" :
+            {
+              "line1" : "Disabilitare agg. aut.",
+              "line2" : "e app mobili?",
+              "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Auto-updates en mob.",
+              "line2" : "apps uitschakelen?",
+              "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Wył. automat. aktual.",
+              "line2" : "i aplikacje mobilne?",
+              "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
+            },
+            "pt-br" :
+            {
+              "line1" : "Desativar atualizações",
+              "line2" : "autom. e aplicativos?",
+              "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Desact. actual. autom.",
+              "line2" : "e aplicações móveis?",
+              "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Откл. автообновления",
+              "line2" : "и мобил. прилож.?",
+              "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
+            },
+            "sv-se" :
+            {
+              "line1" : "Avaktiverar autouppdat.",
+              "line2" : "och mobilappar?",
+              "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Oto. güncelleme ve",
+              "line2" : "mobil uygul. kapat?",
+              "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "line1" : "是否禁用自动更新和",
+              "line2" : "移动应用程序？",
+              "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "停用自動更新",
+              "line2" : "和行動應用程式？",
+              "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
+            }
+          }
+        },
+        "DrivingCharacteristics" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Fahreigenschaften",
+              "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
+            },
+            "en-au" :
+            {
+              "label" : "Driving characteristics",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-gb" :
+            {
+              "label" : "Driving characteristics",
+              "textBody" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-ie" :
+            {
+              "label" : "Driving characteristics",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-us" :
+            {
+              "label" : "Driving Characteristics",
+              "textBody" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
+              "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
+            },
+            "es-en" :
+            {
+              "label" : "Características del manejo",
+              "textBody" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
+              "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
+            },
+            "es-es" :
+            {
+              "label" : "Características de conducción",
+              "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
+            },
+            "es-mx" :
+            {
+              "label" : "Características del manejo",
+              "textBody" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
+              "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
+            },
+            "fr-ca" :
+            {
+              "label" : "Caractéristiques de conduite",
+              "textBody" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
+              "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
+            },
+            "fr-fr" :
+            {
+              "label" : "Caractéristiques de conduite",
+              "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
+            },
+            "it-it" :
+            {
+              "label" : "Caratteristiche di guida",
+              "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
+            },
+            "nl-nl" :
+            {
+              "label" : "Rijkenmerken",
+              "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
+            },
+            "pl-pl" :
+            {
+              "label" : "Informacje dotyczące stylu jazdy",
+              "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
+            },
+            "pt-br" :
+            {
+              "label" : "Características de condução",
+              "line1" : "Caract. Condução",
+              "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
+            },
+            "pt-pt" :
+            {
+              "label" : "Características de condução",
+              "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
+            },
+            "ru-ru" :
+            {
+              "label" : "Характеристики движения",
+              "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
+            },
+            "sv-se" :
+            {
+              "label" : "Köregenskaper",
+              "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
+            },
+            "tr-tr" :
+            {
+              "label" : "Sürüş karakteristikleri",
+              "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
+            },
+            "zh-cn" :
+            {
+              "label" : "行驶特性",
+              "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
+            },
+            "zh-tw" :
+            {
+              "label" : "駕駛特性",
+              "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
+            }
+          }
+        },
+        "Location" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "GPS und Geschwindigkeit",
+              "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
+            },
+            "en-au" :
+            {
+              "label" : "GPS and speed",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-gb" :
+            {
+              "label" : "GPS and speed",
+              "textBody" : "An app can access vehicle GPS and speed.",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-ie" :
+            {
+              "label" : "GPS and speed",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-us" :
+            {
+              "label" : "GPS and Speed",
+              "textBody" : "An app can access vehicle GPS and speed.",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "es-en" :
+            {
+              "label" : "GPS y velocidad",
+              "textBody" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+              "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+            },
+            "es-es" :
+            {
+              "label" : "GPS y velocidad",
+              "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
+            },
+            "es-mx" :
+            {
+              "label" : "GPS y velocidad",
+              "textBody" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+              "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+            },
+            "fr-ca" :
+            {
+              "label" : "GPS et Vitesse",
+              "textBody" : "Une application peut accéder au GPS et à la vitesse du véhicule.",
+              "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
+            },
+            "fr-fr" :
+            {
+              "label" : "GPS et vitesse",
+              "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
+            },
+            "it-it" :
+            {
+              "label" : "GPS e velocità",
+              "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
+            },
+            "nl-nl" :
+            {
+              "label" : "Gps en snelheid",
+              "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
+            },
+            "pl-pl" :
+            {
+              "label" : "GPS i prędkość",
+              "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
+            },
+            "pt-br" :
+            {
+              "label" : "GPS e velocidade",
+              "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
+            },
+            "pt-pt" :
+            {
+              "label" : "GPS e velocidade",
+              "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
+            },
+            "ru-ru" :
+            {
+              "label" : "GPS и скорость",
+              "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
+            },
+            "sv-se" :
+            {
+              "label" : "GPS och hastighet",
+              "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
+            },
+            "tr-tr" :
+            {
+              "label" : "GPS ve hız",
+              "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
+            },
+            "zh-cn" :
+            {
+              "label" : "GPS 和车速",
+              "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
+            },
+            "zh-tw" :
+            {
+              "label" : "GPS和車速",
+              "tts" : "應用程式可存取車輛的GPS和速度。"
+            }
+          }
+        },
+        "Notifications" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Push-Benachrichtigungen",
+              "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
+            },
+            "en-au" :
+            {
+              "label" : "Push notifications",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-gb" :
+            {
+              "label" : "Push notifications",
+              "textBody" : "An app can send notifications when running in the background.",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-ie" :
+            {
+              "label" : "Push notifications",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-us" :
+            {
+              "label" : "Push Notifications",
+              "textBody" : "An app can send notifications when running in the background.",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "es-en" :
+            {
+              "label" : "Notificaciones tipo Push",
+              "textBody" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+              "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+            },
+            "es-es" :
+            {
+              "label" : "Notificaciones push",
+              "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
+            },
+            "es-mx" :
+            {
+              "label" : "Notificaciones tipo Push",
+              "textBody" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+              "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+            },
+            "fr-ca" :
+            {
+              "label" : "Notifications Instantanées",
+              "textBody" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
+              "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+            },
+            "fr-fr" :
+            {
+              "label" : "Notifications push",
+              "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+            },
+            "it-it" :
+            {
+              "label" : "Notifiche push",
+              "tts" : "Un'app può inviare notifiche se eseguita in background."
+            },
+            "nl-nl" :
+            {
+              "label" : "Push-meldingen",
+              "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
+            },
+            "pl-pl" :
+            {
+              "label" : "Powiadomienia Push",
+              "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
+            },
+            "pt-br" :
+            {
+              "label" : "Notificações Push",
+              "line1" : "Notificações",
+              "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
+            },
+            "pt-pt" :
+            {
+              "label" : "Notificações push",
+              "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
+            },
+            "ru-ru" :
+            {
+              "label" : "Оповещения о пересылке",
+              "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
+            },
+            "sv-se" :
+            {
+              "label" : "Push-notiser",
+              "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
+            },
+            "tr-tr" :
+            {
+              "label" : "Anlık bildirimleri",
+              "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
+            },
+            "zh-cn" :
+            {
+              "label" : "推送通知",
+              "tts" : "移动应用程序在后台运行时可推送通知。"
+            },
+            "zh-tw" :
+            {
+              "label" : "傳送通知",
+              "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
+            }
+          }
+        },
+        "SettingAppPermissions" :
+        {
+          "languages" :
+          {
+            "en-us" :
+            {
+              "textBody" : "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
+            }
+          }
+        },
+        "SettingDisableUpdates" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Updates deakt."
+            },
+            "en-au" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-gb" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-ie" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-us" :
+            {
+              "line1" : "Disable Updates",
+              "textBody" : "Disable Updates"
+            },
+            "es-en" :
+            {
+              "line1" : "Deshab. actual.",
+              "textBody" : "Deshab. actual."
+            },
+            "es-es" :
+            {
+              "line1" : "Desact. actual."
+            },
+            "es-mx" :
+            {
+              "line1" : "Deshab. actual.",
+              "textBody" : "Deshab. actual."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Désactiver MAJ",
+              "textBody" : "Désactiver MAJ"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Désactiver màj"
+            },
+            "it-it" :
+            {
+              "line1" : "Disabilita agg."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Upd. uitschak."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Wyłącz aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Desat. atualiz."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Desact. actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Откл. обновл."
+            },
+            "sv-se" :
+            {
+              "line1" : "Inaktivera uppd."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncell. Kapat"
+            },
+            "zh-cn" :
+            {
+              "line1" : "禁用更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "停用更新"
+            }
+          }
+        },
+        "SettingEnableUpdates" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Apps aktivieren"
+            },
+            "en-au" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-gb" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-ie" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-us" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "es-en" :
+            {
+              "line1" : "Hab. aplic."
+            },
+            "es-es" :
+            {
+              "line1" : "Activar apl."
+            },
+            "es-mx" :
+            {
+              "line1" : "Hab. aplic."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Activer app.",
+              "textBody" : "Activer app."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Activer app."
+            },
+            "it-it" :
+            {
+              "line1" : "Abilita app"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Apps inschak."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Włącz aplikacje"
+            },
+            "pt-br" :
+            {
+              "line1" : "Ativar aplic."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Activar actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Вкл. прилож."
+            },
+            "sv-se" :
+            {
+              "line1" : "Aktivera appar"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Uygulamaları aç"
+            },
+            "zh-cn" :
+            {
+              "line1" : "启用应用程序"
+            },
+            "zh-tw" :
+            {
+              "line1" : "啟用應用程式"
+            }
+          }
+        },
+        "SettingUpdateAuto" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Update anford."
+            },
+            "en-au" :
+            {
+              "line1" : "Request update"
+            },
+            "en-gb" :
+            {
+              "line1" : "Request update"
+            },
+            "en-ie" :
+            {
+              "line1" : "Request update"
+            },
+            "en-us" :
+            {
+              "line1" : "Request Update",
+              "textBody" : "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
+            },
+            "es-en" :
+            {
+              "line1" : "Solicit. actualiz.",
+              "textBody" : "Solicit. actualiz."
+            },
+            "es-es" :
+            {
+              "line1" : "Solicitar actual."
+            },
+            "es-mx" :
+            {
+              "line1" : "Solicit. actualiz.",
+              "textBody" : "Solicit. actualiz."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Demander MAJ",
+              "textBody" : "Demander MAJ"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Demander màj"
+            },
+            "it-it" :
+            {
+              "line1" : "Rich. aggiorn."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Upd. aanvragen"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Zażądaj aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Solicitar atualiz."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Solicit. actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Запрос на обн."
+            },
+            "sv-se" :
+            {
+              "line1" : "Begär uppdat."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncelleme iste"
+            },
+            "zh-cn" :
+            {
+              "line1" : "请求更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "請求更新"
+            }
+          }
+        },
+        "StatusNeeded" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Update benötigt"
+            },
+            "en-au" :
+            {
+              "line1" : "Update needed"
+            },
+            "en-gb" :
+            {
+              "line1" : "Update needed",
+              "textBody" : "Update needed"
+            },
+            "en-ie" :
+            {
+              "line1" : "Update needed"
+            },
+            "en-us" :
+            {
+              "line1" : "Update Needed",
+              "textBody" : "Update Needed"
+            },
+            "es-en" :
+            {
+              "line1" : "Actualiz. neces.",
+              "textBody" : "Actualiz. neces."
+            },
+            "es-es" :
+            {
+              "line1" : "Actu. necesaria"
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualiz. neces.",
+              "textBody" : "Actualiz. neces."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Màj requise",
+              "textBody" : "Màj requise"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Mise à jour requise"
+            },
+            "it-it" :
+            {
+              "line1" : "Necess. aggiorn."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Update nodig"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Potrzeba aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualiz. necess."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Actual. necess."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Необх. обновл."
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdat. krävs"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncellenmeli"
+            },
+            "zh-cn" :
+            {
+              "line1" : "需要进行更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "需更新"
+            }
+          }
+        },
+        "StatusPending" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Aktualisieren..."
+            },
+            "en-au" :
+            {
+              "line1" : "Updating..."
+            },
+            "en-gb" :
+            {
+              "line1" : "Updating...",
+              "textBody" : "Updating..."
+            },
+            "en-ie" :
+            {
+              "line1" : "Updating..."
+            },
+            "en-us" :
+            {
+              "line1" : "Updating...",
+              "textBody" : "Updating..."
+            },
+            "es-en" :
+            {
+              "line1" : "Actualizando...",
+              "textBody" : "Actualizando..."
+            },
+            "es-es" :
+            {
+              "line1" : "Actualizando..."
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualizando...",
+              "textBody" : "Actualizando..."
+            },
+            "fr-ca" :
+            {
+              "line1" : "MAJ en cours...",
+              "textBody" : "MAJ en cours..."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Màj en cours..."
+            },
+            "it-it" :
+            {
+              "line1" : "Aggiornamento"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Updaten..."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Aktualizowanie"
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualizando..."
+            },
+            "pt-pt" :
+            {
+              "line1" : "A actualizar..."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Обновление..."
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdaterar..."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncelleniyor..."
+            },
+            "zh-cn" :
+            {
+              "line1" : "正在更新......"
+            },
+            "zh-tw" :
+            {
+              "line1" : "更新中..."
+            }
+          }
+        },
+        "StatusUpToDate" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Aktuelle Version"
+            },
+            "en-au" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "en-gb" :
+            {
+              "line1" : "Up-to-date",
+              "textBody" : "Up-to-date"
+            },
+            "en-ie" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "en-us" :
+            {
+              "line1" : "Up-To-Date",
+              "textBody" : "Up-To-Date"
+            },
+            "es-en" :
+            {
+              "line1" : "Actualizado",
+              "textBody" : "Actualizado"
+            },
+            "es-es" :
+            {
+              "line1" : "Actualizada"
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualizado",
+              "textBody" : "Actualizado"
+            },
+            "fr-ca" :
+            {
+              "line1" : "Déjà à jour",
+              "textBody" : "Déjà à jour"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Déjà à jour"
+            },
+            "it-it" :
+            {
+              "line1" : "più recente"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Aktualne"
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualizado"
+            },
+            "pt-pt" :
+            {
+              "line1" : "Actualizado"
+            },
+            "ru-ru" :
+            {
+              "line1" : "Обновлено"
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdat. krävs ej"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncel"
+            },
+            "zh-cn" :
+            {
+              "line1" : "最新更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "更新最新"
+            }
+          }
+        },
+        "VehicleInfo" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Fahrzeuginformationen",
+              "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
+            },
+            "en-au" :
+            {
+              "label" : "Vehicle information",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
+            },
+            "en-gb" :
+            {
+              "label" : "Vehicle information",
+              "textBody" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
+            },
+            "en-ie" :
+            {
+              "label" : "Vehicle information",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
+            },
+            "en-us" :
+            {
+              "label" : "Vehicle Information",
+              "textBody" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
+              "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
+            },
+            "es-en" :
+            {
+              "label" : "Información del vehículo",
+              "textBody" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
+              "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
+            },
+            "es-es" :
+            {
+              "label" : "Información del vehículo",
+              "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
+            },
+            "es-mx" :
+            {
+              "label" : "Información del Vehículo",
+              "textBody" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
+              "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
+            },
+            "fr-ca" :
+            {
+              "label" : "Renseignements du Véhicule",
+              "textBody" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
+              "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
+            },
+            "fr-fr" :
+            {
+              "label" : "Renseignements du véhicule",
+              "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
+            },
+            "it-it" :
+            {
+              "label" : "Informazioni sul veicolo",
+              "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
+            },
+            "nl-nl" :
+            {
+              "label" : "Voertuiginformatie",
+              "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
+            },
+            "pl-pl" :
+            {
+              "label" : "Informacje o pojeździe",
+              "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
+            },
+            "pt-br" :
+            {
+              "label" : "Informações sobre o veículo",
+              "line1" : "Inform. Veículo",
+              "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
+            },
+            "pt-pt" :
+            {
+              "label" : "Informações do veículo",
+              "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
+            },
+            "ru-ru" :
+            {
+              "label" : "Информация об автомобиле",
+              "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
+            },
+            "sv-se" :
+            {
+              "label" : "Fordonsinformation",
+              "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
+            },
+            "tr-tr" :
+            {
+              "label" : "Araç bilgisi",
+              "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
+            },
+            "zh-cn" :
+            {
+              "label" : "车辆信息",
+              "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
+            },
+            "zh-tw" :
+            {
+              "label" : "車輛資訊",
+              "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
+            }
+          }
+        }
+      },
+      "version" : "001.001.023"
+    },
+    "functional_groupings" :
+    {
+      "BackgroundAPT" :
+      {
+        "rpcs" :
+        {
+          "EndAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          },
+          "OnAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          },
+          "PerformAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          }
+        }
+      },
+      "Base-4" :
+      {
+        "rpcs" :
+        {
+          "AddCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "AddSubMenu" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Alert" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "ChangeRegistration" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "CreateInteractionChoiceSet" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "DeleteInteractionChoiceSet" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteSubMenu" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "EncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "EndAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GenericResponse" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ListFiles" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAppInterfaceUnregistered" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnButtonEvent" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnButtonPress" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnDriverDistraction" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnEncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHMIStatus" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHashChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnLanguageChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnPermissionsChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnSystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "PerformAudioPassThru" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "PerformInteraction" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "PutFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "RegisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ResetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ScrollableMessage" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          },
+          "SetAppIcon" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetDisplayLayout" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetMediaClockTimer" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Show" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Slider" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          },
+          "Speak" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "SubscribeButton" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "SystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnregisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnsubscribeButton" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "BaseBeforeDataConsent" :
+      {
+        "rpcs" :
+        {
+          "ChangeRegistration" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "DeleteFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "EncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ListFiles" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAppInterfaceUnregistered" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnEncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHMIStatus" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHashChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnLanguageChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnPermissionsChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnSystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "PutFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "RegisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ResetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetAppIcon" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetDisplayLayout" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnregisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          }
+        }
+      },
+      "DataConsent-2" :
+      {
+        "rpcs" : null,
+        "user_consent_prompt" : "DataConsent"
+      },
+      "DiagnosticMessageOnly" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "DialNumberOnly" :
+      {
+        "rpcs" :
+        {
+          "DialNumber" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "DrivingCharacteristics-3" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          }
+        },
+        "user_consent_prompt" : "DrivingCharacteristics"
+      },
+      "Emergency-1" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          }
+        }
+      },
+      "Location-1" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          }
+        },
+        "user_consent_prompt" : "Location"
+      },
+      "Navigation-1" :
+      {
+        "rpcs" :
+        {
+          "AlertManeuver" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ShowConstantTBT" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "UpdateTurnList" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "Notifications" :
+      {
+        "rpcs" :
+        {
+          "Alert" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications"
+      },
+      "Notifications-45" :
+      {
+        "rpcs" :
+        {
+          "MWTAA" :
+          {
+            "hmi_levels" : [ "LIMITED" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications-45"
+      },
+      "Notifications-73" :
+      {
+        "rpcs" :
+        {
+          "STEHV" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications-73"
+      },
+      "OnKeyboardInputOnlyGroup" :
+      {
+        "rpcs" :
+        {
+          "OnKeyboardInput" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        }
+      },
+      "OnTouchEventOnlyGroup" :
+      {
+        "rpcs" :
+        {
+          "OnTouchEvent" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        }
+      },
+      "PropriataryData-1" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "PropriataryData-2" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "ProprietaryData-3" :
+      {
+        "rpcs" :
+        {
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "SendLocation" :
+      {
+        "rpcs" :
+        {
+          "SendLocation" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "SendLocationOnly" :
+      {
+        "rpcs" :
+        {
+          "SendLocation" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "VehicleInfo-3" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "vin",
+              "wiperStatus"
+            ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "vin",
+              "wiperStatus"
+            ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "wiperStatus"
+            ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "wiperStatus"
+            ]
+          }
+        },
+        "user_consent_prompt" : "VehicleInfo"
+      }
+    },
+    "module_config" :
+    {
+      "endpoints" :
+      {
+        "0x04" :
+        {
+          "default" : [ "http://x.x.x.x:3000/api/1/softwareUpdate" ]
+        },
+        "0x07" :
+        {
+          "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
+        }
+      },
+      "exchange_after_x_days" : 20,
+      "exchange_after_x_ignition_cycles" : 100,
+      "exchange_after_x_kilometers" : 1800,
+      "notifications_per_minute_by_priority" :
+      {
+        "COMMUNICATION" : 6,
+        "EMERGENCY" : 60,
+        "NAVIGATION" : 15,
+        "NONE" : 0,
+        "NORMAL" : 4,
+        "VOICECOM" : 20
+      },
+      "preloaded_date" : "2012-12-16",
+      "preloaded_pt" : true,
+      "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
+      "timeout_after_x_seconds" : 60
+    }
+  }
+}
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
deleted file mode 100644
index 87fac7c76c..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_preloaded_pt_send_location.json
+++ /dev/null
@@ -1,2341 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "preloaded_pt": true,
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
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
deleted file mode 100644
index 440963ba48..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_pt_first_update.json
+++ /dev/null
@@ -1,1764 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "Notifications-2" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "FULL" ]
-               }
-            },
-            "user_consent_prompt" : "Old_Notifications"
-         },
-         "Notifications-3" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "LIMITED" ]
-               }
-            },
-            "user_consent_prompt" : "Old_Notifications"
-         },
-         "Notifications-4" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "NONE" ]
-               }
-            },
-            "user_consent_prompt" : "New_Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index 5900acbcfb..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_pt_second_update.json
+++ /dev/null
@@ -1,1764 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "Notifications-2" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "FULL" ]
-               }
-            },
-            "user_consent_prompt" : "Old_Notifications"
-         },
-         "Notifications-3" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "LIMITED" ]
-               }
-            },
-            "user_consent_prompt" : "New_Notifications"
-         },
-         "Notifications-4" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "NONE" ]
-               }
-            },
-            "user_consent_prompt" : "New_Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index b3affeb91d..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_pt_update.json
+++ /dev/null
@@ -1,1748 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "Notifications2" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "FULL" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index 639d0143c8..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_have_params.json
+++ /dev/null
@@ -1,2360 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "longitudeDegrees",
-              "latitudeDegrees",
-              "locationDescription",
-              "phoneNumber"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "locationName",
-              "locationImage",
-              "deliveryMode"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation", "SendLocationOnly"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index 53216cab3d..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1.json
+++ /dev/null
@@ -1,2362 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "longitudeDegrees",
-              "latitudeDegrees",
-              "locationName",
-              "locationDescription",
-              "addressLines",
-              "phoneNumber",
-              "locationImage",
-              "deliveryMode",
-              "timeStamp",
-              "address"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": []
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation", "SendLocationOnly"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index a529dc9a3b..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json
+++ /dev/null
@@ -1,2350 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": []
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation", "SendLocationOnly"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index a57791e248..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location.json
+++ /dev/null
@@ -1,2349 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index 5a633e7c95..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_all_params.json
+++ /dev/null
@@ -1,2361 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "longitudeDegrees",
-              "latitudeDegrees",
-              "locationName",
-              "locationDescription",
-              "addressLines",
-              "phoneNumber",
-              "locationImage",
-              "deliveryMode",
-              "timeStamp",
-              "address"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index 86c121491b..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_no_params.json
+++ /dev/null
@@ -1,2350 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": []
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index 2b57912016..0000000000
--- a/src/components/policy/policy_external/test/json/sdl_update_pt_send_location_some_params.json
+++ /dev/null
@@ -1,2355 +0,0 @@
-{
-  "policy_table" : {
-    "module_config": {
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 20,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        },
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-            "longitudeDegrees",
-            "latitudeDegrees",
-            "locationDescription",
-            "phoneNumber"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DialNumberOnly": {
-        "rpcs": {
-          "DialNumber": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "SendLocationOnly": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.023",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "tts": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
-            },
-            "es-mx": {
-              "textBody": "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
-            },
-            "fr-ca": {
-              "textBody": "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução",
-              "line1": "Caract. Condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and Speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et Vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push Notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications Instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push",
-              "line1": "Notificações"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingAppPermissions": {
-          "languages": {
-            "en-us": {
-              "textBody": "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
-            },
-            "es-mx": {
-              "textBody": "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
-            },
-            "fr-ca": {
-              "textBody": "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
-              "label": "Vehicle Information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
-              "label": "Información del Vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
-              "label": "Renseignements du Véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo",
-              "line1": "Inform. Veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "1234": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NORMAL",
-        "default_hmi": "FULL",
-        "groups": [
-          "SendLocation"
-        ]
-      },
-    }
-  }
-}
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
deleted file mode 100644
index acf18c5706..0000000000
--- a/src/components/policy/policy_external/test/json/valid_sdl_pt_update.json
+++ /dev/null
@@ -1,1746 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "app_services": {
-               "MEDIA": {
-                  "service_names" : ["SDL App", "SDL Music"],
-                  "handled_rpcs" : [{"function_id": 41}]
-               }
-            }
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
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
deleted file mode 100644
index 066b5756e2..0000000000
--- a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
+++ /dev/null
@@ -1,1718 +0,0 @@
-/*
- * Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdint.h>
-#include <fstream>
-#include <string>
-#include <vector>
-
-#include "gtest/gtest.h"
-
-#include "policy/policy_manager_impl_test_base.h"
-#include "policy/policy_table/types.h"
-
-#include "json/reader.h"
-#include "utils/date_time.h"
-#include "utils/gen_hash.h"
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-using ::testing::_;
-using ::testing::Return;
-using ::testing::ReturnRef;
-
-TEST_F(PolicyManagerImplTest,
-       DISABLED_TiggerPTUForNaviAppInCaseNoCertificateExistsInPolicyTable) {
-  EXPECT_CALL(*cache_manager_, GetDeviceConsent(_))
-      .WillOnce(Return(kDeviceAllowed));
-  const uint32_t type = 0;
-  const uint32_t id = 1;
-  const EntityStatus status = kStatusOn;
-  ExternalConsentStatusItem item(type, id, status);
-
-  ExternalConsentStatus external_consent_status;
-  external_consent_status.insert(item);
-
-  GroupsByExternalConsentStatus group;
-  group[item].push_back(std::make_pair<std::string, bool>("group_name", true));
-
-  EXPECT_CALL(*cache_manager_, GetExternalConsentStatus())
-      .WillOnce(Return(external_consent_status));
-
-  EXPECT_CALL(*cache_manager_,
-              GetGroupsWithSameEntities(external_consent_status))
-      .WillOnce(Return(group));
-
-  EXPECT_CALL(*cache_manager_, ResetCalculatedPermissions());
-
-  EXPECT_CALL(*cache_manager_, GetPermissionsForApp(_, _, _))
-      .WillOnce(Return(true))
-      .WillOnce(Return(true));
-  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
-      .WillOnce(Return(true))
-      .WillOnce(Return(true));
-
-  EXPECT_CALL(*cache_manager_, SetUserPermissionsForApp(_, _))
-      .WillOnce(Return(false));
-
-  EXPECT_CALL(*cache_manager_, SetExternalConsentForApp(_));
-
-  EXPECT_CALL(*cache_manager_, IsPredataPolicy(_)).WillOnce(Return(false));
-  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(_))
-      .WillOnce(Return(true));
-  EXPECT_EQ(policy_manager_->GetPolicyTableStatus(), "UP_TO_DATE");
-  policy_manager_->AddApplication(kDefaultId,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_EQ(policy_manager_->GetPolicyTableStatus(), "UP_TO_DATE");
-}
-
-TEST_F(PolicyManagerImplTest2, GetNotificationsNumberAfterPTUpdate) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  Json::Value table = createPTforLoad();
-  policy_manager_->ForcePTExchange();
-  policy_manager_->OnUpdateStarted();
-  policy_table::Table update(&table);
-  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
-  // Act
-  std::string json = table.toStyledString();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  EXPECT_CALL(listener_, OnUpdateStatusChanged(_));
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-
-  std::string priority = "EMERGENCY";
-  uint32_t notif_number = policy_manager_->GetNotificationsNumber(priority);
-  EXPECT_EQ(1u, notif_number);
-
-  priority = "NAVIGATION";
-  notif_number = policy_manager_->GetNotificationsNumber(priority);
-  EXPECT_EQ(2u, notif_number);
-
-  priority = "EMERGENCY";
-  notif_number = policy_manager_->GetNotificationsNumber(priority);
-  EXPECT_EQ(1u, notif_number);
-
-  priority = "VOICECOM";
-  notif_number = policy_manager_->GetNotificationsNumber(priority);
-  EXPECT_EQ(3u, notif_number);
-
-  priority = "NORMAL";
-  notif_number = policy_manager_->GetNotificationsNumber(priority);
-  EXPECT_EQ(5u, notif_number);
-
-  priority = "NONE";
-  notif_number = policy_manager_->GetNotificationsNumber(priority);
-  EXPECT_EQ(6u, notif_number);
-}
-
-TEST_F(PolicyManagerImplTest2, IsAppRevoked_SetRevokedAppID_ExpectAppRevoked) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  std::ifstream ifile(kValidSdlPtUpdateJson);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open()) {
-    if (reader.parse(ifile, root, true)) {
-      root["policy_table"]["app_policies"][app_id_1_] = Json::nullValue;
-      json = root.toStyledString();
-    }
-  }
-  ifile.close();
-
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  ASSERT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-  CheckRpcPermissions(
-      app_id_1_, "UnregisterAppInterface", ::policy::kRpcDisallowed);
-  EXPECT_TRUE(policy_manager_->IsApplicationRevoked(app_id_1_));
-}
-
-// Related to manual test APPLINK-18792
-TEST_F(PolicyManagerImplTest2, AppRevokedOne_AppRegistered) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  EmulatePTAppRevoked(kPtu2Json);
-
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Registration is allowed
-  CheckRpcPermissions("RegisterAppInterface", ::policy::kRpcAllowed);
-}
-
-// Related to manual test APPLINK-18794
-TEST_F(PolicyManagerImplTest2, AppRevokedOne_AppRegistered_HMIDefault) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  EmulatePTAppRevoked(kPtu2Json);
-
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  std::string default_hmi;
-  // Default HMI level is NONE
-  EXPECT_TRUE(policy_manager_->GetDefaultHmi(application_id_, &default_hmi));
-  EXPECT_EQ("NONE", default_hmi);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_SetRevokedAppID_ExpectRPCDisallowed) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  cache->AddDevice(device_id_1_, "Bluetooth");
-  cache->SetDeviceData(device_id_1_,
-                       "hardware IPX",
-                       "v.8.0.1",
-                       "Android",
-                       "4.4.2",
-                       "Life",
-                       2,
-                       "Bluetooth");
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-  policy_manager_->SetUserConsentForDevice(device_id_1_, true);
-  // Add app from consented device. App will be assigned with default policies
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check before action
-  policy_table::RpcParameters rpc_parameters;
-  rpc_parameters.hmi_levels.push_back(policy_table::HL_FULL);
-
-  policy_table::Rpc rpc;
-  rpc["Alert"] = rpc_parameters;
-
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-
-  policy_manager_->CheckPermissions(
-      app_id_1_, kHmiLevelFull, "Alert", input_params, output);
-
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-  // Act
-  std::ifstream ifile(kValidSdlPtUpdateJson);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  EXPECT_TRUE(ifile.is_open());
-  EXPECT_TRUE(reader.parse(ifile, root, true));
-  root["policy_table"]["app_policies"][app_id_1_] = Json::nullValue;
-  json = root.toStyledString();
-  ifile.close();
-
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  ASSERT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(cache->IsPTPreloaded());
-
-  policy_manager_->CheckPermissions(
-      app_id_1_, kHmiLevelFull, "Alert", input_params, output);
-  // Check RPC is disallowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_SetAppIDwithPolicies_ExpectRPCAllowed) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-
-  ASSERT_TRUE(cache->SetDeviceData(device_id_1_,
-                                   "hardware IPX",
-                                   "v.8.0.1",
-                                   "Android",
-                                   "4.4.2",
-                                   "Life",
-                                   2,
-                                   "Bluetooth"));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .WillRepeatedly(Return(device_id_1_));
-  policy_manager_->SetUserConsentForDevice(device_id_1_, true);
-  // Add app from consented device. App will be assigned with default policies
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_MEDIA));
-  // Emulate PTU with new policies for app added above
-  std::ifstream ifile(kValidSdlPtUpdateJson);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    // Add AppID with policies
-    root["policy_table"]["app_policies"][application_id_] =
-        Json::Value(Json::objectValue);
-    root["policy_table"]["app_policies"][application_id_]["memory_kb"] =
-        Json::Value(50);
-    root["policy_table"]["app_policies"][application_id_]
-        ["heart_beat_timeout_ms"] = Json::Value(100);
-    root["policy_table"]["app_policies"][application_id_]["AppHMIType"] =
-        Json::Value(Json::arrayValue);
-    root["policy_table"]["app_policies"][application_id_]["AppHMIType"][0] =
-        Json::Value("MEDIA");
-    root["policy_table"]["app_policies"][application_id_]["groups"] =
-        Json::Value(Json::arrayValue);
-    root["policy_table"]["app_policies"][application_id_]["groups"][0] =
-        Json::Value("Base-4");
-    root["policy_table"]["app_policies"][application_id_]["priority"] =
-        Json::Value("EMERGENCY");
-    root["policy_table"]["app_policies"][application_id_]["default_hmi"] =
-        Json::Value("FULL");
-    root["policy_table"]["app_policies"][application_id_]["keep_context"] =
-        Json::Value(true);
-    root["policy_table"]["app_policies"][application_id_]["steal_focus"] =
-        Json::Value(true);
-    root["policy_table"]["app_policies"][application_id_]["certificate"] =
-        Json::Value("sign");
-    json = root.toStyledString();
-  }
-  ifile.close();
-
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  // Load Json to cache
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(cache->IsPTPreloaded());
-
-  policy_table::RpcParameters rpc_parameters;
-  rpc_parameters.hmi_levels.push_back(policy_table::HL_FULL);
-
-  policy_table::Rpc rpc;
-  rpc["Alert"] = rpc_parameters;
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .WillOnce(Return(device_id_1_));
-  cache->AddDevice(device_id_1_, "Bluetooth");
-  cache->SetDeviceData(device_id_1_,
-                       "hardware IPX",
-                       "v.8.0.1",
-                       "Android",
-                       "4.4.2",
-                       "Life",
-                       2,
-                       "Bluetooth");
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "Alert", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of parameters empty
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_NoParametersInPT_CheckRpcsInDifferentLevels) {
-  // Arrange
-  AddSetDeviceData();
-  LoadPTUFromJsonFile("json/sdl_update_pt_send_location.json");
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-
-  // Reset output
-  ResetOutputList(output);
-
-  // Rpc in LIMITED level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelLimited, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-
-  ResetOutputList(output);
-
-  // Rpc in BACKGROUND level
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-
-  ResetOutputList(output);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-  // Check RPC is disallowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  // Check list of parameters is empty
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    CheckPermissions_ParamsNotAllowedInPT_AddAppWithAllParams_CheckRpcsInDiffLvls) {
-  // Arrange
-  AddSetDeviceData();
-  // File have empty parameters, so they are forbidden
-  LoadPTUFromJsonFile("json/sdl_update_pt_send_location_no_params.json");
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  InsertRpcParametersInList(input_params);
-
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-
-  // Group which has RPC does not require user consent, so its auto-allowed for
-  // user. Since RPC 'parameters' section is present, but empty, that means
-  // 'every parameter is disallowed' in case some parameter(s) will be passed
-  // it will be considered as disallowed by policy (assumption, will be
-  // clarified).
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-
-  // Check list of allowed parameters is empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_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);
-
-  // Check list of allowed parameters is empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
-
-  ResetOutputList(output);
-
-  // Rpc in BACKGROUND level
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-
-  // Check list of allowed parameters is empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_undefined_params.size());
-
-  // Reset output
-  ResetOutputList(output);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-
-  // Check lists of parameters are  empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  EXPECT_TRUE(output.list_of_undefined_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_SomeParamsAllowedInPT_CheckRpcsInDiffLvls) {
-  // Arrange
-  AddSetDeviceData();
-
-  // File have some parameters, so only "longitudeDegrees", "latitudeDegrees",
-  //"locationDescription",  "phoneNumber" are allowed
-  LoadPTUFromJsonFile("json/sdl_update_pt_send_location_some_params.json");
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  InsertRpcParametersInList(input_params);
-
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-
-  // Check list of allowed parameters is not empty
-  ASSERT_FALSE(output.list_of_allowed_params.empty());
-  // Check parameters that should be allowed
-  CheckIsParamInList(output.list_of_allowed_params, "longitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "latitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "locationDescription");
-  CheckIsParamInList(output.list_of_allowed_params, "phoneNumber");
-
-  // Parameters that are missing in application assigned groups are considered
-  // as disallowed by policy, i.e. w/o defined user consent, so they are put to
-  // undefined container.
-  ASSERT_FALSE(output.list_of_undefined_params.empty());
-  CheckIsParamInList(output.list_of_undefined_params, "locationName");
-  CheckIsParamInList(output.list_of_undefined_params, "addressLines");
-  CheckIsParamInList(output.list_of_undefined_params, "locationImage");
-  CheckIsParamInList(output.list_of_undefined_params, "deliveryMode");
-  CheckIsParamInList(output.list_of_undefined_params, "timeStamp");
-  CheckIsParamInList(output.list_of_undefined_params, "address");
-
-  // Reset output
-  output.hmi_level_permitted = ::policy::kRpcDisallowed;
-  output.list_of_allowed_params.clear();
-  output.list_of_undefined_params.clear();
-
-  // Rpc in LIMITED level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelLimited, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-
-  // Check list of allowed parameters is not empty
-  ASSERT_FALSE(output.list_of_allowed_params.empty());
-  // Check parameters that should be allowed
-  CheckIsParamInList(output.list_of_allowed_params, "longitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "latitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "locationDescription");
-  CheckIsParamInList(output.list_of_allowed_params, "phoneNumber");
-
-  ASSERT_FALSE(output.list_of_undefined_params.empty());
-  EXPECT_EQ(6u, output.list_of_undefined_params.size());
-  // Reset output
-  ResetOutputList(output);
-
-  // Rpc in BACKGROUND level
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-
-  // Check parameters that should be allowed
-  ASSERT_FALSE(output.list_of_allowed_params.empty());
-  CheckIsParamInList(output.list_of_allowed_params, "longitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "latitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "locationDescription");
-  CheckIsParamInList(output.list_of_allowed_params, "phoneNumber");
-
-  EXPECT_FALSE(output.list_of_undefined_params.empty());
-  // Reset output
-  ResetOutputList(output);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-  // Check RPC is disallowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  // Check lists of parameters are  empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  EXPECT_TRUE(output.list_of_undefined_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest2, GetUpdateUrl) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  GetPTU(kValidSdlPtUpdateJson);
-  // Check expectations
-  const std::string update_url("http://x.x.x.x:3000/api/1/policies");
-  EXPECT_EQ(update_url, policy_manager_->GetUpdateUrl(7));
-  EXPECT_EQ("", policy_manager_->GetUpdateUrl(4));
-}
-
-// Related to manual test APPLINK-18789
-TEST_F(PolicyManagerImplTest2, GetCorrectStatus_PTUSuccessful) {
-  // Precondition
-  CreateLocalPT(preloaded_pt_filename_);
-  // Check
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-
-  // Adding changes PT status
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Before load PT we should send notification about start updating
-  policy_manager_->OnUpdateStarted();
-  // Update
-  GetPTU(kPtu3Json);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_NoParamsInPT_AddAppWithAllParams_CheckRpcsInDiffLvls) {
-  // File does not have parameters, so they all are permitted
-  CheckPermissions_AllParamsAllowed_CheckRpcsInDiffLvls(
-      "json/sdl_update_pt_send_location.json");
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_AllParamsAllowedInPT_CheckRpcsInDiffLvls) {
-  // File has permissions for all params
-  CheckPermissions_AllParamsAllowed_CheckRpcsInDiffLvls(
-      "json/sdl_update_pt_send_location_all_params.json");
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_DiffParamsAllowedInGroups_CheckRpcsInDiffLvls) {
-  // Arrange
-  AddSetDeviceData();
-  // Load Json to cache
-  // File have 2 functional groups: SendLocation and SendLocationOnly.
-  // They have different parameters.
-  // Allowed both groups of parameters
-  LoadPTUFromJsonFile("json/sdl_update_pt_2_groups_have_params.json");
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  InsertRpcParametersInList(input_params);
-
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of allowed parameters is not empty
-  EXPECT_FALSE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(7u, output.list_of_allowed_params.size());
-  // Check parameters that should be allowed
-  CheckIsParamInList(output.list_of_allowed_params, "longitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "latitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "locationDescription");
-  CheckIsParamInList(output.list_of_allowed_params, "phoneNumber");
-  CheckIsParamInList(output.list_of_allowed_params, "locationName");
-  CheckIsParamInList(output.list_of_allowed_params, "locationImage");
-  CheckIsParamInList(output.list_of_allowed_params, "deliveryMode");
-
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  ResetOutputList(output);
-
-  // Rpc in LIMITED level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelLimited, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of allowed parameters is not empty
-  EXPECT_FALSE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(7u, output.list_of_allowed_params.size());
-  // Check parameters that should be allowed
-  CheckIsParamInList(output.list_of_allowed_params, "longitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "latitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "locationDescription");
-  CheckIsParamInList(output.list_of_allowed_params, "phoneNumber");
-  CheckIsParamInList(output.list_of_allowed_params, "locationName");
-  CheckIsParamInList(output.list_of_allowed_params, "locationImage");
-  CheckIsParamInList(output.list_of_allowed_params, "deliveryMode");
-
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  ResetOutputList(output);
-
-  // Rpc in BACKGROUND level
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of allowed parameters is not empty
-  EXPECT_FALSE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(7u, output.list_of_allowed_params.size());
-  // Check parameters that should be allowed
-  CheckIsParamInList(output.list_of_allowed_params, "longitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "latitudeDegrees");
-  CheckIsParamInList(output.list_of_allowed_params, "locationDescription");
-  CheckIsParamInList(output.list_of_allowed_params, "phoneNumber");
-  CheckIsParamInList(output.list_of_allowed_params, "locationName");
-  CheckIsParamInList(output.list_of_allowed_params, "locationImage");
-  CheckIsParamInList(output.list_of_allowed_params, "deliveryMode");
-
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  // Reset output
-  ResetOutputList(output);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-  // Check RPC is disallowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  // Check lists of parameters are  empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  EXPECT_TRUE(output.list_of_undefined_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_ParamsAllowedInOneGroup_CheckRpcsInDiffLvls) {
-  // Load Json to cache
-  // File have 2 functional groups: SendLocation and SendLocationOnly.
-  // They have different parameters. One has dissalowed all params, other -
-  // allowed.
-
-  // Arrange
-  CreateLocalPT("json/sdl_preloaded_pt_send_location.json");
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  ASSERT_TRUE(cache->SetDeviceData(device_id_1_,
-                                   "hardware IPX",
-                                   "v.8.0.1",
-                                   "Android",
-                                   "4.4.2",
-                                   "Life",
-                                   2,
-                                   "Bluetooth"));
-
-  // Add app from consented device. App will be assigned with default policies
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  std::ifstream ifile("json/sdl_update_pt_2_groups_no_params_in1.json");
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open()) {
-    reader.parse(ifile, root, true);
-  }
-  json = root.toStyledString();
-  ifile.close();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(cache->IsPTPreloaded());
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  InsertRpcParametersInList(input_params);
-
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-
-  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::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
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-
-  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);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_ParamOmmittedInOneGroup_CheckRpcsInDiffLvls) {
-  // Load Json to cache
-  // File have 2 functional groups: SendLocation and SendLocationOnly.
-  // They have different parameters. One has dissalowed all params, other -
-  // omitted.
-
-  // Arrange
-  CreateLocalPT("json/sdl_preloaded_pt_send_location.json");
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  ASSERT_TRUE(cache->SetDeviceData(device_id_1_,
-                                   "hardware IPX",
-                                   "v.8.0.1",
-                                   "Android",
-                                   "4.4.2",
-                                   "Life",
-                                   2,
-                                   "Bluetooth"));
-
-  // Add app from consented device. App will be assigned with default policies
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  std::ifstream ifile(
-      "json/sdl_update_pt_2_groups_no_params_in1_omitted_in2.json");
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open()) {
-    reader.parse(ifile, root, true);
-  }
-  json = root.toStyledString();
-  ifile.close();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(cache->IsPTPreloaded());
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  InsertRpcParametersInList(input_params);
-
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-
-  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::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
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-  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);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  EXPECT_TRUE(output.list_of_undefined_params.empty());
-}
-
-TEST_F(PolicyManagerImplTest, LoadPT_SetInvalidUpdatePT_PTIsNotLoaded) {
-  // Arrange
-  policy_manager_->ForcePTExchange();
-  policy_manager_->OnUpdateStarted();
-  Json::Value table(Json::objectValue);
-
-  policy_table::Table update(&table);
-  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
-
-  // Assert update is invalid
-  ASSERT_FALSE(IsValid(update));
-
-  // Act
-  std::string json = table.toStyledString();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-
-  // Assert
-  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).Times(0);
-  EXPECT_CALL(*cache_manager_, ApplyUpdate(_)).Times(0);
-  EXPECT_CALL(listener_, GetAppName(_)).Times(0);
-  EXPECT_CALL(listener_, OnUpdateStatusChanged(_)).Times(1);
-  EXPECT_CALL(*cache_manager_, SaveUpdateRequired(false)).Times(0);
-  EXPECT_CALL(*cache_manager_, TimeoutResponse()).Times(0);
-  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_)).Times(0);
-  EXPECT_FALSE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_CALL(*cache_manager_, IsPTPreloaded());
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    AddApplication_AddExistingApplicationFromDeviceWithoutConsent_ExpectNoUpdateRequired) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  GetPTU(kValidSdlPtUpdateJson);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Try to add existing app
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check no update required
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-}
-
-uint32_t GetCurrentDaysCount() {
-  date_time::TimeDuration current_time = date_time::getCurrentTime();
-  const uint32_t kSecondsInDay = 60 * 60 * 24;
-  return date_time::getSecs(current_time) / kSecondsInDay;
-}
-
-TEST_F(PolicyManagerImplTest2,
-       PTUpdatedAt_DaysNotExceedLimit_ExpectNoUpdateRequired) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  const uint32_t days = GetCurrentDaysCount();
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-
-  GetPTU(kValidSdlPtUpdateJson);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  ::policy::Counters counter = ::policy::Counters::DAYS_AFTER_EPOCH;
-  // Set PT was updated 10 days ago (limit is 30 days for now)
-  // So no limit exceeded
-  policy_manager_->PTUpdatedAt(counter, days - 10);
-  policy_manager_->OnAppRegisteredOnMobile(app_id_2_);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       PTUpdatedAt_DaysExceedLimit_ExpectUpdateRequired) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  const uint32_t days = GetCurrentDaysCount();
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  GetPTU(kValidSdlPtUpdateJson);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  ::policy::Counters counter = ::policy::Counters::DAYS_AFTER_EPOCH;
-  // Set PT was updated 50 days ago (limit is 30 days for now)
-  policy_manager_->PTUpdatedAt(counter, days - 50);
-  policy_manager_->OnAppRegisteredOnMobile(app_id_2_);
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    OnIgnitionCyclesExceeded_SetExceededIgnitionCycles_ExpectUpdateScheduled) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  const uint32_t days = GetCurrentDaysCount();
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  GetPTU(kValidSdlPtUpdateJson);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Try to add existing app
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  ::policy::Counters counter = ::policy::Counters::DAYS_AFTER_EPOCH;
-  // Set PT was updated 10 days ago (limit is 30 days for now)
-  // So no limit exceeded
-  policy_manager_->PTUpdatedAt(counter, days - 10);
-  int ign_cycles =
-      (policy_manager_->GetCache())->IgnitionCyclesBeforeExchange();
-  // Set ignition cycles to value = 99 (limit is 100 which initiates auto
-  // PTExchange)
-  for (int i = 0; i < ign_cycles; ++i) {
-    policy_manager_->IncrementIgnitionCycles();
-  }
-  policy_manager_->OnAppRegisteredOnMobile(app_id_2_);
-  // Check update required
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetUserConsentForApp_SetUserConsentForApp_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  ::policy::StringArray consented_groups;
-  ::policy::StringArray disallowed_groups;
-  consented_groups.push_back(std::string("Notifications"));
-  consented_groups.push_back(std::string("Notifications"));
-  (policy_manager_->GetCache())
-      ->SetUserPermissionsForDevice(
-          device_id_2_, consented_groups, disallowed_groups);
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  GetPTU(kValidSdlPtUpdateJson);
-
-  ::policy::PermissionConsent perm_consent;
-  perm_consent.device_id = device_id_2_;
-  perm_consent.policy_app_id = app_id_2_;
-  perm_consent.consent_source = "VR";
-
-  ::policy::FunctionalGroupPermission group1_perm;
-  group1_perm.group_alias = "Notifications";
-  group1_perm.group_name = "Notifications";
-  group1_perm.group_id = ::utils::Djb2HashFromString("Notifications");
-  group1_perm.state = ::policy::GroupConsent::kGroupAllowed;
-
-  std::vector< ::policy::FunctionalGroupPermission> groups_permissions;
-  groups_permissions.push_back(group1_perm);
-  perm_consent.group_permissions = groups_permissions;
-
-  policy_manager_->SetUserConsentForApp(perm_consent,
-                                        policy::PolicyManager::kSilentMode);
-  policy_manager_->SendNotificationOnPermissionsUpdated(app_id_2_);
-  std::vector< ::policy::FunctionalGroupPermission> actual_groups_permissions;
-  std::vector< ::policy::FunctionalGroupPermission>::iterator it;
-  policy_manager_->GetUserConsentForApp(
-      device_id_2_, app_id_2_, actual_groups_permissions);
-  uint32_t index = 0;
-  for (; index < actual_groups_permissions.size(); ++index) {
-    if (actual_groups_permissions[index].group_id == group1_perm.group_id) {
-      break;
-    }
-  }
-  // Check
-  EXPECT_EQ(group1_perm.group_alias,
-            actual_groups_permissions[index].group_alias);
-  EXPECT_EQ(group1_perm.group_name,
-            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);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CanAppKeepContext_SetPoliciesForAppUpdated_ExpectAppCanKeepContext) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  GetPTU(kValidSdlPtUpdateJson);
-  // Check keep context in updated policies for app
-  EXPECT_TRUE(policy_manager_->CanAppKeepContext(app_id_2_));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CanAppStealFocus_SetPoliciesForAppUpdated_ExpectAppCanStealFocus) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  GetPTU(kValidSdlPtUpdateJson);
-  // Check keep context in updated policies for app
-  EXPECT_TRUE(policy_manager_->CanAppKeepContext(app_id_2_));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetVehicleInfo_SetVehicleInfo_ExpectReceivedInfoCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  GetPTU(kValidSdlPtUpdateJson);
-  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();
-
-  EXPECT_EQ(static_cast<std::string>(*module_config.vehicle_make),
-            vehicle_info.vehicle_make);
-  EXPECT_EQ(static_cast<std::string>(*module_config.vehicle_model),
-            vehicle_info.vehicle_model);
-  EXPECT_EQ(static_cast<std::string>(*module_config.vehicle_year),
-            vehicle_info.vehicle_year);
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    GetPermissionsForApp_SetUserConsentForApp_ExpectReceivedPermissionsCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  ::policy::StringArray consented_groups;
-  ::policy::StringArray disallowed_groups;
-  consented_groups.push_back(std::string("Notifications"));
-  (policy_manager_->GetCache())
-      ->SetUserPermissionsForDevice(
-          device_id_2_, consented_groups, disallowed_groups);
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  GetPTU(kValidSdlPtUpdateJson);
-  ::policy::PermissionConsent perm_consent;
-  perm_consent.device_id = device_id_2_;
-  perm_consent.policy_app_id = app_id_2_;
-  perm_consent.consent_source = "VR";
-
-  ::policy::FunctionalGroupPermission group1_perm;
-  group1_perm.group_alias = "Notifications";
-  group1_perm.group_name = "Notifications";
-  group1_perm.group_id = ::utils::Djb2HashFromString("Notifications");
-  group1_perm.state = ::policy::GroupConsent::kGroupAllowed;
-
-  std::vector< ::policy::FunctionalGroupPermission> groups_permissions;
-  groups_permissions.push_back(group1_perm);
-  perm_consent.group_permissions = groups_permissions;
-
-  policy_manager_->SetUserConsentForApp(perm_consent,
-                                        policy::PolicyManager::kSilentMode);
-  policy_manager_->SendNotificationOnPermissionsUpdated(app_id_2_);
-  std::vector< ::policy::FunctionalGroupPermission> actual_groups_permissions;
-  std::vector< ::policy::FunctionalGroupPermission>::iterator it;
-  policy_manager_->GetPermissionsForApp(
-      device_id_2_, app_id_2_, actual_groups_permissions);
-  uint32_t index = 0;
-  for (; index < actual_groups_permissions.size(); ++index) {
-    if (actual_groups_permissions[index].group_id == group1_perm.group_id) {
-      break;
-    }
-  }
-  // Check
-  EXPECT_EQ(group1_perm.group_alias,
-            actual_groups_permissions[index].group_alias);
-  EXPECT_EQ(group1_perm.group_name,
-            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);
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    GetAppRequestTypes_AddApp_UpdateAppPolicies_ExpectReceivedRequestTypesCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  policy_manager_->AddApplication(app_id_3_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ::policy::StringArray app_requests =
-      policy_manager_->GetAppRequestTypes(app_id_3_);
-  EXPECT_EQ(1u, app_requests.size());
-
-  Json::Value root = GetPTU(kPtuRequestTypeJson);
-  Json::Value request_Types = Json::Value(Json::arrayValue);
-  request_Types =
-      root["policy_table"]["app_policies"][app_id_3_]["RequestType"];
-  app_requests = policy_manager_->GetAppRequestTypes(app_id_3_);
-  EXPECT_EQ(request_Types.size(), app_requests.size());
-  // Check nicknames match
-  for (uint32_t i = 0; i < request_Types.size(); ++i) {
-    EXPECT_EQ(request_Types[i], app_requests[i]);
-  }
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    HertBeatTimeout_AddApp_UpdateAppPolicies_ExpectReceivedHertBeatTimeoutCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  std::shared_ptr<policy_table::Table> pt =
-      (policy_manager_->GetCache())->GetPT();
-  ::policy_table::PolicyTableType type1 =
-      ::policy_table::PolicyTableType::PT_PRELOADED;
-  pt->SetPolicyTableType(type1);
-  if (!pt->is_valid()) {
-    std::cout << "\nPolicy table is not valid."
-              << "\n";
-    rpc::ValidationReport report("policy_table");
-    pt->ReportErrors(&report);
-  }
-  // Add new app
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  uint32_t result = policy_manager_->HeartBeatTimeout(app_id_2_);
-  // By default hertbeat timeout is 0
-  EXPECT_EQ(0u, result);
-  Json::Value root = GetPTU(kValidSdlPtUpdateJson);
-
-  ::policy_table::PolicyTableType type2 =
-      ::policy_table::PolicyTableType::PT_UPDATE;
-  pt->SetPolicyTableType(type2);
-  if (!pt->is_valid()) {
-    std::cout << "\nPolicy table is not valid."
-              << "\n";
-    rpc::ValidationReport report("policy_table");
-    pt->ReportErrors(&report);
-  }
-
-  Json::Value heart_beat_timeout = Json::Value(Json::uintValue);
-  heart_beat_timeout =
-      root["policy_table"]["app_policies"][app_id_2_]["heart_beat_timeout_ms"];
-  result = policy_manager_->HeartBeatTimeout(app_id_2_);
-  EXPECT_EQ(heart_beat_timeout.asUInt(), result);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       RemoveAppConsentForGroup_SetUserConsentForApp_ExpectAppConsentDeleted) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  ::policy::StringArray consented_groups;
-  ::policy::StringArray disallowed_groups;
-  consented_groups.push_back(std::string("Notifications"));
-  (policy_manager_->GetCache())
-      ->SetUserPermissionsForDevice(
-          device_id_2_, consented_groups, disallowed_groups);
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  GetPTU(kValidSdlPtUpdateJson);
-
-  ::policy::PermissionConsent perm_consent;
-  perm_consent.device_id = device_id_2_;
-  perm_consent.policy_app_id = app_id_2_;
-  perm_consent.consent_source = "VR";
-
-  ::policy::FunctionalGroupPermission group1_perm;
-  group1_perm.group_alias = "Notifications";
-  group1_perm.group_name = "Notifications";
-  group1_perm.group_id = ::utils::Djb2HashFromString("Notifications");
-  group1_perm.state = ::policy::GroupConsent::kGroupAllowed;
-
-  std::vector< ::policy::FunctionalGroupPermission> groups_permissions;
-  groups_permissions.push_back(group1_perm);
-  perm_consent.group_permissions = groups_permissions;
-
-  policy_manager_->SetUserConsentForApp(perm_consent,
-                                        policy::PolicyManager::kSilentMode);
-  policy_manager_->SendNotificationOnPermissionsUpdated(app_id_2_);
-  std::vector< ::policy::FunctionalGroupPermission> actual_groups_permissions;
-  std::vector< ::policy::FunctionalGroupPermission>::iterator it;
-  policy_manager_->GetPermissionsForApp(
-      device_id_2_, app_id_2_, actual_groups_permissions);
-  uint32_t index = 0;
-  for (; index < actual_groups_permissions.size(); ++index) {
-    if (actual_groups_permissions[index].group_id == group1_perm.group_id) {
-      break;
-    }
-  }
-  // Check
-  EXPECT_EQ(group1_perm.group_alias,
-            actual_groups_permissions[index].group_alias);
-  EXPECT_EQ(group1_perm.group_name,
-            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);
-  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;
-  ::policy_table::DeviceData::const_iterator dev_data_iter =
-      device_data.find(device_id_2_);
-  if (dev_data_iter != device_data.end()) {
-    const ::policy_table::DeviceParams& dev_params = dev_data_iter->second;
-    const ::policy_table::UserConsentRecords& ucr =
-        *(dev_params.user_consent_records);
-    ucr_size = ucr.size();
-    ASSERT_GT(ucr_size, 0u);
-    ::policy_table::UserConsentRecords::const_iterator ucr_iter =
-        ucr.find(app_id_2_);
-    if (ucr_iter != ucr.end()) {
-      EXPECT_TRUE((*(ucr_iter->second.consent_groups)).find("Notifications") !=
-                  (*(ucr_iter->second.consent_groups)).end());
-      policy_manager_->RemoveAppConsentForGroup(app_id_2_, "Notifications");
-      EXPECT_TRUE((*(ucr_iter->second.consent_groups)).find("Notifications") ==
-                  (*(ucr_iter->second.consent_groups)).end());
-    }
-  }
-}
-
-TEST_F(PolicyManagerImplTest2,
-       SingleInvalidRequestTypeInPTU_ExpectReplaceWithDefaultValues) {
-  // Arrange
-  const std::string section_name = app_id_2_;
-
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  // Setting device consent to 'true' in order to have defult application
-  // permissions, request type etc.
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_1_));
-  policy_manager_->SetUserConsentForDevice(device_id_1_, true);
-
-  // Add app
-  policy_manager_->AddApplication(section_name,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_CALL(listener_, OnPendingPermissionChange(section_name));
-
-  // PTU has single invalid RequestTypes, which must be dropped and replaced
-  // with default RT
-  GetPTU("json/PTU_with_one_invalid_requestType.json");
-
-  // Get RequestTypes from <app_id> section of app policies after PT update
-  ::policy::StringArray app_request_types_after =
-      policy_manager_->GetAppRequestTypes(section_name);
-
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(kDefaultId))
-      .WillOnce(Return(device_id_1_));
-  ::policy::StringArray default_request_types_after =
-      policy_manager_->GetAppRequestTypes(kDefaultId);
-
-  // Check sizes of Request types of PT and PTU
-  EXPECT_EQ(4u, app_request_types_after.size());
-
-  ::policy::AppPermissions permissions =
-      policy_manager_->GetAppPermissionsChanges(section_name);
-  EXPECT_TRUE(permissions.requestTypeChanged);
-
-  policy_table::RequestType temp_res1;
-  std::vector<policy_table::RequestType> result1;
-  for (uint32_t i = 0; i < app_request_types_after.size(); ++i) {
-    if (::rpc::policy_table_interface_base::EnumFromJsonString(
-            app_request_types_after[i], &temp_res1)) {
-      result1.push_back(temp_res1);
-    }
-  }
-  policy_table::RequestType temp_res2;
-  std::vector<policy_table::RequestType> result2;
-  for (size_t i = 0; i < default_request_types_after.size(); ++i) {
-    if (::rpc::policy_table_interface_base::EnumFromJsonString(
-            default_request_types_after[i], &temp_res2)) {
-      result2.push_back(temp_res2);
-    }
-  }
-  ASSERT_EQ(result1.size(), result2.size());
-  std::sort(result1.begin(), result1.end());
-  std::sort(result2.begin(), result2.end());
-  // Checks
-  EXPECT_TRUE(std::equal(result1.begin(), result1.end(), result2.begin()));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       InitPT_LoadPT_ExpectIncrementedCountOfSamePrompts) {
-  // Initializing policy_table
-  CreateLocalPT(preloaded_pt_filename_);
-
-  policy_table::FunctionalGroupings functional_groupings;
-  GetFunctionalGroupingsFromManager(functional_groupings);
-
-  UserConsentPromptToRpcsConnections initial_functional_groupings_map;
-  UserConsentPromptToRpcsConnections updated_functional_groupings_map;
-  // Filling initial map
-  FillMultimapFromFunctionalGroupings(initial_functional_groupings_map,
-                                      functional_groupings);
-
-  // Updating policy_table
-  GetPTU("json/sdl_pt_update.json");
-  policy_table::FunctionalGroupings updated_functional_groupings;
-  GetFunctionalGroupingsFromManager(updated_functional_groupings);
-  // Filling updated map
-  FillMultimapFromFunctionalGroupings(updated_functional_groupings_map,
-                                      updated_functional_groupings);
-
-  // Comparing two multimaps
-  // (EXPECT increment count of functionalgroups
-  // under key : user_consent_prompt)
-  uint32_t count_before_update =
-      initial_functional_groupings_map.count("Notifications");
-  uint32_t count_after_update =
-      updated_functional_groupings_map.count("Notifications");
-  EXPECT_EQ(1u, count_before_update);
-  EXPECT_EQ(2u, count_after_update);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       LoadPT_UpdatePT_ChangingCountsOfDifferentUserConsentPrompts) {
-  // Initializing policy_table
-  CreateLocalPT(preloaded_pt_filename_);
-
-  // First update of policy table
-  GetPTU("json/sdl_pt_first_update.json");
-  // Geting functional groupings first time
-  policy_table::FunctionalGroupings first_functional_groupings;
-  GetFunctionalGroupingsFromManager(first_functional_groupings);
-  // Filling map first time
-  UserConsentPromptToRpcsConnections first_update_functional_groupings_map;
-  FillMultimapFromFunctionalGroupings(first_update_functional_groupings_map,
-                                      first_functional_groupings);
-
-  // Second update of policy table
-  GetPTU("json/sdl_pt_second_update.json");
-  // Geting functional groupings second time
-  policy_table::FunctionalGroupings second_functional_groupings;
-  GetFunctionalGroupingsFromManager(second_functional_groupings);
-  // Filling map second time
-  UserConsentPromptToRpcsConnections second_update_functional_groupings_map;
-  FillMultimapFromFunctionalGroupings(second_update_functional_groupings_map,
-                                      second_functional_groupings);
-
-  // Getting counts before second update
-  uint32_t first_count_of_old_user_consent_prompt =
-      first_update_functional_groupings_map.count("Old_Notifications");
-  uint32_t first_count_of_new_user_consent_prompt =
-      first_update_functional_groupings_map.count("New_Notifications");
-
-  // Getting counts after second update
-  uint32_t second_count_of_old_user_consent_prompt =
-      second_update_functional_groupings_map.count("Old_Notifications");
-  uint32_t second_count_of_new_user_consent_prompt =
-      second_update_functional_groupings_map.count("New_Notifications");
-
-  // Expect decrement count of old user_consent_prormpt
-  EXPECT_GT(first_count_of_old_user_consent_prompt,
-            second_count_of_old_user_consent_prompt);
-  // Expect increment count of new user_consent_prormpt
-  EXPECT_LT(first_count_of_new_user_consent_prompt,
-            second_count_of_new_user_consent_prompt);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_PTWithOneInvalidRequestTypeValue_RequestTypeValueEQToDefault) {
-  // Logic in another function
-  CompareAppRequestTypesWithDefault(kAppId, kJsonFiles[0]);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_InvalidRequestTypeBetweenCorectValuesInPTU_EraseInvalidValue) {
-  // Refresh policy table with invalid RequestType in application
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[1]);
-  // Correct of Request Types
-  policy_table::RequestTypes correct_types;
-  correct_types.push_back(policy_table::RequestType::RT_HTTP);
-  correct_types.push_back(policy_table::RequestType::RT_LAUNCH_APP);
-  correct_types.push_back(policy_table::RequestType::RT_PROPRIETARY);
-  // Get <app_id> Request Types
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(kAppId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(
-    PolicyManagerImplTest_RequestTypes,
-    LoadPT_AppInUpdateFileHaventRequestTypeField_RequestTypeValueEQToDefault) {
-  // Logic in another function
-  CompareAppRequestTypesWithDefault(kAppId, kJsonFiles[2]);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_RequestTypeArrayHaveNoOneValues_AvalibleAllRequestTypes) {
-  // Refresh policy table with invalid RequestType in application
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[3]);
-
-  // Get <app_id> Request Types
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(kAppId);
-
-  // Expect
-  const size_t correct_size = 0;
-  const size_t received_size = received_types.size();
-  EXPECT_EQ(correct_size, received_size);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       InitPT_DefaultRequestTypeHaveOneInvalidValue_False) {
-  // PT have only invalid value in app_policies::default::RequestType
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(app_storage_folder_));
-  ASSERT_FALSE(
-      policy_manager_impl_sptr_->InitPT(kJsonFiles[4], &policy_settings_));
-  // Invalid table data with pt_preloaded=true
-  EXPECT_TRUE(policy_manager_impl_sptr_->GetCache()->IsPTPreloaded());
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       InitPT_DefaultRequestTypeHaveSeveralInvalidValues_False) {
-  // PT have several only invalid values in app_policies::default::RequestType
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(app_storage_folder_));
-  ASSERT_FALSE(
-      policy_manager_impl_sptr_->InitPT(kJsonFiles[5], &policy_settings_));
-  // Invalid table data with pt_preloaded=true
-  EXPECT_TRUE(policy_manager_impl_sptr_->GetCache()->IsPTPreloaded());
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       InitPT_DefaultRequestTypeHaveInvalidValueBetweenCorrect_True) {
-  // PT have ["QUERY_APPS", "IVSU", "PROPRIETARY"]
-  // In app_policies::default::RequestType
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(app_storage_folder_));
-  ASSERT_TRUE(
-      policy_manager_impl_sptr_->InitPT(kJsonFiles[6], &policy_settings_));
-  EXPECT_TRUE(policy_manager_impl_sptr_->GetCache()->IsPTPreloaded());
-
-  // Correct of Request Types
-  policy_table::RequestTypes correct_types;
-  correct_types.push_back(policy_table::RequestType::RT_QUERY_APPS);
-  correct_types.push_back(policy_table::RequestType::RT_PROPRIETARY);
-
-  // Get default Request Types
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(kDefaultAppId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_PTDefaultApp_RequestTypeValueEQToUpdate) {
-  // Base values of Request Types
-  policy_table::RequestTypes correct_types = CreateDefaultAppPTURequestValues();
-
-  // Load valid values for RequestType
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[7]);
-
-  // Get Request Types for "<default>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kDefaultId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(
-    PolicyManagerImplTest_RequestTypes,
-    LoadPT_PTDefaultAppInvalidRequestTypeValues_RequestTypeValueEQToDatabase) {
-  // Base values of Request Types
-  policy_table::RequestTypes correct_types =
-      CreateDefaultAppDatabaseRequestValues();
-
-  // Load RequestType with invalid values
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[8]);
-
-  // Get Request Types for "<default>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kDefaultId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_PTDefaultAppEmptyRequestTypeValues_RequestTypeValueEmpty) {
-  // Load RequestType with empty values
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[9]);
-
-  // Get Request Types for "<default>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kDefaultId);
-
-  // Expect
-  const size_t received_size = received_types.size();
-  EXPECT_EQ(0u, received_size);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_PTDefaultAppOmittedRequestType_RequestTypeValueEQToDatabase) {
-  // Base values of Request Types
-  policy_table::RequestTypes correct_types =
-      CreateDefaultAppDatabaseRequestValues();
-
-  // Load omitted RequestType values
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[10]);
-
-  // Get Request Types for "<default>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kDefaultId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(
-    PolicyManagerImplTest_RequestTypes,
-    LoadPT_PTDefaultAppOneInvalidRequestTypeValue_RequestTypeValueEQValidPT) {
-  // Update values of Request Types
-  policy_table::RequestTypes correct_types = CreateDefaultAppPTURequestValues();
-
-  // Load RequestType with one invalid value
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[11]);
-
-  // Get Request Types for "<default>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kDefaultId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_PTPreDataConsentApp_RequestTypeValueEQToUpdate) {
-  // Update values of Request Types
-  policy_table::RequestTypes correct_types =
-      CreatePreDataConsentAppPTURequestValues();
-
-  // Load valid values for RequestType
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[12]);
-
-  // Get Request Types for "<pre_DataConsent>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kPreDataConsentId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(
-    PolicyManagerImplTest_RequestTypes,
-    LoadPT_PTPreDataConsentAppInvalidRequestTypeValues_RequestTypeValueEQToDatabase) {
-  // Update values of Request Types
-  policy_table::RequestTypes correct_types;
-  correct_types.push_back(policy_table::RequestType::RT_HTTP);
-
-  // Load RequestType with invalid values
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[13]);
-
-  // Get Request Types for "<pre_DataConsent>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kPreDataConsentId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(PolicyManagerImplTest_RequestTypes,
-       LoadPT_PTPreDataConsentAppEmptyRequestTypeValues_RequestTypeValueEmpty) {
-  // Load RequestType with empty values
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[14]);
-
-  // Get Request Types for "<pre_DataConsent>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kPreDataConsentId);
-
-  // Expect
-  const size_t received_size = received_types.size();
-  EXPECT_EQ(0u, received_size);
-}
-
-TEST_F(
-    PolicyManagerImplTest_RequestTypes,
-    LoadPT_PTPreDataConsentAppOmittedRequestType_RequestTypeValueEQToDatabase) {
-  // Base values of Request Types
-  policy_table::RequestTypes correct_types;
-  correct_types.push_back(policy_table::RequestType::RT_HTTP);
-
-  // Load omitted RequestType values
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[15]);
-
-  // Get Request Types for "<pre_DataConsent>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kPreDataConsentId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-TEST_F(
-    PolicyManagerImplTest_RequestTypes,
-    LoadPT_PTPreDataConsentAppOneInvalidRequestTypeValue_RequestTypeValueEQValidPT) {
-  // Update values of Request Types
-  policy_table::RequestTypes correct_types =
-      CreatePreDataConsentAppPTURequestValues();
-
-  // Load RequestType with one invalid value
-  RefreshPT(preloaded_pt_filename_, kJsonFiles[16]);
-
-  // Get Request Types for "<pre_DataConsent>"
-  policy_table::RequestTypes received_types =
-      GetRequestTypesForApplication(policy::kPreDataConsentId);
-
-  CompareRequestTypesContainers(correct_types, received_types);
-}
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
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
deleted file mode 100644
index 3c6377cf5f..0000000000
--- a/src/components/policy/policy_external/test/policy_manager_impl_snapshot_test.cc
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <fstream>
-
-#include "gtest/gtest.h"
-
-#include "policy/policy_manager_impl_test_base.h"
-
-#include "json/json.h"
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-using ::testing::Return;
-
-TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) {
-  // Arrange necessary pre-conditions
-  StringsForUpdate new_data;
-  new_data.new_field_name_ = "Notifications-";
-  CreateNewRandomData(new_data);
-  // Create Initial LocalPT from preloadedPT
-  CreateLocalPT(preloaded_pt_filename_);
-  // Update preloadedPT
-  std::ifstream ifile(preloaded_pt_filename_);
-  Json::Reader reader;
-  Json::Value root(Json::objectValue);
-
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    root["policy_table"]["module_config"]["preloaded_date"] =
-        new_data.new_date_;
-    Json::Value val(Json::objectValue);
-    Json::Value val2(Json::arrayValue);
-    val2[0] = hmi_level_[index_];
-    val[new_data.new_field_value_]["hmi_levels"] = val2;
-    root["policy_table"]["functional_groupings"][new_data.new_field_name_]
-        ["rpcs"] = val;
-    root["policy_table"]["functional_groupings"][new_data.new_field_name_]
-        ["user_consent_prompt"] = new_data.new_field_name_;
-  }
-  ifile.close();
-
-  Json::StyledStreamWriter writer;
-  std::ofstream ofile(preloaded_pt_filename_);
-  writer.write(ofile, root);
-  ofile.flush();
-  ofile.close();
-
-  //  Make PolicyManager to update LocalPT
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  EXPECT_TRUE(
-      policy_manager_->InitPT(preloaded_pt_filename_, &policy_settings_));
-  EXPECT_TRUE(cache->IsPTPreloaded());
-
-  // Arrange
-  std::shared_ptr<policy_table::Table> table = cache->GenerateSnapshot();
-  // Get FunctionalGroupings
-  policy_table::FunctionalGroupings& fc =
-      table->policy_table.functional_groupings;
-  // Get RPCs for new added field in functional_group
-  policy_table::Rpcs& rpcs = fc[new_data.new_field_name_];
-  // Get user consent prompt
-  const std::string& ucp = *(rpcs.user_consent_prompt);
-  // Get Rpcs
-  policy_table::Rpc& rpc = rpcs.rpcs;
-  // Get RPC's parameters
-  policy_table::RpcParameters& rpc_param = rpc[new_data.new_field_value_];
-
-  // Check preloaded date
-  EXPECT_EQ(static_cast<std::string>(
-                *(table->policy_table.module_config.preloaded_date)),
-            new_data.new_date_);
-  // Check if new field exists in Local PT
-  EXPECT_TRUE(fc.find(new_data.new_field_name_) != fc.end());
-  // Check if user_consent_propmp is correct
-  EXPECT_EQ(new_data.new_field_name_, ucp);
-  // Check if new RPC exists
-  EXPECT_TRUE(rpc.find(new_data.new_field_value_) != rpc.end());
-  // Check HMI level of new RPC
-  EXPECT_EQ(index_, static_cast<uint32_t>(rpc_param.hmi_levels[0]));
-  // Check if new field matches field added to preloaded PT
-  EXPECT_EQ(std::string((*(fc.find(new_data.new_field_name_))).first),
-            new_data.new_field_name_);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       SetSystemLanguage_ExpectSystemLanguageSetSuccessfully) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->SetSystemLanguage("it-it");
-  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)));
-}
-
-TEST_F(PolicyManagerImplTest2, SetVINValue_ExpectVINSetSuccessfully) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  std::string vin_code("1FAPP6242VH100001");
-  policy_manager_->SetVINValue(vin_code);
-  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)));
-}
-
-TEST_F(PolicyManagerImplTest2, SetSystemInfo_ExpectSystemInfoSetSuccessfully) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->SetSystemInfo("4.1.3.B_EB355B", "WAEGB", "ru-ru");
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  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",
-            static_cast<std::string>(*(ModuleMeta.ccpu_version)));
-  EXPECT_EQ("WAEGB", static_cast<std::string>(*(ModuleMeta.wers_country_code)));
-  EXPECT_FALSE(cache->IsPTPreloaded());
-}
-
-TEST_F(PolicyManagerImplTest2, CleanUnpairedDevice_ExpectDevicesDeleted) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Add first device
-  ::policy::DeviceInfo dev_info1;
-  dev_info1.hardware = "hardware IPX";
-  dev_info1.firmware_rev = "v.8.0.1";
-  dev_info1.os = "Android";
-  dev_info1.os_ver = "4.4.2";
-  dev_info1.carrier = "Life";
-  dev_info1.max_number_rfcom_ports = 2;
-  dev_info1.connection_type = "Bluetooth";
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  policy_manager_->SetDeviceInfo(device_id_1_, dev_info1);
-
-  // Add second device
-  ::policy::DeviceInfo dev_info2;
-  dev_info2.hardware = "hardware SPX";
-  dev_info2.firmware_rev = "v.6.0.1";
-  dev_info2.os = "Android";
-  dev_info2.os_ver = "4.1.1";
-  dev_info2.carrier = "MTS";
-  dev_info2.max_number_rfcom_ports = 2;
-  dev_info2.connection_type = "Bluetooth";
-  policy_manager_->AddDevice("ZZZ123456789YYY", "Bluetooth");
-  policy_manager_->SetDeviceInfo("ZZZ123456789YYY", dev_info2);
-
-  // Add third device
-  ::policy::DeviceInfo dev_info3;
-  dev_info3.hardware = "hardware DNPX";
-  dev_info3.firmware_rev = "v.4.0.1";
-  dev_info3.os = "Android";
-  dev_info3.os_ver = "5.0.1 Lollipop";
-  dev_info3.carrier = "Kyivstar";
-  dev_info3.max_number_rfcom_ports = 2;
-  dev_info3.connection_type = "Bluetooth";
-  policy_manager_->AddDevice("AAA123456789RRR", "Bluetooth");
-  policy_manager_->SetDeviceInfo("AAA123456789RRR", dev_info3);
-
-  std::shared_ptr<policy_table::Table> pt =
-      (policy_manager_->GetCache())->GetPT();
-  // Try to find first device in PT
-  policy_table::DeviceData::const_iterator iter =
-      (*(pt->policy_table.device_data)).find(device_id_1_);
-  // Check first device successfully added to PT
-  ASSERT_TRUE(iter != (*(pt->policy_table.device_data)).end());
-
-  // Try to find second device in PT
-  iter = (*(pt->policy_table.device_data)).find("ZZZ123456789YYY");
-  // Check second device successfully added to PT
-  ASSERT_TRUE(iter != (*(pt->policy_table.device_data)).end());
-
-  // Try to find third device in PT
-  iter = (*(pt->policy_table.device_data)).find("AAA123456789RRR");
-  // Check third device successfully added to PT
-  ASSERT_TRUE(iter != (*(pt->policy_table.device_data)).end());
-
-  policy_manager_->MarkUnpairedDevice(device_id_1_);
-  policy_manager_->MarkUnpairedDevice("ZZZ123456789YYY");
-  policy_manager_->MarkUnpairedDevice("AAA123456789RRR");
-  policy_manager_->CleanupUnpairedDevices();
-
-  // Try to find first device in PT
-  iter = (*(pt->policy_table.device_data)).find(device_id_1_);
-  // Check first device successfully deleted from PT
-  ASSERT_TRUE(iter == (*(pt->policy_table.device_data)).end());
-
-  // Try to find second device in PT
-  iter = (*(pt->policy_table.device_data)).find("ZZZ123456789YYY");
-  // Check second device successfully deleted from PT
-  ASSERT_TRUE(iter == (*(pt->policy_table.device_data)).end());
-
-  // Try to find third device in PT
-  iter = (*(pt->policy_table.device_data)).find("AAA123456789RRR");
-  // Check third device successfully deleted from PT
-  ASSERT_TRUE(iter == (*(pt->policy_table.device_data)).end());
-}
-
-TEST_F(PolicyManagerImplTest2,
-       AddValidRequestTypesToPT_default_Section_ExpectRTAdded) {
-  // Arrange
-  AddRTtoPT(kPtuJson, policy::kDefaultId, 1u, 0);
-  CheckResultForValidRT();
-}
-
-TEST_F(PolicyManagerImplTest2,
-       AddValidRequestTypeToPT_preDataConsentSection_ExpectRTAdded) {
-  // Arrange
-  AddRTtoPT(kPtuJson, policy::kPreDataConsentId, 1u, 0u);
-  CheckResultForValidRT();
-}
-
-TEST_F(PolicyManagerImplTest2,
-       AddInvalidRequestTypeToPT_defaultSection_ExpectIgnored) {
-  // Arrange
-  AddRTtoPT(kPtu3Json, policy::kDefaultId, 1u, 0u);
-  CheckResultForInvalidRT();
-}
-
-TEST_F(PolicyManagerImplTest2,
-       AddInvalidRequestTypeToPT_pre_DataConsentSection_ExpectIgnored) {
-  // Arrange
-  AddRTtoPT(kPtu3Json, policy::kPreDataConsentId, 1u, 1u);
-  CheckResultForInvalidRT();
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    AddValidRequestTypeToPT_GetNewAppWithSpecificPoliciesViaPTU_ExpectRTAdded) {
-  const std::string& app_id = application_id_;
-
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Add app
-  policy_manager_->AddApplication(app_id, HmiTypes(policy_table::AHT_DEFAULT));
-  // Check app gets RequestTypes from pre_DataConsent of app_policies
-  // section
-  pt_request_types_ = policy_manager_->GetAppRequestTypes(app_id);
-
-  // Only single item as in pre_DataConsent in preloaded PT
-  EXPECT_EQ(1u, pt_request_types_.size());
-  EXPECT_CALL(listener_, OnPendingPermissionChange(app_id)).Times(1);
-
-  // PTU has RequestTypes as [] - means 'all allowed'
-  Json::Value root = GetPTU("json/PTU2.json");
-
-  // Setting device consent to 'true' in order to have appropriate application
-  // permissions, request type etc.
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .WillRepeatedly(Return(device_id_1_));
-  policy_manager_->SetUserConsentForDevice(device_id_1_, true);
-
-  // Get App Request Types from PTU
-  ptu_request_types_ =
-      root["policy_table"]["app_policies"][app_id]["RequestType"];
-  ptu_request_types_size_ = ptu_request_types_.size();
-
-  pt_request_types_.clear();
-  // Get RequestTypes from <app_id> section of app policies after PT update
-  pt_request_types_ = policy_manager_->GetAppRequestTypes(app_id);
-
-  // Check sizes of Request types of PT and PTU
-  ASSERT_EQ(ptu_request_types_size_, pt_request_types_.size());
-
-  ::policy::AppPermissions permissions =
-      policy_manager_->GetAppPermissionsChanges(app_id);
-  EXPECT_TRUE(permissions.requestTypeChanged);
-
-  ::policy::StringArray result;
-  for (uint32_t i = 0; i < ptu_request_types_size_; ++i) {
-    result.push_back(ptu_request_types_[i].asString());
-  }
-  std::sort(pt_request_types_.begin(), pt_request_types_.end());
-  std::sort(result.begin(), result.end());
-  // Checks
-  ASSERT_EQ(pt_request_types_.size(), result.size());
-  EXPECT_TRUE(std::equal(
-      pt_request_types_.begin(), pt_request_types_.end(), result.begin()));
-}
-
-TEST_F(PolicyManagerImplTest2, AddDevice_RegisterDevice_TRUE) {
-  const std::string connection_type = "Bluetooth";
-
-  const bool result =
-      (policy_manager_->GetCache())->AddDevice(device_id_1_, connection_type);
-  // Get 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 =
-      *policy_table->policy_table.module_config.preloaded_pt;
-  // Get connection_type from policy_table
-  const policy_table::DeviceParams& params =
-      (*policy_table->policy_table.device_data)[device_id_1_];
-  const std::string expected_connection_type = *params.connection_type;
-
-  // Expect
-  EXPECT_EQ(connection_type, expected_connection_type);
-  // After adding device preloaded_pt must be false
-  EXPECT_FALSE(is_preloaded_pt);
-  EXPECT_TRUE(result);
-}
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc
deleted file mode 100644
index f886108463..0000000000
--- a/src/components/policy/policy_external/test/policy_manager_impl_stress_test.cc
+++ /dev/null
@@ -1,293 +0,0 @@
-/* Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <fstream>
-#include "gtest/gtest.h"
-#include "mock_policy_listener.h"
-#include "policy/policy_manager_impl.h"
-
-using ::policy::BinaryMessage;
-using ::policy::MockPolicyListener;
-using ::policy::PolicyManagerImpl;
-using ::testing::_;
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-class PolicyManagerImplStressTest : public ::testing::Test {
- protected:
-  static const std::string kNameFile;
-  static const int kNumberGroups = 3;  // 10;
-  static const int kNumberFuncs = 4;   // 100;
-  static const int kNumberApps = 5;
-  static const int kNumberAppGroups = 5;
-  static PolicyManagerImpl* manager;
-  static MockPolicyListener* mock_listener;
-
-  static void SetUpTestCase();
-  static void TearDownTestCase();
-  static void CreateTable(std::ofstream& ofs);
-  static void CreateGroups(std::ofstream& ofs);
-  static void CreateFuncs(std::ofstream& ofs);
-  static void CreateApps(std::ofstream& ofs);
-  static void CreateAppGroups(std::ofstream& ofs);
-};
-
-const std::string PolicyManagerImplStressTest::kNameFile =
-    "sdl_preloaded_pt.json";
-PolicyManagerImpl* PolicyManagerImplStressTest::manager = 0;
-MockPolicyListener* PolicyManagerImplStressTest::mock_listener = 0;
-
-void PolicyManagerImplStressTest::SetUpTestCase() {
-  std::ofstream ofs;
-  ofs.open(kNameFile.c_str(), std::ofstream::out);
-  CreateTable(ofs);
-  ofs.close();
-
-  manager = new PolicyManagerImpl();
-  mock_listener = new MockPolicyListener();
-  manager->set_listener(mock_listener);
-
-  ASSERT_TRUE(manager->InitPT(kNameFile));
-}
-
-void PolicyManagerImplStressTest::TearDownTestCase() {
-  delete manager;
-  delete mock_listener;
-  remove(kNameFile.c_str());
-#ifndef __QNX__
-  remove("policy.sqlite");
-#endif  // __QNX__
-}
-
-void PolicyManagerImplStressTest::CreateGroups(std::ofstream& ofs) {
-  std::stringstream ss;
-  std::string number;
-  for (int i = 0; i < kNumberGroups - 1; ++i) {
-    ss << i << std::endl;
-    ss >> number;
-    ofs << "\"Group-" << number << "\":{\n \t\"rpcs\":{\n";
-    CreateFuncs(ofs);
-    ofs << "} },\n";
-  }
-  ss << kNumberGroups - 1 << std::endl;
-  ss >> number;
-  ofs << "\"Group-" << number << "\":{\n \t\"rpcs\":{\n";
-  CreateFuncs(ofs);
-  ofs << "} }\n";
-}
-
-void PolicyManagerImplStressTest::CreateFuncs(std::ofstream& ofs) {
-  std::string func =
-      "{\n"
-      "\t\t\"hmi_levels\":["
-      "\"BACKGROUND\","
-      "\"FULL\","
-      "\"LIMITED\""
-      "]"
-      "}";
-
-  std::stringstream ss;
-  std::string number;
-  for (int i = 0; i < kNumberFuncs - 1; ++i) {
-    ss << i << std::endl;
-    ss >> number;
-    ofs << "\t\"Func-" << number << "\":" << func << ",\n";
-  }
-  ss << kNumberFuncs - 1 << std::endl;
-  ss >> number;
-  ofs << "\t\"Func-" << number << "\":" + func;
-}
-
-void PolicyManagerImplStressTest::CreateApps(std::ofstream& ofs) {
-  ofs << "\"default\":{\n";
-  ofs << "\"keep_context\": true,\n"
-         "\"steal_focus\": true,\n"
-         "\"priority\": \"NORMAL\",\n"
-         "\"default_hmi\": \"FULL\",\n";
-  ofs << "\"groups\":["
-         "\"Group-1\""
-         "]"
-         "},\n";
-
-  std::stringstream ss;
-  std::string number;
-  for (int i = 0; i < kNumberApps - 1; ++i) {
-    ss << i << std::endl;
-    ss >> number;
-    ofs << "\"" << number << "\" : {";
-    ofs << "\n\"keep_context\": true,\n"
-           "\"steal_focus\": true,\n"
-           "\"priority\": \"NORMAL\",\n"
-           "\"default_hmi\": \"FULL\",\n";
-
-    ofs << "\"groups\": ";
-    CreateAppGroups(ofs);
-    ofs << "},\n";
-  }
-  ss << kNumberApps - 1 << std::endl;
-  ss >> number;
-  ofs << "\"" << number << "\" : {";
-  ofs << "\n\"keep_context\": true,\n"
-         "\"steal_focus\": true,\n"
-         "\"priority\": \"NORMAL\",\n"
-         "\"default_hmi\": \"FULL\",\n";
-
-  ofs << "\"groups\": ";
-  CreateAppGroups(ofs);
-  ofs << "}\n";
-}
-
-void PolicyManagerImplStressTest::CreateAppGroups(std::ofstream& ofs) {
-  ofs << "[";
-
-  std::stringstream ss;
-  std::string number;
-  std::set<int> app_groups;
-  for (int i = 0; i < kNumberAppGroups; ++i) {
-    app_groups.insert(rand() % kNumberGroups);
-  }
-
-  std::set<int>::const_iterator i = app_groups.begin();
-  ss << *i << std::endl;
-  ss >> number;
-  ofs << "\"Group-" << number << "\"";
-  ++i;
-  for (; i != app_groups.end(); ++i) {
-    ss << *i << std::endl;
-    ss >> number;
-    ofs << ",\"Group-" << number << "\"";
-  }
-  ofs << "]\n";
-}
-
-void PolicyManagerImplStressTest::CreateTable(std::ofstream& ofs) {
-  ofs << "{"
-         "\"policy_table\":{\n"
-         "\"module_config\":{\n"
-         "\t\"preloaded_pt\":true,\n"
-         "\t\"endpoints\":{\n"
-         "\t\t\"default\": {\n"
-         "\t\t\t\"default\":["
-         "\"http://sdl.net/api\""
-         "]\n"
-         "\t\t}\n"
-         "\t},\n"
-
-         "\"notifications_per_minute_by_priority\": {\n"
-         "\t\"EMERGENCY\": 60,\n"
-         "\t\"NAVIGATION\": 15,\n"
-         "\t\"COMMUNICATION\": 6,\n"
-         "\t\"NORMAL\": 4,\n"
-         "\t\"NONE\": 0\n"
-         "},\n"
-
-         "\"exchange_after_x_ignition_cycles\": 40,\n"
-         "\"exchange_after_x_kilometers\" : 2,\n"
-         "\"exchange_after_x_days\" : 23,\n"
-         "\"timeout_after_x_seconds\" : 20,\n"
-         "\"seconds_between_retries\" : [10, 7, 5, 3, 1]\n"
-         "},"
-         "\"consumer_friendly_messages\":{\n"
-         "\t\"version\":\"001.001.001\",\n"
-         "\t\"messages\":{} },\n"
-         "\"functional_groupings\":{\n";
-
-  CreateGroups(ofs);
-
-  ofs << "}, \"app_policies\":{";
-
-  CreateApps(ofs);
-
-  ofs << "} } }";
-}
-
-TEST_F(PolicyManagerImplStressTest,
-       OneCheck_AppAndFunctuionExisting_RpcAllowed) {
-  EXPECT_CALL(*mock_listener, OnCurrentDeviceIdUpdateRequired(_));
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  manager->CheckPermissions("2", "FULL", "Func-1", input_params, output);
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-}
-
-TEST_F(PolicyManagerImplStressTest, NoApp_AppDoesNotExisted_RpcDissallowed) {
-  EXPECT_CALL(*mock_listener, OnCurrentDeviceIdUpdateRequired(_));
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  manager->CheckPermissions("150", "FULL", "Func-88", input_params, output);
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-}
-
-TEST_F(PolicyManagerImplStressTest, NoFunc_FuncDoesNotExisted_RpcDissallowed) {
-  EXPECT_CALL(*mock_listener, OnCurrentDeviceIdUpdateRequired(_)).Times(1);
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  manager->CheckPermissions("2", "FULL", "Func-400", input_params, output);
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-}
-
-TEST_F(PolicyManagerImplStressTest, NoHmi_HMIInLevelNone_RpcDissallowed) {
-  EXPECT_CALL(*mock_listener, OnCurrentDeviceIdUpdateRequired(_));
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  manager->CheckPermissions("2", "NONE", "Func-88", input_params, output);
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-}
-
-TEST_F(PolicyManagerImplStressTest,
-       FewChecks_CheckSeveralFunctions_RpcAllowed) {
-  EXPECT_CALL(*mock_listener, OnCurrentDeviceIdUpdateRequired(_))
-      .Times(kNumberFuncs);
-  const int kNumberOfCheckings = kNumberFuncs;  // 100;
-  std::stringstream ss;
-  int app, func;
-  std::string app_number, func_number;
-  for (int i = 0; i < kNumberOfCheckings; ++i) {
-    app = rand() % kNumberApps;
-    func = rand() % kNumberFuncs;
-    ss << app << std::endl;
-    ss >> app_number;
-    ss << func << std::endl;
-    ss >> func_number;
-
-    ::policy::RPCParams input_params;
-    ::policy::CheckPermissionResult output;
-    manager->CheckPermissions(
-        app_number, "FULL", "Func-" + func_number, input_params, output);
-    EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  }
-}
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
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 47b3959aee..4d39e699b5 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Ford Motor Company
+ * Copyright (c) 2020, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,1124 +31,886 @@
  */
 
 #include <fstream>
-
 #include <utility>
+
 #include "gtest/gtest.h"
+
 #include "json/reader.h"
+#include "utils/date_time.h"
+#include "utils/file_system.h"
+#include "utils/gen_hash.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 
-#include "policy/policy_manager_impl_test_base.h"
+#include "policy/policy_manager.h"
+#include "policy/policy_manager_impl.h"
 
-using ::testing::_;
-using ::testing::AtLeast;
-using ::testing::Return;
-using ::testing::SetArgReferee;
+#include "policy/mock_cache_manager.h"
+#include "policy/mock_policy_listener.h"
+#include "policy/mock_policy_settings.h"
 
 namespace test {
 namespace components {
 namespace policy_test {
 
-TEST_F(
-    PolicyManagerImplTest,
-    RefreshRetrySequence_SetSecondsBetweenRetries_ExpectRetryTimeoutSequenceWithSameSeconds) {
-  // Arrange
-  std::vector<int> seconds;
-  seconds.push_back(50);
-  seconds.push_back(100);
-  seconds.push_back(200);
-
-  // Assert
-  EXPECT_CALL(*cache_manager_, TimeoutResponse()).WillOnce(Return(60));
-  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_))
-      .WillOnce(DoAll(SetArgReferee<0>(seconds), Return(true)));
-
-  // Act
-  policy_manager_->RefreshRetrySequence();
-
-  // Assert
-  EXPECT_EQ(50, policy_manager_->NextRetryTimeout());
-  EXPECT_EQ(100, policy_manager_->NextRetryTimeout());
-  EXPECT_EQ(200, policy_manager_->NextRetryTimeout());
-  EXPECT_EQ(0, policy_manager_->NextRetryTimeout());
-}
-
-TEST_F(PolicyManagerImplTest, GetNotificationsNumber) {
-  std::string priority = "EMERGENCY";
-  uint32_t notif_number = 100;
-  EXPECT_CALL(*cache_manager_, GetNotificationsNumber(priority))
-      .WillOnce(Return(notif_number));
+using namespace policy;
+using namespace rpc::policy_table_interface_base;
 
-  EXPECT_EQ(notif_number, policy_manager_->GetNotificationsNumber(priority));
-}
+using ::testing::_;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace {
+const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json";
+const int kServiceTypeInt = 0;
+const std::string kDeviceNumber = "XXX123456789ZZZ";
+const std::string kAppStorageFolder = "app_storage_folder";
+const std::string kValidAppId = "1234";
+}  // namespace
+
+class PolicyManagerImplTest : public ::testing::Test {
+ public:
+  PolicyManagerImplTest()
+      : policy_manager_(nullptr), cache_manager_(nullptr), in_memory_(true) {}
+
+ protected:
+  std::shared_ptr<PolicyManagerImpl> policy_manager_;
+  NiceMock<MockCacheManagerInterface>* cache_manager_;
+  NiceMock<MockPolicyListener> listener_;
+  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
+  bool in_memory_;
+
+  void SetUp() {
+    policy_manager_ = std::make_shared<PolicyManagerImpl>(in_memory_);
+    cache_manager_ = new NiceMock<MockCacheManagerInterface>();
+    policy_manager_->set_cache_manager(cache_manager_);
+    policy_manager_->set_listener(&listener_);
+
+    ON_CALL(policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
+  }
 
-TEST_F(PolicyManagerImplTest, IncrementGlobalCounter) {
-  // Assert
-  EXPECT_CALL(*cache_manager_, Increment(usage_statistics::SYNC_REBOOTS));
-  policy_manager_->Increment(usage_statistics::SYNC_REBOOTS);
-}
+  ::testing::AssertionResult IsValid(const policy_table::Table& table) {
+    if (table.is_valid()) {
+      return ::testing::AssertionSuccess();
+    } else {
+      ::rpc::ValidationReport report(" - table");
+      table.ReportErrors(&report);
+      return ::testing::AssertionFailure() << ::rpc::PrettyFormat(report);
+    }
+  }
+};
 
-TEST_F(PolicyManagerImplTest, IncrementAppCounter) {
-  // Assert
-  EXPECT_CALL(*cache_manager_,
-              Increment("12345", usage_statistics::USER_SELECTIONS));
-  policy_manager_->Increment("12345", usage_statistics::USER_SELECTIONS);
+TEST_F(PolicyManagerImplTest, InitPT_NoAppStorageFolder_ReturnFalse) {
+  EXPECT_FALSE(policy_manager_->InitPT(kSdlPreloadedPtJson, &policy_settings_));
 }
 
-TEST_F(PolicyManagerImplTest, SetAppInfo) {
-  // Assert
-  EXPECT_CALL(*cache_manager_,
-              Set("12345", usage_statistics::LANGUAGE_GUI, "de-de"));
-  policy_manager_->Set("12345", usage_statistics::LANGUAGE_GUI, "de-de");
+TEST_F(PolicyManagerImplTest, InitPT_InitializationNotSuccessful_ReturnFalse) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  EXPECT_CALL(*cache_manager_, Init(kSdlPreloadedPtJson, &policy_settings_))
+      .WillOnce(Return(false));
+  EXPECT_FALSE(policy_manager_->InitPT(kSdlPreloadedPtJson, &policy_settings_));
+  file_system::RemoveDirectory(kAppStorageFolder, true);
 }
 
-TEST_F(PolicyManagerImplTest, AddAppStopwatch) {
-  // Assert
-  EXPECT_CALL(*cache_manager_,
-              Add("12345", usage_statistics::SECONDS_HMI_FULL, 30));
-  policy_manager_->Add("12345", usage_statistics::SECONDS_HMI_FULL, 30);
+TEST_F(PolicyManagerImplTest, InitPT_InitializationIsSuccessful_ReturnTrue) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  EXPECT_CALL(*cache_manager_, Init(kSdlPreloadedPtJson, &policy_settings_))
+      .WillOnce(Return(true));
+  EXPECT_TRUE(policy_manager_->InitPT(kSdlPreloadedPtJson, &policy_settings_));
+  file_system::RemoveDirectory(kAppStorageFolder, true);
 }
 
-TEST_F(PolicyManagerImplTest, ResetPT) {
-  EXPECT_CALL(*cache_manager_, ResetPT("filename"))
-      .WillOnce(Return(true))
+TEST_F(PolicyManagerImplTest, ResetPT_NoRefreshRetrySequence_ReturnFalse) {
+  EXPECT_CALL(*cache_manager_, ResetCalculatedPermissions());
+  EXPECT_CALL(*cache_manager_, ResetPT(kSdlPreloadedPtJson))
       .WillOnce(Return(false));
-  EXPECT_CALL(*cache_manager_, IsPTPreloaded())
-      .WillOnce(Return(true))
-      .WillOnce(Return(false));
-  EXPECT_CALL(*cache_manager_, ResetCalculatedPermissions()).Times(AtLeast(1));
-  EXPECT_CALL(*cache_manager_, TimeoutResponse());
-  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_));
+  EXPECT_CALL(*cache_manager_, TimeoutResponse()).Times(0);
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_)).Times(0);
 
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  EXPECT_TRUE(policy_manager_->ResetPT("filename"));
-  EXPECT_TRUE(cache->IsPTPreloaded());
-  EXPECT_FALSE(policy_manager_->ResetPT("filename"));
-  EXPECT_FALSE(cache->IsPTPreloaded());
+  EXPECT_FALSE(policy_manager_->ResetPT(kSdlPreloadedPtJson));
 }
 
-TEST_F(PolicyManagerImplTest, LoadPT_SetPT_PTIsLoaded) {
-  // Arrange
-  EXPECT_CALL(*cache_manager_, DaysBeforeExchange(_))
-      .WillOnce(Return(kNonZero));
-  policy_manager_->ForcePTExchange();
-  policy_manager_->SetSendOnUpdateFlags(true, false);
-  policy_manager_->OnUpdateStarted();
-  Json::Value table = createPTforLoad();
-
-  policy_table::Table update(&table);
-  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
-
-  // Assert
-  ASSERT_TRUE(IsValid(update));
-
-  EXPECT_CALL(*cache_manager_, GetHMIAppTypeAfterUpdate(_)).Times(AtLeast(1));
-
-  // Act
-  std::string json = table.toStyledString();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-
-  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));
-  EXPECT_CALL(listener_, GetAppName("1234"))
-      .WillOnce(Return(custom_str::CustomString("")));
-  EXPECT_CALL(listener_, OnUpdateStatusChanged(_));
-  EXPECT_CALL(*cache_manager_, SaveUpdateRequired(false));
+TEST_F(PolicyManagerImplTest, ResetPT_ExecuteRefreshRetrySequence_ReturnTrue) {
+  EXPECT_CALL(*cache_manager_, ResetCalculatedPermissions());
+  EXPECT_CALL(*cache_manager_, ResetPT(kSdlPreloadedPtJson))
+      .WillOnce(Return(true));
   EXPECT_CALL(*cache_manager_, TimeoutResponse());
   EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_));
 
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_CALL(*cache_manager_, IsPTPreloaded());
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
+  EXPECT_TRUE(policy_manager_->ResetPT(kSdlPreloadedPtJson));
 }
 
-TEST_F(PolicyManagerImplTest2,
-       KmsChanged_SetExceededKms_ExpectCorrectSchedule) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ::policy::Counters counter = ::policy::Counters::KILOMETERS;
-  policy_manager_->PTUpdatedAt(counter, 50000);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Set kms changed but not exceed limit
-  policy_manager_->KmsChanged(51500);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Set kms changed and exceed limit
-  policy_manager_->KmsChanged(52500);
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
-}
+TEST_F(PolicyManagerImplTest,
+       AppNeedEncryption_EncryptionNotRequired_ReturnFalse) {
+  EncryptionRequired encryption_required;
+  *encryption_required = false;
+  EXPECT_CALL(*cache_manager_, GetAppEncryptionRequiredFlag(kValidAppId))
+      .WillOnce(Return(encryption_required));
 
-TEST_F(PolicyManagerImplTest2, ForcePTExchange_ExpectUpdateNeeded) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Force OT Exchange
-  policy_manager_->ForcePTExchange();
-  // Check update required
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
+  EXPECT_FALSE(policy_manager_->AppNeedEncryption(kValidAppId));
 }
 
-TEST_F(PolicyManagerImplTest2, OnSystemReady) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Check
-  EXPECT_CALL(listener_, OnSystemInfoUpdateRequired());
-  policy_manager_->OnSystemReady();
-}
+TEST_F(PolicyManagerImplTest,
+       AppNeedEncryption_EncryptionNotInitialized_ReturnTrue) {
+  EncryptionRequired encryption_required;
+  EXPECT_CALL(*cache_manager_, GetAppEncryptionRequiredFlag(kValidAppId))
+      .WillOnce(Return(encryption_required));
 
-TEST_F(PolicyManagerImplTest2, ResetRetrySequence) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->ResetRetrySequence();
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
-  policy_manager_->SetSendOnUpdateFlags(false, false);
-  policy_manager_->OnUpdateStarted();
-  EXPECT_EQ("UPDATING", policy_manager_->GetPolicyTableStatus());
+  EXPECT_TRUE(policy_manager_->AppNeedEncryption(kValidAppId));
 }
 
-TEST_F(PolicyManagerImplTest2, NextRetryTimeout_ExpectTimeoutsFromPT) {
-  // Arrange
-  std::ifstream ifile(preloaded_pt_filename_);
-  Json::Reader reader;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    Json::Value seconds_between_retries = Json::Value(Json::arrayValue);
-    seconds_between_retries =
-        root["policy_table"]["module_config"]["seconds_between_retries"];
-    uint32_t size = seconds_between_retries.size();
-    CreateLocalPT(preloaded_pt_filename_);
-    for (uint32_t i = 0; i < size; ++i) {
-      EXPECT_EQ(seconds_between_retries[i],
-                policy_manager_->NextRetryTimeout());
-    }
-  }
-}
+TEST_F(PolicyManagerImplTest,
+       FunctionGroupNeedEncryption_NoGroups_ReturnFalse) {
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupings(_));
+  const std::string group("Base-6");
 
-TEST_F(PolicyManagerImplTest2, TimeOutExchange) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Check value taken from PT
-  EXPECT_EQ(70000u, policy_manager_->TimeoutExchangeMSec());
+  EXPECT_FALSE(policy_manager_->FunctionGroupNeedEncryption(group));
 }
 
 TEST_F(PolicyManagerImplTest,
-       RequestPTUpdate_SetPT_GeneratedSnapshotAndPTUpdate) {
-  Json::Value table = createPTforLoad();
-  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));
+       CheckPermissions_PermissionsIsCalculatedAndAppRevoked_ReturnRpcAllowed) {
+  const std::string hmi_level = "NONE";
+  const std::string rpc = "OnHMIStatus";
+  RPCParams params;
+  CheckPermissionResult result;
 
-  EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _));
-  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(p_table));
+  EXPECT_CALL(*cache_manager_,
+              IsPermissionsCalculated(kDeviceNumber, kValidAppId, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId))
+      .WillOnce(Return(true));
 
-  policy_manager_->RequestPTUpdate();
-}
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
 
-TEST_F(PolicyManagerImplTest, RequestPTUpdate_InvalidPT_PTUpdateFail) {
-  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_EQ(kRpcAllowed, result.hmi_level_permitted);
+}
 
-  EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _)).Times(0);
-  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(p_table));
+TEST_F(
+    PolicyManagerImplTest,
+    CheckPermissions_PermissionsNotCalculatedAndAppRevoked_ReturnRpcDisallowed) {
+  std::string hmi_level = "FULL";
+  std::string rpc = "OnHMIStatus";
+  RPCParams params;
+  CheckPermissionResult result;
 
-  policy_manager_->RequestPTUpdate();
-}
+  EXPECT_CALL(*cache_manager_,
+              IsPermissionsCalculated(kDeviceNumber, kValidAppId, _))
+      .WillOnce(Return(false));
 
-TEST_F(PolicyManagerImplTest, RequestPTUpdate_InvalidSnapshot_PTUpdateFail) {
-  std::shared_ptr<policy_table::Table> p_table;
-  EXPECT_FALSE(p_table);
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceAllowed));
+  ON_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillByDefault(Return(true));
+
+  EXPECT_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId))
+      .WillOnce(Return(true));
 
-  EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _)).Times(0);
-  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(p_table));
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
 
-  policy_manager_->RequestPTUpdate();
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
 }
 
-TEST_F(PolicyManagerImplTest, ResetUserConsent_ResetOnlyOnce) {
-  EXPECT_CALL(*cache_manager_, ResetUserConsent())
-      .WillOnce(Return(true))
+TEST_F(PolicyManagerImplTest,
+       CheckPermissions_RpcNotFound_ReturnRpcDisallowed) {
+  const std::string hmi_level = "NONE";
+  const std::string rpc = "OnHMIStatus";
+  RPCParams params;
+  CheckPermissionResult result;
+
+  EXPECT_CALL(*cache_manager_,
+              IsPermissionsCalculated(kDeviceNumber, kValidAppId, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId))
       .WillOnce(Return(false));
 
-  EXPECT_TRUE(policy_manager_->ResetUserConsent());
-  EXPECT_FALSE(policy_manager_->ResetUserConsent());
-}
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
 
-TEST_F(PolicyManagerImplTest2, GetPolicyTableStatus_ExpectUpToDate) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Check
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
 }
 
 TEST_F(PolicyManagerImplTest,
-       SetUpdateStarted_GetPolicyTableStatus_Expect_Updating) {
-  // Arrange
-  policy_manager_->ForcePTExchange();
-  EXPECT_CALL(*cache_manager_, SaveUpdateRequired(true));
-  policy_manager_->OnUpdateStarted();
-  // Check
-  EXPECT_EQ("UPDATING", policy_manager_->GetPolicyTableStatus());
-}
+       GetPermissionsForApp_CannotGetPermissionsForApp_ReturnEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceAllowed));
+  ON_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_,
+              GetPermissionsForApp(kDeviceNumber, kDefaultId, _))
+      .WillOnce(Return(false));
 
-TEST_F(PolicyManagerImplTest2,
-       RetrySequenceDelaysSeconds_Expect_CorrectValues) {
-  // Arrange
-  std::ifstream ifile(preloaded_pt_filename_);
-  Json::Reader reader;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    Json::Value seconds_between_retries = Json::Value(Json::arrayValue);
-    seconds_between_retries =
-        root["policy_table"]["module_config"]["seconds_between_retries"];
-    uint32_t size = seconds_between_retries.size();
-    CreateLocalPT(preloaded_pt_filename_);
-    std::vector<int> delaySecs = policy_manager_->RetrySequenceDelaysSeconds();
-    // Check
-    ASSERT_EQ(size, delaySecs.size());
-    for (uint32_t i = 0; i < size; ++i) {
-      EXPECT_EQ(seconds_between_retries[i], delaySecs[i]);
-    }
-  }
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest2,
-       OnExceededTimeout_GetPolicyTableStatus_ExpectUpdateNeeded) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->ForcePTExchange();
-  policy_manager_->OnExceededTimeout();
-  // Check
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
+TEST_F(PolicyManagerImplTest,
+       GetPermissionsForApp_NoSuchApp_ReturnEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillOnce(Return(false));
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest, MarkUnpairedDevice) {
-  // Assert
-  EXPECT_CALL(*cache_manager_, SetUnpairedDevice(unpaired_device_id_, true))
+TEST_F(PolicyManagerImplTest,
+       GetPermissionsForApp_PredataPolicy_ReturnEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceDisallowed));
+  ON_CALL(*cache_manager_, IsPredataPolicy(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_,
+          GetPermissionsForApp(kDeviceNumber, kPreDataConsentId, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
       .WillOnce(Return(true));
-  EXPECT_CALL(*cache_manager_, SetDeviceConsent(unpaired_device_id_, false));
-  EXPECT_CALL(*cache_manager_,
-              HasDeviceSpecifiedConsent(unpaired_device_id_, false))
-      .WillRepeatedly(Return(true));
-  EXPECT_CALL(*cache_manager_, IgnitionCyclesBeforeExchange());
-  EXPECT_CALL(*cache_manager_, DaysBeforeExchange(_));
-  // Act
-  policy_manager_->MarkUnpairedDevice(unpaired_device_id_);
-}
 
-TEST_F(PolicyManagerImplTest2, GetCurrentDeviceId) {
-  // Arrange
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_)).Times(1);
-  EXPECT_EQ("", policy_manager_->GetCurrentDeviceId(app_id_2_));
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) {
-  // Arrange
-  std::string kServiceType = "MEDIA";
-  CreateLocalPT(preloaded_pt_filename_);
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  GetPTU("json/valid_sdl_pt_update.json");
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-  // Try to add existing app
-  policy_table::AppServiceParameters app_service_parameters =
-      policy_table::AppServiceParameters();
-  policy_manager_->GetAppServiceParameters(app_id_2_, &app_service_parameters);
-
-  ASSERT_FALSE(app_service_parameters.find(kServiceType) ==
-               app_service_parameters.end());
-
-  auto service_names = *(app_service_parameters[kServiceType].service_names);
-
-  ASSERT_TRUE(service_names.is_initialized());
-  ASSERT_EQ(service_names.size(), 2u);
-  EXPECT_EQ(static_cast<std::string>(service_names[0]), "SDL App");
-  EXPECT_EQ(static_cast<std::string>(service_names[1]), "SDL Music");
-
-  auto handled_rpcs = app_service_parameters[kServiceType].handled_rpcs;
-
-  ASSERT_TRUE(handled_rpcs.is_initialized());
-  EXPECT_EQ(handled_rpcs[0].function_id, 41);
+TEST_F(PolicyManagerImplTest,
+       GetPermissionsForApp_NotPredataOrDefaultPolicy_ReturnEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceDisallowed));
+  ON_CALL(*cache_manager_, IsPredataPolicy(kValidAppId))
+      .WillByDefault(Return(false));
+  ON_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillByDefault(Return(false));
+  ON_CALL(*cache_manager_,
+          GetPermissionsForApp(kDeviceNumber, kPreDataConsentId, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillOnce(Return(true));
 
-  // Check no update required
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusWhileAppExists_ExpectUserConsentsUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
+TEST_F(PolicyManagerImplTest,
+       GetPermissionsForApp_NoFunctionalGroupsNames_ReturnEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceDisallowed));
+  ON_CALL(*cache_manager_, IsPredataPolicy(kValidAppId))
+      .WillByDefault(Return(false));
+  ON_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillByDefault(Return(false));
+  ON_CALL(*cache_manager_,
+          GetPermissionsForApp(kDeviceNumber, kPreDataConsentId, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillOnce(Return(false));
 
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
+}
 
-  // Checking groups consents before setting ExternalConsent status
-  const policy_table::DeviceData::const_iterator device_data =
-      pt->policy_table.device_data->find(device_id_1_);
+TEST_F(PolicyManagerImplTest, LoadPT_InvalidPT_ReturnkWrongPtReceived) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
 
-  EXPECT_TRUE(pt->policy_table.device_data->end() != device_data);
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  ifile.close();
+  policy_table::Table update(&root);
+  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
 
-  const UserConsentRecords::const_iterator updated_consent_records =
-      device_data->second.user_consent_records->find(app_id_1_);
+  ASSERT_FALSE(IsValid(update));
 
-  EXPECT_TRUE(device_data->second.user_consent_records->end() !=
-              updated_consent_records);
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
 
-  const ConsentGroups::const_iterator group_1 =
-      updated_consent_records->second.consent_groups->find(group_name_1_);
-  EXPECT_TRUE(updated_consent_records->second.consent_groups->end() != group_1);
+  EXPECT_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillOnce(Return(vehicle_items));
+  EXPECT_CALL(*cache_manager_, SaveUpdateRequired(false)).Times(0);
+  const std::string filename("preloaded_pt.json");
+  EXPECT_EQ(policy_manager_->LoadPT(filename, msg),
+            PolicyManager::PtProcessingResult::kWrongPtReceived);
+}
 
-  EXPECT_EQ(Boolean(true), group_1->second);
+TEST_F(PolicyManagerImplTest,
+       LoadPT_SnapshotNotGenerated_ReturnkNewPtRequired) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+  std::ifstream ifile(kSdlPreloadedPtJson);
 
-  const ConsentGroups::const_iterator group_2 =
-      updated_consent_records->second.consent_groups->find(group_name_2_);
+  ASSERT_TRUE(ifile.good());
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"]["module_config"].removeMember("preloaded_pt");
+  ifile.close();
+  policy_table::Table update(&root);
 
-  EXPECT_TRUE(updated_consent_records->second.consent_groups->end() != group_2);
+  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
 
-  EXPECT_EQ(Boolean(false), group_2->second);
+  ASSERT_TRUE(IsValid(update));
 
-  const ConsentGroups::const_iterator group_3 =
-      updated_consent_records->second.consent_groups->find(group_name_3_);
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
 
-  EXPECT_FALSE(updated_consent_records->second.consent_groups->end() !=
-               group_3);
+  EXPECT_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillOnce(Return(vehicle_items));
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(nullptr));
+  const std::string filename("preloaded_pt.json");
+  EXPECT_EQ(policy_manager_->LoadPT(filename, msg),
+            PolicyManager::PtProcessingResult::kNewPtRequired);
+}
 
-  // Act - setting new ExternalConsent status
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
+TEST_F(PolicyManagerImplTest, LoadPT_UpdateNotApplied_ReturnkNewPtRequired) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
 
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"]["module_config"].removeMember("preloaded_pt");
+  ifile.close();
+  policy_table::Table update(&root);
 
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
+  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
 
-  // Checking groups consent after setting ExternalConsent status
-  EXPECT_EQ(Boolean(false), group_1->second);
-  EXPECT_EQ(Boolean(true), group_2->second);
+  ASSERT_TRUE(IsValid(update));
 
-  // Check, that no consent has been added for third groups
-  const ConsentGroups::const_iterator updated_group_3 =
-      updated_consent_records->second.consent_groups->find(group_name_3_);
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
 
-  EXPECT_FALSE(updated_consent_records->second.consent_groups->end() !=
-               updated_group_3);
+  EXPECT_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillOnce(Return(vehicle_items));
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot())
+      .WillOnce(Return(std::make_shared<policy_table::Table>(update)));
+  EXPECT_CALL(*cache_manager_, ApplyUpdate(_)).WillOnce(Return(false));
+  const std::string filename("preloaded_pt.json");
+  EXPECT_EQ(policy_manager_->LoadPT(filename, msg),
+            PolicyManager::PtProcessingResult::kNewPtRequired);
 }
 
-TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusWhileAppExists_ExpectExternalConsentUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
-
-  // Act
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  // Checking ExternalConsent consents before setting new ExternalConsent status
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
+TEST_F(PolicyManagerImplTest, LoadPT_NoHMIAppTypes_ReturnkSuccess) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
 
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
-
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"]["module_config"].removeMember("preloaded_pt");
+  ifile.close();
+  policy_table::Table update(&root);
 
-  EXPECT_TRUE(updated_device_data->second.user_consent_records->end() !=
-              updated_consent_records);
+  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
 
-  EXPECT_TRUE(
-      updated_consent_records->second.external_consent_status_groups->empty());
+  ASSERT_TRUE(IsValid(update));
 
-  // Act - setting new ExternalConsent status
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
   ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  const ConsentGroups& external_consent_statuss =
-      *updated_consent_records->second.external_consent_status_groups;
-
-  const ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
-
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
-
-  const ConsentGroups::const_iterator updated_group_1 =
-      external_consent_statuss.find(group_name_1_);
-
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_1);
-
-  const ConsentGroups::const_iterator updated_group_2 =
-      external_consent_statuss.find(group_name_2_);
-
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_2);
-
-  EXPECT_EQ(Boolean(false), updated_group_1->second);
-  EXPECT_EQ(Boolean(true), updated_group_2->second);
+  GroupsByExternalConsentStatus groups_by_status;
+  std::map<std::string, std::string> known_links;
+  const std::string linked_device("device_1");
+  const std::string linked_app("app_1");
+  known_links[linked_device] = linked_app;
+
+  ON_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillByDefault(Return(vehicle_items));
+  ON_CALL(*cache_manager_, GenerateSnapshot())
+      .WillByDefault(Return(std::make_shared<policy_table::Table>(update)));
+  ON_CALL(*cache_manager_, ApplyUpdate(_)).WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetExternalConsentStatus())
+      .WillByDefault(Return(status));
+  ON_CALL(*cache_manager_, GetGroupsWithSameEntities(status))
+      .WillByDefault(Return(groups_by_status));
+  ON_CALL(*cache_manager_, GetKnownLinksFromPT())
+      .WillByDefault(Return(known_links));
+
+  const std::string filename("preloaded_pt.json");
+  EXPECT_EQ(policy_manager_->LoadPT(filename, msg),
+            PolicyManager::PtProcessingResult::kSuccess);
 }
 
-TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusNewAppAddedAfterward_ExpectExternalConsentUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppPolicy();
-
-  // Act
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_FALSE(pt->policy_table.device_data->end() != updated_device_data);
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Check ExternalConsent consents for application
-  updated_device_data = pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
-
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
-
-  const ConsentGroups& external_consent_statuss =
-      *updated_consent_records->second.external_consent_status_groups;
-
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  app_parameters = pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
-
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
-
-  ConsentGroups::const_iterator updated_group_1 =
-      external_consent_statuss.find(group_name_1_);
-
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_1);
+TEST_F(PolicyManagerImplTest,
+       AddApplication_NewApplication_ReturnCallStatusChanges) {
+  AppHmiTypes hmi_types;
+  ExternalConsentStatus ext_consent_status;
+  GroupsByExternalConsentStatus groups;
 
-  ConsentGroups::const_iterator updated_group_2 =
-      external_consent_statuss.find(group_name_2_);
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceAllowed));
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(false));
+  ON_CALL(*cache_manager_, GetExternalConsentStatus())
+      .WillByDefault(Return(ext_consent_status));
+  ON_CALL(*cache_manager_, GetGroupsWithSameEntities(ext_consent_status))
+      .WillByDefault(Return(groups));
 
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_2);
+  EXPECT_CALL(*cache_manager_, IsPredataPolicy(kValidAppId)).Times(0);
 
-  EXPECT_EQ(Boolean(false), updated_group_1->second);
-  EXPECT_EQ(Boolean(true), updated_group_2->second);
+  policy_manager_->AddApplication(kDeviceNumber, kValidAppId, hmi_types);
 }
 
-TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusNewAppAddedAfterward_ExpectUserConsentsUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppPolicy();
-
-  // Act
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_FALSE(pt->policy_table.device_data->end() != updated_device_data);
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
-
-  updated_device_data = pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
-
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
-
-  EXPECT_TRUE(updated_device_data->second.user_consent_records->end() !=
-              updated_consent_records);
-
-  const ConsentGroups& external_consent_statuss =
-      *updated_consent_records->second.consent_groups;
-
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
-
-  ConsentGroups::const_iterator updated_group_1 =
-      external_consent_statuss.find(group_name_1_);
+TEST_F(PolicyManagerImplTest,
+       AddApplication_ExistedApplication_ReturnCallNothing) {
+  AppHmiTypes hmi_types;
+  ExternalConsentStatus ext_consent_status;
+  GroupsByExternalConsentStatus groups;
+
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceAllowed));
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetExternalConsentStatus())
+      .WillByDefault(Return(ext_consent_status));
+  ON_CALL(*cache_manager_, GetGroupsWithSameEntities(ext_consent_status))
+      .WillByDefault(Return(groups));
+
+  EXPECT_CALL(*cache_manager_, IsPredataPolicy(kValidAppId))
+      .WillOnce(Return(true));
 
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_1);
+  policy_manager_->AddApplication(kDeviceNumber, kValidAppId, hmi_types);
+}
 
-  ConsentGroups::const_iterator updated_group_2 =
-      external_consent_statuss.find(group_name_2_);
+TEST_F(PolicyManagerImplTest,
+       OnPTUFinished_PtuResultIskNewPtRequired_InvokeForcePTExchange) {
+  std::string initial_pt_status = policy_manager_->GetPolicyTableStatus();
 
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_2);
+  // EXPECT_CALL(listener_, CanUpdate()).WillOnce(Return(true));
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(nullptr));
 
-  EXPECT_EQ(Boolean(false), updated_group_1->second);
-  EXPECT_EQ(Boolean(true), updated_group_2->second);
+  policy_manager_->OnPTUFinished(
+      PolicyManager::PtProcessingResult::kNewPtRequired);
+  std::string final_pt_status = policy_manager_->GetPolicyTableStatus();
+  EXPECT_NE(initial_pt_status, final_pt_status);
 }
 
 TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusNewAppPromotedAfterward_ExpectUserConsentsUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  CreateLocalPT(preloaded_pt_filename_);
-  Table t = PreparePTWithGroupsHavingExternalConsent();
-
-  EXPECT_TRUE(policy_manager_->GetCache()->ApplyUpdate(t));
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillOnce(Return(device_id_1_))         // registered
-      .WillOnce(Return(""))                   // not registered
-      .WillRepeatedly(Return(device_id_1_));  // again registered
-
-  // First register w/o app having groups to consent
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Act
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_FALSE(pt->policy_table.device_data->end() != updated_device_data);
-
-  ApplicationParams app_params;
-  app_params.groups.push_back(group_name_1_);
-  app_params.groups.push_back(group_name_2_);
-
-  t.policy_table.app_policies_section.apps.insert(
-      std::make_pair(app_id_1_, app_params));
+    PolicyManagerImplTest,
+    OnPTUFinished_PtuResultIskWrongPtReceived_NoPTExchangeAndNoRefreshRetrySequence) {
+  std::string initial_pt_status = policy_manager_->GetPolicyTableStatus();
 
-  // Adding application groups to consent, will be pending untill next
-  // registration
-  EXPECT_TRUE(policy_manager_->GetCache()->ApplyUpdate(t));
+  EXPECT_CALL(listener_, CanUpdate()).Times(0);
+  EXPECT_CALL(*cache_manager_, TimeoutResponse()).Times(0);
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_)).Times(0);
 
-  // Second time register w/ app having groups to consent
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
+  policy_manager_->OnPTUFinished(
+      PolicyManager::PtProcessingResult::kWrongPtReceived);
+  std::string final_pt_status = policy_manager_->GetPolicyTableStatus();
+  EXPECT_EQ(initial_pt_status, final_pt_status);
+}
 
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
+TEST_F(PolicyManagerImplTest,
+       OnPTUFinished_PtuResultIskSuccess_InvokeRefreshRetrySequence) {
+  std::string initial_pt_status = policy_manager_->GetPolicyTableStatus();
 
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
+  EXPECT_CALL(*cache_manager_, TimeoutResponse());
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_));
 
-  updated_device_data = pt->policy_table.device_data->find(device_id_1_);
+  policy_manager_->OnPTUFinished(PolicyManager::PtProcessingResult::kSuccess);
+  std::string final_pt_status = policy_manager_->GetPolicyTableStatus();
+  EXPECT_EQ(initial_pt_status, final_pt_status);
+}
 
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
+TEST_F(PolicyManagerImplTest, GetUpdateUrl_NoEndpoints_ReturnEmptyString) {
+  EXPECT_CALL(*cache_manager_, GetUpdateUrls(kServiceTypeInt, _));
 
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
+  EXPECT_TRUE((policy_manager_->GetUpdateUrl(kServiceTypeInt)).empty());
+}
 
-  EXPECT_TRUE(updated_device_data->second.user_consent_records->end() !=
-              updated_consent_records);
+TEST_F(PolicyManagerImplTest, RequestPTUpdate_PTIsValid_PTIsUpdated) {
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"]["consumer_friendly_messages"].removeMember("messages");
+  ifile.close();
+  policy_table::Table update(&root);
+  auto snapshot = std::make_shared<policy_table::Table>();
+  snapshot->policy_table = update.policy_table;
+  if (update.policy_table.vehicle_data.is_initialized()) {
+    snapshot->policy_table.vehicle_data =
+        rpc::Optional<policy_table::VehicleData>();
+    snapshot->policy_table.vehicle_data->mark_initialized();
+    snapshot->policy_table.vehicle_data->schema_version =
+        update.policy_table.vehicle_data->schema_version;
+  }
 
-  const ConsentGroups& external_consent_statuss =
-      *updated_consent_records->second.consent_groups;
+  snapshot->SetPolicyTableType(policy_table::PT_SNAPSHOT);
+  ASSERT_TRUE(IsValid(*snapshot));
 
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(snapshot));
+  EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _));
+  policy_manager_->RequestPTUpdate();
+}
 
-  ConsentGroups::const_iterator updated_group_1 =
-      external_consent_statuss.find(group_name_1_);
+TEST_F(PolicyManagerImplTest, RequestPTUpdate_InvalidPT_PTNotUpdated) {
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  ifile.close();
+  policy_table::Table update(&root);
+  auto snapshot = std::make_shared<policy_table::Table>();
+  snapshot->policy_table = update.policy_table;
 
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_1);
+  snapshot->SetPolicyTableType(policy_table::PT_SNAPSHOT);
+  ASSERT_FALSE(IsValid(*snapshot));
 
-  ConsentGroups::const_iterator updated_group_2 =
-      external_consent_statuss.find(group_name_2_);
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(snapshot));
+  EXPECT_CALL(listener_, OnSnapshotCreated(_, _, _)).Times(0);
+  policy_manager_->RequestPTUpdate();
+}
 
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_2);
+TEST_F(PolicyManagerImplTest,
+       SendNotificationOnPermissionsUpdated_EmptyDeviceID_NoNotifications) {
+  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId)).Times(0);
 
-  EXPECT_EQ(Boolean(false), updated_group_1->second);
-  EXPECT_EQ(Boolean(true), updated_group_2->second);
+  const std::string device_id;
+  policy_manager_->SendNotificationOnPermissionsUpdated(device_id, kValidAppId);
 }
 
 TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusNewAppPromotedAfterward_ExpectExternalConsentUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  CreateLocalPT(preloaded_pt_filename_);
-  Table t = PreparePTWithGroupsHavingExternalConsent();
-
-  EXPECT_TRUE(policy_manager_->GetCache()->ApplyUpdate(t));
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillOnce(Return(device_id_1_))         // registered
-      .WillOnce(Return(""))                   // not registered
-      .WillRepeatedly(Return(device_id_1_));  // registered again
-
-  // First register w/o app having groups to consent
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Act
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_FALSE(pt->policy_table.device_data->end() != updated_device_data);
-
-  ApplicationParams app_params;
-  app_params.groups.push_back(group_name_1_);
-  app_params.groups.push_back(group_name_2_);
-
-  t.policy_table.app_policies_section.apps.insert(
-      std::make_pair(app_id_1_, app_params));
-
-  // Adding application groups to consent, will be pending i.e. not consented
-  // yet, untill next registration
-  EXPECT_TRUE(policy_manager_->GetCache()->ApplyUpdate(t));
-
-  // Second time register w/ app having groups to consent
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Check ExternalConsent consents for application
-  updated_device_data = pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
-
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
-
-  const ConsentGroups& external_consent_statuss =
-      *updated_consent_records->second.external_consent_status_groups;
-
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  app_parameters = pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
-
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
-
-  ConsentGroups::const_iterator updated_group_1 =
-      external_consent_statuss.find(group_name_1_);
-
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_1);
+    PolicyManagerImplTest,
+    SendNotificationOnPermissionsUpdated_ValidAppAndDeviceIDs_PermissionsIsUpdated) {
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceAllowed));
+  ON_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(false));
+
+  EXPECT_CALL(listener_,
+              OnPermissionsUpdated(kDeviceNumber, kValidAppId, _, _));
+  policy_manager_->SendNotificationOnPermissionsUpdated(kDeviceNumber,
+                                                        kValidAppId);
+}
+
+TEST_F(PolicyManagerImplTest, KmsChanged_StartPTExchangeAndUpdatePT) {
+  int kilometers = 1000;
+
+  EXPECT_CALL(*cache_manager_, KilometersBeforeExchange(kilometers))
+      .WillOnce(Return(0));
+
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"]["consumer_friendly_messages"].removeMember("messages");
+  ifile.close();
+  policy_table::Table update(&root);
+  auto snapshot = std::make_shared<policy_table::Table>();
+  snapshot->policy_table = update.policy_table;
+  if (update.policy_table.vehicle_data.is_initialized()) {
+    snapshot->policy_table.vehicle_data =
+        rpc::Optional<policy_table::VehicleData>();
+    snapshot->policy_table.vehicle_data->mark_initialized();
+    snapshot->policy_table.vehicle_data->schema_version =
+        update.policy_table.vehicle_data->schema_version;
+  }
 
-  ConsentGroups::const_iterator updated_group_2 =
-      external_consent_statuss.find(group_name_2_);
+  snapshot->SetPolicyTableType(policy_table::PT_SNAPSHOT);
+  ASSERT_TRUE(IsValid(*snapshot));
 
-  EXPECT_TRUE(external_consent_statuss.end() != updated_group_2);
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(snapshot));
+  EXPECT_CALL(*cache_manager_,
+              SetCountersPassedForSuccessfulUpdate(KILOMETERS, kilometers));
+  EXPECT_CALL(*cache_manager_, ResetIgnitionCycles());
 
-  EXPECT_EQ(Boolean(false), updated_group_1->second);
-  EXPECT_EQ(Boolean(true), updated_group_2->second);
+  policy_manager_->KmsChanged(kilometers);
 }
 
-TEST_F(PolicyManagerImplTest_ExternalConsent,
-       ExternalConsent_PTUWithNewGroups_ExpectExternalConsentUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
-
-  const uint32_t type_4 = 6u;
-  const uint32_t id_4 = 7u;
-  const std::string group_name_4 = "NewGroup";
-
-  // ExternalConsent status has new group, which is not yet assigned to any
-  // application
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_4, id_4, kStatusOn));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  // Check ExternalConsent consents for application
-  policy_table::DeviceData::const_iterator initial_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != initial_device_data);
-
-  UserConsentRecords::const_iterator initial_consent_records =
-      initial_device_data->second.user_consent_records->find(app_id_1_);
-
-  EXPECT_TRUE(initial_device_data->second.user_consent_records->end() !=
-              initial_consent_records);
-
-  const ConsentGroups& external_consent_statuss =
-      *initial_consent_records->second.external_consent_status_groups;
-
-  ConsentGroups::const_iterator group_1 =
-      external_consent_statuss.find(group_name_1_);
-
-  EXPECT_TRUE(external_consent_statuss.end() != group_1);
-
-  ConsentGroups::const_iterator group_2 =
-      external_consent_statuss.find(group_name_2_);
-
-  EXPECT_TRUE(external_consent_statuss.end() != group_2);
-
-  ConsentGroups::const_iterator group_4 =
-      external_consent_statuss.find(group_name_4);
-
-  EXPECT_FALSE(external_consent_statuss.end() != group_4);
-
-  // Consents for known groups have been done
-  EXPECT_EQ(Boolean(false), group_1->second);
-  EXPECT_EQ(Boolean(true), group_2->second);
-
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  app_parameters = pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
-
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
-
-  const std::string ptu_json =
-      PreparePTUWithNewGroup(type_4, id_4, group_name_4);
+TEST_F(PolicyManagerImplTest, KmsChanged_NoPTExchangeAndNotUpdatePT) {
+  int kilometers = 1000;
 
-  const BinaryMessage msg(ptu_json.begin(), ptu_json.end());
-
-  ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
-
-  EXPECT_CALL(listener_, OnCertificateUpdated(_));
-
-  EXPECT_TRUE(policy_manager_->LoadPT("DummyFileName", msg));
-
-  pt = policy_manager_->GetCache()->GetPT();
-
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
-
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
-
-  EXPECT_TRUE(updated_device_data->second.user_consent_records->end() !=
-              updated_consent_records);
-
-  const ConsentGroups& updated_external_consent_statuss =
-      *updated_consent_records->second.external_consent_status_groups;
-
-  group_1 = updated_external_consent_statuss.find(group_name_1_);
-
-  EXPECT_TRUE(updated_external_consent_statuss.end() != group_1);
-
-  group_2 = updated_external_consent_statuss.find(group_name_2_);
-
-  EXPECT_TRUE(updated_external_consent_statuss.end() != group_2);
-
-  group_4 = updated_external_consent_statuss.find(group_name_4);
-
-  EXPECT_TRUE(updated_external_consent_statuss.end() != group_4);
-
-  EXPECT_EQ(Boolean(false), group_1->second);
-  EXPECT_EQ(Boolean(true), group_2->second);
-  EXPECT_EQ(Boolean(false), group_4->second);
-
-  app_parameters = pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
+  EXPECT_CALL(*cache_manager_, KilometersBeforeExchange(kilometers))
+      .WillOnce(Return(100));
+  EXPECT_CALL(*cache_manager_,
+              SetCountersPassedForSuccessfulUpdate(KILOMETERS, kilometers))
+      .Times(0);
+  EXPECT_CALL(*cache_manager_, ResetIgnitionCycles()).Times(0);
 
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_statuss.size());
+  policy_manager_->KmsChanged(kilometers);
 }
 
-TEST_F(PolicyManagerImplTest_ExternalConsent,
-       ExternalConsent_PTUWithNewGroups_ExpectUserConsentsUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
-
-  const uint32_t type_4 = 6u;
-  const uint32_t id_4 = 7u;
-  const std::string group_name_4 = "NewGroup";
-
-  ExternalConsentStatus status;
-  status.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status.insert(ExternalConsentStatusItem(type_4, id_4, kStatusOn));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status));
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  // Check ExternalConsent consents for application
-  policy_table::DeviceData::const_iterator initial_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != initial_device_data);
-
-  UserConsentRecords::const_iterator initial_consent_records =
-      initial_device_data->second.user_consent_records->find(app_id_1_);
+TEST_F(PolicyManagerImplTest,
+       SetExternalConsentStatus_EmptyStatus_ReturnFalse) {
+  ExternalConsentStatus consent_status;
 
-  EXPECT_TRUE(initial_device_data->second.user_consent_records->end() !=
-              initial_consent_records);
+  EXPECT_FALSE(policy_manager_->SetExternalConsentStatus(consent_status));
+}
 
-  const ConsentGroups& user_consents =
-      *initial_consent_records->second.consent_groups;
+TEST_F(PolicyManagerImplTest,
+       SetExternalConsentStatus_CacheNotSetConsentStatus_ReturnFalse) {
+  ExternalConsentStatus consent_status;
+  consent_status.insert(ExternalConsentStatusItem());
 
-  ConsentGroups::const_iterator group_1 = user_consents.find(group_name_1_);
+  EXPECT_FALSE(policy_manager_->SetExternalConsentStatus(consent_status));
+}
 
-  EXPECT_TRUE(user_consents.end() != group_1);
+TEST_F(PolicyManagerImplTest,
+       SetExternalConsentStatus_ConsentStatusIsSettedByCache_ReturnTrue) {
+  ExternalConsentStatus consent_status;
+  consent_status.insert(ExternalConsentStatusItem());
+  GroupsByExternalConsentStatus groups_by_status;
+  std::map<std::string, std::string> known_links;
+  const std::string linked_device("device_1");
+  const std::string linked_app("app_1");
+  known_links[linked_device] = linked_app;
 
-  ConsentGroups::const_iterator group_2 = user_consents.find(group_name_2_);
+  ON_CALL(*cache_manager_, SetExternalConsentStatus(consent_status))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetGroupsWithSameEntities(consent_status))
+      .WillByDefault(Return(groups_by_status));
+  ON_CALL(*cache_manager_, GetKnownLinksFromPT())
+      .WillByDefault(Return(known_links));
 
-  EXPECT_TRUE(user_consents.end() != group_2);
+  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(consent_status));
+}
 
-  ConsentGroups::const_iterator group_4 = user_consents.find(group_name_4);
+TEST_F(PolicyManagerImplTest,
+       MarkUnpairedDevice_UnpairedDeviceIsNotSetted_NoUserConsentForDevice) {
+  EXPECT_CALL(*cache_manager_, SetUnpairedDevice(kDeviceNumber, _))
+      .WillOnce(Return(false));
+  EXPECT_CALL(*cache_manager_, SetDeviceConsent(kDeviceNumber, false)).Times(0);
 
-  EXPECT_FALSE(user_consents.end() != group_4);
+  policy_manager_->MarkUnpairedDevice(kDeviceNumber);
+}
 
-  EXPECT_EQ(Boolean(false), group_1->second);
-  EXPECT_EQ(Boolean(true), group_2->second);
+TEST_F(PolicyManagerImplTest,
+       MarkUnpairedDevice_UnpairedDeviceIsSetted_SetUserConsentForDevice) {
+  EXPECT_CALL(*cache_manager_, SetUnpairedDevice(kDeviceNumber, _))
+      .WillOnce(Return(true));
+  EXPECT_CALL(listener_, CanUpdate()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(nullptr));
 
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
+  policy_manager_->MarkUnpairedDevice(kDeviceNumber);
+}
 
-  app_parameters = pt->policy_table.app_policies_section.apps.find(app_id_1_);
+TEST_F(PolicyManagerImplTest,
+       SetUserConsentForApp_UserPermissionsNotSetted_NotificationIsNotSent) {
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
 
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
+  const std::string group_name("Notifications");
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupAllowed;
 
-  EXPECT_EQ(app_parameters->second.groups.size(), user_consents.size());
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
 
-  const std::string ptu_json =
-      PreparePTUWithNewGroup(type_4, id_4, group_name_4);
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, SetUserPermissionsForApp(_, _))
+      .WillByDefault(Return(false));
 
-  const BinaryMessage msg(ptu_json.begin(), ptu_json.end());
+  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId)).Times(0);
 
-  ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
+  policy_manager_->SetUserConsentForApp(perm_consent,
+                                        PolicyManager::kNotifyApplicationMode);
+}
 
-  EXPECT_CALL(listener_, OnCertificateUpdated(_));
+TEST_F(PolicyManagerImplTest,
+       SetUserConsentForApp_SilentMode_NotificationIsNotSent) {
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
 
-  EXPECT_TRUE(policy_manager_->LoadPT("DummyFileName", msg));
+  const std::string group_name("Notifications");
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupAllowed;
 
-  pt = policy_manager_->GetCache()->GetPT();
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
 
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, SetUserPermissionsForApp(_, _))
+      .WillByDefault(Return(true));
 
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
+  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId)).Times(0);
 
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
+  policy_manager_->SetUserConsentForApp(perm_consent,
+                                        PolicyManager::kSilentMode);
+}
 
-  EXPECT_TRUE(updated_device_data->second.user_consent_records->end() !=
-              updated_consent_records);
+TEST_F(PolicyManagerImplTest,
+       SetUserConsentForApp_AppPermissionsNotChanged_NotificationIsNotSent) {
+  PermissionConsent perm_consent;
+  perm_consent.device_id = kDeviceNumber;
+  perm_consent.policy_app_id = kValidAppId;
+  const std::string source("VR");
+  perm_consent.consent_source = source;
 
-  const ConsentGroups& updated_user_consents =
-      *updated_consent_records->second.consent_groups;
+  const std::string group_name("Notifications");
+  FunctionalGroupPermission group_perm;
+  group_perm.group_alias = group_name;
+  group_perm.group_name = group_name;
+  group_perm.group_id = ::utils::Djb2HashFromString(group_name);
+  group_perm.state = GroupConsent::kGroupAllowed;
 
-  group_1 = updated_user_consents.find(group_name_1_);
+  std::vector<FunctionalGroupPermission> groups_permissions;
+  groups_permissions.push_back(group_perm);
+  perm_consent.group_permissions = groups_permissions;
 
-  EXPECT_TRUE(updated_user_consents.end() != group_1);
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, SetUserPermissionsForApp(_, _))
+      .WillByDefault(Return(true));
 
-  group_2 = updated_user_consents.find(group_name_2_);
+  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId)).Times(0);
 
-  EXPECT_TRUE(updated_user_consents.end() != group_2);
+  policy_manager_->SetUserConsentForApp(perm_consent,
+                                        PolicyManager::kNotifyApplicationMode);
+}
 
-  group_4 = updated_user_consents.find(group_name_4);
+TEST_F(PolicyManagerImplTest,
+       GetUserConsentForApp_NoPermissionsForApp_NoConsent) {
+  std::vector<FunctionalGroupPermission> permissions;
 
-  EXPECT_TRUE(updated_user_consents.end() != group_4);
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(false));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_)).Times(0);
 
-  EXPECT_EQ(Boolean(false), group_1->second);
-  EXPECT_EQ(Boolean(true), group_2->second);
-  EXPECT_EQ(Boolean(false), group_4->second);
+  policy_manager_->GetUserConsentForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
+}
 
-  app_parameters = pt->policy_table.app_policies_section.apps.find(app_id_1_);
+TEST_F(PolicyManagerImplTest,
+       GetUserConsentForApp_NoFunctionalGroupsNames_NoConsent) {
+  std::vector<FunctionalGroupPermission> permissions;
 
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillOnce(Return(false));
 
-  EXPECT_EQ(app_parameters->second.groups.size(), user_consents.size());
+  policy_manager_->GetUserConsentForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
 TEST_F(
-    PolicyManagerImplTest_ExternalConsent,
-    ExternalConsent_SetExternalConsentStatusTurnOnThanOff_ExpectExternalConsentUpdateForApp) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  PreconditionExternalConsentPreparePTWithAppGroupsAndConsents();
-
-  // Act
-  std::shared_ptr<policy_table::Table> pt =
-      policy_manager_->GetCache()->GetPT();
-
-  // Checking ExternalConsent consents before setting new ExternalConsent status
-  policy_table::DeviceData::const_iterator updated_device_data =
-      pt->policy_table.device_data->find(device_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.device_data->end() != updated_device_data);
-
-  UserConsentRecords::const_iterator updated_consent_records =
-      updated_device_data->second.user_consent_records->find(app_id_1_);
-
-  EXPECT_TRUE(updated_device_data->second.user_consent_records->end() !=
-              updated_consent_records);
-
-  EXPECT_TRUE(
-      updated_consent_records->second.external_consent_status_groups->empty());
-
-  // Act - setting new ExternalConsent status
-  ExternalConsentStatus status_on;
-  status_on.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOn));
-  status_on.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOn));
-  status_on.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOn));
-
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _));
-
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status_on));
-
-  // Checking ExternalConsent consents after setting new ExternalConsent status
-  const ConsentGroups& external_consent_status =
-      *updated_consent_records->second.external_consent_status_groups;
-
-  ApplicationPolicies::const_iterator app_parameters =
-      pt->policy_table.app_policies_section.apps.find(app_id_1_);
-
-  EXPECT_TRUE(pt->policy_table.app_policies_section.apps.end() !=
-              app_parameters);
-
-  EXPECT_EQ(app_parameters->second.groups.size(),
-            external_consent_status.size());
-
-  ConsentGroups::const_iterator updated_group_1 =
-      external_consent_status.find(group_name_1_);
-
-  EXPECT_TRUE(external_consent_status.end() != updated_group_1);
-
-  ConsentGroups::const_iterator updated_group_2 =
-      external_consent_status.find(group_name_2_);
-
-  EXPECT_TRUE(external_consent_status.end() != updated_group_2);
+    PolicyManagerImplTest,
+    ReactOnUserDevConsentForApp_AppPoliciesIsChanged_AppPermissionsNotChanged) {
+  transport_manager::DeviceHandle device_handle;
+  bool is_device_allowed = true;
+
+  ON_CALL(listener_,
+          OnCurrentDeviceIdUpdateRequired(device_handle, kValidAppId))
+      .WillByDefault(Return(kDeviceNumber));
+  ON_CALL(*cache_manager_, GetDeviceConsent(kDeviceNumber))
+      .WillByDefault(Return(kDeviceAllowed));
+  ON_CALL(*cache_manager_,
+          ReactOnUserDevConsentForApp(kValidAppId, is_device_allowed))
+      .WillByDefault(Return(true));
+
+  EXPECT_CALL(listener_,
+              SendOnAppPermissionsChanged(_, kDeviceNumber, kValidAppId))
+      .Times(0);
+  EXPECT_TRUE(policy_manager_->ReactOnUserDevConsentForApp(
+      device_handle, kValidAppId, is_device_allowed));
+}
 
-  EXPECT_EQ(Boolean(false), updated_group_1->second);
-  EXPECT_EQ(Boolean(true), updated_group_2->second);
+TEST_F(PolicyManagerImplTest,
+       GetInitialAppData_HandleNullPointers_ReturnFalse) {
+  EXPECT_FALSE(
+      policy_manager_->GetInitialAppData(kValidAppId, nullptr, nullptr));
+}
 
-  // Switching ExternalConsent status off
-  ExternalConsentStatus status_off;
-  status_off.insert(ExternalConsentStatusItem(type_1_, id_1_, kStatusOff));
-  status_off.insert(ExternalConsentStatusItem(type_2_, id_2_, kStatusOff));
-  status_off.insert(ExternalConsentStatusItem(type_3_, id_3_, kStatusOff));
+TEST_F(PolicyManagerImplTest,
+       GetInitialAppData_HandleValidPointers_ReturnTrue) {
+  StringArray nicknames;
+  StringArray app_hmi_types;
+  ON_CALL(*cache_manager_,
+          GetInitialAppData(kValidAppId, nicknames, app_hmi_types))
+      .WillByDefault(Return(true));
 
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_1_, _)).Times(1);
+  EXPECT_TRUE(policy_manager_->GetInitialAppData(
+      kValidAppId, &nicknames, &app_hmi_types));
+}
 
-  EXPECT_TRUE(policy_manager_->SetExternalConsentStatus(status_off));
+TEST_F(PolicyManagerImplTest,
+       GetAppPermissionsChanges_NoPermissionsChanges_GeneratePermissions) {
+  EXPECT_CALL(*cache_manager_,
+              CountUnconsentedGroups(kValidAppId, kDeviceNumber));
+  EXPECT_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId));
+  EXPECT_CALL(*cache_manager_, GetPriority(kValidAppId, _));
 
-  updated_group_1 = external_consent_status.find(group_name_1_);
+  policy_manager_->GetAppPermissionsChanges(kDeviceNumber, kValidAppId);
+}
 
-  EXPECT_TRUE(external_consent_status.end() != updated_group_1);
+TEST_F(PolicyManagerImplTest, GetHMITypes_AppIsDefaultPolicy_ReturnFalse) {
+  std::vector<int> app_types;
+  EXPECT_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillOnce(Return(true));
 
-  updated_group_2 = external_consent_status.find(group_name_2_);
+  EXPECT_FALSE(policy_manager_->GetHMITypes(kValidAppId, &app_types));
+}
 
-  EXPECT_TRUE(external_consent_status.end() != updated_group_2);
+TEST_F(PolicyManagerImplTest, GetHMITypes_NoHmiTypes_ReturnFalse) {
+  std::vector<int> app_types;
+  EXPECT_CALL(*cache_manager_, GetHMITypes(kValidAppId))
+      .WillOnce(Return(nullptr));
+  EXPECT_FALSE(policy_manager_->GetHMITypes(kValidAppId, &app_types));
+}
 
-  EXPECT_EQ(Boolean(true), updated_group_1->second);
-  EXPECT_EQ(Boolean(false), updated_group_2->second);
+TEST_F(PolicyManagerImplTest, GetHMITypes_ValidHmiTypes_ReturnTrue) {
+  std::vector<int> app_types;
+  AppHMITypes hmi_types;
+  EXPECT_CALL(*cache_manager_, GetHMITypes(kValidAppId))
+      .WillOnce(Return(&hmi_types));
+  EXPECT_TRUE(policy_manager_->GetHMITypes(kValidAppId, &app_types));
 }
 
 }  // namespace policy_test
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
deleted file mode 100644
index 82d87cd7ba..0000000000
--- a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
+++ /dev/null
@@ -1,919 +0,0 @@
-/*
- * Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdint.h>
-#include <fstream>
-#include <string>
-#include <vector>
-
-#include "policy/policy_manager_impl_test_base.h"
-
-#include "utils/file_system.h"
-
-#include "json/reader.h"
-#include "utils/gen_hash.h"
-
-#include "policy/mock_pt_ext_representation.h"
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-using ::testing::_;
-using ::testing::ContainerEq;
-using ::testing::Return;
-using ::testing::ReturnRef;
-
-// Help functions
-char GenRandomChar(char range_from, char range_to) {
-  if (range_from > range_to) {
-    std::swap(range_from, range_to);
-  }
-  const int range_size = range_to - range_from;
-  return rand() % range_size + range_from;
-}
-
-struct StringsForUpdate CreateNewRandomData(StringsForUpdate& str) {
-  // Generate random date
-  srand(time(NULL));
-  unsigned int day = 1 + rand() % 31;      // Day from 1 - 31
-  unsigned int month = 1 + rand() % 12;    // Month from 1 - 12
-  unsigned int year = 1985 + rand() % 31;  // Year from 1985 - 2015
-
-  // Convert date to string
-  str.new_date_ = NumberToString(year) + '-' + NumberToString(month) + '-' +
-                  NumberToString(day);
-
-  // Create new field
-  unsigned int number = 1 + rand() % 100;  // Number from 1 - 100
-  str.new_field_name_ += NumberToString(number);
-
-  for (unsigned int i = 0; i < 5; ++i) {
-    str.new_field_value_ += GenRandomChar('A', 'Z');
-  }
-  return str;
-}
-
-void CheckIsParamInList(const ::policy::RPCParams& list,
-                        const std::string& parameter) {
-  EXPECT_TRUE(std::find(list.begin(), list.end(), parameter) != list.end())
-      << "Parameter not exists: " << parameter;
-}
-
-Json::Value createPTforLoad() {
-  const std::string load_table(
-      "{"
-      "\"policy_table\": {"
-      "\"module_config\": {"
-      "\"exchange_after_x_ignition_cycles\": 10,"
-      "\"exchange_after_x_kilometers\": 100,"
-      "\"exchange_after_x_days\": 5,"
-      "\"timeout_after_x_seconds\": 500,"
-      "\"seconds_between_retries\": [10, 20, 30],"
-      "\"endpoints\": {"
-      "\"0x00\": {"
-      "\"default\": [\"http://ford.com/cloud/default\"]"
-      "}"
-      "},"
-      "\"notifications_per_minute_by_priority\": {"
-      "\"EMERGENCY\": 1,"
-      "\"NAVIGATION\": 2,"
-      "\"VOICECOM\": 3,"
-      "\"COMMUNICATION\": 4,"
-      "\"NORMAL\": 5,"
-      "\"NONE\": 6"
-      "},"
-      "\"vehicle_make\" : \"MakeT\","
-      "\"vehicle_model\" : \"ModelT\","
-      "\"vehicle_year\": \"2014\""
-      "},"
-      "\"app_policies\": {"
-      "\"default\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "},   "
-      "\"pre_DataConsent\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "},         "
-      "\"device\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "},"
-      "\"1234\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "}"
-      "},"
-      "\"consumer_friendly_messages\": {"
-      "\"version\": \"1.2\""
-      "},"
-      "\"functional_groupings\": {"
-      "\"default\": {"
-      "\"rpcs\": {"
-      "\"Update\": {"
-      "\"hmi_levels\": [\"FULL\"],"
-      "\"parameters\" : [\"speed\"]"
-      "}"
-      "}"
-      "}"
-      "}"
-      "}"
-      "}");
-
-  Json::Value table(Json::objectValue);
-  Json::Reader reader;
-  EXPECT_TRUE(reader.parse(load_table, table));
-  return table;
-}
-
-void InsertRpcParametersInList(::policy::RPCParams& input_params) {
-  input_params.insert("longitudeDegrees");
-  input_params.insert("latitudeDegrees");
-  input_params.insert("locationName");
-  input_params.insert("locationDescription");
-  input_params.insert("addressLines");
-  input_params.insert("phoneNumber");
-  input_params.insert("locationImage");
-  input_params.insert("deliveryMode");
-  input_params.insert("timeStamp");
-  input_params.insert("address");
-}
-
-policy_table::AppHmiTypes HmiTypes(const policy_table::AppHMIType hmi_type) {
-  policy_table::AppHmiTypes hmi_types;
-  hmi_types.push_back(hmi_type);
-  return hmi_types;
-}
-
-// PolicyManagerImplTest class methods
-PolicyManagerImplTest::PolicyManagerImplTest()
-    : unpaired_device_id_("08-00-27-CE-76-FE")
-    , policy_manager_(NULL)
-    , cache_manager_(NULL) {}
-
-void PolicyManagerImplTest::SetUp() {
-  policy_manager_ = new PolicyManagerImpl();
-  cache_manager_ = new MockCacheManagerInterface();
-  policy_manager_->set_cache_manager(cache_manager_);
-  policy_manager_->set_listener(&listener_);
-
-  ON_CALL(*cache_manager_, GetExternalConsentStatus())
-      .WillByDefault(Return(ExternalConsentStatus()));
-  ON_CALL(*cache_manager_, GetGroupsWithSameEntities(_))
-      .WillByDefault(Return(GroupsByExternalConsentStatus()));
-  ON_CALL(*cache_manager_, GetKnownLinksFromPT())
-      .WillByDefault(Return(std::map<std::string, std::string>()));
-  ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
-}
-
-void PolicyManagerImplTest::TearDown() {
-  delete policy_manager_;
-}
-
-::testing::AssertionResult PolicyManagerImplTest::IsValid(
-    const policy_table::Table& table) {
-  if (table.is_valid()) {
-    return ::testing::AssertionSuccess();
-  } else {
-    ::rpc::ValidationReport report(" - table");
-    table.ReportErrors(&report);
-    return ::testing::AssertionFailure() << ::rpc::PrettyFormat(report);
-  }
-}
-
-// PolicyManagerImplTest2 class methods
-PolicyManagerImplTest2::PolicyManagerImplTest2()
-    : app_id_1_("123456789")
-    , app_id_2_("1010101010")
-    , app_id_3_("123454321")
-    , device_id_1_("XXX123456789ZZZ")
-    , device_id_2_("08-00-27-CE-76-FE")
-    , application_id_("1234")
-    , app_storage_folder_("storage_PolicyManagerImplTest2")
-    , preloaded_pt_filename_(kSdlPreloadedPtJson)
-    , in_memory_(true)
-    , policy_manager_(NULL)
-    , ptu_request_types_size_(0u)
-    , index_(0u)
-    , ptu_request_types_(Json::arrayValue) {}
-
-void PolicyManagerImplTest2::SetUp() {
-  ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
-
-  file_system::CreateDirectory(app_storage_folder_);
-
-  policy_manager_ = new PolicyManagerImpl(in_memory_);
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(app_storage_folder_));
-  policy_manager_->set_listener(&listener_);
-  const char* levels[] = {"BACKGROUND", "FULL", "LIMITED", "NONE"};
-  hmi_level_.assign(levels, levels + sizeof(levels) / sizeof(levels[0]));
-  srand(time(NULL));
-  index_ = rand() % 3;
-}
-
-::policy::StringArray PolicyManagerImplTest2::JsonToVectorString(
-    const Json::Value& PTU_request_types) {
-  ::policy::StringArray result;
-  for (uint32_t i = 0; i < PTU_request_types.size(); ++i) {
-    result.push_back(PTU_request_types[i].asString());
-  }
-  return result;
-}
-
-const Json::Value PolicyManagerImplTest2::GetPTU(const std::string& file_name) {
-  // Get PTU
-  std::ifstream ifile(file_name);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    json = root.toStyledString();
-  }
-  ifile.close();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  // Load Json to cache
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-  return root;
-}
-
-void PolicyManagerImplTest2::CreateLocalPT(const std::string& file_name) {
-  file_system::remove_directory_content(app_storage_folder_);
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(app_storage_folder_));
-  ASSERT_TRUE(policy_manager_->InitPT(file_name, &policy_settings_));
-  EXPECT_TRUE(policy_manager_->GetCache()->IsPTPreloaded());
-}
-
-void PolicyManagerImplTest2::AddRTtoPT(const std::string& update_file_name,
-                                       const std::string& section_name,
-                                       const uint32_t rt_number,
-                                       const uint32_t invalid_rt_number) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Get RequestTypes from section of preloaded_pt app_policies
-  pt_request_types_ = policy_manager_->GetAppRequestTypes(section_name);
-  EXPECT_EQ(rt_number, pt_request_types_.size());
-  Json::Value root = GetPTU(update_file_name);
-  // Get Request Types from JSON (PTU)
-  ptu_request_types_ =
-      root["policy_table"]["app_policies"][section_name]["RequestType"];
-  ptu_request_types_size_ = ptu_request_types_.size();
-  pt_request_types_.clear();
-  // Get RequestTypes from section of PT app policies after update
-  pt_request_types_ = policy_manager_->GetAppRequestTypes(section_name);
-  // Check number of RT in PTU and PT now are equal
-  ASSERT_EQ(ptu_request_types_size_ - invalid_rt_number,
-            pt_request_types_.size());
-}
-
-void PolicyManagerImplTest2::AddRTtoAppSectionPT(
-    const std::string& update_file_name,
-    const std::string& section_name,
-    const uint32_t rt_number,
-    const uint32_t invalid_rt_number) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  // Add app
-  policy_manager_->AddApplication(section_name,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check app gets RequestTypes from pre_DataConsent of app_policies
-  // section
-  pt_request_types_ = policy_manager_->GetAppRequestTypes(section_name);
-  EXPECT_EQ(rt_number, pt_request_types_.size());
-  EXPECT_CALL(listener_, OnPendingPermissionChange(section_name)).Times(1);
-  Json::Value root = GetPTU(update_file_name);
-
-  // Get App Request Types from PTU
-  ptu_request_types_ =
-      root["policy_table"]["app_policies"][section_name]["RequestType"];
-  ptu_request_types_size_ = ptu_request_types_.size();
-
-  pt_request_types_.clear();
-  // Get RequestTypes from <app_id> section of app policies after PT update
-  pt_request_types_ = policy_manager_->GetAppRequestTypes(section_name);
-  // Check sizes of Request types of PT and PTU
-  ASSERT_EQ(ptu_request_types_size_ - invalid_rt_number,
-            pt_request_types_.size());
-
-  ::policy::AppPermissions permissions =
-      policy_manager_->GetAppPermissionsChanges(section_name);
-  EXPECT_TRUE(permissions.requestTypeChanged);
-}
-
-std::vector<policy_table::RequestType>
-PolicyManagerImplTest2::PushRequestTypesToContainer(
-    const ::policy::StringArray& temp_result) {
-  policy_table::RequestType filtered_result;
-  std::vector<policy_table::RequestType> final_result;
-  for (size_t i = 0; i < temp_result.size(); ++i) {
-    if (policy_table::EnumFromJsonString(temp_result[i], &filtered_result)) {
-      final_result.push_back(filtered_result);
-    }
-  }
-  return final_result;
-}
-
-void PolicyManagerImplTest2::CheckResultForValidRT() {
-  // Convert Json Array to ::policy::StringArray
-  const ::policy::StringArray& result = JsonToVectorString(ptu_request_types_);
-  // Checks
-  SortAndCheckEquality(pt_request_types_, result);
-}
-
-void PolicyManagerImplTest2::CheckResultForInvalidRT() {
-  // Convert Json Array to ::policy::StringArray
-  const ::policy::StringArray& temp_result =
-      JsonToVectorString(ptu_request_types_);
-  const std::vector<policy_table::RequestType>& result1 =
-      PushRequestTypesToContainer(temp_result);
-  const std::vector<policy_table::RequestType>& result2 =
-      PushRequestTypesToContainer(pt_request_types_);
-  // Checks
-  SortAndCheckEquality(result1, result2);
-}
-
-void PolicyManagerImplTest2::FillMultimapFromFunctionalGroupings(
-    UserConsentPromptToRpcsConnections& input_multimap,
-    policy_table::FunctionalGroupings& fg_table) {
-  policy_table::FunctionalGroupings::iterator fg_itter = fg_table.begin();
-  const policy_table::FunctionalGroupings::iterator fg_itter_end =
-      fg_table.end();
-  for (; fg_itter != fg_itter_end; ++fg_itter) {
-    // RPCS getting
-    policy_table::Rpcs& rpcs_ref = fg_itter->second;
-    // User_consent_prompt getting
-    rpc::Optional<rpc::String<1, 255> >& optional_ref =
-        rpcs_ref.user_consent_prompt;
-    rpc::String<1, 255>& ucp_string = *optional_ref;
-    const std::string& ucp_std_string =
-        static_cast<const std::string&>(ucp_string);
-    // Multimap inserting
-    input_multimap.insert(
-        std::pair<std::string, policy_table::Rpcs&>(ucp_std_string, rpcs_ref));
-  }
-}
-
-void PolicyManagerImplTest2::GetFunctionalGroupingsFromManager(
-    policy_table::FunctionalGroupings& input_functional_groupings) {
-  // Get cache
-  ::policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  // Get table_snapshot
-  std::shared_ptr<policy_table::Table> table = cache->GenerateSnapshot();
-  // Set functional groupings from policy table
-  input_functional_groupings = table->policy_table.functional_groupings;
-}
-
-void PolicyManagerImplTest2::TearDown() {
-  delete policy_manager_;
-  file_system::RemoveDirectory(app_storage_folder_, true);
-}
-
-void PolicyManagerImplTest2::ResetOutputList(
-    ::policy::CheckPermissionResult& output) {
-  // Reset output
-  output.hmi_level_permitted = ::policy::kRpcDisallowed;
-  output.list_of_allowed_params.clear();
-  output.list_of_disallowed_params.clear();
-  output.list_of_undefined_params.clear();
-}
-// To avoid duplicate test with different json files
-void PolicyManagerImplTest2::
-    CheckPermissions_AllParamsAllowed_CheckRpcsInDiffLvls(
-        const std::string& update_file) {
-  // Arrange
-  CreateLocalPT("json/sdl_preloaded_pt_send_location.json");
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  policy::CacheManagerInterfaceSPtr cache = policy_manager_->GetCache();
-  ASSERT_TRUE(cache->SetDeviceData(device_id_1_,
-                                   "hardware IPX",
-                                   "v.8.0.1",
-                                   "Android",
-                                   "4.4.2",
-                                   "Life",
-                                   2,
-                                   "Bluetooth"));
-
-  // Add app from consented device. App will be assigned with default policies
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Expect all parameters are allowed
-  std::ifstream ifile(update_file);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open()) {
-    reader.parse(ifile, root, true);
-  }
-  json = root.toStyledString();
-  ifile.close();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(cache->IsPTPreloaded());
-
-  // Will be called each time permissions are checked
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(application_id_))
-      .Times(4)
-      .WillRepeatedly(Return(device_id_1_));
-
-  // Check RPC in each level
-  ::policy::RPCParams input_params;
-  InsertRpcParametersInList(input_params);
-
-  ::policy::CheckPermissionResult output;
-  // Rpc in FULL level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of allowed parameters is not empty
-  EXPECT_FALSE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_allowed_params.size());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  ResetOutputList(output);
-
-  // Rpc in LIMITED level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelLimited, "SendLocation", input_params, output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of allowed parameters is not empty
-  EXPECT_FALSE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_allowed_params.size());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  ResetOutputList(output);
-
-  // Rpc in BACKGROUND level
-  policy_manager_->CheckPermissions(application_id_,
-                                    kHmiLevelBackground,
-                                    "SendLocation",
-                                    input_params,
-                                    output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of allowed parameters is not empty
-  EXPECT_FALSE(output.list_of_allowed_params.empty());
-  EXPECT_EQ(10u, output.list_of_allowed_params.size());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  // Reset output
-  ResetOutputList(output);
-
-  // Rpc in NONE level
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelNone, "SendLocation", input_params, output);
-  // Check RPC is disallowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  // Check lists of parameters are  empty
-  EXPECT_TRUE(output.list_of_allowed_params.empty());
-  EXPECT_TRUE(output.list_of_disallowed_params.empty());
-  EXPECT_TRUE(output.list_of_undefined_params.empty());
-}
-
-void PolicyManagerImplTest2::CheckRpcPermissions(
-    const std::string& rpc_name, const PermitResult& expected_permission) {
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  policy_manager_->CheckPermissions(
-      application_id_, kHmiLevelFull, rpc_name, input_params, output);
-  EXPECT_EQ(expected_permission, output.hmi_level_permitted);
-}
-
-void PolicyManagerImplTest2::CheckRpcPermissions(
-    const std::string& app_id,
-    const std::string& rpc_name,
-    const policy::PermitResult& out_expected_permission) {
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-  policy_manager_->CheckPermissions(
-      app_id, kHmiLevelFull, rpc_name, input_params, output);
-  EXPECT_EQ(out_expected_permission, output.hmi_level_permitted);
-}
-
-void PolicyManagerImplTest2::EmulatePTAppRevoked(const std::string& ptu_name) {
-  std::ifstream ifile(ptu_name);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    // Emulate application is revoked
-    root["policy_table"]["app_policies"]["1234"]["is_revoked"] = 1;
-    json = root.toStyledString();
-  }
-  ifile.close();
-
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  ASSERT_TRUE(policy_manager_->LoadPT(kDummyUpdateFileName, msg));
-}
-
-// To avoid duplicate arrange of test
-void PolicyManagerImplTest2::AddSetDeviceData() {
-  CreateLocalPT("json/sdl_preloaded_pt_send_location.json");
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_1_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  // Add app from consented device. App will be assigned with default policies
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  (policy_manager_->GetCache())->AddDevice(device_id_1_, "Bluetooth");
-}
-
-// Load Json File and set it as PTU
-void PolicyManagerImplTest2::LoadPTUFromJsonFile(
-    const std::string& update_file) {
-  // Load Json to cache
-  std::ifstream ifile(update_file);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open()) {
-    reader.parse(ifile, root, true);
-  }
-  json = root.toStyledString();
-  ifile.close();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
-}
-
-// PolicyManagerImplTest_RequestTypes class methods
-PolicyManagerImplTest_RequestTypes::PolicyManagerImplTest_RequestTypes()
-    : kJsonFiles{"json/PTU_with_one_invalid_requestType.json",
-                 "json/PTU_with_invalid_requestType_between_correct.json",
-                 "json/PTU_without_requestType_field.json",
-                 "json/PTU_with_empty_requestType_array.json",
-                 "json/preloadedPT_with_invalid_default_requestType.json",
-                 "json/preloadedPT_with_several_invalid_default_requestTypes."
-                 "json",
-                 "json/"
-                 "preloadedPT_with_invalid_default_reqestType_between_valid."
-                 "json",
-                 "json/PTU_default_app.json",
-                 "json/"
-                 "PTU_default_app_app_invalid_values_RequestType_array.json",
-                 "json/PTU_default_app_empty_RequestType_array.json",
-                 "json/PTU_default_app_omitted_RequestType_array.json",
-                 "json/"
-                 "PTU_default_app_one_invalid_value_RequestType_array.json",
-                 "json/PTU_pre_data_consent_app.json",
-                 "json/"
-                 "PTU_pre_data_consent_app_invalid_values_RequestType_array."
-                 "json",
-                 "json/PTU_pre_data_consent_app_empty_RequestType_array.json",
-                 "json/"
-                 "PTU_pre_data_consent_app_omitted_RequestType_array.json",
-                 "json/"
-                 "PTU_pre_data_consent_app_one_invalid_value_RequestType_"
-                 "array."
-                 "json"}
-    , kAppId("1010101010")
-    , kDefaultAppId(policy::kDefaultId)
-    , app_storage_folder_("storage3")
-    , preloaded_pt_filename_(kSdlPreloadedPtJson) {}
-
-void PolicyManagerImplTest_RequestTypes::SetUp() {
-  ON_CALL(listener_, GetRegisteredLinks(_)).WillByDefault(Return());
-
-  file_system::CreateDirectory(app_storage_folder_);
-  const bool in_memory = true;
-  policy_manager_impl_sptr_ = std::make_shared<PolicyManagerImpl>(in_memory);
-  policy_manager_impl_sptr_->set_listener(&listener_);
-}
-
-const Json::Value PolicyManagerImplTest_RequestTypes::GetPTU(
-    const std::string& file_name) {
-  // Get PTU
-  std::ifstream ifile(file_name);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    json = root.toStyledString();
-  }
-  ifile.close();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  // Load Json to cache
-  EXPECT_TRUE(policy_manager_impl_sptr_->LoadPT(kFilePtUpdateJson, msg));
-  EXPECT_FALSE(policy_manager_impl_sptr_->GetCache()->IsPTPreloaded());
-  return root;
-}
-
-void PolicyManagerImplTest_RequestTypes::RefreshPT(
-    const std::string& preloaded_pt_file, const std::string& update_pt_file) {
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(app_storage_folder_));
-  ASSERT_TRUE(
-      policy_manager_impl_sptr_->InitPT(preloaded_pt_file, &policy_settings_))
-      << "can`t load preloaded file";
-  EXPECT_TRUE(policy_manager_impl_sptr_->GetCache()->IsPTPreloaded());
-  GetPTU(update_pt_file);
-}
-
-PolicyTableSPtr PolicyManagerImplTest_RequestTypes::GetPolicyTableSnapshot() {
-  // Get cache
-  ::policy::CacheManagerInterfaceSPtr cache =
-      policy_manager_impl_sptr_->GetCache();
-  // Get and return table_snapshot
-  return cache->GenerateSnapshot();
-}
-
-policy_table::RequestTypes
-PolicyManagerImplTest_RequestTypes::GetRequestTypesForApplication(
-    const std::string& app_id) {
-  // Get table_snapshot
-  PolicyTableSPtr table = GetPolicyTableSnapshot();
-  // Get request types
-  policy_table::PolicyTable& pt = table->policy_table;
-  policy_table::ApplicationPolicies& app_policies =
-      pt.app_policies_section.apps;
-  policy_table::ApplicationPolicies::const_iterator app_iter =
-      app_policies.find(app_id);
-
-  return *(app_iter->second.RequestType);
-}
-
-void PolicyManagerImplTest_RequestTypes::CompareAppRequestTypesWithDefault(
-    const std::string& app_id, const std::string& ptu_file) {
-  // Refresh policy table with invalid RequestType in application
-  RefreshPT(preloaded_pt_filename_, ptu_file);
-
-  // Get <app_id> RequestType array
-  policy_table::RequestTypes app_request_types =
-      GetRequestTypesForApplication(app_id);
-  // Get "default" RequestType array
-  policy_table::RequestTypes default_request_types =
-      GetRequestTypesForApplication(policy::kDefaultId);
-
-  // Expect
-  const size_t app_requests_size = app_request_types.size();
-  const size_t default_requests_size = default_request_types.size();
-  ASSERT_EQ(default_requests_size, app_requests_size);
-  EXPECT_THAT(default_request_types, ContainerEq(app_request_types));
-}
-
-policy_table::RequestTypes
-PolicyManagerImplTest_RequestTypes::CreateDefaultAppPTURequestValues() {
-  policy_table::RequestTypes request_types;
-  request_types.push_back(policy_table::RequestType::RT_QUERY_APPS);
-  request_types.push_back(policy_table::RequestType::RT_LAUNCH_APP);
-  request_types.push_back(policy_table::RequestType::RT_PROPRIETARY);
-  request_types.push_back(policy_table::RequestType::RT_LOCK_SCREEN_ICON_URL);
-  return request_types;
-}
-
-policy_table::RequestTypes
-PolicyManagerImplTest_RequestTypes::CreateDefaultAppDatabaseRequestValues() {
-  policy_table::RequestTypes request_types;
-  request_types.push_back(policy_table::RequestType::RT_QUERY_APPS);
-  request_types.push_back(policy_table::RequestType::RT_LAUNCH_APP);
-  request_types.push_back(policy_table::RequestType::RT_PROPRIETARY);
-  return request_types;
-}
-
-policy_table::RequestTypes
-PolicyManagerImplTest_RequestTypes::CreatePreDataConsentAppPTURequestValues() {
-  policy_table::RequestTypes request_types;
-  request_types.push_back(policy_table::RequestType::RT_FILE_RESUME);
-  request_types.push_back(policy_table::RequestType::RT_AUTH_REQUEST);
-  request_types.push_back(policy_table::RequestType::RT_AUTH_CHALLENGE);
-  request_types.push_back(policy_table::RequestType::RT_AUTH_ACK);
-  return request_types;
-}
-
-void PolicyManagerImplTest_RequestTypes::CompareRequestTypesContainers(
-    const policy_table::RequestTypes& expected_data,
-    const policy_table::RequestTypes& received_data) {
-  const size_t received_size = received_data.size();
-  const size_t expected_size = expected_data.size();
-  ASSERT_EQ(expected_size, received_size);
-  EXPECT_THAT(expected_data, ContainerEq(received_data));
-}
-
-void PolicyManagerImplTest_RequestTypes::TearDown() {
-  file_system::RemoveDirectory(app_storage_folder_, true);
-}
-
-void PolicyManagerImplTest_ExternalConsent::
-    PreconditionExternalConsentPreparePTWithAppGroupsAndConsents() {
-  using namespace policy_table;
-  using namespace rpc;
-
-  CreateLocalPT(preloaded_pt_filename_);
-  Table t = PreparePTWithGroupsHavingExternalConsent();
-
-  ApplicationParams app_params;
-  app_params.groups.push_back(group_name_1_);
-  app_params.groups.push_back(group_name_2_);
-
-  t.policy_table.app_policies_section.apps.insert(
-      std::make_pair(app_id_1_, app_params));
-
-  EXPECT_TRUE(policy_manager_->GetCache()->ApplyUpdate(t));
-
-  // User allows first group and disallows second group. Third is kept
-  // untouched.
-  PermissionConsent permissions;
-  permissions.device_id = device_id_1_;
-  permissions.policy_app_id = app_id_1_;
-
-  FunctionalGroupPermission group_permissions_1;
-  group_permissions_1.group_name = group_name_1_;
-  group_permissions_1.group_alias = group_name_1_;
-  group_permissions_1.group_id = utils::Djb2HashFromString(group_name_1_);
-  group_permissions_1.state = kGroupAllowed;
-
-  FunctionalGroupPermission group_permissions_2;
-  group_permissions_2.group_name = group_name_2_;
-  group_permissions_2.group_alias = group_name_2_;
-  group_permissions_2.group_id = utils::Djb2HashFromString(group_name_2_);
-  group_permissions_2.state = kGroupDisallowed;
-
-  permissions.group_permissions.push_back(group_permissions_1);
-  permissions.group_permissions.push_back(group_permissions_2);
-
-  policy_manager_->SetUserConsentForApp(permissions,
-                                        policy::PolicyManager::kSilentMode);
-}
-
-void PolicyManagerImplTest_ExternalConsent::
-    PreconditionExternalConsentPreparePTWithAppPolicy() {
-  using namespace policy_table;
-  using namespace rpc;
-
-  // PT has 3 functional groups with some entities in
-  // disallowed_by_external_consent_entities_on/off. Groups consents can be
-  // changed.
-  CreateLocalPT(preloaded_pt_filename_);
-  Table t = PreparePTWithGroupsHavingExternalConsent();
-
-  ApplicationParams app_params;
-  app_params.groups.push_back(group_name_1_);
-  app_params.groups.push_back(group_name_2_);
-
-  t.policy_table.app_policies_section.apps.insert(
-      std::make_pair(app_id_1_, app_params));
-
-  EXPECT_TRUE(policy_manager_->GetCache()->ApplyUpdate(t));
-}
-
-rpc::policy_table_interface_base::Table PolicyManagerImplTest_ExternalConsent::
-    PreparePTWithGroupsHavingExternalConsent() {
-  using namespace policy_table;
-  using namespace rpc;
-
-  // PT has 3 functional groups with some entities in
-  // disallowed_by_external_consent_entities_on/off. Groups consents can be
-  // changed.
-
-  ExternalConsentEntity entity_1(type_1_, id_1_);
-  ExternalConsentEntity entity_2(type_2_, id_2_);
-  ExternalConsentEntity entity_3(type_3_, id_3_);
-
-  Rpcs rpcs_1;
-  rpcs_1.disallowed_by_external_consent_entities_on->push_back(entity_1);
-  *rpcs_1.user_consent_prompt = group_name_1_;
-  rpcs_1.rpcs.set_to_null();
-
-  Rpcs rpcs_2;
-  rpcs_2.disallowed_by_external_consent_entities_off->push_back(entity_2);
-  *rpcs_2.user_consent_prompt = group_name_2_;
-  rpcs_2.rpcs.set_to_null();
-
-  Rpcs rpcs_3;
-  rpcs_3.disallowed_by_external_consent_entities_on->push_back(entity_3);
-  *rpcs_3.user_consent_prompt = group_name_3_;
-  rpcs_3.rpcs.set_to_null();
-
-  Table t;
-  t.policy_table.functional_groupings.insert(
-      std::make_pair(group_name_1_, rpcs_1));
-  t.policy_table.functional_groupings.insert(
-      std::make_pair(group_name_2_, rpcs_2));
-  t.policy_table.functional_groupings.insert(
-      std::make_pair(group_name_3_, rpcs_3));
-
-  return t;
-}
-
-std::string PolicyManagerImplTest_ExternalConsent::PreparePTUWithNewGroup(
-    const uint32_t type, const uint32_t id, const std::string& group_name) {
-  using namespace policy_table;
-  using namespace rpc;
-
-  std::ifstream ifile(preloaded_pt_filename_);
-  Json::Reader reader;
-  std::string json;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    Table t = PreparePTWithGroupsHavingExternalConsent();
-
-    ExternalConsentEntity entity_4(type, id);
-
-    Rpcs rpcs_4;
-    rpcs_4.disallowed_by_external_consent_entities_on->push_back(entity_4);
-    *rpcs_4.user_consent_prompt = group_name;
-    rpcs_4.rpcs.set_to_null();
-
-    t.policy_table.functional_groupings.insert(
-        std::make_pair(group_name, rpcs_4));
-
-    ApplicationParams app_params;
-    app_params.groups.push_back(group_name_1_);
-    app_params.groups.push_back(group_name_2_);
-    app_params.groups.push_back(group_name);
-    app_params.keep_context = Boolean(true);
-    app_params.steal_focus = Boolean(true);
-    app_params.default_hmi = HL_FULL;
-    app_params.priority = P_EMERGENCY;
-
-    t.policy_table.app_policies_section.apps.insert(
-        std::make_pair(app_id_1_, app_params));
-
-    const Json::Value overriden_table = t.ToJsonValue();
-
-    const std::string policy_table_key = "policy_table";
-    const std::string functional_groupings_key = "functional_groupings";
-    const std::string app_policies_key = "app_policies";
-
-    root[policy_table_key][functional_groupings_key] =
-        overriden_table[policy_table_key][functional_groupings_key];
-
-    root[policy_table_key][app_policies_key][app_id_1_] =
-        overriden_table[policy_table_key][app_policies_key][app_id_1_];
-
-    root[policy_table_key]["module_config"].removeMember("preloaded_pt");
-    root[policy_table_key]["module_config"].removeMember("preloaded_date");
-
-    json = root.toStyledString();
-  }
-  ifile.close();
-
-  return json;
-}
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
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
deleted file mode 100644
index c58ae00ff4..0000000000
--- a/src/components/policy/policy_external/test/policy_manager_impl_user_consent_test.cc
+++ /dev/null
@@ -1,675 +0,0 @@
-/*
- * Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gtest/gtest.h"
-
-#include "policy/policy_manager_impl_test_base.h"
-#include "utils/date_time.h"
-
-namespace test {
-namespace components {
-namespace policy_test {
-
-using ::testing::_;
-using ::testing::Return;
-
-// Tests that use device without Consent
-TEST_F(
-    PolicyManagerImplTest2,
-    AddApplication_AddNewApplicationFromDeviceWithConsent_ExpectUpdateRequired) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-
-  policy_manager_->SetUserConsentForDevice(device_id_1_, true);
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  EXPECT_EQ("UPDATE_NEEDED", policy_manager_->GetPolicyTableStatus());
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    AddApplication_AddNewApplicationFromDeviceWithoutConsent_ExpectUpToDate) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-
-  // To set UP_TO_DATE before registration
-  GetPTU(kValidSdlPtUpdateJson);
-
-  const date_time::TimeDuration current_time = date_time::getCurrentTime();
-  const int kSecondsInDay = 60 * 60 * 24;
-  const int days_after_epoch = date_time::getSecs(current_time) / kSecondsInDay;
-
-  policy_manager_->PTUpdatedAt(DAYS_AFTER_EPOCH, days_after_epoch);
-  policy_manager_->PTUpdatedAt(KILOMETERS, 1000);
-
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_1_))
-      .WillRepeatedly(Return(device_id_1_));
-
-  policy_manager_->SetUserConsentForDevice(device_id_1_, false);
-
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  EXPECT_EQ("UP_TO_DATE", policy_manager_->GetPolicyTableStatus());
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    ReactOnUserDevConsentForApp_AddNewApplicationFromDeviceWithoutConsent_ExpectPreDataConsent) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE(policy_manager_->IsPredataPolicy(app_id_1_));
-  policy_manager_->ReactOnUserDevConsentForApp(app_id_1_, false);
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_1_));
-}
-
-// Related to manual test APPLINK-18768
-TEST_F(PolicyManagerImplTest2,
-       CheckPreDataConsent_AppRegistered_ExpectReceivedRpcPermissionCorrect) {
-  // Arrange
-  CreateLocalPT(kSdlPreloadedPtJson2);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  policy_manager_->AddApplication(application_id_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-
-  // Expect RPCs from pre_dataConsent group are allowed
-  // Next checks are equal to BaseBeforeDataConsent_APIs.xml checks from task
-  CheckRpcPermissions("ListFiles", ::policy::kRpcAllowed);
-  CheckRpcPermissions("PutFile", ::policy::kRpcAllowed);
-  CheckRpcPermissions("SetAppIcon", ::policy::kRpcAllowed);
-  CheckRpcPermissions("SetGlobalProperties", ::policy::kRpcAllowed);
-  CheckRpcPermissions("ResetGlobalProperties", ::policy::kRpcAllowed);
-  CheckRpcPermissions("SetDisplayLayout", ::policy::kRpcAllowed);
-  CheckRpcPermissions("ListFiles", ::policy::kRpcAllowed);
-  CheckRpcPermissions("DeleteFile", ::policy::kRpcAllowed);
-
-  // Next checks are equal to NonBaseBeforeDataConsent_APIs.xml checks from task
-  CheckRpcPermissions("AddSubMenu", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("AddCommand", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("DeleteCommand", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("DeleteSubMenu", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("CreateInteractionChoiceSet", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("PerformInteraction", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("DeleteInteractionChoiceSet", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("Alert", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("Show", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("Speak", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("SetMediaClockTimer", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("SubscribeButton", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("UnsubscribeButton", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("PerformAudioPassThru", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("EndAudioPassThru", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("SubscribeVehicleData", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("UnsubscribeVehicleData", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("GetVehicleData", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("ReadDID", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("GetDTCs", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("ScrollableMessage", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("Slider", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("ShowConstantTBT", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("AlertManeuver", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("UpdateTurnList", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("SendLocation", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("GenericRequest", ::policy::kRpcDisallowed);
-  CheckRpcPermissions("DialNumber", ::policy::kRpcDisallowed);
-}
-
-// Related to manual tests APPLINK-18763, APPLINK-18764
-TEST_F(PolicyManagerImplTest2, CheckPreDataConsent_GetDefaultHmiLevel_NONE) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  std::string default_hmi;
-  // Default HMI level is NONE
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi);
-  EXPECT_EQ("NONE", default_hmi);
-
-  // Default priority level is NONE
-  std::string priority1;
-  EXPECT_TRUE(policy_manager_->GetPriority(app_id_2_, &priority1));
-  EXPECT_EQ("NONE", priority1);
-}
-
-// Related to manual tests APPLINK-18763, APPLINK-18764
-TEST_F(PolicyManagerImplTest2,
-       CheckPreDataConsent_GetDefaultHmiLevel_BACKGROUNG) {
-  // Arrange
-  CreateLocalPT(kSdlPreloadedPtJson2);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  std::string default_hmi;
-  // Default HMI level is BACKGROUND
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi);
-  EXPECT_EQ("BACKGROUND", default_hmi);
-  // Default priority level is EMERGENCY
-  std::string priority1;
-  EXPECT_TRUE(policy_manager_->GetPriority(app_id_2_, &priority1));
-  EXPECT_EQ("EMERGENCY", priority1);
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    ReactOnUserDevConsentForApp_AddNewApplicationFromDeviceWithConsent_ExpectDefault) {
-  // Arrange
-  // RequestTypes for default & preDataConsent are different
-  CreateLocalPT("json/ptu_requestType.json");
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE(policy_manager_->IsPredataPolicy(app_id_1_));
-  policy_manager_->ReactOnUserDevConsentForApp(app_id_1_, true);
-  EXPECT_FALSE(policy_manager_->IsPredataPolicy(app_id_1_));
-  // Expect app_id_1_ has default policy
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_1_));
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    ReactOnUserDevConsentForApp_AddNewApplicationFromDeviceWithConsent_ExpectPreDataConsent) {
-  // Arrange
-  // RequestTypes for default & preDataConsent are the same
-  CreateLocalPT(kPtu2RequestTypeJson);
-  policy_manager_->AddApplication(app_id_1_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE(policy_manager_->IsPredataPolicy(app_id_1_));
-  EXPECT_CALL(listener_, OnPendingPermissionChange(app_id_1_)).Times(0);
-  policy_manager_->ReactOnUserDevConsentForApp(app_id_1_, true);
-  EXPECT_FALSE(policy_manager_->IsPredataPolicy(app_id_1_));
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_1_));
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    GetUserConsentForDevice_SetDeviceWithoutConcent_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceHasNoConsent, consent);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetUserConsentForDevice_SetDeviceAllowed_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    GetUserConsentForDevice_SetDeviceDisallowed_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  policy_manager_->SetUserConsentForDevice(device_id_2_, false);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceDisallowed, consent);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetDefaultHmi_SetDeviceDisallowed_ExpectReceivedHmiCorrect) {
-  // Arrange
-  CreateLocalPT(kPtu2RequestTypeJson);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  policy_manager_->SetUserConsentForDevice(device_id_2_, false);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceDisallowed, consent);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  std::string default_hmi;
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi);
-  EXPECT_EQ("NONE", default_hmi);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetDefaultHmi_SetDeviceAllowed_ExpectReceivedHmiCorrect) {
-  // Arrange
-  CreateLocalPT(kPtu2RequestTypeJson);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_2_));
-  std::string default_hmi1;
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi1);
-  EXPECT_EQ("NONE", default_hmi1);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_2_));
-  std::string default_hmi2;
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi2);
-  EXPECT_EQ("LIMITED", default_hmi2);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetDefaultPriority_SetDeviceAllowed_ExpectReceivedPriorityCorrect) {
-  // Arrange
-  CreateLocalPT(kPtu2RequestTypeJson);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_2_));
-  std::string priority1;
-  EXPECT_TRUE(policy_manager_->GetPriority(app_id_2_, &priority1));
-  EXPECT_EQ("NONE", priority1);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_2_));
-  std::string priority2;
-  EXPECT_TRUE(policy_manager_->GetPriority(app_id_2_, &priority2));
-  EXPECT_EQ("EMERGENCY", priority2);
-}
-
-TEST_F(PolicyManagerImplTest2,
-       GetUserFirendlyMessages_ExpectReceivedCorrectMessages) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ::policy::StringArray message_code;
-  message_code.push_back("SettingEnableUpdates");
-  message_code.push_back("AppPermissions");
-  const std::string language = "en-us";
-  const std::string active_hmi_language = language;
-  std::vector< ::policy::UserFriendlyMessage> result =
-      policy_manager_->GetUserFriendlyMessages(
-          message_code, language, active_hmi_language);
-  uint32_t size = result.size();
-  EXPECT_GT(size, 0u);
-  std::vector< ::policy::UserFriendlyMessage>::iterator result_iter;
-  std::shared_ptr<policy_table::Table> pt =
-      (policy_manager_->GetCache())->GetPT();
-
-  policy_table::ConsumerFriendlyMessages& consumer_friendly_messages =
-      *(pt->policy_table.consumer_friendly_messages);
-  policy_table::Messages& Messages = *(consumer_friendly_messages.messages);
-
-  policy_table::Messages::const_iterator messages_iter = Messages.begin();
-  // Loop until end of messages
-  for (; messages_iter != Messages.end(); ++messages_iter) {
-    if (messages_iter->first == "AppPermissions") {
-      for (result_iter = result.begin(); result_iter != result.end();
-           ++result_iter) {
-        if (result_iter->message_code == "AppPermissions") {
-          const policy_table::MessageLanguages& MessageLanguages =
-              messages_iter->second;
-          const policy_table::Languages& Languages = MessageLanguages.languages;
-          policy_table::Languages::const_iterator languages_iter =
-              Languages.find("en-us");
-          // If necessary language found
-          if (languages_iter != Languages.end()) {
-            const policy_table::MessageString& MessageString =
-                languages_iter->second;
-            EXPECT_EQ(static_cast<std::string>(*(MessageString.line1)),
-                      result_iter->line1);
-            EXPECT_EQ(static_cast<std::string>(*(MessageString.line2)),
-                      result_iter->line2);
-            EXPECT_EQ(static_cast<std::string>(*(MessageString.tts)),
-                      result_iter->tts);
-            EXPECT_EQ(static_cast<std::string>(*(MessageString.label)),
-                      result_iter->label);
-            EXPECT_EQ(static_cast<std::string>(*(MessageString.textBody)),
-                      result_iter->text_body);
-          }
-        }
-      }
-    } else if (messages_iter->first == "SettingEnableUpdates") {
-      for (result_iter = result.begin(); result_iter != result.end();
-           ++result_iter) {
-        if (result_iter->message_code == "SettingEnableUpdates") {
-          const policy_table::MessageLanguages& MessageLanguages =
-              messages_iter->second;
-          const policy_table::Languages& Languages = MessageLanguages.languages;
-          policy_table::Languages::const_iterator languages_iter =
-              Languages.find("en-us");
-          // If necessary language found
-          if (languages_iter != Languages.end()) {
-            const policy_table::MessageString& MessageString2 =
-                languages_iter->second;
-            EXPECT_EQ(static_cast<std::string>(*(MessageString2.line1)),
-                      result_iter->line1);
-          }
-        }
-      }
-    }
-  }
-}
-
-TEST_F(PolicyManagerImplTest2, SetDeviceInfo_ExpectDevInfoAddedToPT) {
-  // Arrange
-  ::policy::DeviceInfo dev_info;
-  std::shared_ptr<policy_table::Table> pt =
-      (policy_manager_->GetCache())->GetPT();
-  dev_info.hardware = "hardware IPX";
-  dev_info.firmware_rev = "v.8.0.1";
-  dev_info.os = "Android";
-  dev_info.os_ver = "4.4.2";
-  dev_info.carrier = "Life";
-  dev_info.max_number_rfcom_ports = 2;
-  dev_info.connection_type = "Bluetooth";
-  policy_manager_->AddDevice(device_id_1_, "Bluetooth");
-  policy_manager_->SetDeviceInfo(device_id_1_, dev_info);
-  // Find device in PT
-  policy_table::DeviceData::const_iterator iter =
-      (*(pt->policy_table.device_data)).find(device_id_1_);
-  // Checks
-  ASSERT_TRUE(iter != (*(pt->policy_table.device_data)).end());
-  EXPECT_EQ(static_cast<std::string>(*(*iter).second.hardware),
-            dev_info.hardware);
-  EXPECT_EQ(static_cast<std::string>(*(*iter).second.firmware_rev),
-            dev_info.firmware_rev);
-  EXPECT_EQ(static_cast<std::string>(*(*iter).second.os), dev_info.os);
-  EXPECT_EQ(static_cast<std::string>(*(*iter).second.os_version),
-            dev_info.os_ver);
-  EXPECT_EQ(static_cast<std::string>(*(*iter).second.carrier),
-            dev_info.carrier);
-  EXPECT_EQ(static_cast<std::string>(*(*iter).second.connection_type),
-            dev_info.connection_type);
-  EXPECT_EQ(static_cast<uint8_t>(*(*iter).second.max_number_rfcom_ports),
-            dev_info.max_number_rfcom_ports);
-}
-
-TEST_F(PolicyManagerImplTest2, GetInitialAppData_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ::policy::StringArray app_nicknames;
-  ::policy::StringArray app_hmi_types;
-  policy_manager_->GetInitialAppData(app_id_2_, &app_nicknames, &app_hmi_types);
-  // Expect Empty nicknames and AppHmiTypes
-  EXPECT_EQ(0u, app_nicknames.size());
-  EXPECT_EQ(0u, app_hmi_types.size());
-
-  Json::Value root = GetPTU(kValidSdlPtUpdateJson);
-
-  Json::Value appHmiTypes = Json::Value(Json::arrayValue);
-  appHmiTypes = root["policy_table"]["app_policies"][app_id_2_]["AppHMIType"];
-  const uint32_t appHmiType_size = appHmiTypes.size();
-
-  Json::Value appNicknames = Json::Value(Json::arrayValue);
-  appNicknames = root["policy_table"]["app_policies"][app_id_2_]["nicknames"];
-  const uint32_t appNicknames_size = appNicknames.size();
-
-  ::policy::StringArray app_nicknames1;
-  ::policy::StringArray app_hmi_types1;
-  policy_manager_->GetInitialAppData(
-      app_id_2_, &app_nicknames1, &app_hmi_types1);
-  const uint32_t nick_names_size = app_nicknames1.size();
-  const uint32_t app_hmi_types_size = app_hmi_types1.size();
-  ASSERT_EQ(appHmiType_size, app_hmi_types_size);
-  ASSERT_EQ(appNicknames_size, nick_names_size);
-  ASSERT_GT(nick_names_size, 0u);
-  ASSERT_GT(app_hmi_types_size, 0u);
-  // Check nicknames match
-  for (uint32_t i = 0; i < nick_names_size; ++i) {
-    EXPECT_EQ(app_nicknames1[i], appNicknames[i].asString());
-  }
-  // Check AppHmiTypes match
-  for (uint32_t i = 0; i < app_hmi_types_size; ++i) {
-    EXPECT_EQ(app_hmi_types1[i], appHmiTypes[i].asString());
-  }
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    CanAppKeepContext_AddAppFromUnconsentedDevice_ExpectAppCannotKeepContext) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_2_));
-  // Check keep context in preData policy
-  EXPECT_FALSE(policy_manager_->CanAppKeepContext(app_id_2_));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CanAppKeepContext_AddAppFromConsentedDevice_ExpectAppCannotKeepContext) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_2_));
-  // Check keep context in default policy
-  EXPECT_FALSE(policy_manager_->CanAppKeepContext(app_id_2_));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CanAppStealFocus_AddAppFromUnconsentedDevice_ExpectAppCannotStealFocus) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_2_));
-  // Check keep context in preData policy
-  EXPECT_FALSE(policy_manager_->CanAppStealFocus(app_id_2_));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       CanAppStealFocus_AddAppFromConsentedDevice_ExpectAppCannotStealFocus) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_2_));
-  // Check keep context in default policy
-  EXPECT_FALSE(policy_manager_->CanAppStealFocus(app_id_2_));
-}
-
-TEST_F(PolicyManagerImplTest2,
-       IsPredataPolicy_SetAppWIthPredataPolicy_ExpectPredataPolicy) {
-  // Arrange
-  CreateLocalPT(preloaded_pt_filename_);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_2_));
-}
-
-TEST_F(
-    PolicyManagerImplTest2,
-    SendNotificationOnPermissionsUpdated_SetDeviceAllowed_ExpectNotificationSent) {
-  // Arrange
-  CreateLocalPT(kPtu2RequestTypeJson);
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_TRUE(policy_manager_->IsPredataPolicy(app_id_2_));
-  std::string default_hmi1;
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi1);
-  EXPECT_EQ("NONE", default_hmi1);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillOnce(Return(""));
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_2_, _, default_hmi1))
-      .Times(0);
-  policy_manager_->SendNotificationOnPermissionsUpdated(app_id_2_);
-
-  ASSERT_TRUE(
-      (policy_manager_->GetCache())->AddDevice(device_id_2_, "Bluetooth"));
-  ASSERT_TRUE((policy_manager_->GetCache())
-                  ->SetDeviceData(device_id_2_,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  policy_manager_->SetUserConsentForDevice(device_id_2_, true);
-  ::policy::DeviceConsent consent =
-      policy_manager_->GetUserConsentForDevice(device_id_2_);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener_, OnCurrentDeviceIdUpdateRequired(app_id_2_))
-      .WillRepeatedly(Return(device_id_2_));
-  policy_manager_->AddApplication(app_id_2_,
-                                  HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((policy_manager_->GetCache())->IsDefaultPolicy(app_id_2_));
-  std::string default_hmi2;
-  policy_manager_->GetDefaultHmi(app_id_2_, &default_hmi2);
-  EXPECT_EQ("LIMITED", default_hmi2);
-  EXPECT_CALL(listener_, OnPermissionsUpdated(app_id_2_, _, default_hmi2));
-  policy_manager_->SendNotificationOnPermissionsUpdated(app_id_2_);
-}
-
-}  // namespace policy_test
-}  // namespace components
-}  // namespace test
diff --git a/src/components/policy/policy_external/test/sql_pt_ext_representation_storage_test.cc b/src/components/policy/policy_external/test/sql_pt_ext_representation_storage_test.cc
new file mode 100644
index 0000000000..1ceb5ea1ef
--- /dev/null
+++ b/src/components/policy/policy_external/test/sql_pt_ext_representation_storage_test.cc
@@ -0,0 +1,126 @@
+/* Copyright (c) 2018, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "policy/sql_pt_ext_representation.h"
+
+#include <string>
+
+#include "gtest/gtest.h"
+
+#include "policy/mock_policy_settings.h"
+#include "sqlite_wrapper/sql_query.h"
+#include "utils/file_system.h"
+#include "utils/make_shared.h"
+#include "utils/shared_ptr.h"
+
+using namespace ::policy;
+
+using testing::NiceMock;
+using testing::ReturnRef;
+
+namespace test {
+namespace components {
+namespace policy_test {
+
+class SQLPTExtRepresentationStorageTest : public ::testing::Test {
+ public:
+  SQLPTExtRepresentationStorageTest() : reps_(NULL) {}
+
+ protected:
+  const std::string kAppStorageFolder =
+      "storage_SQLPTExtRepresentationStorageTest";
+
+  std::shared_ptr<SQLPTExtRepresentation> reps_;
+  std::shared_ptr<NiceMock<policy_handler_test::MockPolicySettings> >
+      policy_settings_;
+  std::shared_ptr<utils::dbms::SQLQuery> query_wrapper_;
+
+  void SetUp() OVERRIDE {
+    file_system::CreateDirectory(kAppStorageFolder);
+
+    reps_ = std::make_shared<SQLPTExtRepresentation>();
+    ASSERT_TRUE(reps_ != NULL);
+
+    policy_settings_ =
+        std::make_shared<NiceMock<policy_handler_test::MockPolicySettings> >();
+    ON_CALL(*policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
+    ASSERT_EQ(SUCCESS, reps_->Init(policy_settings_.get()));
+
+    query_wrapper_ = std::make_shared<utils::dbms::SQLQuery>(reps_->db());
+    ASSERT_TRUE(query_wrapper_ != NULL);
+  }
+
+  void TearDown() OVERRIDE {
+    EXPECT_TRUE(reps_->Drop());
+    EXPECT_TRUE(reps_->Close());
+
+    file_system::remove_directory_content(kAppStorageFolder);
+    file_system::RemoveDirectory(kAppStorageFolder, true);
+  }
+};
+
+TEST_F(
+    SQLPTExtRepresentationStorageTest,
+    CanAppKeepContext_InsertKeepContext_ExpectValuesThatSetInKeepContextParams) {
+  // Arrange
+  const std::string query_delete = "DELETE FROM `application`; ";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_delete));
+
+  // Act
+  const std::string value_12345 = "12345";
+  const std::string query_insert_12345 =
+      "INSERT INTO `application` (`id`, `memory_kb`,"
+      " `heart_beat_timeout_ms`, `keep_context`) VALUES ('" +
+      value_12345 + "', 5, 10, 1)";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_12345));
+  EXPECT_FALSE(reps_->CanAppKeepContext("0"));
+  EXPECT_TRUE(reps_->CanAppKeepContext(value_12345));
+
+  // Act
+  const std::string value_123 = "123";
+  const std::string query_insert_123 =
+      "INSERT INTO `application` (`id`, `memory_kb`,"
+      " `heart_beat_timeout_ms`, `keep_context`) VALUES ('" +
+      value_123 + "', 10, 7, 0)";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_123));
+  EXPECT_FALSE(reps_->CanAppKeepContext(value_123));
+}
+
+}  // namespace policy_test
+}  // namespace components
+}  // namespace test
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 a9c7667ba6..ce51682f3c 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
@@ -65,32 +65,24 @@ class SQLPTExtRepresentationTest : public ::testing::Test {
   SQLPTExtRepresentationTest() : reps_(NULL) {}
 
  protected:
-  SQLPTExtRepresentation* reps_;
+  std::shared_ptr<SQLPTExtRepresentation> reps_;
   policy_handler_test::MockPolicySettings policy_settings_;
-  static const string kDatabaseName;
   PermissionConsent perm_consent;
   FunctionalGroupPermission group1_perm;
   FunctionalGroupPermission group2_perm;
-  utils::dbms::SQLQuery* query_wrapper_;
-  static const bool in_memory_;
-  const std::string kAppStorageFolder = "storage_SQLPTExtRepresentationTest";
+  std::shared_ptr<utils::dbms::SQLQuery> query_wrapper_;
 
   void SetUp() OVERRIDE {
-    file_system::DeleteFile(kDatabaseName);
-    reps_ = new SQLPTExtRepresentation(in_memory_);
+    reps_ = std::make_shared<SQLPTExtRepresentation>(true);
     ASSERT_TRUE(reps_ != NULL);
-    ON_CALL(policy_settings_, app_storage_folder())
-        .WillByDefault(ReturnRef(kAppStorageFolder));
     ASSERT_EQ(SUCCESS, reps_->Init(&policy_settings_));
-    query_wrapper_ = new utils::dbms::SQLQuery(reps_->db());
+    query_wrapper_ = std::make_shared<utils::dbms::SQLQuery>(reps_->db());
     ASSERT_TRUE(query_wrapper_ != NULL);
   }
 
   void TearDown() OVERRIDE {
-    delete query_wrapper_;
     EXPECT_TRUE(reps_->Drop());
     EXPECT_TRUE(reps_->Close());
-    delete reps_;
   }
 
   void FillGroupPermission(
@@ -261,9 +253,6 @@ SQLPTExtRepresentationTest::GetDataInternal(
   return table.policy_table.functional_groupings;
 }
 
-const string SQLPTExtRepresentationTest::kDatabaseName = ":memory:";
-const bool SQLPTExtRepresentationTest::in_memory_ = true;
-
 ::testing::AssertionResult IsValid(const policy_table::Table& table) {
   if (table.is_valid()) {
     return ::testing::AssertionSuccess();
@@ -1541,8 +1530,8 @@ TEST_F(SQLPTExtRepresentationTest, SaveFunctionalGroupings_ExpectedSaved) {
 
   const HmiLevel test_level_1 = HL_FULL;
   const HmiLevel test_level_2 = HL_LIMITED;
-  const policy_table::Parameter test_parameter_1 = P_GPS;
-  const policy_table::Parameter test_parameter_2 = P_SPEED;
+  const std::string test_parameter_1 = "P_GPS";
+  const std::string test_parameter_2 = "P_SPEED";
 
   Rpcs rpcs;
 
@@ -1578,7 +1567,7 @@ TEST_F(SQLPTExtRepresentationTest, SaveFunctionalGroupings_ExpectedSaved) {
   *another_rpcs.user_consent_prompt = another_user_consent_prompt;
 
   const HmiLevel test_level_3 = HL_BACKGROUND;
-  const policy_table::Parameter test_parameter_3 = P_BELTSTATUS;
+  const std::string test_parameter_3 = "P_BELTSTATUS";
 
   RpcParameters another_parameters;
   another_parameters.hmi_levels.push_back(test_level_3);
@@ -1615,10 +1604,10 @@ TEST_F(SQLPTExtRepresentationTest, SaveFunctionalGroupings_ExpectedSaved) {
   EXPECT_TRUE(
       (IsKeyExist<HmiLevels>(loaded_parameters.hmi_levels, test_level_2)));
 
-  EXPECT_TRUE((
-      IsKeyExist<Parameters>(*loaded_parameters.parameters, test_parameter_1)));
-  EXPECT_TRUE((
-      IsKeyExist<Parameters>(*loaded_parameters.parameters, test_parameter_2)));
+  EXPECT_TRUE((IsKeyExist<Parameters, std::string>(
+      *loaded_parameters.parameters, test_parameter_1)));
+  EXPECT_TRUE((IsKeyExist<Parameters, std::string>(
+      *loaded_parameters.parameters, test_parameter_2)));
 
   Rpcs another_loaded_rpcs = GetKeyData<FunctionalGroupings, Rpcs>(
       loaded_groupings, another_group_name);
@@ -1637,8 +1626,8 @@ TEST_F(SQLPTExtRepresentationTest, SaveFunctionalGroupings_ExpectedSaved) {
   EXPECT_TRUE((IsKeyExist<HmiLevels>(another_loaded_parameters.hmi_levels,
                                      test_level_3)));
 
-  EXPECT_TRUE((IsKeyExist<Parameters>(*another_loaded_parameters.parameters,
-                                      test_parameter_3)));
+  EXPECT_TRUE((IsKeyExist<Parameters, std::string>(
+      *another_loaded_parameters.parameters, test_parameter_3)));
 }
 
 TEST_F(SQLPTExtRepresentationTest, JsonContentsExternalConsent_ExpectParsed) {
diff --git a/src/components/policy/policy_external/test/sql_pt_representation_storage_test.cc b/src/components/policy/policy_external/test/sql_pt_representation_storage_test.cc
new file mode 100644
index 0000000000..7214ecba81
--- /dev/null
+++ b/src/components/policy/policy_external/test/sql_pt_representation_storage_test.cc
@@ -0,0 +1,129 @@
+/* Copyright (c) 2018, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "policy/sql_pt_representation.h"
+
+#include <memory>
+#include <string>
+
+#include "gtest/gtest.h"
+
+#include "policy/mock_policy_settings.h"
+#include "policy/sql_wrapper.h"
+#include "utils/file_system.h"
+
+using testing::NiceMock;
+using testing::ReturnRef;
+
+namespace test {
+namespace components {
+namespace policy_test {
+
+class SQLPTRepresentationStorageTest : public ::testing::Test {
+ protected:
+  const std::string kAppStorageFolder =
+      "storage_SQLPTRepresentationStorageTest";
+
+  std::shared_ptr<policy::SQLPTRepresentation> reps;
+  std::shared_ptr<utils::dbms::SQLQuery> query_wrapper_;
+  std::shared_ptr<policy_handler_test::MockPolicySettings> policy_settings_;
+
+  void SetUp() {
+    file_system::CreateDirectory(kAppStorageFolder);
+
+    reps = std::make_shared<policy::SQLPTRepresentation>();
+    ASSERT_TRUE(reps != NULL);
+
+    policy_settings_ =
+        std::make_shared<NiceMock<policy_handler_test::MockPolicySettings> >();
+    ON_CALL(*policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
+    EXPECT_EQ(::policy::SUCCESS, reps->Init(policy_settings_.get()));
+
+    query_wrapper_ = std::make_shared<utils::dbms::SQLQuery>(reps->db());
+    ASSERT_TRUE(query_wrapper_ != NULL);
+  }
+
+  void TearDown() OVERRIDE {
+    EXPECT_TRUE(reps->Drop());
+    EXPECT_TRUE(reps->Close());
+    reps->RemoveDB();
+
+    file_system::remove_directory_content(kAppStorageFolder);
+    file_system::RemoveDirectory(kAppStorageFolder, true);
+  }
+};
+
+TEST_F(
+    SQLPTRepresentationStorageTest,
+    CheckPermissionsAllowed_SetValuesInAppGroupRpcFunctionalGroup_GetEqualParamsInCheckPermissionResult) {
+  // Arrange
+  const std::string value_12345 = "12345";
+  const std::string gps = "gps";
+  const std::string speed = "speed";
+  const std::string query =
+      "INSERT OR REPLACE INTO `application` (`id`, `memory_kb`,"
+      " `heart_beat_timeout_ms`) VALUES ('" +
+      value_12345 +
+      "', 5, 10); "
+      "INSERT OR REPLACE INTO functional_group (`id`, `name`)"
+      "  VALUES (1, 'Base-4'); "
+      "INSERT OR REPLACE INTO `app_group` (`application_id`,"
+      " `functional_group_id`) VALUES ('" +
+      value_12345 +
+      "', 1); "
+      "INSERT OR REPLACE INTO `rpc` (`name`, `parameter`, `hmi_level_value`,"
+      " `functional_group_id`) VALUES ('Update', '" +
+      gps +
+      "', 'FULL', 1); "
+      "INSERT OR REPLACE INTO `rpc` (`name`, `parameter`, `hmi_level_value`,"
+      " `functional_group_id`) VALUES ('Update', '" +
+      speed + "', 'FULL', 1);";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query));
+
+  // Act
+  policy::CheckPermissionResult ret;
+  reps->CheckPermissions(value_12345, "FULL", "Update", ret);
+
+  // Assert
+  EXPECT_TRUE(ret.hmi_level_permitted == ::policy::kRpcAllowed);
+  ASSERT_EQ(2u, ret.list_of_allowed_params.size());
+  EXPECT_TRUE(ret.list_of_allowed_params.end() !=
+              ret.list_of_allowed_params.find(gps));
+  EXPECT_TRUE(ret.list_of_allowed_params.end() !=
+              ret.list_of_allowed_params.find(speed));
+}
+
+}  // namespace policy_test
+}  // namespace components
+}  // namespace test
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 9e6e18b77d..2cb5ec1aaf 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
@@ -66,33 +66,22 @@ namespace test {
 namespace components {
 namespace policy_test {
 
-namespace {
-const int32_t kPolicyTablesNumber = 27;
-}
-
 class SQLPTRepresentationTest : public SQLPTRepresentation,
                                 public ::testing::Test {
- public:
-  static const bool in_memory_;
-
  protected:
-  static SQLPTRepresentation* reps;
-  static const std::string kDatabaseName;
-  static utils::dbms::SQLQuery* query_wrapper_;
+  static std::shared_ptr<SQLPTRepresentation> reps;
+  static std::shared_ptr<utils::dbms::SQLQuery> query_wrapper_;
   // Gtest can show message that this object doesn't destroyed
-  static std::unique_ptr<policy_handler_test::MockPolicySettings>
+  static std::shared_ptr<policy_handler_test::MockPolicySettings>
       policy_settings_;
 
   static void SetUpTestCase() {
-    const std::string kAppStorageFolder = "storage_SQLPTRepresentationTest";
-    reps = new SQLPTRepresentation(in_memory_);
+    reps = std::make_shared<SQLPTRepresentation>(true);
     ASSERT_TRUE(reps != NULL);
-    policy_settings_ = std::unique_ptr<policy_handler_test::MockPolicySettings>(
-        new policy_handler_test::MockPolicySettings());
-    ON_CALL(*policy_settings_, app_storage_folder())
-        .WillByDefault(ReturnRef(kAppStorageFolder));
+    policy_settings_ =
+        std::make_shared<policy_handler_test::MockPolicySettings>();
     EXPECT_EQ(::policy::SUCCESS, reps->Init(policy_settings_.get()));
-    query_wrapper_ = new utils::dbms::SQLQuery(reps->db());
+    query_wrapper_ = std::make_shared<utils::dbms::SQLQuery>(reps->db());
     ASSERT_TRUE(query_wrapper_ != NULL);
   }
 
@@ -101,12 +90,9 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
   }
 
   static void TearDownTestCase() {
-    delete query_wrapper_;
     EXPECT_TRUE(reps->Drop());
     EXPECT_TRUE(reps->Close());
     reps->RemoveDB();
-    delete reps;
-    policy_settings_.reset();
   }
 
   virtual utils::dbms::SQLDatabase* db() const {
@@ -176,7 +162,7 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
       policy_table::Strings& temp_groups = apps_iter->second.groups;
       StringsCompare(groups, temp_groups);
       EXPECT_EQ(0u, (*(apps_iter->second.nicknames)).size());
-      EXPECT_EQ(prio, apps_iter->second.priority);
+      EXPECT_EQ(prio, (apps_iter->second).priority);
       EXPECT_EQ(0u, (*(apps_iter->second.AppHMIType)).size());
       EXPECT_EQ(memory_kb, (*(apps_iter->second.memory_kb)));
       EXPECT_EQ(heart_beat_timeout_ms,
@@ -343,16 +329,15 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
   }
 };
 
-SQLPTRepresentation* SQLPTRepresentationTest::reps = 0;
-utils::dbms::SQLQuery* SQLPTRepresentationTest::query_wrapper_ = 0;
-const std::string SQLPTRepresentationTest::kDatabaseName = ":memory:";
-const bool SQLPTRepresentationTest::in_memory_ = true;
-std::unique_ptr<policy_handler_test::MockPolicySettings>
-    SQLPTRepresentationTest::policy_settings_;
+std::shared_ptr<SQLPTRepresentation> SQLPTRepresentationTest::reps = NULL;
+std::shared_ptr<utils::dbms::SQLQuery> SQLPTRepresentationTest::query_wrapper_ =
+    NULL;
+std::shared_ptr<policy_handler_test::MockPolicySettings>
+    SQLPTRepresentationTest::policy_settings_ = NULL;
 
 class SQLPTRepresentationTest2 : public ::testing::Test {
  protected:
-  SQLPTRepresentation* reps;
+  std::shared_ptr<SQLPTRepresentation> reps;
   NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
   virtual void SetUp() OVERRIDE {
     file_system::CreateDirectory(kAppStorageFolder);
@@ -363,19 +348,113 @@ class SQLPTRepresentationTest2 : public ::testing::Test {
         .WillByDefault(Return(kOpenAttemptTimeoutMs));
     ON_CALL(policy_settings_, attempts_to_open_policy_db())
         .WillByDefault(Return(kAttemptsToOpenPolicyDB));
-    reps = new SQLPTRepresentation;
+    reps = std::make_shared<SQLPTRepresentation>();
     ASSERT_TRUE(reps != NULL);
   }
 
   virtual void TearDown() OVERRIDE {
+    chmod(kAppStorageFolder.c_str(), 755);
     file_system::RemoveDirectory(kAppStorageFolder, true);
-    delete reps;
+    reps.reset();
   }
   const std::string kAppStorageFolder = "storage123";
   const uint16_t kOpenAttemptTimeoutMs = 70u;
   const uint16_t kAttemptsToOpenPolicyDB = 2u;
 };
 
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Store_Item) {
+  policy_table::VehicleDataItem rpm;
+  rpm.mark_initialized();
+  rpm.name = "rpm";
+  rpm.type = "Integer";
+  rpm.key = "OEM_REF_RPM";
+  rpm.mandatory = false;
+  *rpm.array = false;
+  rpm.params->mark_initialized();
+  ASSERT_FALSE(reps->VehicleDataItemExists(rpm));
+  ASSERT_TRUE(reps->InsertVehicleDataItem(rpm));
+  ASSERT_TRUE(reps->VehicleDataItemExists(rpm));
+
+  auto rpm_retrieved = reps->GetVehicleDataItem(rpm.name, rpm.key);
+
+  std::cout << rpm.ToJsonValue().toStyledString() << std::endl;
+  std::cout << rpm_retrieved.ToJsonValue().toStyledString() << std::endl;
+
+  ASSERT_EQ(rpm.ToJsonValue(), rpm_retrieved.begin()->ToJsonValue());
+}
+
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Store_Complete_Item) {
+  policy_table::VehicleDataItem message;
+  message.name = "messsageName";
+  message.type = "String";
+  message.key = "OEM_REF_MSG";
+  message.mandatory = false;
+  *message.array = false;
+  *message.since = "1.0";
+  *message.until = "5.0";
+  *message.removed = false;
+  *message.deprecated = false;
+  *message.minvalue = 0;
+  *message.maxvalue = 255;
+  *message.minsize = 0;
+  *message.maxsize = 255;
+  *message.minlength = 0;
+  *message.maxlength = 255;
+  message.params->mark_initialized();
+  ASSERT_TRUE(reps->InsertVehicleDataItem(message));
+
+  auto message_retrieved = reps->GetVehicleDataItem(message.name, message.key);
+  ASSERT_EQ(message.ToJsonValue(), message_retrieved.begin()->ToJsonValue());
+}
+
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Store_Struct) {
+  policy_table::VehicleDataItem alss;
+  alss.mark_initialized();
+  alss.name = "ambientLightSensorStatus";
+  alss.type = "AmbientLightStatus";
+  alss.key = "OEM_REF_AMB_LIGHT";
+  alss.mandatory = false;
+  alss.params->mark_initialized();
+  policy_table::VehicleDataItem lss;
+  lss.mark_initialized();
+  lss.name = "LightSensorStatus";
+  lss.type = "Struct";
+  lss.key = "OEM_REF_SEN_LIGHT";
+  lss.mandatory = false;
+  lss.params->mark_initialized();
+  (*lss.params).push_back(alss);
+
+  policy_table::VehicleDataItem hbo;
+  hbo.mark_initialized();
+  hbo.name = "highBeamsOn";
+  hbo.type = "Boolean";
+  hbo.key = "OEM_REF_HIGH_BEAM";
+  hbo.mandatory = true;
+  hbo.params->mark_initialized();
+  policy_table::VehicleDataItem lbo;
+  lbo.mark_initialized();
+  lbo.name = "lowBeamsOn";
+  lbo.type = "Boolean";
+  lbo.key = "OEM_REF_LOW_BEAM";
+  lbo.mandatory = false;
+  lbo.params->mark_initialized();
+  policy_table::VehicleDataItem hls;
+  hls.mark_initialized();
+  hls.name = "headLampStatus";
+  hls.type = "Struct";
+  hls.key = "OEM_REF_HLSTATUS";
+  hls.mandatory = false;
+  hls.params->mark_initialized();
+  (*hls.params).push_back(lss);
+  (*hls.params).push_back(lbo);
+  (*hls.params).push_back(hbo);
+  ASSERT_TRUE(reps->InsertVehicleDataItem(alss));
+  ASSERT_TRUE(reps->InsertVehicleDataItem(hls));
+
+  auto hls_retrieved = reps->GetVehicleDataItem(hls.name, hls.key);
+  ASSERT_EQ(hls.ToJsonValue(), hls_retrieved.begin()->ToJsonValue());
+}
+
 TEST_F(SQLPTRepresentationTest2,
        CheckActualAttemptsToOpenDB_ExpectCorrectNumber) {
   EXPECT_EQ(::policy::FAIL, reps->Init(&policy_settings_));
@@ -406,8 +485,8 @@ TEST_F(SQLPTRepresentationTest,
   query.Prepare(query_select);
   query.Next();
 
-  // 37 - is current total tables number created by schema
-  const int policy_tables_number = 37;
+  // 41 - is current total tables number created by schema
+  const int policy_tables_number = 41;
   ASSERT_EQ(policy_tables_number, query.GetInteger(0));
 
   const std::string query_select_count_of_iap_buffer_full =
@@ -965,25 +1044,6 @@ TEST_F(
   ASSERT_EQ(0, query.GetInteger(0));
 }
 
-TEST_F(
-    SQLPTRepresentationTest,
-    GetVehicleInfo_ManuallySetVehcleInfoThenCallGetVehicleInfo_ExpectValuesReceived) {
-  // Check
-  const std::string query_insert_module_config =
-      "UPDATE `module_config` SET `preloaded_pt` = 1, "
-      " `exchange_after_x_ignition_cycles` = 50,"
-      "  `exchange_after_x_kilometers` = 2000, `exchange_after_x_days` = 30,"
-      " `timeout_after_x_seconds` = 5, `vehicle_make` = 'FORD', "
-      "  `vehicle_model` = 'MUSTANG', `vehicle_year` = '2003', "
-      "`preloaded_date` = '25.04.2015'";
-  ASSERT_TRUE(query_wrapper_->Exec(query_insert_module_config));
-  VehicleInfo info = reps->GetVehicleInfo();
-
-  ASSERT_EQ("FORD", info.vehicle_make);
-  ASSERT_EQ("MUSTANG", info.vehicle_model);
-  ASSERT_EQ("2003", info.vehicle_year);
-}
-
 TEST_F(SQLPTRepresentationTest,
        GetUserFriendlyMsg_SetMsg_ExpectReceivedMsgSetInParams) {
   // Arrange
@@ -1079,17 +1139,11 @@ TEST_F(SQLPTRepresentationTest,
   EXPECT_EQ("EMERGENCY", priority);
 }
 
-namespace {
-const std::string kAppStorageFolder = "storage";
-}
 TEST(SQLPTRepresentationTest3, Init_InitNewDataBase_ExpectResultSuccess) {
   // Arrange
-  const bool in_memory_ = true;
   NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
-  SQLPTRepresentation reps(in_memory_);
+  SQLPTRepresentation reps(true);
   // Checks
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(kAppStorageFolder));
   EXPECT_EQ(::policy::SUCCESS, reps.Init(&policy_settings_));
   EXPECT_EQ(::policy::EXISTS, reps.Init(&policy_settings_));
   reps.RemoveDB();
@@ -1111,10 +1165,7 @@ TEST(SQLPTRepresentationTest3,
      Close_InitNewDataBaseThenClose_ExpectResultSuccess) {
   // Arrange
   NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
-  ON_CALL(policy_settings_, app_storage_folder())
-      .WillByDefault(ReturnRef(kAppStorageFolder));
-  const bool in_memory_ = true;
-  SQLPTRepresentation reps(in_memory_);
+  SQLPTRepresentation reps(true);
   EXPECT_EQ(::policy::SUCCESS, reps.Init(&policy_settings_));
   EXPECT_TRUE(reps.Close());
   utils::dbms::SQLError error(utils::dbms::Error::OK);
@@ -1556,9 +1607,8 @@ TEST_F(SQLPTRepresentationTest,
 
 TEST(SQLPTRepresentationTest3, RemoveDB_RemoveDB_ExpectFileDeleted) {
   // Arrange
-  const bool in_memory_ = true;
   policy_handler_test::MockPolicySettings policy_settings_;
-  SQLPTRepresentation reps(in_memory_);
+  SQLPTRepresentation reps(true);
   EXPECT_EQ(::policy::SUCCESS, reps.Init(&policy_settings_));
   EXPECT_EQ(::policy::EXISTS, reps.Init(&policy_settings_));
   std::string path = (reps.db())->get_path();
@@ -1608,13 +1658,15 @@ TEST_F(SQLPTRepresentationTest,
   table["policy_table"]["module_meta"] = Json::Value(Json::objectValue);
   table["policy_table"]["module_config"]["preloaded_pt"] = Json::Value(false);
   policy_table::Table expected(&table);
-  Json::StyledWriter writer;
+  Json::StreamWriterBuilder writer_builder;
   // Checks
-  EXPECT_EQ(writer.write(expected.ToJsonValue()),
-            writer.write(snapshot->ToJsonValue()));
-  std::cout << writer.write(snapshot->ToJsonValue()) << std::endl;
+  Json::Value snapshot_json_value = snapshot->ToJsonValue();
+  EXPECT_EQ(Json::writeString(writer_builder, expected.ToJsonValue()),
+            Json::writeString(writer_builder, snapshot_json_value));
+  std::cout << Json::writeString(writer_builder, snapshot_json_value)
+            << std::endl;
   EXPECT_EQ(expected.ToJsonValue().toStyledString(),
-            snapshot->ToJsonValue().toStyledString());
+            snapshot_json_value.toStyledString());
 }
 
 TEST_F(SQLPTRepresentationTest,
@@ -1695,9 +1747,8 @@ TEST_F(SQLPTRepresentationTest,
 
   const ::policy_table::Parameters& parameters = *(rpc_iter->second.parameters);
   EXPECT_EQ(1u, parameters.size());
-  EXPECT_TRUE(parameters.end() != std::find(parameters.begin(),
-                                            parameters.end(),
-                                            policy_table::Parameter::P_SPEED));
+  EXPECT_TRUE(parameters.end() !=
+              std::find(parameters.begin(), parameters.end(), "P_SPEED"));
   // Check Application Policies Section
   GatherApplicationPoliciesSection(&policies);
   const uint32_t apps_size = 3u;
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 f5192471cc..29952bd18e 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
@@ -33,6 +33,7 @@
 #include "policy/update_status_manager.h"
 #include "gtest/gtest.h"
 #include "policy/mock_policy_listener.h"
+#include "policy/mock_ptu_retry_handler.h"
 #include "policy/policy_manager_impl.h"
 
 #include "utils/conditional_variable.h"
@@ -52,6 +53,7 @@ class UpdateStatusManagerTest : public ::testing::Test {
   PolicyTableStatus status_;
   const uint32_t k_timeout_;
   NiceMock<MockPolicyListener> listener_;
+  NiceMock<MockPTURetryHandler> mock_ptu_retry_handler_;
   const std::string up_to_date_status_;
   const std::string update_needed_status_;
   const std::string updating_status_;
@@ -61,6 +63,7 @@ class UpdateStatusManagerTest : public ::testing::Test {
       : manager_(std::make_shared<UpdateStatusManager>())
       , k_timeout_(1000)
       , listener_()
+      , mock_ptu_retry_handler_()
       , up_to_date_status_("UP_TO_DATE")
       , update_needed_status_("UPDATE_NEEDED")
       , updating_status_("UPDATING") {}
@@ -68,6 +71,8 @@ class UpdateStatusManagerTest : public ::testing::Test {
   void SetUp() OVERRIDE {
     manager_->set_listener(&listener_);
     ON_CALL(listener_, OnUpdateStatusChanged(_)).WillByDefault(Return());
+    ON_CALL(listener_, ptu_retry_handler())
+        .WillByDefault(ReturnRef(mock_ptu_retry_handler_));
   }
 
   void TearDown() OVERRIDE {}
@@ -111,6 +116,11 @@ ACTION_P(NotifyAsync, waiter) {
   waiter->Notify();
 }
 
+ACTION_P2(RetryFailed, manager, listener) {
+  manager->OnResetRetrySequence();
+  listener->OnPTUFinished(false);
+}
+
 TEST_F(UpdateStatusManagerTest,
        OnUpdateSentOut_WaitForTimeoutExpired_ExpectStatusUpdateNeeded) {
   // Arrange
@@ -131,6 +141,38 @@ TEST_F(UpdateStatusManagerTest,
   EXPECT_EQ(StatusUpdateRequired, status_);
 }
 
+TEST_F(
+    UpdateStatusManagerTest,
+    OnUpdateSentOut_WaitForTimeoutExpired_ExpectStatusUpdateNeeded_RetryExceeded) {
+  sync_primitives::Lock lock;
+  sync_primitives::AutoLock auto_lock(lock);
+  const uint32_t count = 3u;
+  const uint32_t timeout = 2u * k_timeout_;
+  WaitAsync waiter(count, timeout);
+  EXPECT_CALL(listener_, OnUpdateStatusChanged(_))
+      .WillRepeatedly(NotifyAsync(&waiter));
+  EXPECT_CALL(mock_ptu_retry_handler_, RetrySequenceFailed())
+      .WillOnce(RetryFailed(manager_, &listener_));
+  manager_->ScheduleUpdate();
+  manager_->OnUpdateSentOut(k_timeout_);
+  status_ = manager_->GetLastUpdateStatus();
+  {
+    ::testing::InSequence s;
+    EXPECT_CALL(mock_ptu_retry_handler_, IsAllowedRetryCountExceeded())
+        .WillRepeatedly(Return(false));
+    EXPECT_CALL(mock_ptu_retry_handler_, IsAllowedRetryCountExceeded())
+        .WillRepeatedly(Return(false));
+    EXPECT_CALL(mock_ptu_retry_handler_, IsAllowedRetryCountExceeded())
+        .WillRepeatedly(Return(true));
+    EXPECT_CALL(listener_, OnPTUFinished(false));
+  }
+  EXPECT_EQ(StatusUpdatePending, status_);
+  EXPECT_TRUE(waiter.Wait(auto_lock));
+  status_ = manager_->GetLastUpdateStatus();
+  // Check
+  EXPECT_EQ(StatusUpdateRequired, status_);
+}
+
 TEST_F(UpdateStatusManagerTest,
        OnUpdateTimeOutOccurs_ExpectStatusUpdateNeeded) {
   // Arrange
@@ -245,7 +287,7 @@ TEST_F(UpdateStatusManagerTest, OnResetRetrySequence_ExpectStatusUpToDate) {
   manager_->OnResetRetrySequence();
   status_ = manager_->GetLastUpdateStatus();
   // Check
-  EXPECT_EQ(StatusUpdatePending, status_);
+  EXPECT_EQ(StatusUpdateRequired, status_);
 }
 
 TEST_F(UpdateStatusManagerTest,
@@ -298,6 +340,12 @@ TEST_F(UpdateStatusManagerTest,
   EXPECT_FALSE(manager_->IsAppsSearchInProgress());
 }
 
+TEST_F(UpdateStatusManagerTest, OnAppRegistered) {
+  manager_->ScheduleUpdate();
+  ASSERT_EQ(policy::kUpdateNeeded, manager_->StringifiedUpdateStatus());
+  manager_->ProcessEvent(policy::UpdateEvent::kOnNewAppRegistered);
+  EXPECT_EQ(policy::kUpdateNeeded, manager_->StringifiedUpdateStatus());
+}
 }  // namespace policy_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/policy/policy_regular/CMakeLists.txt b/src/components/policy/policy_regular/CMakeLists.txt
index 3679b2efea..e14057ec89 100644
--- a/src/components/policy/policy_regular/CMakeLists.txt
+++ b/src/components/policy/policy_regular/CMakeLists.txt
@@ -30,25 +30,81 @@
 
 include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/platform.cmake)
 include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
+include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/generators.cmake)
 
 include_directories (
-  ${POLICY_PATH}/include
-  ${POLICY_GLOBAL_INCLUDE_PATH}/
-  ${COMPONENTS_DIR}/rpc_base/include
-  ${JSONCPP_INCLUDE_DIRECTORY}
+  ${POLICY_PATH}/include/
+  ${COMPONENTS_DIR}/
   ${COMPONENTS_DIR}/utils/include/
   ${COMPONENTS_DIR}/config_profile/include
-  ${LOG4CXX_INCLUDE_DIRECTORY}
-  ${BOOST_INCLUDE_DIR}
+  ${COMPONENTS_DIR}/connection_handler/include/
+  ${COMPONENTS_DIR}/protocol_handler/include/
+  ${COMPONENTS_DIR}/config_profile/include/
+  ${COMPONENTS_DIR}/smart_objects/include/
+  ${COMPONENTS_DIR}/rpc_base/include/
+  ${CMAKE_BINARY_DIR}/src/components/
+  ${POLICY_GLOBAL_INCLUDE_PATH}/
+  ${BOOST_INCLUDE_DIR}/
+  ${JSONCPP_INCLUDE_DIRECTORY}/
+  ${LOG4CXX_INCLUDE_DIRECTORY}/
 )
 
+set(GENERATED_MOBILE_POLICY_TYPES_CPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_MOBILE_API_policy_types.cc"
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_MOBILE_API_enum_schema_factory.cc")
+
+set(GENERATED_MOBILE_POLICY_TYPES_HPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_MOBILE_API_policy_types.h")
+
+set(GENERATED_MOBILE_POLICY_TYPES
+  ${GENERATED_MOBILE_POLICY_TYPES_HPP}
+  ${GENERATED_MOBILE_POLICY_TYPES_CPP})
+
+generate_policy_types("${GENERATED_MOBILE_POLICY_TYPES}"
+                      "${COMPONENTS_DIR}/interfaces/MOBILE_API.xml"
+                      "rpc::policy_table_interface_base"
+                      "mobile-policy-types")
+
+
+set(GENERATED_HMI_POLICY_TYPES_CPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_HMI_API_policy_types.cc")
+
+set(GENERATED_HMI_POLICY_TYPES_HPP
+  "${CMAKE_CURRENT_BINARY_DIR}/generated_HMI_API_policy_types.h")
+
+set(GENERATED_HMI_POLICY_TYPES
+  ${GENERATED_HMI_POLICY_TYPES_HPP}
+  ${GENERATED_HMI_POLICY_TYPES_CPP})
+
+
+generate_policy_types("${GENERATED_HMI_POLICY_TYPES}"
+                    "${COMPONENTS_DIR}/interfaces/HMI_API.xml"
+                    "rpc::policy_table_interface_base"
+                    "hmi-policy-types")
+
 set(POLICY_TABLE_PATHS
   ${CMAKE_CURRENT_SOURCE_DIR}/include/policy/policy_table
   ${CMAKE_CURRENT_SOURCE_DIR}/src/policy_table
+  ${CMAKE_CURRENT_BINARY_DIR}/
+)
+
+set(POLICY_TABLE_SOURCES
+  ${GENERATED_MOBILE_POLICY_TYPES_CPP}
+  ${GENERATED_HMI_POLICY_TYPES_CPP}
+  ${POLICY_PATH}/src/policy_table/enums.cc
+  ${POLICY_PATH}/src/policy_table/types.cc
+  ${POLICY_PATH}/src/policy_table/validation.cc
 )
-collect_sources(POLICY_TABLE_SOURCES "${POLICY_TABLE_PATHS}")
+
 add_library(policy_struct ${POLICY_TABLE_SOURCES})
-target_link_libraries(policy_struct Utils)
+target_link_libraries(policy_struct
+  MOBILE_API
+  HMI_API
+  Utils
+  SmartObjects
+  formatters
+  jsoncpp
+)
 
 set(USAGE_STATISTICS_PATHS
   ${CMAKE_CURRENT_SOURCE_DIR}/include/policy/usage_statistics
@@ -74,7 +130,6 @@ set(LIBRARIES
   ConfigProfile
   policy_struct
   dbms
-  jsoncpp
   Utils
 )
 
@@ -87,8 +142,13 @@ else ()
   list(APPEND LIBRARIES sqlite3)
 endif ()
 
-add_library(Policy SHARED ${SOURCES})
-target_link_libraries(Policy ${LIBRARIES})
+
+add_library(PolicyStatic ${SOURCES})
+target_link_libraries(PolicyStatic ${LIBRARIES})
+
+
+add_library(Policy SHARED "src/policy_manager_impl.cc")
+target_link_libraries(Policy PolicyStatic)
 
 if(ENABLE_LOG)
   target_link_libraries(Policy log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
diff --git a/src/components/policy/policy_regular/include/policy/cache_manager.h b/src/components/policy/policy_regular/include/policy/cache_manager.h
index 1c28b596c0..00f0adab06 100644
--- a/src/components/policy/policy_regular/include/policy/cache_manager.h
+++ b/src/components/policy/policy_regular/include/policy/cache_manager.h
@@ -142,14 +142,26 @@ class CacheManager : public CacheManagerInterface {
   virtual bool SecondsBetweenRetries(std::vector<int>& seconds);
 
   /**
-   * @brief Get information about vehicle
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
    */
-  virtual const VehicleInfo GetVehicleInfo() const;
+  virtual Json::Value GetPolicyTableData() const OVERRIDE;
+
+  /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const;
+
+  std::vector<policy_table::VehicleDataItem> GetRemovedVehicleDataItems()
+      const OVERRIDE;
 
   const boost::optional<bool> LockScreenDismissalEnabledState() const OVERRIDE;
 
   const boost::optional<std::string> LockScreenDismissalWarningMessage(
       const std::string& language) const OVERRIDE;
+
   /**
    * @brief Get a list of enabled cloud applications
    * @param enabled_apps List filled with the policy app id of each enabled
@@ -159,28 +171,14 @@ class CacheManager : public CacheManagerInterface {
       std::vector<std::string>& enabled_apps) const;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
-   * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(const std::string& policy_app_id,
-                                     bool& enabled,
-                                     std::string& endpoint,
-                                     std::string& certificate,
-                                     std::string& auth_token,
-                                     std::string& cloud_transport_type,
-                                     std::string& hybrid_app_preference) const;
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  std::vector<std::string> GetEnabledLocalApps() const OVERRIDE;
+
+  bool GetAppProperties(const std::string& policy_app_id,
+                        AppProperties& out_app_properties) const OVERRIDE;
 
   /**
    * Initializes a new cloud application with default policies
@@ -279,18 +277,11 @@ class CacheManager : public CacheManagerInterface {
    * @param service_type If URLs for specific service are preset,
    * return them otherwise default URLs.
    */
-  virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points);
+  void GetUpdateUrls(const std::string& service_type,
+                     EndpointUrls& out_end_points) const OVERRIDE;
 
-  virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points);
-  /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   *
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const;
+  void GetUpdateUrls(const uint32_t service_type,
+                     EndpointUrls& out_end_points) const OVERRIDE;
 
   /**
    * @brief Get Icon Url used for showing a cloud apps icon before the intial
@@ -396,6 +387,12 @@ class CacheManager : public CacheManagerInterface {
   bool GetFunctionalGroupings(policy_table::FunctionalGroupings& groups);
 
   /**
+   * @brief Get policy app names from PT
+   * @return container of strings representing policy application names
+   */
+  const policy_table::Strings GetPolicyAppIDs() const OVERRIDE;
+
+  /**
    * Checks if the application is represented in policy table
    * @param app_id application id
    * @return true if application is represented in policy table
@@ -835,6 +832,24 @@ class CacheManager : public CacheManagerInterface {
   void MergeCFM(const policy_table::PolicyTable& new_pt,
                 policy_table::PolicyTable& pt);
 
+  /**
+   * @brief MergeVD allows to merge VehicleDataItems section by
+   *definite rules.
+   *
+   * The rules are:
+   * 1. If vehicle_data_items key is not presented in the updated PolicyTable,
+   * update for VehicleDataItems should be ignored.
+   * 2. If vehicle_data_items presented in updated PolicyTable, the
+   * VehicleDataItems in the database (LocalPT) should be overwritten with
+   * updated data.
+   *
+   * @param new_pt the policy table loaded from updated preload JSON file.
+   *
+   * @param pt the exists database
+   */
+  void MergeVD(const policy_table::PolicyTable& new_pt,
+               policy_table::PolicyTable& pt);
+
   const PolicySettings& get_settings() const;
 
   std::shared_ptr<policy_table::Table> pt() const {
@@ -850,6 +865,24 @@ class CacheManager : public CacheManagerInterface {
   void OnDeviceSwitching(const std::string& device_id_from,
                          const std::string& device_id_to) OVERRIDE;
 
+  EncryptionRequired GetAppEncryptionRequiredFlag(
+      const std::string& application_policy_name) const OVERRIDE;
+
+  EncryptionRequired GetFunctionalGroupingEncryptionRequiredFlag(
+      const std::string& functional_group) const OVERRIDE;
+
+  void GetApplicationParams(
+      const std::string& application_name,
+      policy_table::ApplicationParams& application_policies) const OVERRIDE;
+
+  /**
+   * @brief Method for separate RPCSpec vehicle data items from custom
+   * @param full vehicle data items during PTU
+   * @return array with only custom vehicle items
+   */
+  static policy_table::VehicleDataItems CollectCustomVDItems(
+      const policy_table::VehicleDataItems& vd_items);
+
  private:
   std::string currentDateTime();
   struct AppHMITypeToString {
@@ -869,6 +902,24 @@ class CacheManager : public CacheManagerInterface {
    */
   void CheckSnapshotInitialization();
 
+  /**
+   * @brief Calculates difference between two provided custom vehicle data items
+   * @param items_before list of vehicle data items before PTU was applied
+   * @param items_after list of vehicle data items after PTU was applied
+   * @return list with calculated difference or empty list if two input lists
+   * are equal
+   */
+  policy_table::VehicleDataItems CalculateCustomVdItemsDiff(
+      const policy_table::VehicleDataItems& items_before,
+      const policy_table::VehicleDataItems& items_after) const;
+
+  /**
+   * @brief Sets the custom vehicle data items
+   * @param removed_items list of vehicle data items to set
+   */
+  void SetRemovedCustomVdItems(
+      const policy_table::VehicleDataItems& removed_items);
+
   void PersistData();
 
   /**
@@ -895,6 +946,7 @@ class CacheManager : public CacheManagerInterface {
   bool update_required;
   typedef std::set<std::string> UnpairedDevices;
   UnpairedDevices is_unpaired_;
+  policy_table::VehicleDataItems removed_custom_vd_items_;
 
   mutable sync_primitives::RecursiveLock cache_lock_;
   sync_primitives::Lock unpaired_lock_;
diff --git a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h
index e8f2644bc5..fc1a6337aa 100644
--- a/src/components/policy/policy_regular/include/policy/cache_manager_interface.h
+++ b/src/components/policy/policy_regular/include/policy/cache_manager_interface.h
@@ -149,9 +149,24 @@ class CacheManagerInterface {
   virtual bool SecondsBetweenRetries(std::vector<int>& seconds) = 0;
 
   /**
-   * @brief Get information about vehicle
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
    */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
+  virtual Json::Value GetPolicyTableData() const = 0;
+
+  /**
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
+   */
+  virtual const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const = 0;
+
+  /**
+   * @brief Gets vehicle data items removed after the last PTU
+   * @return List of removed vehicle data items
+   */
+  virtual std::vector<policy_table::VehicleDataItem>
+  GetRemovedVehicleDataItems() const = 0;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -162,29 +177,21 @@ class CacheManagerInterface {
       std::vector<std::string>& enabled_apps) const = 0;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  virtual std::vector<std::string> GetEnabledLocalApps() const = 0;
+
+  /**
+   * @brief Get app policy information, all fields that aren't set for a
    * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  virtual bool GetCloudAppParameters(
-      const std::string& policy_app_id,
-      bool& enabled,
-      std::string& endpoint,
-      std::string& certificate,
-      std::string& auth_token,
-      std::string& cloud_transport_type,
-      std::string& hybrid_app_preference) const = 0;
+   * @param policy_app_id policy app id
+   * @param out_app_properties application properties
+   * @return true if application presents in database, otherwise - false
+   */
+  virtual bool GetAppProperties(const std::string& policy_app_id,
+                                AppProperties& out_app_properties) const = 0;
 
   /**
    * Initializes a new cloud application with default policies
@@ -301,17 +308,9 @@ class CacheManagerInterface {
    * return them otherwise default URLs.
    */
   virtual void GetUpdateUrls(const std::string& service_type,
-                             EndpointUrls& out_end_points) = 0;
+                             EndpointUrls& out_end_points) const = 0;
   virtual void GetUpdateUrls(const uint32_t service_type,
-                             EndpointUrls& out_end_points) = 0;
-
-  /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   *
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const = 0;
+                             EndpointUrls& out_end_points) const = 0;
 
   /**
    * @brief Get Icon Url used for showing a cloud apps icon before the intial
@@ -419,6 +418,12 @@ class CacheManagerInterface {
       policy_table::FunctionalGroupings& groups) = 0;
 
   /**
+   * @brief Get policy app names from PT
+   * @return container of strings representing policy application names
+   */
+  virtual const policy_table::Strings GetPolicyAppIDs() const = 0;
+
+  /**
    * Checks if the application is represented in policy table
    * @param app_id application id
    * @return true if application is represented in policy table
@@ -815,6 +820,36 @@ class CacheManagerInterface {
    */
   virtual void OnDeviceSwitching(const std::string& device_id_from,
                                  const std::string& device_id_to) = 0;
+
+  /**
+   * @brief GetAppEncryptionRequiredFlag retrieves encryption required flag for
+   * given application
+   * @param application policy application name
+   * @return optional object containing encryption required flag
+   */
+  virtual rpc::Optional<rpc::Boolean> GetAppEncryptionRequiredFlag(
+      const std::string& application_policy_name) const = 0;
+
+  /**
+   * @brief GetFunctionalGroupingEncryptionRequiredFlag retrieves encryption
+   * required flag
+   * for
+   * given functional grouping
+   * @param functional_group policy functional group name
+   * @return optional object containing encryption required flag
+   */
+  virtual rpc::Optional<rpc::Boolean>
+  GetFunctionalGroupingEncryptionRequiredFlag(
+      const std::string& functional_group) const = 0;
+
+  /**
+   * @brief retreives application params
+   * @param application_name policy applicatoin name
+   * @param application_params application params
+   */
+  virtual void GetApplicationParams(
+      const std::string& application_name,
+      policy_table::ApplicationParams& application_params) const = 0;
 };
 
 typedef std::shared_ptr<CacheManagerInterface> CacheManagerInterfaceSPtr;
diff --git a/src/components/policy/policy_regular/include/policy/policy_helper.h b/src/components/policy/policy_regular/include/policy/policy_helper.h
index 4c697858f5..d5155cf91b 100644
--- a/src/components/policy/policy_regular/include/policy/policy_helper.h
+++ b/src/components/policy/policy_regular/include/policy/policy_helper.h
@@ -1,4 +1,4 @@
-/*
+/*
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
@@ -83,22 +83,11 @@ bool operator!=(const policy_table::ApplicationParams& first,
 struct CheckAppPolicy {
   CheckAppPolicy(PolicyManagerImpl* pm,
                  const std::shared_ptr<policy_table::Table> update,
-                 const std::shared_ptr<policy_table::Table> snapshot);
+                 const std::shared_ptr<policy_table::Table> snapshot,
+                 CheckAppPolicyResults& out_results);
   bool operator()(const AppPoliciesValueType& app_policy);
 
  private:
-  enum PermissionsCheckResult {
-    RESULT_NO_CHANGES,
-    RESULT_APP_REVOKED,
-    RESULT_NICKNAME_MISMATCH,
-    RESULT_PERMISSIONS_REVOKED,
-    RESULT_CONSENT_NEEDED,
-    RESULT_CONSENT_NOT_REQIURED,
-    RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED,
-    RESULT_REQUEST_TYPE_CHANGED,
-    RESULT_REQUEST_SUBTYPE_CHANGED
-  };
-
   void SetPendingPermissions(const AppPoliciesValueType& app_policy,
                              PermissionsCheckResult result) const;
   PermissionsCheckResult CheckPermissionsChanges(
@@ -107,6 +96,8 @@ struct CheckAppPolicy {
                         policy_table::Strings* revoked_groups = NULL) const;
   bool HasNewGroups(const AppPoliciesValueType& app_policy,
                     policy_table::Strings* new_groups = NULL) const;
+  bool HasUpdatedGroups(const policy::AppPoliciesValueType& app_policy,
+                        policy_table::Strings* updated_groups = NULL) const;
   bool HasConsentNeededGroups(const AppPoliciesValueType& app_policy) const;
   std::vector<FunctionalGroupPermission> GetRevokedGroups(
       const AppPoliciesValueType& app_policy) const;
@@ -115,10 +106,18 @@ struct CheckAppPolicy {
       const std::vector<FunctionalGroupPermission>& revoked_groups) const;
   bool IsKnownAppication(const std::string& application_id) const;
   void NotifySystem(const AppPoliciesValueType& app_policy) const;
-  void SendPermissionsToApp(const std::string& app_id,
-                            const policy_table::Strings& groups) const;
   bool IsAppRevoked(const AppPoliciesValueType& app_policy) const;
   bool NicknamesMatch(const AppPoliciesValueType& app_policy) const;
+
+  /**
+   * @brief Check of current policy against incoming updated policy is
+   * performed.
+   * This function adds result code of this check to container.
+   * @param app_id Application id
+   * @param result Result value
+   */
+  void AddResult(const std::string& app_id, PermissionsCheckResult result);
+
   /**
    * @brief Allows to check if appropriate group requires any consent.
    * @param group_name the group for which consent will be checked.
@@ -129,10 +128,35 @@ struct CheckAppPolicy {
   bool IsRequestTypeChanged(const AppPoliciesValueType& app_policy) const;
   bool IsRequestSubTypeChanged(const AppPoliciesValueType& app_policy) const;
 
+  bool IsEncryptionRequiredFlagChanged(
+      const AppPoliciesValueType& app_policy) const;
+
+  bool IsAppPropertiesChanged(const AppPoliciesValueType& app_policy) const;
+
+  bool IsAppPropertiesProvided(const AppPoliciesValueType& app_policy) const;
+
  private:
   PolicyManagerImpl* pm_;
   const std::shared_ptr<policy_table::Table> update_;
   const std::shared_ptr<policy_table::Table> snapshot_;
+  CheckAppPolicyResults& out_results_;
+};
+
+/**
+ * @brief Helper struct for filling actions to be done for processed application
+ * using CheckAppPolicyResults data as a source
+ */
+struct FillActionsForAppPolicies {
+  FillActionsForAppPolicies(
+      ApplicationsPoliciesActions& actions,
+      const policy_table::ApplicationPolicies& app_policies)
+      : actions_(actions), app_policies_(app_policies) {}
+
+  void operator()(const policy::CheckAppPolicyResults::value_type& value);
+
+ private:
+  ApplicationsPoliciesActions& actions_;
+  const policy_table::ApplicationPolicies& app_policies_;
 };
 
 /*
@@ -174,6 +198,9 @@ struct ProcessFunctionalGroup {
 
  private:
   GroupConsent GetGroupState(const std::string& group_name);
+  void FillEncryptionFlagForRpcs(
+      const policy_table::Rpc& rpcs,
+      const policy::EncryptionRequired encryption_required);
   const policy_table::FunctionalGroupings& fg_;
   const std::vector<FunctionalGroupPermission>& group_permissions_;
   Permissions& data_;
diff --git a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
index 13d19e1a41..aa77019613 100644
--- a/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
+++ b/src/components/policy/policy_regular/include/policy/policy_manager_impl.h
@@ -37,6 +37,7 @@
 #include <list>
 #include <string>
 
+#include "application_manager/policies/policy_encryption_flag_getter.h"
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
 #include "policy/cache_manager_interface.h"
@@ -57,6 +58,45 @@ struct CheckAppPolicy;
 class PolicyManagerImpl : public PolicyManager {
  public:
   PolicyManagerImpl();
+  /*
+   * \param policy_app_id policy app id
+   * \return true if the app need encryption
+   */
+  bool AppNeedEncryption(const std::string& policy_app_id) const OVERRIDE;
+
+  /*
+   * \param policy_app_id policy app id
+   * \return Optional app need encryption
+   */
+  const rpc::Optional<rpc::Boolean> GetAppEncryptionRequired(
+      const std::string& policy_app_id) const OVERRIDE;
+  /*
+   * \param policy_app_id policy app id
+   * \return groups that exist for app
+   */
+  const std::vector<std::string> GetFunctionalGroupsForApp(
+      const std::string& policy_app_id) const OVERRIDE;
+
+  const std::vector<std::string> GetApplicationPolicyIDs() const OVERRIDE;
+
+  /*
+   * \param policy_group group
+   * \return true if the group need encryption
+   */
+  bool FunctionGroupNeedEncryption(
+      const std::string& policy_group) const OVERRIDE;
+  /*
+   * \param policy_group group
+   * \return RPCs that exists in group
+   */
+  const std::vector<std::string> GetRPCsForFunctionGroup(
+      const std::string& group) const OVERRIDE;
+  /*
+   * \param function_id function id
+   * \return policy function name
+   */
+  const std::string GetPolicyFunctionName(
+      const uint32_t function_id) const OVERRIDE;
 
   /**
    * @brief set_listener set new policy listener instance
@@ -89,8 +129,35 @@ class PolicyManagerImpl : public PolicyManager {
    * @param pt_content PTU as binary string
    * @return true if successfully
    */
-  bool LoadPT(const std::string& file,
-              const BinaryMessage& pt_content) OVERRIDE;
+  PtProcessingResult LoadPT(const std::string& file,
+                            const BinaryMessage& pt_content) OVERRIDE;
+
+  void OnPTUFinished(const PtProcessingResult ptu_result) OVERRIDE;
+
+  typedef policy_table::ApplicationPolicies::value_type AppPoliciesValueType;
+
+  /**
+   * @brief Notifies system by sending OnAppPermissionChanged notification
+   * @param device_id device identifier
+   * @param app_policy Reference to application policy
+   */
+  void NotifySystem(const std::string& device_id,
+                    const AppPoliciesValueType& app_policy) const;
+
+  /**
+   * @brief Sends OnPermissionChange notification to application if its
+   * currently registered
+   * @param device_id device identifier
+   * @param app_policy Reference to application policy
+   */
+  void SendPermissionsToApp(const std::string& device_id,
+                            const AppPoliciesValueType& app_policy);
+
+  /**
+   * @brief Resumes all policy actions for all apps, suspended during
+   * PTU applying
+   */
+  void ResumePendingAppPolicyActions();
 
   /**
    * @brief Resets Policy Table
@@ -105,16 +172,9 @@ class PolicyManagerImpl : public PolicyManager {
    * @param out_end_points output vector of urls
    */
   void GetUpdateUrls(const uint32_t service_type,
-                     EndpointUrls& out_end_points) OVERRIDE;
+                     EndpointUrls& out_end_points) const OVERRIDE;
   void GetUpdateUrls(const std::string& service_type,
-                     EndpointUrls& out_end_points) OVERRIDE;
-
-  /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  std::string GetLockScreenIconUrl() const OVERRIDE;
+                     EndpointUrls& out_end_points) const OVERRIDE;
 
   /**
    * @brief Get Icon Url used for showing a cloud apps icon before the intial
@@ -128,7 +188,7 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief PTU is needed, for this PTS has to be formed and sent.
    */
-  bool RequestPTUpdate() OVERRIDE;
+  bool RequestPTUpdate(const PTUIterationType iteration_type) OVERRIDE;
 
   /**
    * @brief Check if specified RPC for specified application
@@ -178,6 +238,8 @@ class PolicyManagerImpl : public PolicyManager {
    */
   std::string ForcePTExchange() OVERRIDE;
 
+  void StopRetrySequence() OVERRIDE;
+
   /**
    * @brief Exchange by user request
    * @return Current status of policy table
@@ -192,8 +254,10 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Resets retry sequence
+   * @param send_event - if true corresponding event is sent to
+   * UpdateStatusManager
    */
-  void ResetRetrySequence();
+  void ResetRetrySequence(const ResetRetryCountType reset_type) OVERRIDE;
 
   /**
    * @brief Gets timeout to wait before next retry updating PT
@@ -265,12 +329,15 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Update Application Policies as reaction
    * on User allowing/disallowing device this app is running on.
+   * @param device_handle device identifier
    * @param app_id Unique application id
    * @param is_device_allowed true if user allowing device otherwise false
    * @return true if operation was successful
    */
-  bool ReactOnUserDevConsentForApp(const std::string app_id,
-                                   const bool is_device_allowed) OVERRIDE;
+  bool ReactOnUserDevConsentForApp(
+      const transport_manager::DeviceHandle& device_handle,
+      const std::string app_id,
+      const bool is_device_allowed) OVERRIDE;
 
   /**
    * @brief Retrieves data from app_policies about app on its registration:
@@ -311,12 +378,14 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Get default HMI level for application
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @param default_hmi Default HMI level for application or empty, if value
    * was not set
    * @return true, if succedeed, otherwise - false
    */
-  bool GetDefaultHmi(const std::string& policy_app_id,
+  bool GetDefaultHmi(const std::string& device_id,
+                     const std::string& policy_app_id,
                      std::string* default_hmi) const OVERRIDE;
 
   /**
@@ -359,9 +428,11 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Return device id, which hosts specific application
+   * @param device_handle device identifier
    * @param policy_app_id Application id, which is required to update device id
    */
   std::string& GetCurrentDeviceId(
+      const transport_manager::DeviceHandle& device_handle,
       const std::string& policy_app_id) const OVERRIDE;
 
   /**
@@ -381,13 +452,6 @@ class PolicyManagerImpl : public PolicyManager {
                      const std::string& language) OVERRIDE;
 
   /**
-   * @brief Runs necessary operations, which is depends on external system
-   * state, e.g. getting system-specific parameters which are need to be
-   * filled into policy table
-   */
-  void OnSystemReady() OVERRIDE;
-
-  /**
    * @brief Get number of notification by priority
    * @param priority Specified priority
    * @return notification number
@@ -403,11 +467,12 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Gets specific application permissions changes since last policy
    * table update
+   * @param device_id device identifier
    * @param policy_app_id Unique application id
    * @return Permissions changes
    */
   AppPermissions GetAppPermissionsChanges(
-      const std::string& policy_app_id) OVERRIDE;
+      const std::string& device_id, const std::string& policy_app_id) OVERRIDE;
 
   /**
    * @brief Removes specific application permissions changes
@@ -417,10 +482,11 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Send OnPermissionsUpdated for choosen application
+   * @param device_id device identifier
    * @param application_id Unique application id
    */
   void SendNotificationOnPermissionsUpdated(
-      const std::string& application_id) OVERRIDE;
+      const std::string& device_id, const std::string& application_id) OVERRIDE;
 
   /**
    * @brief Removes unpaired device records and related records from DB
@@ -451,20 +517,24 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Adds, application to the db or update existed one
    * run PTU if policy update is necessary for application.
+   * @param device_id device identifier
    * @param application_id Unique application id
    * @param hmi_types application HMI types
    * @return function that will notify update manager about new application
    */
   StatusNotifier AddApplication(
+      const std::string& device_id,
       const std::string& application_id,
       const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) OVERRIDE;
 
   /**
    * @brief Assigns new HMI types for specified application
+   * @param device_handle device identifier
    * @param application_id Unique application id
    * @param hmi_types new HMI types list
    */
-  void SetDefaultHmiTypes(const std::string& application_id,
+  void SetDefaultHmiTypes(const transport_manager::DeviceHandle& device_handle,
+                          const std::string& application_id,
                           const std::vector<int>& hmi_types) OVERRIDE;
 
   /**
@@ -540,6 +610,8 @@ class PolicyManagerImpl : public PolicyManager {
    */
   void OnAppsSearchCompleted(const bool trigger_ptu) OVERRIDE;
 
+  void UpdatePTUReadyAppsCount(const uint32_t new_app_count) OVERRIDE;
+
   /**
    * @brief Get state of request types for given application
    * @param policy_app_id Unique application id
@@ -573,10 +645,20 @@ class PolicyManagerImpl : public PolicyManager {
       const std::string& policy_app_id) const OVERRIDE;
 
   /**
-   * @brief Get information about vehicle
-   * @return vehicle information
+   * @brief Gets vehicle data items
+   * @return Structure with vehicle data items
    */
-  const VehicleInfo GetVehicleInfo() const OVERRIDE;
+  const std::vector<policy_table::VehicleDataItem> GetVehicleDataItems()
+      const OVERRIDE;
+
+  std::vector<policy_table::VehicleDataItem> GetRemovedVehicleDataItems()
+      const OVERRIDE;
+
+  /**
+   * @brief Gets copy of current policy table data
+   * @return policy_table as json object
+   */
+  Json::Value GetPolicyTableData() const OVERRIDE;
 
   /**
    * @brief Get a list of enabled cloud applications
@@ -587,28 +669,14 @@ class PolicyManagerImpl : public PolicyManager {
       std::vector<std::string>& enabled_apps) const OVERRIDE;
 
   /**
-   * @brief Get cloud app policy information, all fields that aren't set for a
-   * given app will be filled with empty strings
-   * @param policy_app_id Unique application id
-   * @param enabled Whether or not the app is enabled
-   * @param endpoint Filled with the endpoint used to connect to the cloud
-   * application
-   * @param certificate Filled with the certificate used to for creating a
-   * secure connection to the cloud application
-   * @param auth_token Filled with the token used for authentication when
-   * reconnecting to the cloud app
-   * @param cloud_transport_type Filled with the transport type used by the
-   * cloud application (ex. "WSS")
-   * @param hybrid_app_preference Filled with the hybrid app preference for the
-   * cloud application set by the user
-   */
-  bool GetCloudAppParameters(const std::string& policy_app_id,
-                             bool& enabled,
-                             std::string& endpoint,
-                             std::string& certificate,
-                             std::string& auth_token,
-                             std::string& cloud_transport_type,
-                             std::string& hybrid_app_preference) const OVERRIDE;
+   * @brief Get a list of enabled local applications
+   * @return enabled_apps List filled with the policy app id of each enabled
+   * local application
+   */
+  std::vector<std::string> GetEnabledLocalApps() const OVERRIDE;
+
+  bool GetAppProperties(const std::string& policy_app_id,
+                        AppProperties& out_app_properties) const OVERRIDE;
 
   /**
    * @ brief Initialize new cloud app in the policy table
@@ -684,10 +752,13 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief OnAppRegisteredOnMobile allows to handle event when application were
    * succesfully registered on mobile device.
-   * It will send OnAppPermissionSend notification and will try to start PTU. *
+   * It will send OnAppPermissionSend notification and will try to start PTU.
+   *
+   * @param device_id device identifier
    * @param application_id registered application.
    */
-  void OnAppRegisteredOnMobile(const std::string& application_id) OVERRIDE;
+  void OnAppRegisteredOnMobile(const std::string& device_id,
+                               const std::string& application_id) OVERRIDE;
 
   void OnDeviceSwitching(const std::string& device_id_from,
                          const std::string& device_id_to) OVERRIDE;
@@ -726,6 +797,11 @@ class PolicyManagerImpl : public PolicyManager {
   AppIdURL RetrySequenceUrl(const struct RetrySequenceURL& rs,
                             const EndpointUrls& urls) const OVERRIDE;
 
+  /**
+   * @brief Trigger a PTU once on startup if it is required
+   */
+  virtual void TriggerPTUOnStartupIfRequired() OVERRIDE;
+
 #ifdef BUILD_TESTS
   /**
    * @brief Getter for cache_manager instance
@@ -780,6 +856,12 @@ class PolicyManagerImpl : public PolicyManager {
            int32_t timespan_seconds) OVERRIDE;
   // Interface StatisticsManager (end)
 
+  void OnLocalAppAdded() OVERRIDE;
+
+  bool IsNewApplication(const std::string& application_id) const OVERRIDE;
+
+  void ResetTimeout() OVERRIDE;
+
  protected:
 #ifdef USE_HMI_PTU_DECRYPTION
   /**
@@ -820,10 +902,19 @@ class PolicyManagerImpl : public PolicyManager {
    * @param snapshot Shared pointer to current copy of policy table
    * @return Collection per-application results
    */
-  void CheckPermissionsChanges(
+  CheckAppPolicyResults CheckPermissionsChanges(
       const std::shared_ptr<policy_table::Table> update,
       const std::shared_ptr<policy_table::Table> snapshot);
 
+  void ProcessAppPolicyCheckResults(
+      const CheckAppPolicyResults& results,
+      const rpc::policy_table_interface_base::ApplicationPolicies&
+          app_policies);
+
+  void ProcessActionsForAppPolicies(
+      const ApplicationsPoliciesActions& actions,
+      const policy_table::ApplicationPolicies& app_policies);
+
   /**
    * @brief Compares current policies to the updated one.
    * Trigger actions in case if certain fields after update were changed.
@@ -877,13 +968,6 @@ class PolicyManagerImpl : public PolicyManager {
                                  DeviceConsent device_consent);
 
   /**
-   * @brief Check if certain application already in policy db.
-   * @param policy application id.
-   * @return true if application presents false otherwise.
-   */
-  bool IsNewApplication(const std::string& application_id) const;
-
-  /**
    * Checks existing and permissions of AppStorageFolder
    * @return true if AppStorageFolder exists and has permissions read/write
    */
@@ -891,9 +975,12 @@ class PolicyManagerImpl : public PolicyManager {
 
   /**
    * @brief Checks whether need ask the permission of users
+   * @param device_id device identifier
+   * @param app_id policy application id
    * @return true if user consent is needed
    */
-  virtual bool IsConsentNeeded(const std::string& app_id);
+  virtual bool IsConsentNeeded(const std::string& device_id,
+                               const std::string& app_id);
 
   /**
    * @brief Changes isConsentNeeded for app pending permissions, in case
@@ -936,7 +1023,12 @@ class PolicyManagerImpl : public PolicyManager {
   /**
    * @brief Starts new retry sequence
    */
-  void RetrySequence();
+  void OnPTUIterationTimeout();
+
+  /**
+   * @brief Check that new applications for PTU were registered
+   */
+  bool HasApplicationForPTU() const;
 
  private:
   /**
@@ -967,6 +1059,9 @@ class PolicyManagerImpl : public PolicyManager {
   void SendAppPermissionsChanged(const std::string& device_id,
                                  const std::string& application_id) OVERRIDE;
 
+  void SendOnAppPropertiesChangeNotification(
+      const std::string& policy_app_id) const OVERRIDE;
+
   /**
    * @brief notify listener of updated auth token for a given policy id
    * @param policy_app_id the app id that has an updated auth token
@@ -1036,6 +1131,11 @@ class PolicyManagerImpl : public PolicyManager {
   uint32_t retry_sequence_index_;
 
   /**
+   * @brief Applications pending count ready for PTU
+   */
+  uint32_t applications_pending_ptu_count_;
+
+  /**
    * @brief Lock for guarding retry sequence
    */
   sync_primitives::Lock retry_sequence_lock_;
@@ -1070,19 +1170,44 @@ class PolicyManagerImpl : public PolicyManager {
   RetrySequenceURL retry_sequence_url_;
 
   /**
-   * @brief Flag for notifying that invalid PTU was received
+   * @brief Flag for notifying that PTU was started
    */
-  bool wrong_ptu_update_received_;
+  bool send_on_update_sent_out_;
 
   /**
-   * @brief Flag for notifying that PTU was started
+   * @brief List of chnaged application properties
    */
-  bool send_on_update_sent_out_;
+  std::vector<std::string> app_properties_changed_list_;
 
   /**
    * @brief Flag for notifying that invalid PTU should be triggered
    */
   bool trigger_ptu_;
+
+  /**
+   * @brief Flag for notifying that PTU was requested
+   */
+  bool ptu_requested_;
+
+  /**
+   * @brief Last registered application id on mobile
+   */
+  std::string last_registered_policy_app_id_;
+
+  typedef std::list<std::pair<std::string, AppPoliciesValueType> >
+      PendingAppPolicyActionsList;
+
+  /**
+   * @brief List containing device_id and pending permissions structure pairs
+   * which can be processed later on demand
+   */
+  PendingAppPolicyActionsList notify_system_list_;
+
+  /**
+   * @brief List containing device_id and pending permissions structure pairs
+   * which can be processed later on demand
+   */
+  PendingAppPolicyActionsList send_permissions_list_;
 };
 
 }  // namespace policy
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/enums.h b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
index ecb44943aa..05b39a0082 100644
--- a/src/components/policy/policy_regular/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
@@ -34,567 +34,12 @@
 #define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_ENUMS_H_
 
 #include <string>
+#include "generated_HMI_API_policy_types.h"
+#include "generated_MOBILE_API_policy_types.h"
 
 namespace rpc {
 namespace policy_table_interface_base {
 
-enum Priority {
-  P_EMERGENCY,
-  P_NAVIGATION,
-  P_VOICECOM,
-  P_COMMUNICATION,
-  P_NORMAL,
-  P_PROJECTION,
-  P_NONE,
-};
-
-bool IsValidEnum(Priority val);
-const char* EnumToJsonString(Priority val);
-bool EnumFromJsonString(const std::string& literal, Priority* result);
-
-enum HmiLevel {
-  HL_BACKGROUND,
-  HL_FULL,
-  HL_LIMITED,
-  HL_NONE,
-};
-bool IsValidEnum(HmiLevel val);
-const char* EnumToJsonString(HmiLevel val);
-bool EnumFromJsonString(const std::string& literal, HmiLevel* result);
-
-enum Parameter {
-  P_GPS,
-  P_SPEED,
-  P_ENGINETORQUE,
-  P_EXTERNALTEMPERATURE,
-  P_TURNSIGNAL,
-  P_FUELLEVEL,
-  P_FUELLEVEL_STATE,
-  P_HEADLAMPSTATUS,
-  P_INSTANTFUELCONSUMPTION,
-  P_FUELRANGE,
-  P_ODOMETER,
-  P_TIREPRESSURE,
-  P_WIPERSTATUS,
-  P_VIN,
-  P_ACCPEDALPOSITION,
-  P_BELTSTATUS,
-  P_ELECTRONICPARKBRAKESTATUS,
-  P_DRIVERBRAKING,
-  P_PRNDL,
-  P_RPM,
-  P_STEERINGWHEELANGLE,
-  P_ENGINEOILLIFE,
-  P_MYKEY,
-  P_CLOUD_APP_VEHICLE_ID,
-  P_AIRBAGSTATUS,
-  P_BODYINFORMATION,
-  P_CLUSTERMODESTATUS,
-  P_DEVICESTATUS,
-  P_EMERGENCYEVENT,
-  P_ECALLINFO,
-  P_EMPTY  // Added to allow empty parameters handling
-};
-
-bool IsValidEnum(Parameter val);
-const char* EnumToJsonString(Parameter val);
-bool EnumFromJsonString(const std::string& literal, Parameter* result);
-
-enum AppHMIType {
-  AHT_DEFAULT,
-  AHT_COMMUNICATION,
-  AHT_MEDIA,
-  AHT_MESSAGING,
-  AHT_NAVIGATION,
-  AHT_INFORMATION,
-  AHT_SOCIAL,
-  AHT_BACKGROUND_PROCESS,
-  AHT_TESTING,
-  AHT_SYSTEM,
-  AHT_PROJECTION,
-  AHT_REMOTE_CONTROL
-};
-bool IsValidEnum(AppHMIType val);
-const char* EnumToJsonString(AppHMIType val);
-bool EnumFromJsonString(const std::string& literal, AppHMIType* result);
-
-enum RequestType {
-  RT_HTTP,
-  RT_FILE_RESUME,
-  RT_AUTH_REQUEST,
-  RT_AUTH_CHALLENGE,
-  RT_AUTH_ACK,
-  RT_PROPRIETARY,
-  RT_QUERY_APPS,
-  RT_LAUNCH_APP,
-  RT_LOCK_SCREEN_ICON_URL,
-  RT_TRAFFIC_MESSAGE_CHANNEL,
-  RT_DRIVER_PROFILE,
-  RT_VOICE_SEARCH,
-  RT_NAVIGATION,
-  RT_PHONE,
-  RT_CLIMATE,
-  RT_SETTINGS,
-  RT_VEHICLE_DIAGNOSTICS,
-  RT_EMERGENCY,
-  RT_MEDIA,
-  RT_FOTA,
-  RT_OEM_SPECIFIC,
-  RT_EMPTY  // Added to allow empty Request Types handling
-};
-
-bool IsValidEnum(RequestType val);
-const char* EnumToJsonString(RequestType val);
-bool EnumFromJsonString(const std::string& literal, RequestType* result);
-
-enum Input {
-  I_GUI,
-  I_VUI,
-};
-bool IsValidEnum(Input val);
-const char* EnumToJsonString(Input val);
-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);
-bool EnumFromJsonString(const std::string& literal, ModuleType* result);
-
-enum HybridAppPreference { HAP_MOBILE, HAP_CLOUD, HAP_BOTH };
-bool IsValidEnum(HybridAppPreference val);
-const char* EnumToJsonString(HybridAppPreference val);
-bool EnumFromJsonString(const std::string& literal,
-                        HybridAppPreference* result);
-
-/**
- * @brief Enumeration FunctionID.
- *
- * Enumeration linking function names with function IDs in AppLink protocol.
- * Assumes enumeration starts at value 0.
- */
-enum FunctionID {
-  /**
-   * @brief RESERVED.
-   */
-  RESERVED = 0,
-
-  /**
-   * @brief RegisterAppInterfaceID.
-   */
-  RegisterAppInterfaceID = 1,
-
-  /**
-   * @brief UnregisterAppInterfaceID.
-   */
-  UnregisterAppInterfaceID = 2,
-
-  /**
-   * @brief SetGlobalPropertiesID.
-   */
-  SetGlobalPropertiesID = 3,
-
-  /**
-   * @brief ResetGlobalPropertiesID.
-   */
-  ResetGlobalPropertiesID = 4,
-
-  /**
-   * @brief AddCommandID.
-   */
-  AddCommandID = 5,
-
-  /**
-   * @brief DeleteCommandID.
-   */
-  DeleteCommandID = 6,
-
-  /**
-   * @brief AddSubMenuID.
-   */
-  AddSubMenuID = 7,
-
-  /**
-   * @brief DeleteSubMenuID.
-   */
-  DeleteSubMenuID = 8,
-
-  /**
-   * @brief CreateInteractionChoiceSetID.
-   */
-  CreateInteractionChoiceSetID = 9,
-
-  /**
-   * @brief PerformInteractionID.
-   */
-  PerformInteractionID = 10,
-
-  /**
-   * @brief DeleteInteractionChoiceSetID.
-   */
-  DeleteInteractionChoiceSetID = 11,
-
-  /**
-   * @brief AlertID.
-   */
-  AlertID = 12,
-
-  /**
-   * @brief ShowID.
-   */
-  ShowID = 13,
-
-  /**
-   * @brief SpeakID.
-   */
-  SpeakID = 14,
-
-  /**
-   * @brief SetMediaClockTimerID.
-   */
-  SetMediaClockTimerID = 15,
-
-  /**
-   * @brief PerformAudioPassThruID.
-   */
-  PerformAudioPassThruID = 16,
-
-  /**
-   * @brief EndAudioPassThruID.
-   */
-  EndAudioPassThruID = 17,
-
-  /**
-   * @brief SubscribeButtonID.
-   */
-  SubscribeButtonID = 18,
-
-  /**
-   * @brief UnsubscribeButtonID.
-   */
-  UnsubscribeButtonID = 19,
-
-  /**
-   * @brief SubscribeVehicleDataID.
-   */
-  SubscribeVehicleDataID = 20,
-
-  /**
-   * @brief UnsubscribeVehicleDataID.
-   */
-  UnsubscribeVehicleDataID = 21,
-
-  /**
-   * @brief GetVehicleDataID.
-   */
-  GetVehicleDataID = 22,
-
-  /**
-   * @brief ReadDIDID.
-   */
-  ReadDIDID = 23,
-
-  /**
-   * @brief GetDTCsID.
-   */
-  GetDTCsID = 24,
-
-  /**
-   * @brief ScrollableMessageID.
-   */
-  ScrollableMessageID = 25,
-
-  /**
-   * @brief SliderID.
-   */
-  SliderID = 26,
-
-  /**
-   * @brief ShowConstantTBTID.
-   */
-  ShowConstantTBTID = 27,
-
-  /**
-   * @brief AlertManeuverID.
-   */
-  AlertManeuverID = 28,
-
-  /**
-   * @brief UpdateTurnListID.
-   */
-  UpdateTurnListID = 29,
-
-  /**
-   * @brief ChangeRegistrationID.
-   */
-  ChangeRegistrationID = 30,
-
-  /**
-   * @brief GenericResponseID.
-   */
-  GenericResponseID = 31,
-
-  /**
-   * @brief PutFileID.
-   */
-  PutFileID = 32,
-
-  /**
-   * @brief DeleteFileID.
-   */
-  DeleteFileID = 33,
-
-  /**
-   * @brief ListFilesID.
-   */
-  ListFilesID = 34,
-
-  /**
-   * @brief SetAppIconID.
-   */
-  SetAppIconID = 35,
-
-  /**
-   * @brief SetDisplayLayoutID.
-   */
-  SetDisplayLayoutID = 36,
-
-  /**
-   * @brief DiagnosticMessageID.
-   */
-  DiagnosticMessageID = 37,
-
-  /**
-   * @brief SystemRequestID.
-   */
-  SystemRequestID = 38,
-
-  /**
-   * @brief SendLocationID.
-   */
-  SendLocationID = 39,
-
-  /**
-   * @brief DialNumberID.
-   */
-  DialNumberID = 40,
-
-  /**
-   * @brief ButtonPressID.
-   */
-  ButtonPressID = 41,
-
-  /**
-   * @brief GetInteriorVehicleDataID.
-   */
-  GetInteriorVehicleDataID = 43,
-
-  /**
-   * @brief SetInteriorVehicleDataID.
-   */
-  SetInteriorVehicleDataID = 44,
-
-  /**
-   * @brief GetWayPointsID.
-   */
-  GetWayPointsID = 45,
-
-  /**
-   * @brief SubscribeWayPointsID.
-   */
-  SubscribeWayPointsID = 46,
-
-  /**
-   * @brief UnsubscribeWayPointsID.
-   */
-  UnsubscribeWayPointsID = 47,
-
-  /**
-   * @brief GetSystemCapabilityID.
-   */
-  GetSystemCapabilityID = 48,
-
-  /**
-   * @brief SendHapticDataID.
-   */
-  SendHapticDataID = 49,
-
-  /**
-   * @brief SetCloudAppPropertiesID.
-   */
-  SetCloudAppPropertiesID = 50,
-
-  /**
-   * @brief GetCloudAppPropertiesID.
-   */
-  GetCloudAppPropertiesID = 51,
-
-  /**
-   * @brief PublishAppServiceID.
-   */
-  PublishAppServiceID = 52,
-
-  /**
-   * @brief GetAppServiceDataID.
-   */
-  GetAppServiceDataID = 53,
-
-  /**
-   * @brief GetFileID
-   */
-  GetFileID = 54,
-
-  /**
-   * @brief PerformAppServiceInteractionID.
-   */
-  PerformAppServiceInteractionID = 55,
-
-  /**
-   * @brief UnpublishAppServiceID.
-   */
-  UnpublishAppServiceID = 56,
-
-  /**
-   * @brief CloseApplicationID.
-   */
-  CloseApplicationID = 58,
-
-  /**
-   * @brief ShowAppMenuID.
-   */
-  ShowAppMenuID = 59,
-
-  /**
-   * @brief OnHMIStatusID.
-   */
-  OnHMIStatusID = 32768,
-
-  /**
-   * @brief OnAppInterfaceUnregisteredID.
-   */
-  OnAppInterfaceUnregisteredID = 32769,
-
-  /**
-   * @brief OnButtonEventID.
-   */
-  OnButtonEventID = 32770,
-
-  /**
-   * @brief OnButtonPressID.
-   */
-  OnButtonPressID = 32771,
-
-  /**
-   * @brief OnVehicleDataID.
-   */
-  OnVehicleDataID = 32772,
-
-  /**
-   * @brief OnCommandID.
-   */
-  OnCommandID = 32773,
-
-  /**
-   * @brief OnTBTClientStateID.
-   */
-  OnTBTClientStateID = 32774,
-
-  /**
-   * @brief OnDriverDistractionID.
-   */
-  OnDriverDistractionID = 32775,
-
-  /**
-   * @brief OnPermissionsChangeID.
-   */
-  OnPermissionsChangeID = 32776,
-
-  /**
-   * @brief OnAudioPassThruID.
-   */
-  OnAudioPassThruID = 32777,
-
-  /**
-   * @brief OnLanguageChangeID.
-   */
-  OnLanguageChangeID = 32778,
-
-  /**
-   * @brief OnKeyboardInputID.
-   */
-  OnKeyboardInputID = 32779,
-
-  /**
-   * @brief OnTouchEventID.
-   */
-  OnTouchEventID = 32780,
-
-  /**
-   * @brief OnSystemRequestID.
-   */
-  OnSystemRequestID = 32781,
-
-  /**
-   * @brief OnHashChangeID.
-   */
-  OnHashChangeID = 32782,
-
-  /**
-   * @brief OnInteriorVehicleDataID.
-   */
-  OnInteriorVehicleDataID = 32783,
-
-  /**
-   * @brief OnWayPointChangeID.
-   */
-  OnWayPointChangeID = 32784,
-
-  /**
-   * @brief OnRCStatusID.
-   */
-  OnRCStatusID = 32785,
-
-  /**
-   * @brief OnAppServiceDataID.
-   */
-  OnAppServiceDataID = 32786,
-
-  /**
-   * @brief OnSystemCapabilityUpdatedID
-   */
-  OnSystemCapabilityUpdatedID = 32787,
-
-  /**
-   * @brief EncodedSyncPDataID.
-   */
-  EncodedSyncPDataID = 65536,
-
-  /**
-   * @brief SyncPDataID.
-   */
-  SyncPDataID = 65537,
-
-  /**
-   * @brief OnEncodedSyncPDataID.
-   */
-  OnEncodedSyncPDataID = 98304,
-
-  /**
-   * @brief OnSyncPDataID.
-   */
-  OnSyncPDataID = 98305
-};
-bool IsValidEnum(FunctionID val);
-const char* EnumToJsonString(FunctionID val);
-bool EnumFromJsonString(const std::string& literal, FunctionID* result);
-
 extern const std::string kDefaultApp;
 extern const std::string kPreDataConsentApp;
 extern const std::string kDeviceApp;
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/policy_enum_schema_factory.h b/src/components/policy/policy_regular/include/policy/policy_table/policy_enum_schema_factory.h
new file mode 100644
index 0000000000..2053923cfe
--- /dev/null
+++ b/src/components/policy/policy_regular/include/policy/policy_table/policy_enum_schema_factory.h
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2017, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_POLICY_ENUM_SCHEMA_FACTORY_H
+#define SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_POLICY_ENUM_SCHEMA_FACTORY_H
+#include <memory>
+#include <string>
+
+#include "smart_objects/smart_schema.h"
+
+namespace rpc {
+namespace policy_table_interface_base {
+
+class EnumSchemaItemFactory {
+ public:
+  /**
+   * @brief Get enum schema from enum name
+   * Implementation of this function should be generated from MOBILE_API.xml
+   * @param enum_name enum name to get schema factory for
+   * @return shared pointer to schema factory or empty shared pointer if
+   * enum_name is wrong
+   */
+  static std::shared_ptr<ns_smart_device_link::ns_smart_objects::ISchemaItem>
+  Get(const std::string& enum_name);
+
+  static bool IsRPCSpecVehicleDataType(const std::string& vd_name);
+};
+
+}  // namespace policy_table_interface_base
+}  // namespace rpc
+#endif  // SRC_COMPONENTS_POLICY_POLICY_REGULAR_INCLUDE_POLICY_POLICY_TABLE_POLICY_ENUM_SCHEMA_FACTORY_H
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/types.h b/src/components/policy/policy_regular/include/policy/policy_table/types.h
index c2a8f901ad..2ffbf2e7ec 100644
--- a/src/components/policy/policy_regular/include/policy/policy_table/types.h
+++ b/src/components/policy/policy_regular/include/policy/policy_table/types.h
@@ -36,7 +36,9 @@
 #include <climits>
 
 #include "policy/policy_table/enums.h"
+#include "policy/policy_table/policy_enum_schema_factory.h"
 #include "rpc_base/rpc_message.h"
+#include "utils/helpers.h"
 
 namespace Json {
 class Value;
@@ -46,6 +48,7 @@ namespace policy_table_interface_base {
 struct AppLevel;
 struct ApplicationParams;
 struct DeviceParams;
+struct EndpointProperty;
 struct MessageLanguages;
 struct MessageString;
 struct RpcParameters;
@@ -67,16 +70,18 @@ typedef Array<Enum<AppHMIType>, 0, 255> AppHMITypes;
 
 typedef Array<Enum<HmiLevel>, 0, 4> HmiLevels;
 
-typedef Array<Enum<Parameter>, 0, 255> Parameters;
+typedef Array<String<0, 255>, 0, 255> Parameters;
 
 typedef Map<RpcParameters, 0, UINT_MAX> Rpc;
 
-typedef Array<String<10, 255>, 1, 3> URL;
+typedef Array<String<10, INT_MAX>, 1, 3> URL;
 
 typedef Map<URL, 1, 255> URLList;
 
 typedef Map<URLList, 1, 255> ServiceEndpoints;
 
+typedef Map<EndpointProperty, 0, 255> ServiceEndpointProperties;
+
 typedef uint8_t NumberOfNotificationsType;
 typedef Map<Integer<NumberOfNotificationsType, 0, 255>, 0, 7>
     NumberOfNotificationsPerMinute;
@@ -203,6 +208,7 @@ struct ApplicationParams : PolicyBase {
   // App Service Params
   Optional<AppServiceParameters> app_service_parameters;
   Optional<Boolean> allow_unknown_rpc_passthrough;
+  Optional<Boolean> encryption_required;
 
  public:
   ApplicationParams();
@@ -268,6 +274,7 @@ struct Rpcs : CompositeType {
  public:
   Optional<String<1, 255> > user_consent_prompt;
   Nullable<Rpc> rpcs;
+  Optional<Boolean> encryption_required;
 
  public:
   Rpcs();
@@ -285,6 +292,24 @@ struct Rpcs : CompositeType {
   bool Validate() const;
 };
 
+struct EndpointProperty : CompositeType {
+ public:
+  Optional<String<0, 100> > version;
+
+  EndpointProperty();
+  ~EndpointProperty();
+  explicit EndpointProperty(const Json::Value* value__);
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  void SetPolicyTableType(PolicyTableType pt_type) OVERRIDE;
+
+ private:
+  bool Validate() const;
+};
+
 struct ModuleConfig : CompositeType {
  public:
   Optional<Map<String<0, 100>, 0, 255> > device_certificates;
@@ -296,6 +321,7 @@ struct ModuleConfig : CompositeType {
   Integer<uint16_t, 0, 65535> timeout_after_x_seconds;
   SecondsBetweenRetries seconds_between_retries;
   ServiceEndpoints endpoints;
+  Optional<ServiceEndpointProperties> endpoint_properties;
   NumberOfNotificationsPerMinute notifications_per_minute_by_priority;
   Optional<String<1, 100> > vehicle_make;
   Optional<String<1, 100> > vehicle_model;
@@ -304,6 +330,8 @@ struct ModuleConfig : CompositeType {
   Optional<String<0, 65535> > certificate;
   Optional<Boolean> lock_screen_dismissal_enabled;
 
+  static const std::string kDefaultOemMappingServiceName;
+
  public:
   ModuleConfig();
   ModuleConfig(uint8_t exchange_after_x_ignition_cycles,
@@ -312,6 +340,7 @@ struct ModuleConfig : CompositeType {
                uint16_t timeout_after_x_seconds,
                const SecondsBetweenRetries& seconds_between_retries,
                const ServiceEndpoints& endpoints,
+               const ServiceEndpointProperties& endpoint_properties,
                const NumberOfNotificationsPerMinute&
                    notifications_per_minute_by_priority);
   ~ModuleConfig();
@@ -495,6 +524,88 @@ struct DeviceParams : CompositeType {
   bool Validate() const;
 };
 
+struct VehicleDataItem : CompositeType {
+ public:
+  static const std::vector<std::string> kPODTypes;
+
+  static const std::string kInteger;
+  static const std::string kStruct;
+  static const std::string kString;
+  static const std::string kFloat;
+  static const std::string kDouble;
+  static const std::string kBoolean;
+  static const std::string kName;
+  static const std::string kParams;
+
+  String<1, 255> name;
+  String<0, 255> type;
+  String<1, 255> key;
+  Boolean mandatory;
+  Optional<Array<VehicleDataItem, 0, 255> > params;
+
+  Optional<Boolean> array;
+  Optional<String<0, 255> > since;
+  Optional<String<0, 255> > until;
+  Optional<Boolean> removed;
+  Optional<Boolean> deprecated;
+  Optional<Float<-INT32_MAX, INT32_MAX> > minvalue;
+  Optional<Float<-INT32_MAX, INT32_MAX> > maxvalue;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > minsize;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > maxsize;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > minlength;
+  Optional<Integer<uint32_t, 0, UINT32_MAX> > maxlength;
+
+  VehicleDataItem();
+  VehicleDataItem(const VehicleDataItem& policy_table);
+  explicit VehicleDataItem(const Json::Value* value__);
+
+  bool operator==(const VehicleDataItem& vd);
+
+  ~VehicleDataItem();
+
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_not_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  virtual void SetPolicyTableType(PolicyTableType pt_type);
+
+  /**
+   * @brief Validates type of vehicle data item according to
+   * POD types and generated from API enums.
+   * @return true if type is valid.
+   */
+  bool ValidateTypes() const;
+  bool IsPrimitiveType() const;
+  bool ValidateNaming(std::string str) const;
+
+ private:
+  bool Validate() const;
+};
+
+typedef Array<VehicleDataItem, 0, 255> VehicleDataItems;
+
+struct VehicleData : CompositeType {
+ public:
+  Optional<String<0, 100> > schema_version;
+  Optional<VehicleDataItems> schema_items;
+
+  VehicleData();
+  VehicleData(const VehicleData& vehicle_data);
+  VehicleData(const Json::Value* value__);
+  ~VehicleData();
+
+  Json::Value ToJsonValue() const;
+  bool is_valid() const;
+  bool is_initialized() const;
+  bool struct_empty() const;
+  void ReportErrors(rpc::ValidationReport* report__) const;
+  virtual void SetPolicyTableType(PolicyTableType pt_type);
+
+ private:
+  bool Validate() const;
+};
+
 struct PolicyTable : CompositeType {
  public:
   ApplicationPoliciesSection app_policies_section;
@@ -504,6 +615,7 @@ struct PolicyTable : CompositeType {
   Optional<ModuleMeta> module_meta;
   Optional<UsageAndErrorCounts> usage_and_error_counts;
   Optional<DeviceData> device_data;
+  Optional<VehicleData> vehicle_data;
 
  public:
   PolicyTable();
diff --git a/src/components/policy/policy_regular/include/policy/policy_types.h b/src/components/policy/policy_regular/include/policy/policy_types.h
index 0be5919126..7f95d9132b 100644
--- a/src/components/policy/policy_regular/include/policy/policy_types.h
+++ b/src/components/policy/policy_regular/include/policy/policy_types.h
@@ -41,6 +41,7 @@
 #include <utility>
 #include <vector>
 
+#include "policy/policy_table/types.h"
 #include "transport_manager/common.h"
 #include "utils/helpers.h"
 
@@ -74,9 +75,16 @@ enum PolicyTableStatus {
   StatusUpToDate = 0,
   StatusUpdatePending,
   StatusUpdateRequired,
-  StatusUnknown
+  StatusUnknown,
+  StatusProcessingSnapshot
 };
 
+enum class PTUIterationType { DefaultIteration = 0, RetryIteration };
+
+enum class ResetRetryCountType { kResetWithStatusUpdate = 0, kResetInternally };
+
+typedef rpc::Optional<rpc::Boolean> EncryptionRequired;
+
 // Code generator uses String class name, so this typedef was renamed to PTSring
 typedef std::string PTString;
 typedef std::vector<uint8_t> BinaryMessage;
@@ -102,6 +110,7 @@ struct ParameterPermissions
 struct RpcPermissions {
   HMIPermissions hmi_permissions;
   ParameterPermissions parameter_permissions;
+  EncryptionRequired require_encryption;
 };
 
 typedef std::map<RpcName, RpcPermissions> Permissions;
@@ -225,8 +234,11 @@ struct DeviceInfo {
     using namespace helpers;
     static const std::string bluetooth("BLUETOOTH");
     static const std::string wifi("WIFI");
+    static const std::string webengine("WEBENGINE_WEBSOCKET");
     if (Compare<std::string, EQ, ONE>(deviceType, bluetooth, wifi)) {
       connection_type.assign("BTMAC");
+    } else if (Compare<std::string, EQ, ONE>(deviceType, webengine)) {
+      connection_type.assign("");
     }
   }
 };
@@ -428,6 +440,30 @@ struct ExternalConsentStatusItemSorter {
 };
 
 /**
+ * @brief The ApplicationPolicyActions struct contains actions which should be
+ * done for some application
+ */
+struct ApplicationPolicyActions {
+  ApplicationPolicyActions()
+      : is_notify_system(false)
+      , is_send_permissions_to_app(false)
+      , is_consent_needed(false)
+      , app_properties_changed(false) {}
+
+  bool is_notify_system;
+  bool is_send_permissions_to_app;
+  bool is_consent_needed;
+  bool app_properties_changed;
+};
+
+/**
+ * @brief ApplicationsPoliciesActions map of actions to be done for every
+ * application
+ */
+typedef std::map<std::string, ApplicationPolicyActions>
+    ApplicationsPoliciesActions;
+
+/**
  * @brief Customer connectivity settings status
  */
 typedef std::set<ExternalConsentStatusItem, ExternalConsentStatusItemSorter>
@@ -473,10 +509,12 @@ enum PermissionsCheckResult {
   RESULT_NICKNAME_MISMATCH,
   RESULT_PERMISSIONS_REVOKED,
   RESULT_CONSENT_NEEDED,
-  RESULT_CONSENT_NOT_REQIURED,
+  RESULT_CONSENT_NOT_REQUIRED,
   RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED,
   RESULT_REQUEST_TYPE_CHANGED,
-  RESULT_REQUEST_SUBTYPE_CHANGED
+  RESULT_REQUEST_SUBTYPE_CHANGED,
+  RESULT_ENCRYPTION_REQUIRED_FLAG_CHANGED,
+  RESULT_APP_PROPERTIES_CHANGED
 };
 
 /**
@@ -492,6 +530,68 @@ typedef std::set<std::pair<std::string, PermissionsCheckResult> >
  */
 typedef std::pair<uint32_t, uint32_t> AppIdURL;
 
+/**
+ * @brief The AppProperties struct contains application properties
+ */
+struct AppProperties {
+  AppProperties()
+      : endpoint()
+      , certificate()
+      , enabled(false)
+      , auth_token()
+      , transport_type()
+      , hybrid_app_preference() {}
+
+  AppProperties(std::string endpoint,
+                std::string certificate,
+                bool enabled,
+                std::string auth_token,
+                std::string transport_type,
+                std::string hybrid_app_preference)
+      : endpoint(endpoint)
+      , certificate(certificate)
+      , enabled(enabled)
+      , auth_token(auth_token)
+      , transport_type(transport_type)
+      , hybrid_app_preference(hybrid_app_preference) {}
+
+  /**
+   * @brief endpoint Filled with the endpoint used to connect to the cloud
+   * application.
+   * @note should be absent for local applications
+   */
+  std::string endpoint;
+
+  /**
+   * @brief certificate Filled with the certificate used for creation
+   * of a secure connection to the cloud application
+   */
+  std::string certificate;
+
+  /**
+   * @brief enabled Whether or not the app is enabled
+   */
+  bool enabled;
+
+  /**
+   * @brief auth_token Filled with the token used for authentication when
+   * reconnecting to the cloud app
+   */
+  std::string auth_token;
+
+  /**
+   * @brief transport_type Filled with the transport type used by the
+   * cloud/local application (ex. "WSS")
+   */
+  std::string transport_type;
+
+  /**
+   * @brief hybrid_app_preference Filled with the hybrid app preference for the
+   * application set by the user
+   */
+  std::string hybrid_app_preference;
+};
+
 }  //  namespace policy
 
 #endif  // SRC_COMPONENTS_POLICY_POLICY_EXTERNAL_INCLUDE_POLICY_POLICY_TYPES_H_
diff --git a/src/components/policy/policy_regular/include/policy/pt_representation.h b/src/components/policy/policy_regular/include/policy/pt_representation.h
index 0534b27093..467fb4641f 100644
--- a/src/components/policy/policy_regular/include/policy/pt_representation.h
+++ b/src/components/policy/policy_regular/include/policy/pt_representation.h
@@ -123,11 +123,6 @@ class PTRepresentation {
   virtual bool SecondsBetweenRetries(std::vector<int>* seconds) = 0;
 
   /**
-   * @brief Get information about vehicle
-   */
-  virtual const VehicleInfo GetVehicleInfo() const = 0;
-
-  /**
    * @brief Allows to update 'vin' field in module_meta table.
    *
    * @param new 'vin' value.
@@ -157,14 +152,6 @@ class PTRepresentation {
   virtual EndpointUrls GetUpdateUrls(int service_type) = 0;
 
   /**
-   * @brief GetLockScreenIcon allows to obtain lock screen icon url;
-   *
-   * @return url which point to the resourse where lock screen icon could be
-   *obtained.
-   */
-  virtual std::string GetLockScreenIconUrl() const = 0;
-
-  /**
    * @brief Get allowed number of notifications
    * depending on application priority.
    * @param priority Priority of application
diff --git a/src/components/policy/policy_regular/include/policy/sql_pt_queries.h b/src/components/policy/policy_regular/include/policy/sql_pt_queries.h
index bada9a003a..315c30b995 100644
--- a/src/components/policy/policy_regular/include/policy/sql_pt_queries.h
+++ b/src/components/policy/policy_regular/include/policy/sql_pt_queries.h
@@ -49,7 +49,6 @@ extern const std::string kSelectPreloaded;
 extern const std::string kIsFirstRun;
 extern const std::string kSetNotFirstRun;
 extern const std::string kSelectEndpoint;
-extern const std::string kSelectLockScreenIcon;
 extern const std::string kSelectModuleConfig;
 extern const std::string kSelectEndpoints;
 extern const std::string kSelectNotificationsPerMin;
@@ -143,6 +142,19 @@ extern const std::string kSelectDBVersion;
 extern const std::string kUpdateDBVersion;
 extern const std::string kSaveModuleMeta;
 extern const std::string kSelectModuleMeta;
+extern const std::string kInsertVehicleDataItem;
+extern const std::string kSelectVehicleDataItem;
+extern const std::string kDeleteVehicleDataItems;
+extern const std::string kInsertVehicleDataItemParams;
+extern const std::string kSelectVehicleDataItemParams;
+extern const std::string kDeleteVehicleDataItemParams;
+extern const std::string kSelectVehicleDataItemWithVersion;
+extern const std::string kSelectPrimitiveVehicleDataItems;
+extern const std::string kSelectCompositeVehicleDataItemsKey;
+extern const std::string kSelectVehicleDataSchemaVersion;
+extern const std::string kInsertVehicleDataSchemaVersion;
+extern const std::string kSelectEndpointProperties;
+extern const std::string kInsertEndpointVersion;
 
 }  // namespace sql_pt
 }  // namespace policy
diff --git a/src/components/policy/policy_regular/include/policy/sql_pt_representation.h b/src/components/policy/policy_regular/include/policy/sql_pt_representation.h
index e95620fbc2..1bb74e028c 100644
--- a/src/components/policy/policy_regular/include/policy/sql_pt_representation.h
+++ b/src/components/policy/policy_regular/include/policy/sql_pt_representation.h
@@ -44,6 +44,7 @@ namespace policy_table = rpc::policy_table_interface_base;
 namespace utils {
 namespace dbms {
 class SQLDatabase;
+class SQLQuery;
 }  // namespace dbms
 }  // namespace utils
 
@@ -52,6 +53,7 @@ namespace policy {
 class SQLPTRepresentation : public virtual PTRepresentation {
  public:
   SQLPTRepresentation();
+  explicit SQLPTRepresentation(bool in_memory);
   ~SQLPTRepresentation();
   virtual void CheckPermissions(const PTString& app_id,
                                 const PTString& hmi_level,
@@ -69,13 +71,11 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual int TimeoutResponse();
   virtual bool SecondsBetweenRetries(std::vector<int>* seconds);
   virtual bool RefreshDB();
-  virtual const VehicleInfo GetVehicleInfo() const;
 
   virtual std::vector<UserFriendlyMessage> GetUserFriendlyMsg(
       const std::vector<std::string>& msg_codes, const std::string& language);
 
   virtual EndpointUrls GetUpdateUrls(int service_type);
-  virtual std::string GetLockScreenIconUrl() const;
   virtual int GetNotificationsNumber(const std::string& priority);
   virtual bool GetPriority(const std::string& policy_app_id,
                            std::string* priority);
@@ -123,6 +123,9 @@ class SQLPTRepresentation : public virtual PTRepresentation {
       policy_table::ConsumerFriendlyMessages* messages) const;
   virtual bool GatherApplicationPoliciesSection(
       policy_table::ApplicationPoliciesSection* policies) const;
+  virtual bool GatherVehicleDataItems(
+      policy_table::VehicleDataItems* vehicle_data_items) const;
+  virtual bool GatherVehicleData(policy_table::VehicleData* vehicle_data) const;
 
   bool GatherAppGroup(const std::string& app_id,
                       policy_table::Strings* app_groups) const;
@@ -159,6 +162,9 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual bool SaveSpecificAppPolicy(
       const policy_table::ApplicationPolicies::value_type& app);
   virtual bool SaveDevicePolicy(const policy_table::DevicePolicy& device);
+  virtual bool SaveVehicleDataItems(
+      const policy_table::VehicleDataItems& vehicle_data_items);
+  virtual bool SaveVehicleData(const policy_table::VehicleData& vehicle_data);
 
   virtual bool SaveMessageString(const std::string& type,
                                  const std::string& lang,
@@ -202,6 +208,26 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual bool IsDBVersionActual() const OVERRIDE;
   virtual bool UpdateDBVersion() const OVERRIDE;
 
+  policy_table::VehicleDataItems GetVehicleDataItem(
+      const std::string& name, const std::string& key) const;
+  bool InsertVehicleDataItem(
+      const policy_table::VehicleDataItem& vehicle_data_item);
+  bool VehicleDataItemExists(
+      const policy_table::VehicleDataItem& vehicle_data_item) const;
+
+  /**
+   * @brief Retrieves vehicle data items of type Struct (which contains
+   * params) from the database including these parameters.
+   * @return Array of composite VehicleDataItems
+   */
+  policy_table::VehicleDataItems SelectCompositeVehicleDataItems() const;
+
+  /**
+   * @brief Retrieves vehicle data items of non Struct type from the database.
+   * @return Array of primitive VehicleDataItems
+   */
+  policy_table::VehicleDataItems SelectPrimitiveVehicleDataItems() const;
+
  private:
   static const std::string kDatabaseName;
   utils::dbms::SQLDatabase* db_;
@@ -217,12 +243,17 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   const int32_t GetDBVersion() const;
   bool SaveRpcs(int64_t group_id, const policy_table::Rpc& rpcs);
   bool SaveServiceEndpoints(const policy_table::ServiceEndpoints& endpoints);
+  bool SaveServiceEndpointProperties(
+      const policy_table::ServiceEndpointProperties& endpoint_properties);
   bool SaveSecondsBetweenRetries(
       const policy_table::SecondsBetweenRetries& seconds);
   bool SaveNumberOfNotificationsPerMinute(
       const policy_table::NumberOfNotificationsPerMinute& notifications);
   bool SaveMessageType(const std::string& type);
   bool SaveLanguage(const std::string& code);
+  policy_table::VehicleDataItem PopulateVDIFromQuery(
+      const utils::dbms::SQLQuery& query) const;
+  bool DeleteVehicleDataItems() const;
 
   bool is_in_memory;
 };
diff --git a/src/components/policy/policy_regular/include/policy/status.h b/src/components/policy/policy_regular/include/policy/status.h
index 8fd3ff559e..4d8bc47dae 100644
--- a/src/components/policy/policy_regular/include/policy/status.h
+++ b/src/components/policy/policy_regular/include/policy/status.h
@@ -52,6 +52,7 @@ enum UpdateEvent {
   kOnResetPolicyTableRequireUpdate,
   kOnResetPolicyTableNoUpdate,
   kScheduleUpdate,
+  kPendingUpdate,
   kScheduleManualUpdate,
   kOnResetRetrySequence,
   kNoEvent
@@ -118,6 +119,39 @@ class Status {
 };
 
 /**
+ * @brief The UpdatePendingStatus class represents cases when SDL knows that an
+ * update is required but before the snapshot is sent to the HMI
+ */
+class UpdatePendingStatus : public Status {
+ public:
+  /**
+   * @brief Constructor
+   */
+  UpdatePendingStatus();
+
+  /**
+   * @brief Process event by setting next status in case event can affect
+   * current status or ignores the event
+   * @param manager Status manager pointer
+   * @param event Event which needs to be processed
+   */
+  void ProcessEvent(UpdateStatusManagerInterface* manager,
+                    UpdateEvent event) OVERRIDE;
+
+  /**
+   * @brief Check whether update is required in terms of status
+   * @return True if update is required, otherwise - false
+   */
+  bool IsUpdateRequired() const OVERRIDE;
+
+  /**
+   * @brief Check whether update is pending in terms of status
+   * @return True if update is pending, otherwise - false
+   */
+  bool IsUpdatePending() const OVERRIDE;
+};
+
+/**
  * @brief The UpToDateStatus class represents 'up-to-date' status
  */
 class UpToDateStatus : public Status {
diff --git a/src/components/policy/policy_regular/include/policy/update_status_manager.h b/src/components/policy/policy_regular/include/policy/update_status_manager.h
index 0c79bf0ba4..fb679ac10b 100644
--- a/src/components/policy/policy_regular/include/policy/update_status_manager.h
+++ b/src/components/policy/policy_regular/include/policy/update_status_manager.h
@@ -149,6 +149,12 @@ class UpdateStatusManager : public UpdateStatusManagerInterface {
   void ScheduleUpdate();
 
   /**
+   * @brief PendingUpdate will change state from Update_Needed
+   * to Update_Pending
+   */
+  void PendingUpdate();
+
+  /**
    * @brief ScheduleUpdate allows to schedule next update.
    * It will change state to Update_Needed, that's is
    * and will not send any notifications about updating to HMI
diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc
index d121886765..28ceec3ccb 100644
--- a/src/components/policy/policy_regular/src/cache_manager.cc
+++ b/src/components/policy/policy_regular/src/cache_manager.cc
@@ -33,14 +33,17 @@
 #include "policy/cache_manager.h"
 
 #include <algorithm>
+#include <boost/algorithm/string.hpp>
 #include <cmath>
 #include <ctime>
 #include <functional>
 #include <sstream>
 
-#include "json/features.h"
+#include "interfaces/MOBILE_API.h"
+#include "json/json_features.h"
 #include "json/reader.h"
 #include "json/writer.h"
+#include "smart_objects/enum_schema_item.h"
 #include "utils/date_time.h"
 #include "utils/file_system.h"
 #include "utils/gen_hash.h"
@@ -50,6 +53,7 @@
 #include "utils/threads/thread.h"
 #include "utils/threads/thread_delegate.h"
 
+#include "policy/policy_helper.h"
 #include "policy/sql_pt_representation.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
@@ -104,6 +108,7 @@ CacheManager::CacheManager()
     , pt_(new policy_table::Table)
     , backup_(new SQLPTRepresentation())
     , update_required(false)
+    , removed_custom_vd_items_()
     , settings_(nullptr) {
   LOG4CXX_AUTO_TRACE(logger_);
   backuper_ = new BackgroundBackuper(this);
@@ -124,6 +129,20 @@ const policy_table::Strings& CacheManager::GetGroups(const PTString& app_id) {
   return pt_->policy_table.app_policies_section.apps[app_id].groups;
 }
 
+const policy_table::Strings CacheManager::GetPolicyAppIDs() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  const auto apps = pt_->policy_table.app_policies_section.apps;
+
+  policy_table::Strings policy_app_ids;
+  for (const auto& app : apps) {
+    policy_app_ids.push_back(app.first);
+  }
+
+  return policy_app_ids;
+}
+
 bool CacheManager::CanAppKeepContext(const std::string& app_id) const {
   CACHE_MANAGER_CHECK(false);
   bool result = true;
@@ -282,11 +301,58 @@ bool CacheManager::ApplyUpdate(const policy_table::Table& update_pt) {
   pt_->policy_table.consumer_friendly_messages.assign_if_valid(
       update_pt.policy_table.consumer_friendly_messages);
 
+  pt_->policy_table.module_config.endpoint_properties =
+      update_pt.policy_table.module_config.endpoint_properties;
+
+  // Apply update for vehicle data
+  if (update_pt.policy_table.vehicle_data.is_initialized()) {
+    policy_table::VehicleDataItems custom_items_before_apply;
+    if (pt_->policy_table.vehicle_data->schema_items.is_initialized()) {
+      custom_items_before_apply =
+          CollectCustomVDItems(*pt_->policy_table.vehicle_data->schema_items);
+    }
+
+    if (!update_pt.policy_table.vehicle_data->schema_items.is_initialized() ||
+        update_pt.policy_table.vehicle_data->schema_items->empty()) {
+      pt_->policy_table.vehicle_data->schema_items =
+          rpc::Optional<policy_table::VehicleDataItems>();
+    } else {
+      policy_table::VehicleDataItems custom_items = CollectCustomVDItems(
+          *update_pt.policy_table.vehicle_data->schema_items);
+
+      pt_->policy_table.vehicle_data->schema_version =
+          update_pt.policy_table.vehicle_data->schema_version;
+      pt_->policy_table.vehicle_data->schema_items =
+          rpc::Optional<policy_table::VehicleDataItems>(custom_items);
+    }
+
+    policy_table::VehicleDataItems custom_items_after_apply =
+        *pt_->policy_table.vehicle_data->schema_items;
+    const auto& items_diff = CalculateCustomVdItemsDiff(
+        custom_items_before_apply, custom_items_after_apply);
+    SetRemovedCustomVdItems(items_diff);
+  }
+
   ResetCalculatedPermissions();
   Backup();
   return true;
 }
 
+policy_table::VehicleDataItems CacheManager::CollectCustomVDItems(
+    const policy_table::VehicleDataItems& vd_items) {
+  policy_table::VehicleDataItems result_items;
+  for (auto& item : vd_items) {
+    const std::string i_name = "VEHICLEDATA_" + std::string(item.name);
+    const std::string vd_name = boost::to_upper_copy<std::string>(i_name);
+    const bool is_rpc_spec =
+        policy_table::EnumSchemaItemFactory::IsRPCSpecVehicleDataType(vd_name);
+    if (!is_rpc_spec) {
+      result_items.push_back(item);
+    }
+  }
+  return result_items;
+}
+
 void CacheManager::GetHMIAppTypeAfterUpdate(
     std::map<std::string, StringArray>& app_hmi_types) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -512,14 +578,8 @@ void CacheManager::CheckPermissions(const policy_table::Strings& groups,
         if (rpc_param.hmi_levels.end() != hmi_iter) {
           result.hmi_level_permitted = PermitResult::kRpcAllowed;
 
-          policy_table::Parameters::const_iterator params_iter =
-              rpc_param.parameters->begin();
-          policy_table::Parameters::const_iterator params_iter_end =
-              rpc_param.parameters->end();
-
-          for (; params_iter != params_iter_end; ++params_iter) {
-            result.list_of_allowed_params.insert(
-                policy_table::EnumToJsonString(*params_iter));
+          for (const auto& param : *rpc_param.parameters) {
+            result.list_of_allowed_params.insert(std::string(param));
           }
         }
       }
@@ -666,20 +726,26 @@ bool CacheManager::SecondsBetweenRetries(std::vector<int>& seconds) {
   return true;
 }
 
-const policy::VehicleInfo CacheManager::GetVehicleInfo() const {
-  CACHE_MANAGER_CHECK(VehicleInfo());
+const std::vector<policy_table::VehicleDataItem>
+CacheManager::GetVehicleDataItems() const {
+  CACHE_MANAGER_CHECK(std::vector<policy_table::VehicleDataItem>());
   sync_primitives::AutoLock auto_lock(cache_lock_);
-  policy_table::ModuleConfig& module_config = pt_->policy_table.module_config;
-  VehicleInfo vehicle_info;
-  vehicle_info.vehicle_make = *module_config.vehicle_make;
-  vehicle_info.vehicle_model = *module_config.vehicle_model;
-  vehicle_info.vehicle_year = *module_config.vehicle_year;
-  LOG4CXX_DEBUG(
-      logger_,
-      "Vehicle info (make, model, year):" << vehicle_info.vehicle_make << ","
-                                          << vehicle_info.vehicle_model << ","
-                                          << vehicle_info.vehicle_year);
-  return vehicle_info;
+  if (pt_->policy_table.vehicle_data.is_initialized() &&
+      pt_->policy_table.vehicle_data->schema_items.is_initialized()) {
+    return *(pt_->policy_table.vehicle_data->schema_items);
+  }
+
+  return std::vector<policy_table::VehicleDataItem>();
+}
+
+std::vector<policy_table::VehicleDataItem>
+CacheManager::GetRemovedVehicleDataItems() const {
+  CACHE_MANAGER_CHECK(std::vector<policy_table::VehicleDataItem>());
+  return removed_custom_vd_items_;
+}
+
+Json::Value CacheManager::GetPolicyTableData() const {
+  return pt_->policy_table.ToJsonValue();
 }
 
 void CacheManager::GetEnabledCloudApps(
@@ -701,35 +767,55 @@ void CacheManager::GetEnabledCloudApps(
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 }
 
-bool CacheManager::GetCloudAppParameters(
-    const std::string& policy_app_id,
-    bool& enabled,
-    std::string& endpoint,
-    std::string& certificate,
-    std::string& auth_token,
-    std::string& cloud_transport_type,
-    std::string& hybrid_app_preference) const {
+std::vector<std::string> CacheManager::GetEnabledLocalApps() const {
+#if !defined(WEBSOCKET_SERVER_TRANSPORT_SUPPORT)
+  return std::vector<std::string>();
+#else
+  std::vector<std::string> enabled_apps;
+  const policy_table::ApplicationPolicies& app_policies =
+      pt_->policy_table.app_policies_section.apps;
+  for (const auto& app_policies_item : app_policies) {
+    const auto app_policy = app_policies_item.second;
+    // Local (WebEngine) applications
+    // should not have "endpoint" field
+    if (app_policy.endpoint.is_initialized()) {
+      continue;
+    }
+    if (app_policy.enabled.is_initialized() && *app_policy.enabled) {
+      enabled_apps.push_back(app_policies_item.first);
+    }
+  }
+  return enabled_apps;
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+}
+
+bool CacheManager::GetAppProperties(const std::string& policy_app_id,
+                                    AppProperties& out_app_properties) const {
   const policy_table::ApplicationPolicies& policies =
       pt_->policy_table.app_policies_section.apps;
   policy_table::ApplicationPolicies::const_iterator policy_iter =
       policies.find(policy_app_id);
   if (policies.end() != policy_iter) {
     auto app_policy = (*policy_iter).second;
-    endpoint = app_policy.endpoint.is_initialized() ? *app_policy.endpoint
-                                                    : std::string();
-    auth_token = app_policy.auth_token.is_initialized() ? *app_policy.auth_token
-                                                        : std::string();
-    cloud_transport_type = app_policy.cloud_transport_type.is_initialized()
-                               ? *app_policy.cloud_transport_type
-                               : std::string();
-    certificate = app_policy.certificate.is_initialized()
-                      ? *app_policy.certificate
-                      : std::string();
-    hybrid_app_preference =
+    out_app_properties.endpoint = app_policy.endpoint.is_initialized()
+                                      ? *app_policy.endpoint
+                                      : std::string();
+    out_app_properties.auth_token = app_policy.auth_token.is_initialized()
+                                        ? *app_policy.auth_token
+                                        : std::string();
+    out_app_properties.transport_type =
+        app_policy.cloud_transport_type.is_initialized()
+            ? *app_policy.cloud_transport_type
+            : std::string();
+    out_app_properties.certificate = app_policy.certificate.is_initialized()
+                                         ? *app_policy.certificate
+                                         : std::string();
+    out_app_properties.hybrid_app_preference =
         app_policy.hybrid_app_preference.is_initialized()
             ? EnumToJsonString(*app_policy.hybrid_app_preference)
             : std::string();
-    enabled = app_policy.enabled.is_initialized() && *app_policy.enabled;
+    out_app_properties.enabled =
+        app_policy.enabled.is_initialized() && *app_policy.enabled;
     return true;
   }
   return false;
@@ -954,16 +1040,24 @@ std::vector<UserFriendlyMessage> CacheManager::GetUserFriendlyMsg(
 }
 
 void CacheManager::GetUpdateUrls(const uint32_t service_type,
-                                 EndpointUrls& out_end_points) {
-  std::stringstream service_type_stream;
-  service_type_stream << (service_type <= 9 ? "0x0" : "0x") << service_type;
-
-  const std::string service_type_str = service_type_stream.str();
-  GetUpdateUrls(service_type_str, out_end_points);
+                                 EndpointUrls& out_end_points) const {
+  auto find_hexademical =
+      [service_type](policy_table::ServiceEndpoints::value_type end_point) {
+        uint32_t decimal;
+        std::istringstream(end_point.first) >> std::hex >> decimal;
+        return end_point.first.compare(0, 2, "0x") == 0 &&
+               decimal == service_type;
+      };
+  auto& end_points = pt_->policy_table.module_config.endpoints;
+  const auto end_point =
+      std::find_if(end_points.begin(), end_points.end(), find_hexademical);
+  if (end_point != end_points.end()) {
+    GetUpdateUrls(end_point->first, out_end_points);
+  }
 }
 
 void CacheManager::GetUpdateUrls(const std::string& service_type,
-                                 EndpointUrls& out_end_points) {
+                                 EndpointUrls& out_end_points) const {
   LOG4CXX_AUTO_TRACE(logger_);
   CACHE_MANAGER_CHECK_VOID();
 
@@ -990,13 +1084,6 @@ void CacheManager::GetUpdateUrls(const std::string& service_type,
   }
 }
 
-std::string CacheManager::GetLockScreenIconUrl() const {
-  if (backup_) {
-    return backup_->GetLockScreenIconUrl();
-  }
-  return std::string("");
-}
-
 std::string CacheManager::GetIconUrl(const std::string& policy_app_id) const {
   CACHE_MANAGER_CHECK(std::string());
   std::string url;
@@ -1169,6 +1256,46 @@ void CacheManager::CheckSnapshotInitialization() {
   }
 }
 
+policy_table::VehicleDataItems CacheManager::CalculateCustomVdItemsDiff(
+    const policy_table::VehicleDataItems& items_before,
+    const policy_table::VehicleDataItems& items_after) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (items_before.empty()) {
+    LOG4CXX_DEBUG(logger_, "No custom VD items found in policy");
+    return policy_table::VehicleDataItems();
+  }
+
+  if (items_after.empty()) {
+    LOG4CXX_DEBUG(logger_,
+                  "All custom VD items were removed after policy update");
+    return items_before;
+  }
+
+  policy_table::VehicleDataItems removed_items;
+  for (auto& item_to_search : items_before) {
+    auto item_predicate =
+        [&item_to_search](const policy_table::VehicleDataItem& item_to_check) {
+          return item_to_search.name == item_to_check.name;
+        };
+
+    auto it =
+        std::find_if(items_after.begin(), items_after.end(), item_predicate);
+    if (items_after.end() == it) {
+      removed_items.push_back(item_to_search);
+    }
+  }
+
+  LOG4CXX_DEBUG(logger_,
+                "Found " << removed_items.size() << " removed VD items");
+  return removed_items;
+}
+
+void CacheManager::SetRemovedCustomVdItems(
+    const policy_table::VehicleDataItems& removed_items) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  removed_custom_vd_items_ = removed_items;
+}
+
 void CacheManager::PersistData() {
   LOG4CXX_AUTO_TRACE(logger_);
   if (backup_.use_count() != 0) {
@@ -1285,8 +1412,20 @@ std::shared_ptr<policy_table::Table> CacheManager::GenerateSnapshot() {
   snapshot_->policy_table.module_meta = pt_->policy_table.module_meta;
   snapshot_->policy_table.usage_and_error_counts =
       pt_->policy_table.usage_and_error_counts;
+  snapshot_->policy_table.usage_and_error_counts->app_level =
+      pt_->policy_table.usage_and_error_counts->app_level;
+  snapshot_->policy_table.usage_and_error_counts->mark_initialized();
+  snapshot_->policy_table.usage_and_error_counts->app_level->mark_initialized();
   snapshot_->policy_table.device_data = pt_->policy_table.device_data;
 
+  if (pt_->policy_table.vehicle_data.is_initialized()) {
+    snapshot_->policy_table.vehicle_data =
+        rpc::Optional<policy_table::VehicleData>();
+    snapshot_->policy_table.vehicle_data->mark_initialized();
+    snapshot_->policy_table.vehicle_data->schema_version =
+        pt_->policy_table.vehicle_data->schema_version;
+  }
+
   // Set policy table type to Snapshot
   snapshot_->SetPolicyTableType(
       rpc::policy_table_interface_base::PolicyTableType::PT_SNAPSHOT);
@@ -1670,9 +1809,15 @@ bool CacheManager::Init(const std::string& file_name,
       if (!result) {
         rpc::ValidationReport report("policy_table");
         snapshot->ReportErrors(&report);
+        LOG4CXX_DEBUG(logger_,
+                      "Validation report: " << rpc::PrettyFormat(report));
         return result;
       }
 
+      if (!UnwrapAppPolicies(pt_->policy_table.app_policies_section.apps)) {
+        LOG4CXX_ERROR(logger_, "Cannot unwrap application policies");
+      }
+
       backup_->UpdateDBVersion();
       Backup();
     } break;
@@ -1730,13 +1875,16 @@ bool CacheManager::LoadFromFile(const std::string& file_name,
     return false;
   }
 
+  Json::CharReaderBuilder reader_builder;
+  Json::CharReaderBuilder::strictMode(&reader_builder.settings_);
+  auto reader =
+      std::unique_ptr<Json::CharReader>(reader_builder.newCharReader());
   Json::Value value;
-  Json::Reader reader(Json::Features::strictMode());
+  JSONCPP_STRING err;
   std::string json(json_string.begin(), json_string.end());
-  if (!reader.parse(json.c_str(), value)) {
-    LOG4CXX_FATAL(
-        logger_,
-        "Preloaded PT is corrupted: " << reader.getFormattedErrorMessages());
+  const size_t json_len = json.length();
+  if (!reader->parse(json.c_str(), json.c_str() + json_len, &value, &err)) {
+    LOG4CXX_FATAL(logger_, "Preloaded PT is corrupted: " << err);
     return false;
   }
 
@@ -1745,9 +1893,10 @@ bool CacheManager::LoadFromFile(const std::string& file_name,
 
   table = policy_table::Table(&value);
 
-  Json::StyledWriter s_writer;
+  Json::StreamWriterBuilder writer_builder;
   LOG4CXX_DEBUG(logger_, "PT out:");
-  LOG4CXX_DEBUG(logger_, s_writer.write(table.ToJsonValue()));
+  LOG4CXX_DEBUG(logger_,
+                Json::writeString(writer_builder, table.ToJsonValue()));
 
   MakeLowerCaseAppNames(table);
 
@@ -1920,6 +2069,7 @@ bool CacheManager::MergePreloadPT(const std::string& file_name) {
     MergeFG(new_table, current);
     MergeAP(new_table, current);
     MergeCFM(new_table, current);
+    MergeVD(new_table, current);
     Backup();
   }
   return true;
@@ -1987,6 +2137,12 @@ void CacheManager::MergeCFM(const policy_table::PolicyTable& new_pt,
   }
 }
 
+void CacheManager::MergeVD(const policy_table::PolicyTable& new_pt,
+                           policy_table::PolicyTable& pt) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  pt.vehicle_data.assign_if_valid(new_pt.vehicle_data);
+}
+
 const PolicySettings& CacheManager::get_settings() const {
   DCHECK(settings_);
 
@@ -2052,4 +2208,46 @@ void CacheManager::BackgroundBackuper::DoBackup() {
   backup_notifier_.NotifyOne();
 }
 
+EncryptionRequired CacheManager::GetAppEncryptionRequiredFlag(
+    const std::string& application) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  return pt_->policy_table.app_policies_section.apps[application]
+      .encryption_required;
+}
+
+EncryptionRequired CacheManager::GetFunctionalGroupingEncryptionRequiredFlag(
+    const std::string& functional_group) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  const auto& functional_groupings = pt_->policy_table.functional_groupings;
+
+  const auto& grouping_itr = functional_groupings.find(functional_group);
+  if (grouping_itr == functional_groupings.end()) {
+    LOG4CXX_WARN(logger_, "Group " << functional_group << " not found");
+    return EncryptionRequired(rpc::Boolean(false));
+  }
+
+  return (*grouping_itr).second.encryption_required;
+}
+
+void CacheManager::GetApplicationParams(
+    const std::string& application_name,
+    policy_table::ApplicationParams& application_params) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock auto_lock(cache_lock_);
+
+  const auto apps = pt_->policy_table.app_policies_section.apps;
+  const auto it = apps.find(application_name);
+  if (apps.end() == it) {
+    LOG4CXX_WARN(logger_,
+                 "Application " << application_name << " was not found");
+    return;
+  }
+
+  application_params = (*it).second;
+}
+
 }  // namespace policy
diff --git a/src/components/policy/policy_regular/src/policy_helper.cc b/src/components/policy/policy_regular/src/policy_helper.cc
index 5fa0b314b3..08f1fbb177 100644
--- a/src/components/policy/policy_regular/src/policy_helper.cc
+++ b/src/components/policy/policy_regular/src/policy_helper.cc
@@ -1,4 +1,4 @@
-/*
+/*
  Copyright (c) 2013, Ford Motor Company
  All rights reserved.
 
@@ -46,7 +46,8 @@ namespace {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "Policy")
 
-bool Compare(const StringsValueType& first, const StringsValueType& second) {
+bool CompareStrings(const StringsValueType& first,
+                    const StringsValueType& second) {
   const std::string& first_str = first;
   const std::string& second_str = second;
   return (strcasecmp(first_str.c_str(), second_str.c_str()) < 0);
@@ -112,7 +113,7 @@ bool operator!=(const policy_table::ApplicationParams& first,
   for (; it_first != it_first_end; ++it_first) {
     CompareGroupName gp(*it_first);
     StringsConstItr it = std::find_if(it_second, it_second_end, gp);
-    if (it_first_end == it) {
+    if (it_second_end == it) {
       return true;
     }
   }
@@ -122,8 +123,12 @@ bool operator!=(const policy_table::ApplicationParams& first,
 CheckAppPolicy::CheckAppPolicy(
     PolicyManagerImpl* pm,
     const std::shared_ptr<policy_table::Table> update,
-    const std::shared_ptr<policy_table::Table> snapshot)
-    : pm_(pm), update_(update), snapshot_(snapshot) {}
+    const std::shared_ptr<policy_table::Table> snapshot,
+    CheckAppPolicyResults& out_results)
+    : pm_(pm)
+    , update_(update)
+    , snapshot_(snapshot)
+    , out_results_(out_results) {}
 
 bool policy::CheckAppPolicy::HasRevokedGroups(
     const policy::AppPoliciesValueType& app_policy,
@@ -132,10 +137,10 @@ bool policy::CheckAppPolicy::HasRevokedGroups(
       snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
 
   policy_table::Strings groups_new = app_policy.second.groups;
-  std::sort(groups_new.begin(), groups_new.end(), Compare);
+  std::sort(groups_new.begin(), groups_new.end(), CompareStrings);
 
   policy_table::Strings groups_curr = (*it).second.groups;
-  std::sort(groups_curr.begin(), groups_curr.end(), Compare);
+  std::sort(groups_curr.begin(), groups_curr.end(), CompareStrings);
 
   StringsConstItr it_groups_new = groups_new.begin();
   StringsConstItr it_groups_new_end = groups_new.end();
@@ -149,18 +154,7 @@ bool policy::CheckAppPolicy::HasRevokedGroups(
                       it_groups_new,
                       it_groups_new_end,
                       std::back_inserter(revoked_group_list),
-                      Compare);
-
-  // Remove groups which are not required user consent
-  policy_table::Strings::iterator it_revoked = revoked_group_list.begin();
-  for (; revoked_group_list.end() != it_revoked;) {
-    if (!IsConsentRequired(app_policy.first, std::string(*it_revoked))) {
-      revoked_group_list.erase(it_revoked);
-      it_revoked = revoked_group_list.begin();
-    } else {
-      ++it_revoked;
-    }
-  }
+                      CompareStrings);
 
   if (revoked_groups) {
     *revoked_groups = revoked_group_list;
@@ -169,6 +163,76 @@ bool policy::CheckAppPolicy::HasRevokedGroups(
   return !revoked_group_list.empty();
 }
 
+bool policy::CheckAppPolicy::HasUpdatedGroups(
+    const policy::AppPoliciesValueType& app_policy,
+    policy_table::Strings* updated_groups) const {
+  AppPoliciesConstItr it =
+      snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
+
+  policy_table::Strings groups_new = app_policy.second.groups;
+  std::sort(groups_new.begin(), groups_new.end(), CompareStrings);
+
+  policy_table::Strings groups_curr = (*it).second.groups;
+  std::sort(groups_curr.begin(), groups_curr.end(), CompareStrings);
+
+  policy_table::Strings intersection_list;
+  std::set_intersection(groups_new.begin(),
+                        groups_new.end(),
+                        groups_curr.begin(),
+                        groups_curr.end(),
+                        std::back_inserter(intersection_list));
+
+  auto IsGroupContentUpdated =
+      [this](const StringsValueType& groupName) -> bool {
+    const auto& func_group_from_update =
+        update_->policy_table.functional_groupings.find(groupName);
+    const auto& func_group_from_snapshot =
+        snapshot_->policy_table.functional_groupings.find(groupName);
+
+    const auto& update_fg_rpcs = func_group_from_update->second.rpcs;
+    const auto& snapshot_fg_rpcs = func_group_from_snapshot->second.rpcs;
+
+    if (update_fg_rpcs.is_null() || snapshot_fg_rpcs.is_null()) {
+      return !(update_fg_rpcs.is_null() && snapshot_fg_rpcs.is_null());
+    }
+
+    if (update_fg_rpcs.size() != snapshot_fg_rpcs.size()) {
+      return true;
+    }
+
+    for (const auto& rpc : update_fg_rpcs) {
+      const auto& old_rpc = snapshot_fg_rpcs.find(rpc.first);
+      if (snapshot_fg_rpcs.end() == old_rpc) {
+        return true;
+      }
+
+      const bool hmi_levels_same =
+          old_rpc->second.hmi_levels == rpc.second.hmi_levels;
+      const bool parameters_same =
+          *(old_rpc->second.parameters) == *(rpc.second.parameters);
+
+      if (!hmi_levels_same || !parameters_same) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+  policy_table::Strings updated_group_list;
+  for (const auto& item : intersection_list) {
+    if (IsGroupContentUpdated(item)) {
+      updated_group_list.push_back(item);
+    }
+  }
+
+  if (updated_groups) {
+    *updated_groups = updated_group_list;
+  }
+
+  return !updated_group_list.empty();
+}
+
 bool policy::CheckAppPolicy::HasNewGroups(
     const policy::AppPoliciesValueType& app_policy,
     policy_table::Strings* new_groups) const {
@@ -176,10 +240,10 @@ bool policy::CheckAppPolicy::HasNewGroups(
       snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
 
   policy_table::Strings groups_new = app_policy.second.groups;
-  std::sort(groups_new.begin(), groups_new.end(), Compare);
+  std::sort(groups_new.begin(), groups_new.end(), CompareStrings);
 
   policy_table::Strings groups_curr = (*it).second.groups;
-  std::sort(groups_curr.begin(), groups_curr.end(), Compare);
+  std::sort(groups_curr.begin(), groups_curr.end(), CompareStrings);
 
   StringsConstItr it_groups_new = groups_new.begin();
   StringsConstItr it_groups_new_end = groups_new.end();
@@ -193,7 +257,7 @@ bool policy::CheckAppPolicy::HasNewGroups(
                       it_groups_curr,
                       it_groups_curr_end,
                       std::back_inserter(new_group_list),
-                      Compare);
+                      CompareStrings);
 
   if (new_groups) {
     *new_groups = new_group_list;
@@ -205,14 +269,23 @@ bool policy::CheckAppPolicy::HasNewGroups(
 bool policy::CheckAppPolicy::HasConsentNeededGroups(
     const policy::AppPoliciesValueType& app_policy) const {
   policy_table::Strings new_groups;
-  if (!HasNewGroups(app_policy, &new_groups)) {
+  policy_table::Strings updated_groups;
+  if (!HasNewGroups(app_policy, &new_groups) &&
+      !HasUpdatedGroups(app_policy, &updated_groups)) {
     return false;
   }
 
-  StringsConstItr it_new = new_groups.begin();
-  StringsConstItr it_new_end = new_groups.end();
-  for (; it_new != it_new_end; ++it_new) {
-    if (IsConsentRequired(app_policy.first, *it_new)) {
+  policy_table::Strings groups_to_check_consent;
+  std::set_union(new_groups.begin(),
+                 new_groups.end(),
+                 updated_groups.begin(),
+                 updated_groups.end(),
+                 std::back_inserter(groups_to_check_consent));
+
+  StringsConstItr it = groups_to_check_consent.begin();
+  StringsConstItr it_end = groups_to_check_consent.end();
+  for (; it != it_end; ++it) {
+    if (IsConsentRequired(app_policy.first, *it)) {
       return true;
     }
   }
@@ -263,30 +336,18 @@ bool CheckAppPolicy::IsKnownAppication(
 
 void policy::CheckAppPolicy::NotifySystem(
     const policy::AppPoliciesValueType& app_policy) const {
-  pm_->listener()->OnPendingPermissionChange(app_policy.first);
-}
-
-void CheckAppPolicy::SendPermissionsToApp(
-    const std::string& app_id, const policy_table::Strings& groups) const {
-  const std::string device_id = pm_->GetCurrentDeviceId(app_id);
-  if (device_id.empty()) {
-    LOG4CXX_WARN(logger_,
-                 "Couldn't find device info for application id: " << app_id);
+  auto& listener = *pm_->listener();
+  const auto devices_ids = listener.GetDevicesIds(app_policy.first);
+  if (devices_ids.empty()) {
+    LOG4CXX_WARN(
+        logger_,
+        "Couldn't find device info for application id: " << app_policy.first);
     return;
   }
-  std::vector<FunctionalGroupPermission> group_permissons;
-  pm_->GetPermissionsForApp(device_id, app_id, group_permissons);
 
-  Permissions notification_data;
-  pm_->PrepareNotificationData(update_->policy_table.functional_groupings,
-                               groups,
-                               group_permissons,
-                               notification_data);
-
-  LOG4CXX_INFO(logger_, "Send notification for application_id: " << app_id);
-  // Default_hmi is Ford-specific and should not be used with basic policy
-  const std::string default_hmi;
-  pm_->listener()->OnPermissionsUpdated(app_id, notification_data, default_hmi);
+  for (const auto& device_id : devices_ids) {
+    listener.OnPendingPermissionChange(device_id, app_policy.first);
+  }
 }
 
 bool CheckAppPolicy::IsAppRevoked(
@@ -317,9 +378,22 @@ bool CheckAppPolicy::NicknamesMatch(
   return true;
 }
 
+void CheckAppPolicy::AddResult(const std::string& app_id,
+                               PermissionsCheckResult result) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto item = std::make_pair(app_id, result);
+  out_results_.insert(item);
+}
+
 bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
   const std::string app_id = app_policy.first;
 
+  const bool app_properties_changed = IsAppPropertiesChanged(app_policy);
+  const bool is_predefined_app = IsPredefinedApp(app_policy);
+  if (!is_predefined_app && app_properties_changed) {
+    AddResult(app_id, RESULT_APP_PROPERTIES_CHANGED);
+  }
+
   if (!IsKnownAppication(app_id)) {
     LOG4CXX_WARN(logger_,
                  "Application:" << app_id << " is not present in snapshot.");
@@ -328,13 +402,13 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
 
   if (!IsPredefinedApp(app_policy) && IsAppRevoked(app_policy)) {
     SetPendingPermissions(app_policy, RESULT_APP_REVOKED);
-    NotifySystem(app_policy);
+    AddResult(app_id, RESULT_APP_REVOKED);
     return true;
   }
 
   if (!IsPredefinedApp(app_policy) && !NicknamesMatch(app_policy)) {
     SetPendingPermissions(app_policy, RESULT_NICKNAME_MISMATCH);
-    NotifySystem(app_policy);
+    AddResult(app_id, RESULT_NICKNAME_MISMATCH);
     return true;
   }
 
@@ -345,19 +419,18 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
 
     if (is_request_type_changed) {
       SetPendingPermissions(app_policy, RESULT_REQUEST_TYPE_CHANGED);
+      AddResult(app_id, RESULT_REQUEST_TYPE_CHANGED);
     }
     if (is_request_subtype_changed) {
       SetPendingPermissions(app_policy, RESULT_REQUEST_SUBTYPE_CHANGED);
-    }
-
-    if (is_request_type_changed || is_request_subtype_changed) {
-      NotifySystem(app_policy);
+      AddResult(app_id, RESULT_REQUEST_SUBTYPE_CHANGED);
     }
   }
   if (RESULT_NO_CHANGES == result) {
     LOG4CXX_INFO(
         logger_,
         "Permissions for application:" << app_id << " wasn't changed.");
+    AddResult(app_id, RESULT_NO_CHANGES);
     return true;
   }
 
@@ -366,28 +439,33 @@ bool CheckAppPolicy::operator()(const AppPoliciesValueType& app_policy) {
       "Permissions for application:" << app_id << " have been changed.");
 
   if (IsPredefinedApp(app_policy)) {
-    for (const policy_table::ApplicationPolicies::value_type& app :
-         snapshot_->policy_table.app_policies_section.apps) {
-      if (app_policy.first == app.second.get_string()) {
-        if (RESULT_CONSENT_NOT_REQIURED != result) {
-          SetPendingPermissions(app, result);
-          NotifySystem(app);
-        }
-        SendPermissionsToApp(app.first, app_policy.second.groups);
-      }
+    const auto& snapshot_app_policy_begin =
+        snapshot_->policy_table.app_policies_section.apps.begin();
+    const auto& snapshot_app_policy_end =
+        snapshot_->policy_table.app_policies_section.apps.end();
+
+    auto find_app = [&app_id](AppPoliciesValueType& app) {
+      return app_id == app.second.get_string();
+    };
+
+    const auto& app = std::find_if(
+        snapshot_app_policy_begin, snapshot_app_policy_end, find_app);
+
+    if ((snapshot_app_policy_end != app) &&
+        (RESULT_CONSENT_NOT_REQUIRED != result)) {
+      SetPendingPermissions(*app, result);
+      AddResult(app_id, RESULT_CONSENT_NEEDED);
     }
     return true;
   }
 
-  if (!IsPredefinedApp(app_policy) && RESULT_CONSENT_NOT_REQIURED != result) {
-    SetPendingPermissions(app_policy, result);
-    NotifySystem(app_policy);
+  SetPendingPermissions(app_policy, result);
+  if (RESULT_CONSENT_NOT_REQUIRED != result) {
+    AddResult(app_id, RESULT_CONSENT_NEEDED);
+    return true;
   }
 
-  // Don't sent notification for predefined apps (e.g. default, device etc.)
-  if (!IsPredefinedApp(app_policy)) {
-    SendPermissionsToApp(app_policy.first, app_policy.second.groups);
-  }
+  AddResult(app_id, result);
   return true;
 }
 
@@ -445,14 +523,18 @@ void policy::CheckAppPolicy::SetPendingPermissions(
   pm_->app_permissions_diff_lock_.Release();
 }
 
-policy::CheckAppPolicy::PermissionsCheckResult
-policy::CheckAppPolicy::CheckPermissionsChanges(
+policy::PermissionsCheckResult policy::CheckAppPolicy::CheckPermissionsChanges(
     const policy::AppPoliciesValueType& app_policy) const {
-  bool has_revoked_groups = HasRevokedGroups(app_policy);
+  const bool has_revoked_groups = HasRevokedGroups(app_policy);
 
-  bool has_consent_needed_groups = HasConsentNeededGroups(app_policy);
+  const bool has_consent_needed_groups = HasConsentNeededGroups(app_policy);
 
-  bool has_new_groups = HasNewGroups(app_policy);
+  const bool has_new_groups = HasNewGroups(app_policy);
+
+  const bool has_updated_groups = HasUpdatedGroups(app_policy);
+
+  const bool encryption_required_flag_changed =
+      IsEncryptionRequiredFlagChanged(app_policy);
 
   if (has_revoked_groups && has_consent_needed_groups) {
     return RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED;
@@ -460,8 +542,10 @@ policy::CheckAppPolicy::CheckPermissionsChanges(
     return RESULT_PERMISSIONS_REVOKED;
   } else if (has_consent_needed_groups) {
     return RESULT_CONSENT_NEEDED;
-  } else if (has_new_groups) {
-    return RESULT_CONSENT_NOT_REQIURED;
+  } else if (has_new_groups || has_updated_groups) {
+    return RESULT_CONSENT_NOT_REQUIRED;
+  } else if (encryption_required_flag_changed) {
+    return RESULT_ENCRYPTION_REQUIRED_FLAG_CHANGED;
   }
 
   return RESULT_NO_CHANGES;
@@ -530,6 +614,200 @@ bool CheckAppPolicy::IsRequestSubTypeChanged(
   return diff.size();
 }
 
+bool CheckAppPolicy::IsAppPropertiesProvided(
+    const AppPoliciesValueType& app_policy) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (app_policy.second.hybrid_app_preference.is_initialized() ||
+      app_policy.second.endpoint.is_initialized() ||
+      app_policy.second.enabled.is_initialized() ||
+      app_policy.second.auth_token.is_initialized() ||
+      app_policy.second.cloud_transport_type.is_initialized() ||
+      app_policy.second.nicknames.is_initialized()) {
+    return true;
+  }
+  return false;
+}
+
+bool CheckAppPolicy::IsAppPropertiesChanged(
+    const AppPoliciesValueType& app_policy) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!IsAppPropertiesProvided(app_policy)) {
+    return false;
+  }
+
+  if (!IsKnownAppication(app_policy.first)) {
+    LOG4CXX_DEBUG(
+        logger_,
+        "AppProperties provided for new application: " << app_policy.first);
+    return true;
+  }
+
+  policy::AppPoliciesConstItr it =
+      snapshot_->policy_table.app_policies_section.apps.find(app_policy.first);
+  const auto snapshot_properties = *it;
+
+  if (app_policy.second.enabled.is_initialized() &&
+      app_policy.second.enabled != snapshot_properties.second.enabled) {
+    LOG4CXX_DEBUG(logger_, "\"enabled\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.endpoint.is_initialized() &&
+      app_policy.second.endpoint != snapshot_properties.second.endpoint) {
+    LOG4CXX_DEBUG(logger_, "\"endpoint\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.hybrid_app_preference.is_initialized() &&
+      app_policy.second.hybrid_app_preference !=
+          snapshot_properties.second.hybrid_app_preference) {
+    LOG4CXX_DEBUG(logger_, "\"hybrid_app_preference\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.auth_token.is_initialized() &&
+      app_policy.second.auth_token != snapshot_properties.second.auth_token) {
+    LOG4CXX_DEBUG(logger_, "\"auth_token\" was changed");
+    return true;
+  }
+
+  if (app_policy.second.cloud_transport_type.is_initialized() &&
+      app_policy.second.cloud_transport_type !=
+          snapshot_properties.second.cloud_transport_type) {
+    LOG4CXX_DEBUG(logger_, "\"cloud_transport_type\" was changed");
+    return true;
+  }
+
+  return false;
+}
+
+bool CheckAppPolicy::IsEncryptionRequiredFlagChanged(
+    const AppPoliciesValueType& app_policy) const {
+  auto get_app_encryption_needed =
+      [](const std::string& policy_app_id,
+         policy_table::ApplicationPolicies& policies)
+      -> rpc::Optional<rpc::Boolean> {
+    auto it = policies.find(policy_app_id);
+    if (policies.end() == it) {
+      LOG4CXX_WARN(logger_, "App is not present in policies" << policy_app_id);
+      return rpc::Optional<rpc::Boolean>(false);
+    }
+    return it->second.encryption_required;
+  };
+
+  auto get_app_groups =
+      [](const std::string& policy_app_id,
+         policy_table::ApplicationPolicies& policies) -> policy_table::Strings {
+    policy_table::Strings result;
+    auto it = policies.find(policy_app_id);
+    if (policies.end() == it) {
+      LOG4CXX_WARN(logger_, "App is not present in policies" << policy_app_id);
+      return result;
+    }
+    auto& groups = it->second.groups;
+    std::copy(groups.begin(), groups.end(), std::back_inserter(result));
+    return result;
+  };
+
+  auto get_app_rpcs = [](const std::string group_name,
+                         const FunctionalGroupings& groups)
+      -> rpc::Optional<policy_table::Rpcs> {
+    auto it = groups.find(group_name);
+    if (it == groups.end()) {
+      return rpc::Optional<policy_table::Rpcs>();
+    }
+    return rpc::Optional<policy_table::Rpcs>(it->second);
+  };
+
+  const auto snapshot_groups = get_app_groups(
+      app_policy.first, snapshot_->policy_table.app_policies_section.apps);
+  const auto update_groups = get_app_groups(
+      app_policy.first, update_->policy_table.app_policies_section.apps);
+
+  auto get_resulting_encryption_required_flag_for_app_groups =
+      [this, &get_app_rpcs](
+          const rpc::policy_table_interface_base::Strings& app_groups,
+          const std::shared_ptr<rpc::policy_table_interface_base::Table> pt) {
+        for (const auto& group : app_groups) {
+          const auto rpcs =
+              get_app_rpcs(group, pt->policy_table.functional_groupings);
+          if (*rpcs->encryption_required) {
+            return true;
+          }
+        }
+
+        return false;
+      };
+
+  auto group_res_en_flag_changed =
+      [this, &get_resulting_encryption_required_flag_for_app_groups](
+          const rpc::policy_table_interface_base::Strings& snapshot_groups,
+          const rpc::policy_table_interface_base::Strings& update_groups) {
+        return get_resulting_encryption_required_flag_for_app_groups(
+                   snapshot_groups, snapshot_) !=
+               get_resulting_encryption_required_flag_for_app_groups(
+                   update_groups, update_);
+      };
+
+  const auto snapshot_app_encryption_needed = get_app_encryption_needed(
+      app_policy.first, snapshot_->policy_table.app_policies_section.apps);
+  const auto update_app_encryption_needed = get_app_encryption_needed(
+      app_policy.first, update_->policy_table.app_policies_section.apps);
+
+  const bool app_encryption_needed_changed =
+      (snapshot_app_encryption_needed.is_initialized() !=
+       update_app_encryption_needed.is_initialized()) ||
+      (*snapshot_app_encryption_needed != *update_app_encryption_needed);
+
+  if ((!update_app_encryption_needed.is_initialized() ||
+       *update_app_encryption_needed) &&
+      group_res_en_flag_changed(snapshot_groups, update_groups)) {
+    return true;
+  }
+
+  return app_encryption_needed_changed;
+}
+
+void FillActionsForAppPolicies::operator()(
+    const policy::CheckAppPolicyResults::value_type& value) {
+  const std::string app_id = value.first;
+  const auto app_policy = app_policies_.find(app_id);
+  if (app_policies_.end() == app_policy) {
+    return;
+  }
+
+  if (IsPredefinedApp(*app_policy)) {
+    return;
+  }
+
+  switch (value.second) {
+    case RESULT_APP_REVOKED:
+    case RESULT_NICKNAME_MISMATCH:
+      actions_[app_id].is_notify_system = true;
+      return;
+    case RESULT_CONSENT_NEEDED:
+    case RESULT_PERMISSIONS_REVOKED_AND_CONSENT_NEEDED:
+      actions_[app_id].is_consent_needed = true;
+      break;
+    case RESULT_APP_PROPERTIES_CHANGED:
+      actions_[app_id].app_properties_changed = true;
+      break;
+    case RESULT_CONSENT_NOT_REQUIRED:
+    case RESULT_PERMISSIONS_REVOKED:
+    case RESULT_REQUEST_TYPE_CHANGED:
+    case RESULT_REQUEST_SUBTYPE_CHANGED:
+    case RESULT_ENCRYPTION_REQUIRED_FLAG_CHANGED:
+      break;
+    case RESULT_NO_CHANGES:
+    default:
+      return;
+  }
+
+  actions_[app_id].is_notify_system = true;
+  actions_[app_id].is_send_permissions_to_app = true;
+}
+
 FillNotificationData::FillNotificationData(Permissions& data,
                                            GroupConsent group_state,
                                            GroupConsent undefined_group_consent)
@@ -595,7 +873,7 @@ void FillNotificationData::UpdateParameters(
   ParametersConstItr it_parameters_end = in_parameters.end();
 
   for (; it_parameters != it_parameters_end; ++it_parameters) {
-    out_parameter.insert(policy_table::EnumToJsonString(*it_parameters));
+    out_parameter.insert(*it_parameters);
   }
 }
 
@@ -713,10 +991,31 @@ bool ProcessFunctionalGroup::operator()(const StringsValueType& group_name) {
     FillNotificationData filler(
         data_, GetGroupState(group_name_str), undefined_group_consent_);
     std::for_each(rpcs.begin(), rpcs.end(), filler);
+    FillEncryptionFlagForRpcs(rpcs, (*it).second.encryption_required);
   }
   return true;
 }
 
+void ProcessFunctionalGroup::FillEncryptionFlagForRpcs(
+    const policy_table::Rpc& rpcs,
+    const EncryptionRequired encryption_required) {
+  auto update_encryption_required = [](EncryptionRequired& current,
+                                       const EncryptionRequired& incoming) {
+    if (!incoming.is_initialized()) {
+      return;
+    }
+    if (current.is_initialized() && *current) {
+      return;
+    }
+    current = incoming;
+  };
+
+  for (const auto& rpc : rpcs) {
+    auto& item = data_[rpc.first];
+    update_encryption_required(item.require_encryption, encryption_required);
+  }
+}
+
 GroupConsent ProcessFunctionalGroup::GetGroupState(
     const std::string& group_name) {
   std::vector<FunctionalGroupPermission>::const_iterator it =
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index 00a3d33379..0cdca26f2e 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -36,13 +36,13 @@
 #include <limits>
 #include <queue>
 #include <set>
-#include "json/reader.h"
 #include "json/writer.h"
 #include "policy/policy_helper.h"
 #include "policy/policy_table.h"
 #include "policy/pt_representation.h"
 #include "utils/date_time.h"
 #include "utils/file_system.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/logger.h"
 
 #include "config_profile/profile.h"
@@ -53,13 +53,6 @@
 #include "policy/access_remote.h"
 #include "policy/access_remote_impl.h"
 
-policy::PolicyManager* CreateManager() {
-  return new policy::PolicyManagerImpl();
-}
-void DeleteManager(policy::PolicyManager* pm) {
-  delete pm;
-}
-
 namespace {
 const uint32_t kDefaultRetryTimeoutInMSec =
     60u * date_time::MILLISECONDS_IN_SECOND;
@@ -77,14 +70,17 @@ PolicyManagerImpl::PolicyManagerImpl()
           new AccessRemoteImpl(std::static_pointer_cast<CacheManager>(cache_)))
     , retry_sequence_timeout_(kDefaultRetryTimeoutInMSec)
     , retry_sequence_index_(0)
-    , timer_retry_sequence_("Retry sequence timer",
-                            new timer::TimerTaskImpl<PolicyManagerImpl>(
-                                this, &PolicyManagerImpl::RetrySequence))
+    , applications_pending_ptu_count_(0)
+    , timer_retry_sequence_(
+          "Retry sequence timer",
+          new timer::TimerTaskImpl<PolicyManagerImpl>(
+              this, &PolicyManagerImpl::OnPTUIterationTimeout))
     , 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)
+    , ptu_requested_(false)
+    , last_registered_policy_app_id_(std::string()) {}
 
 void PolicyManagerImpl::set_listener(PolicyListener* listener) {
   listener_ = listener;
@@ -96,9 +92,10 @@ void PolicyManagerImpl::set_listener(PolicyListener* listener) {
 std::shared_ptr<policy_table::Table> PolicyManagerImpl::Parse(
     const BinaryMessage& pt_content) {
   std::string json(pt_content.begin(), pt_content.end());
+  utils::JsonReader reader;
   Json::Value value;
-  Json::Reader reader;
-  if (reader.parse(json.c_str(), value)) {
+
+  if (reader.parse(json, &value)) {
     return std::make_shared<policy_table::Table>(&value);
   } else {
     return std::make_shared<policy_table::Table>();
@@ -110,9 +107,10 @@ std::shared_ptr<policy_table::Table> PolicyManagerImpl::Parse(
 std::shared_ptr<policy_table::Table> PolicyManagerImpl::ParseArray(
     const BinaryMessage& pt_content) {
   std::string json(pt_content.begin(), pt_content.end());
+  utils::JsonReader reader;
   Json::Value value;
-  Json::Reader reader;
-  if (reader.parse(json.c_str(), value)) {
+
+  if (reader.parse(json, &value)) {
     // For PT Update received from SDL Server.
     if (value["data"].size() != 0) {
       Json::Value data = value["data"];
@@ -164,7 +162,9 @@ void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
  * schema
  * @param rpc_parameters parameters to filter
  */
-void FilterInvalidRPCParameters(policy_table::RpcParameters& rpc_parameters) {
+void FilterInvalidRPCParameters(
+    policy_table::RpcParameters& rpc_parameters,
+    const std::vector<policy_table::VehicleDataItem>& vehicle_data_items) {
   policy_table::HmiLevels valid_hmi_levels;
   for (const auto& hmi_level : rpc_parameters.hmi_levels) {
     if (hmi_level.is_valid()) {
@@ -173,10 +173,31 @@ void FilterInvalidRPCParameters(policy_table::RpcParameters& rpc_parameters) {
   }
   rpc_parameters.hmi_levels.swap(valid_hmi_levels);
 
+  auto ParamExists =
+      [&vehicle_data_items](const rpc::String<0, 255>& param_name) {
+        policy_table::Parameter parameter_enum;
+        if (policy_table::EnumFromJsonString(param_name, &parameter_enum)) {
+          return true;
+        }
+
+        // In case when this collection is empty that means collection is not
+        // initialized
+        if (vehicle_data_items.empty()) {
+          return false;
+        }
+
+        for (const auto& vdi : vehicle_data_items) {
+          if (param_name == vdi.name) {
+            return true;
+          }
+        }
+        return false;
+      };
+
   policy_table::Parameters valid_params;
   const policy_table::Parameters& params = *(rpc_parameters.parameters);
   for (const auto& param : params) {
-    if (param.is_valid()) {
+    if (param.is_valid() && ParamExists(param)) {
       valid_params.push_back(param);
     }
   }
@@ -261,7 +282,9 @@ void FilterInvalidApplicationParameters(
  * @brief FilterPolicyTable filter values that not present in schema
  * @param pt policy table to filter
  */
-void FilterPolicyTable(policy_table::PolicyTable& pt) {
+void FilterPolicyTable(
+    policy_table::PolicyTable& pt,
+    const std::vector<policy_table::VehicleDataItem>& current_vd_items) {
   policy_table::ModuleConfig& module_config = pt.module_config;
   if (module_config.is_initialized() &&
       module_config.notifications_per_minute_by_priority.is_initialized()) {
@@ -280,14 +303,24 @@ void FilterPolicyTable(policy_table::PolicyTable& pt) {
     policy_table::Rpc& rpcs = group.second.rpcs;
     FilterInvalidFunctions(rpcs);
 
+    policy_table::VehicleDataItems vehicle_data_items;
+
+    if (!pt.vehicle_data->struct_empty()) {
+      vehicle_data_items =
+          pt.vehicle_data.is_initialized() &&
+                  pt.vehicle_data->schema_items.is_initialized()
+              ? *pt.vehicle_data->schema_items
+              : current_vd_items;
+    }
+
     for (auto& func : rpcs) {
-      FilterInvalidRPCParameters(func.second);
+      FilterInvalidRPCParameters(func.second, vehicle_data_items);
     }
   }
 }
 
-bool PolicyManagerImpl::LoadPT(const std::string& file,
-                               const BinaryMessage& pt_content) {
+PolicyManager::PtProcessingResult PolicyManagerImpl::LoadPT(
+    const std::string& file, const BinaryMessage& pt_content) {
   LOG4CXX_INFO(logger_, "LoadPT of size " << pt_content.size());
   LOG4CXX_DEBUG(
       logger_,
@@ -304,91 +337,227 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
   std::shared_ptr<policy_table::Table> pt_update = ParseArray(pt_content);
 #endif
   if (!pt_update) {
-    LOG4CXX_WARN(logger_, "Parsed table pointer is 0.");
-    update_status_manager_.OnWrongUpdateReceived();
-    return false;
+    LOG4CXX_WARN(logger_, "Parsed table pointer is NULL.");
+    ;
+    return PtProcessingResult::kWrongPtReceived;
   }
 
   file_system::DeleteFile(file);
 
-  FilterPolicyTable(pt_update->policy_table);
+  auto current_vd_items = GetVehicleDataItems();
+
+  FilterPolicyTable(pt_update->policy_table, current_vd_items);
   if (!IsPTValid(pt_update, policy_table::PT_UPDATE)) {
-    wrong_ptu_update_received_ = true;
-    update_status_manager_.OnWrongUpdateReceived();
-    return false;
+    LOG4CXX_WARN(logger_, "Received policy table update is not valid");
+    return PtProcessingResult::kWrongPtReceived;
   }
 
-  update_status_manager_.OnValidUpdateReceived();
-  cache_->SaveUpdateRequired(false);
-
   // Update finished, no need retry
   if (timer_retry_sequence_.is_running()) {
     LOG4CXX_INFO(logger_, "Stop retry sequence");
     timer_retry_sequence_.Stop();
   }
 
-  {
-    sync_primitives::AutoLock lock(apps_registration_lock_);
+  cache_->SaveUpdateRequired(false);
 
-    // Get current DB data, since it could be updated during awaiting of PTU
-    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, trying another exchange");
-      ForcePTExchange();
-      return false;
-    }
+  sync_primitives::AutoLock lock(apps_registration_lock_);
+
+  // Get current DB data, since it could be updated during awaiting of PTU
+  auto policy_table_snapshot = cache_->GenerateSnapshot();
+  if (!policy_table_snapshot) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Failed to create snapshot of policy table, trying another exchange");
+    return PtProcessingResult::kNewPtRequired;
+  }
 
-    // Checking of difference between PTU and current policy state
-    // Must to be done before PTU applying since it is possible, that functional
-    // groups, which had been present before are absent in PTU and will be
-    // removed after update. So in case of revoked groups system has to know
-    // names and ids of revoked groups before they will be removed.
-    CheckPermissionsChanges(pt_update, policy_table_snapshot);
+  // Checking of difference between PTU and current policy state
+  // Must to be done before PTU applying since it is possible, that functional
+  // groups, which had been present before are absent in PTU and will be
+  // removed after update. So in case of revoked groups system has to know
+  // names and ids of revoked groups before they will be removed.
+  const auto results =
+      CheckPermissionsChanges(pt_update, policy_table_snapshot);
 
-    // Replace current data with updated
-    if (!cache_->ApplyUpdate(*pt_update)) {
-      LOG4CXX_WARN(
-          logger_,
-          "Unsuccessful save of updated policy table, trying another exchange");
-      ForcePTExchange();
-      return false;
-    }
-    CheckPermissionsChangesAfterUpdate(*pt_update, *policy_table_snapshot);
+  // Replace current data with updated
+  if (!cache_->ApplyUpdate(*pt_update)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Unsuccessful save of updated policy table, trying another exchange");
+    return PtProcessingResult::kNewPtRequired;
+  }
+  CheckPermissionsChangesAfterUpdate(*pt_update, *policy_table_snapshot);
 
-    listener_->OnCertificateUpdated(
-        *(pt_update->policy_table.module_config.certificate));
+  ProcessAppPolicyCheckResults(
+      results, pt_update->policy_table.app_policies_section.apps);
 
-    std::map<std::string, StringArray> app_hmi_types;
-    cache_->GetHMIAppTypeAfterUpdate(app_hmi_types);
-    if (!app_hmi_types.empty()) {
-      LOG4CXX_INFO(logger_, "app_hmi_types is full calling OnUpdateHMIAppType");
-      listener_->OnUpdateHMIAppType(app_hmi_types);
-    } else {
-      LOG4CXX_INFO(logger_, "app_hmi_types empty" << pt_content.size());
-    }
+  listener_->OnCertificateUpdated(
+      *(pt_update->policy_table.module_config.certificate));
 
-    std::vector<std::string> enabled_apps;
-    cache_->GetEnabledCloudApps(enabled_apps);
-    for (auto it = enabled_apps.begin(); it != enabled_apps.end(); ++it) {
-      SendAuthTokenUpdated(*it);
-    }
+  std::map<std::string, StringArray> app_hmi_types;
+  cache_->GetHMIAppTypeAfterUpdate(app_hmi_types);
+  if (!app_hmi_types.empty()) {
+    LOG4CXX_INFO(logger_, "app_hmi_types is full calling OnUpdateHMIAppType");
+    listener_->OnUpdateHMIAppType(app_hmi_types);
+  } else {
+    LOG4CXX_INFO(logger_, "app_hmi_types empty" << pt_content.size());
+  }
+
+  std::vector<std::string> enabled_apps;
+  cache_->GetEnabledCloudApps(enabled_apps);
+  for (auto it = enabled_apps.begin(); it != enabled_apps.end(); ++it) {
+    SendAuthTokenUpdated(*it);
+  }
+
+  return PtProcessingResult::kSuccess;
+}
+
+void PolicyManagerImpl::OnPTUFinished(const PtProcessingResult ptu_result) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  ptu_requested_ = false;
+  if (PtProcessingResult::kWrongPtReceived == ptu_result) {
+    LOG4CXX_DEBUG(logger_, "Wrong PT was received");
+    update_status_manager_.OnWrongUpdateReceived();
+    return;
   }
 
+  update_status_manager_.OnValidUpdateReceived();
+
+  if (PtProcessingResult::kNewPtRequired == ptu_result) {
+    LOG4CXX_DEBUG(logger_, "New PTU interation is required");
+    ForcePTExchange();
+    return;
+  }
+
+  ResumePendingAppPolicyActions();
+
   // If there was a user request for policy table update, it should be started
   // right after current update is finished
-  if (update_status_manager_.IsUpdateRequired()) {
+  if (update_status_manager_.IsUpdateRequired() && HasApplicationForPTU()) {
+    LOG4CXX_DEBUG(logger_,
+                  "PTU was successful and new PTU iteration was scheduled");
     StartPTExchange();
-    return true;
+    return;
   }
 
   RefreshRetrySequence();
-  return true;
 }
 
-void PolicyManagerImpl::CheckPermissionsChanges(
+void PolicyManagerImpl::ProcessAppPolicyCheckResults(
+    const CheckAppPolicyResults& results,
+    const rpc::policy_table_interface_base::ApplicationPolicies& app_policies) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  ApplicationsPoliciesActions actions_for_apps_policies;
+  FillActionsForAppPolicies filler(actions_for_apps_policies, app_policies);
+
+  std::for_each(results.begin(), results.end(), filler);
+
+  ProcessActionsForAppPolicies(actions_for_apps_policies, app_policies);
+}
+
+void PolicyManagerImpl::ProcessActionsForAppPolicies(
+    const ApplicationsPoliciesActions& actions,
+    const policy_table::ApplicationPolicies& app_policies) {
+  notify_system_list_.clear();
+  send_permissions_list_.clear();
+
+  ApplicationsPoliciesActions::const_iterator it_actions = actions.begin();
+  for (; it_actions != actions.end(); ++it_actions) {
+    auto app_policy = app_policies.find(it_actions->first);
+    if (app_policies.end() == app_policy) {
+      continue;
+    }
+
+    if (it_actions->second.app_properties_changed) {
+      app_properties_changed_list_.push_back(app_policy->first);
+    }
+
+    const auto devices_ids = listener()->GetDevicesIds(app_policy->first);
+    for (const auto& device_id : devices_ids) {
+      if (it_actions->second.is_consent_needed) {
+        // Post-check after ExternalConsent consent changes
+        const std::string& policy_app_id = app_policy->first;
+        if (!IsConsentNeeded(device_id, policy_app_id)) {
+          sync_primitives::AutoLock lock(app_permissions_diff_lock_);
+
+          PendingPermissions::iterator app_id_diff =
+              app_permissions_diff_.find(policy_app_id);
+
+          if (app_permissions_diff_.end() != app_id_diff) {
+            app_id_diff->second.appPermissionsConsentNeeded = false;
+          }
+        }
+      }
+      if (it_actions->second.is_notify_system) {
+        notify_system_list_.push_back(std::make_pair(device_id, *app_policy));
+      }
+      if (it_actions->second.is_send_permissions_to_app) {
+        send_permissions_list_.push_back(
+            std::make_pair(device_id, *app_policy));
+      }
+    }
+  }
+}
+
+void PolicyManagerImpl::SendOnAppPropertiesChangeNotification(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  listener_->SendOnAppPropertiesChangeNotification(policy_app_id);
+}
+
+void PolicyManagerImpl::ResumePendingAppPolicyActions() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  for (auto& notify_system_params : notify_system_list_) {
+    NotifySystem(notify_system_params.first, notify_system_params.second);
+  }
+  notify_system_list_.clear();
+
+  for (auto& send_permissions_params : send_permissions_list_) {
+    SendPermissionsToApp(send_permissions_params.first,
+                         send_permissions_params.second);
+  }
+
+  for (auto& app : app_properties_changed_list_) {
+    SendOnAppPropertiesChangeNotification(app);
+  }
+
+  send_permissions_list_.clear();
+}
+
+void PolicyManagerImpl::NotifySystem(
+    const std::string& device_id,
+    const PolicyManagerImpl::AppPoliciesValueType& app_policy) const {
+  listener()->OnPendingPermissionChange(device_id, app_policy.first);
+}
+
+void PolicyManagerImpl::SendPermissionsToApp(
+    const std::string& device_id,
+    const PolicyManagerImpl::AppPoliciesValueType& app_policy) {
+  const std::string app_id = app_policy.first;
+
+  std::vector<FunctionalGroupPermission> group_permissons;
+  GetPermissionsForApp(device_id, app_id, group_permissons);
+
+  Permissions notification_data;
+
+  // Need to get rid of this call
+  auto policy_table_snapshot = cache_->GenerateSnapshot();
+
+  PrepareNotificationData(
+      policy_table_snapshot->policy_table.functional_groupings,
+      app_policy.second.groups,
+      group_permissons,
+      notification_data);
+
+  std::string default_hmi;
+  default_hmi = "NONE";
+  listener()->OnPermissionsUpdated(
+      device_id, app_id, notification_data, default_hmi);
+}
+
+CheckAppPolicyResults PolicyManagerImpl::CheckPermissionsChanges(
     const std::shared_ptr<policy_table::Table> pt_update,
     const std::shared_ptr<policy_table::Table> snapshot) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -397,9 +566,13 @@ void PolicyManagerImpl::CheckPermissionsChanges(
   // to actual values of default section
   UnwrapAppPolicies(pt_update->policy_table.app_policies_section.apps);
 
+  CheckAppPolicyResults out_results;
+
   std::for_each(pt_update->policy_table.app_policies_section.apps.begin(),
                 pt_update->policy_table.app_policies_section.apps.end(),
-                CheckAppPolicy(this, pt_update, snapshot));
+                CheckAppPolicy(this, pt_update, snapshot, out_results));
+
+  return out_results;
 }
 
 void PolicyManagerImpl::CheckPermissionsChangesAfterUpdate(
@@ -418,49 +591,50 @@ void PolicyManagerImpl::PrepareNotificationData(
     const policy_table::Strings& group_names,
     const std::vector<FunctionalGroupPermission>& group_permission,
     Permissions& notification_data) {
-  LOG4CXX_INFO(logger_, "Preparing data for notification.");
+  LOG4CXX_AUTO_TRACE(logger_);
   ProcessFunctionalGroup processor(groups, group_permission, notification_data);
   std::for_each(group_names.begin(), group_names.end(), processor);
 }
 
 void PolicyManagerImpl::GetUpdateUrls(const std::string& service_type,
-                                      EndpointUrls& out_end_points) {
+                                      EndpointUrls& out_end_points) const {
   LOG4CXX_AUTO_TRACE(logger_);
   cache_->GetUpdateUrls(service_type, out_end_points);
 }
+
 void PolicyManagerImpl::GetUpdateUrls(const uint32_t service_type,
-                                      EndpointUrls& out_end_points) {
+                                      EndpointUrls& out_end_points) const {
   LOG4CXX_AUTO_TRACE(logger_);
   cache_->GetUpdateUrls(service_type, out_end_points);
 }
 
-bool PolicyManagerImpl::RequestPTUpdate() {
+bool PolicyManagerImpl::RequestPTUpdate(const PTUIterationType iteration_type) {
   LOG4CXX_AUTO_TRACE(logger_);
-  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");
-    return false;
-  }
-
-  IsPTValid(policy_table_snapshot, policy_table::PT_SNAPSHOT);
+  BinaryMessage update;
+  if (PTUIterationType::DefaultIteration == iteration_type) {
+    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");
+      return false;
+    }
 
-  Json::Value value = policy_table_snapshot->ToJsonValue();
-  Json::FastWriter writer;
-  std::string message_string = writer.write(value);
+    IsPTValid(policy_table_snapshot, policy_table::PT_SNAPSHOT);
 
-  LOG4CXX_DEBUG(logger_, "Snapshot contents is : " << message_string);
+    Json::Value value = policy_table_snapshot->ToJsonValue();
+    Json::StreamWriterBuilder writer_builder;
+    writer_builder["indentation"] = "";
+    std::string message_string = Json::writeString(writer_builder, value);
 
-  BinaryMessage update(message_string.begin(), message_string.end());
+    LOG4CXX_DEBUG(logger_, "Snapshot contents is : " << message_string);
 
-  listener_->OnSnapshotCreated(update);
+    update = BinaryMessage(message_string.begin(), message_string.end());
+  }
+  ptu_requested_ = true;
+  listener_->OnSnapshotCreated(update, iteration_type);
   return true;
 }
 
-std::string PolicyManagerImpl::GetLockScreenIconUrl() const {
-  return cache_->GetLockScreenIconUrl();
-}
-
 std::string PolicyManagerImpl::GetIconUrl(
     const std::string& policy_app_id) const {
   return cache_->GetIconUrl(policy_app_id);
@@ -488,14 +662,16 @@ void PolicyManagerImpl::StartPTExchange() {
     return;
   }
 
-  if (listener_ && listener_->CanUpdate()) {
+  if (listener_) {
     if (ignition_check) {
       CheckTriggers();
       ignition_check = false;
     }
 
     if (update_status_manager_.IsUpdateRequired()) {
-      if (RequestPTUpdate() && !timer_retry_sequence_.is_running()) {
+      update_status_manager_.PendingUpdate();
+      if (RequestPTUpdate(PTUIterationType::DefaultIteration) &&
+          !timer_retry_sequence_.is_running()) {
         // Start retry sequency
         const uint32_t timeout_msec = NextRetryTimeout();
 
@@ -520,15 +696,36 @@ void PolicyManagerImpl::OnAppsSearchCompleted(const bool trigger_ptu) {
 
   trigger_ptu_ = trigger_ptu;
 
-  if (update_status_manager_.IsUpdateRequired()) {
+  if (update_status_manager_.IsUpdateRequired() && !ptu_requested_ &&
+      HasApplicationForPTU()) {
     StartPTExchange();
   }
 }
 
-void PolicyManagerImpl::OnAppRegisteredOnMobile(
-    const std::string& application_id) {
+void PolicyManagerImpl::OnLocalAppAdded() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  update_status_manager_.ScheduleUpdate();
   StartPTExchange();
-  SendNotificationOnPermissionsUpdated(application_id);
+}
+
+void PolicyManagerImpl::UpdatePTUReadyAppsCount(const uint32_t new_app_count) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  applications_pending_ptu_count_ = new_app_count;
+}
+
+void PolicyManagerImpl::OnAppRegisteredOnMobile(
+    const std::string& device_id, const std::string& application_id) {
+  if (application_id != last_registered_policy_app_id_) {
+    if (last_registered_policy_app_id_.empty()) {
+      LOG4CXX_DEBUG(logger_, "Stopping update after first app is registered");
+      // ResetRetrySequence(ResetRetryCountType::kResetInternally);
+      StopRetrySequence();
+    }
+    StartPTExchange();
+    last_registered_policy_app_id_ = application_id;
+  }
+
+  SendNotificationOnPermissionsUpdated(device_id, application_id);
 }
 
 void PolicyManagerImpl::OnDeviceSwitching(const std::string& device_id_from,
@@ -562,9 +759,18 @@ const std::vector<std::string> PolicyManagerImpl::GetAppRequestSubTypes(
   cache_->GetAppRequestSubTypes(policy_app_id, request_subtypes);
   return request_subtypes;
 }
+const std::vector<policy_table::VehicleDataItem>
+PolicyManagerImpl::GetVehicleDataItems() const {
+  return cache_->GetVehicleDataItems();
+}
+
+std::vector<policy_table::VehicleDataItem>
+PolicyManagerImpl::GetRemovedVehicleDataItems() const {
+  return cache_->GetRemovedVehicleDataItems();
+}
 
-const VehicleInfo PolicyManagerImpl::GetVehicleInfo() const {
-  return cache_->GetVehicleInfo();
+Json::Value PolicyManagerImpl::GetPolicyTableData() const {
+  return cache_->GetPolicyTableData();
 }
 
 void PolicyManagerImpl::GetEnabledCloudApps(
@@ -572,21 +778,13 @@ void PolicyManagerImpl::GetEnabledCloudApps(
   cache_->GetEnabledCloudApps(enabled_apps);
 }
 
-bool PolicyManagerImpl::GetCloudAppParameters(
-    const std::string& policy_app_id,
-    bool& enabled,
-    std::string& endpoint,
-    std::string& certificate,
-    std::string& auth_token,
-    std::string& cloud_transport_type,
-    std::string& hybrid_app_preference) const {
-  return cache_->GetCloudAppParameters(policy_app_id,
-                                       enabled,
-                                       endpoint,
-                                       certificate,
-                                       auth_token,
-                                       cloud_transport_type,
-                                       hybrid_app_preference);
+std::vector<std::string> PolicyManagerImpl::GetEnabledLocalApps() const {
+  return cache_->GetEnabledLocalApps();
+}
+
+bool PolicyManagerImpl::GetAppProperties(
+    const std::string& policy_app_id, AppProperties& out_app_properties) const {
+  return cache_->GetAppProperties(policy_app_id, out_app_properties);
 }
 
 void PolicyManagerImpl::InitCloudApp(const std::string& policy_app_id) {
@@ -681,16 +879,8 @@ bool PolicyManagerImpl::ResetUserConsent() {
 }
 
 void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
-    const std::string& application_id) {
+    const std::string& device_id, const std::string& application_id) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(application_id);
-  if (device_id.empty()) {
-    LOG4CXX_WARN(logger_,
-                 "Couldn't find device info for application id "
-                 "'" << application_id
-                     << "'");
-    return;
-  }
 
   std::vector<FunctionalGroupPermission> app_group_permissions;
   GetPermissionsForApp(device_id, application_id, app_group_permissions);
@@ -699,12 +889,8 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
   cache_->GetFunctionalGroupings(functional_groupings);
 
   policy_table::Strings app_groups;
-  std::vector<FunctionalGroupPermission>::const_iterator it =
-      app_group_permissions.begin();
-  std::vector<FunctionalGroupPermission>::const_iterator it_end =
-      app_group_permissions.end();
-  for (; it != it_end; ++it) {
-    app_groups.push_back((*it).group_name);
+  for (const auto& group_permission : app_group_permissions) {
+    app_groups.push_back(group_permission.group_name);
   }
 
   Permissions notification_data;
@@ -714,19 +900,19 @@ void PolicyManagerImpl::SendNotificationOnPermissionsUpdated(
                           notification_data);
 
   LOG4CXX_INFO(logger_,
-               "Send notification for application_id:" << application_id);
+               "Send notification for application_id: " << application_id);
 
-  std::string default_hmi;
-  default_hmi = "NONE";
+  std::string default_hmi = "NONE";
 
   const ApplicationOnDevice who = {device_id, application_id};
   if (access_remote_->IsAppRemoteControl(who)) {
-    listener()->OnPermissionsUpdated(application_id, notification_data);
+    listener()->OnPermissionsUpdated(
+        device_id, application_id, notification_data);
     return;
   }
 
   listener()->OnPermissionsUpdated(
-      application_id, notification_data, default_hmi);
+      device_id, application_id, notification_data, default_hmi);
 }
 
 bool PolicyManagerImpl::CleanupUnpairedDevices() {
@@ -748,6 +934,9 @@ void PolicyManagerImpl::SetUserConsentForDevice(const std::string& device_id,
   DeviceConsent current_consent = GetUserConsentForDevice(device_id);
   bool is_current_device_allowed =
       DeviceConsent::kDeviceAllowed == current_consent ? true : false;
+  if (is_allowed) {
+    StartPTExchange();
+  }
   if (DeviceConsent::kDeviceHasNoConsent != current_consent &&
       is_current_device_allowed == is_allowed) {
     const std::string consent = is_allowed ? "allowed" : "disallowed";
@@ -756,8 +945,13 @@ void PolicyManagerImpl::SetUserConsentForDevice(const std::string& device_id,
   }
 }
 
-bool PolicyManagerImpl::ReactOnUserDevConsentForApp(const std::string app_id,
-                                                    bool is_device_allowed) {
+bool PolicyManagerImpl::ReactOnUserDevConsentForApp(
+    const transport_manager::DeviceHandle& device_handle,
+    const std::string app_id,
+    bool is_device_allowed) {
+  UNUSED(device_handle);
+  UNUSED(app_id);
+  UNUSED(is_device_allowed);
   return true;
 }
 
@@ -868,11 +1062,11 @@ void PolicyManagerImpl::SetUserConsentForApp(
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
-bool PolicyManagerImpl::GetDefaultHmi(const std::string& policy_app_id,
+bool PolicyManagerImpl::GetDefaultHmi(const std::string& device_id,
+                                      const std::string& policy_app_id,
                                       std::string* default_hmi) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(policy_app_id);
-  DeviceConsent device_consent = GetUserConsentForDevice(device_id);
+  const DeviceConsent device_consent = GetUserConsentForDevice(device_id);
   const std::string app_id = policy::kDeviceAllowed != device_consent
                                  ? kPreDataConsentId
                                  : policy_app_id;
@@ -955,7 +1149,7 @@ void PolicyManagerImpl::GetPermissionsForApp(
     app_id_to_check = kDefaultId;
     allowed_by_default = true;
   } else if (cache_->IsPredataPolicy(policy_app_id) ||
-             policy::kDeviceDisallowed == GetUserConsentForDevice(device_id)) {
+             policy::kDeviceAllowed != GetUserConsentForDevice(device_id)) {
     app_id_to_check = kPreDataConsentId;
     allowed_by_default = true;
   }
@@ -1010,9 +1204,11 @@ void PolicyManagerImpl::GetPermissionsForApp(
 }
 
 std::string& PolicyManagerImpl::GetCurrentDeviceId(
+    const transport_manager::DeviceHandle& device_handle,
     const std::string& policy_app_id) const {
   LOG4CXX_AUTO_TRACE(logger_);
-  last_device_id_ = listener()->OnCurrentDeviceIdUpdateRequired(policy_app_id);
+  last_device_id_ =
+      listener()->OnCurrentDeviceIdUpdateRequired(device_handle, policy_app_id);
   return last_device_id_;
 }
 
@@ -1024,14 +1220,6 @@ void PolicyManagerImpl::SetSystemInfo(const std::string& ccpu_version,
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
-void PolicyManagerImpl::OnSystemReady() {
-  // Update policy table for the first time with system information
-  if (cache_->IsPTPreloaded()) {
-    listener()->OnSystemInfoUpdateRequired();
-    return;
-  }
-}
-
 uint32_t PolicyManagerImpl::GetNotificationsNumber(
     const std::string& priority) const {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1077,6 +1265,7 @@ void PolicyManagerImpl::KmsChanged(int kilometers) {
     LOG4CXX_INFO(logger_, "Enough kilometers passed to send for PT update.");
     update_status_manager_.ScheduleUpdate();
     StartPTExchange();
+    PTUpdatedAt(KILOMETERS, kilometers);
   }
 }
 
@@ -1097,10 +1286,24 @@ void PolicyManagerImpl::IncrementIgnitionCycles() {
 
 std::string PolicyManagerImpl::ForcePTExchange() {
   update_status_manager_.ScheduleUpdate();
+
+  ptu_requested_ = false;
   StartPTExchange();
   return update_status_manager_.StringifiedUpdateStatus();
 }
 
+void PolicyManagerImpl::StopRetrySequence() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (timer_retry_sequence_.is_running()) {
+    timer_retry_sequence_.Stop();
+  }
+
+  if (cache_->UpdateRequired()) {
+    ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate);
+  }
+}
+
 std::string PolicyManagerImpl::ForcePTExchangeAtUserRequest() {
   update_status_manager_.ScheduleManualUpdate();
   StartPTExchange();
@@ -1112,6 +1315,7 @@ std::string PolicyManagerImpl::GetPolicyTableStatus() const {
 }
 
 uint32_t PolicyManagerImpl::NextRetryTimeout() {
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
   LOG4CXX_DEBUG(logger_, "Index: " << retry_sequence_index_);
   uint32_t next = 0u;
@@ -1137,16 +1341,23 @@ uint32_t PolicyManagerImpl::NextRetryTimeout() {
 }
 
 void PolicyManagerImpl::RefreshRetrySequence() {
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
   retry_sequence_timeout_ = cache_->TimeoutResponse();
   retry_sequence_seconds_.clear();
   cache_->SecondsBetweenRetries(retry_sequence_seconds_);
 }
 
-void PolicyManagerImpl::ResetRetrySequence() {
+void PolicyManagerImpl::ResetRetrySequence(
+    const ResetRetryCountType reset_type) {
+  LOG4CXX_AUTO_TRACE(logger_);
   sync_primitives::AutoLock auto_lock(retry_sequence_lock_);
   retry_sequence_index_ = 0;
-  update_status_manager_.OnResetRetrySequence();
+  retry_sequence_url_ = RetrySequenceURL();
+  ptu_requested_ = false;
+  if (ResetRetryCountType::kResetWithStatusUpdate == reset_type) {
+    update_status_manager_.OnResetRetrySequence();
+  }
 }
 
 uint32_t PolicyManagerImpl::TimeoutExchangeMSec() {
@@ -1202,7 +1413,8 @@ bool PolicyManagerImpl::IsApplicationRevoked(const std::string& app_id) const {
   return cache_->IsApplicationRevoked(app_id);
 }
 
-bool PolicyManagerImpl::IsConsentNeeded(const std::string& app_id) {
+bool PolicyManagerImpl::IsConsentNeeded(const std::string& device_id,
+                                        const std::string& app_id) {
   LOG4CXX_AUTO_TRACE(logger_);
   return false;
 }
@@ -1210,15 +1422,17 @@ bool PolicyManagerImpl::IsConsentNeeded(const std::string& app_id) {
 void PolicyManagerImpl::SetVINValue(const std::string& value) {}
 
 AppPermissions PolicyManagerImpl::GetAppPermissionsChanges(
-    const std::string& policy_app_id) {
+    const std::string& device_id, const std::string& policy_app_id) {
   typedef std::map<std::string, AppPermissions>::iterator PermissionsIt;
   PermissionsIt app_id_diff = app_permissions_diff_.find(policy_app_id);
   AppPermissions permissions(policy_app_id);
   if (app_permissions_diff_.end() != app_id_diff) {
     permissions = app_id_diff->second;
   } else {
-    permissions.appPermissionsConsentNeeded = IsConsentNeeded(policy_app_id);
+    permissions.appPermissionsConsentNeeded =
+        IsConsentNeeded(device_id, policy_app_id);
     permissions.appRevoked = IsApplicationRevoked(policy_app_id);
+    permissions.isSDLAllowed = true;
     GetPriority(permissions.application_id, &permissions.priority);
   }
   return permissions;
@@ -1305,11 +1519,11 @@ class CallStatusChange : public utils::Callable {
 };
 
 StatusNotifier PolicyManagerImpl::AddApplication(
+    const std::string& device_id,
     const std::string& application_id,
     const rpc::policy_table_interface_base::AppHmiTypes& hmi_types) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string device_id = GetCurrentDeviceId(application_id);
-  DeviceConsent device_consent = GetUserConsentForDevice(device_id);
+  auto device_consent = GetUserConsentForDevice(device_id);
   sync_primitives::AutoLock lock(apps_registration_lock_);
   if (IsNewApplication(application_id)) {
     AddNewApplication(application_id, device_consent);
@@ -1317,7 +1531,9 @@ StatusNotifier PolicyManagerImpl::AddApplication(
                                               device_consent);
   }
   PromoteExistedApplication(application_id, device_consent);
-  update_status_manager_.OnExistedApplicationAdded(cache_->UpdateRequired());
+  if (!ptu_requested_) {
+    update_status_manager_.OnExistedApplicationAdded(cache_->UpdateRequired());
+  }
   return std::make_shared<utils::CallNothing>();
 }
 
@@ -1356,6 +1572,7 @@ bool PolicyManagerImpl::IsNewApplication(
 }
 
 bool PolicyManagerImpl::ResetPT(const std::string& file_name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   cache_->ResetCalculatedPermissions();
   const bool result = cache_->ResetPT(file_name);
   if (result) {
@@ -1398,10 +1615,10 @@ bool PolicyManagerImpl::InitPT(const std::string& file_name,
     if (!certificate_data.empty()) {
       listener_->OnCertificateUpdated(certificate_data);
     }
-    std::vector<std::string> enabled_apps;
-    cache_->GetEnabledCloudApps(enabled_apps);
-    for (auto it = enabled_apps.begin(); it != enabled_apps.end(); ++it) {
-      SendAuthTokenUpdated(*it);
+    std::vector<std::string> enabled_cloud_apps;
+    cache_->GetEnabledCloudApps(enabled_cloud_apps);
+    for (auto app : enabled_cloud_apps) {
+      SendAuthTokenUpdated(app);
     }
   }
   return ret;
@@ -1412,6 +1629,11 @@ uint32_t PolicyManagerImpl::HeartBeatTimeout(const std::string& app_id) const {
 }
 
 void PolicyManagerImpl::SaveUpdateStatusRequired(bool is_update_needed) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!is_update_needed) {
+    ResetRetrySequence(ResetRetryCountType::kResetInternally);
+  }
   cache_->SaveUpdateRequired(is_update_needed);
 }
 
@@ -1420,8 +1642,36 @@ void PolicyManagerImpl::set_cache_manager(
   cache_ = std::shared_ptr<CacheManagerInterface>(cache_manager);
 }
 
-void PolicyManagerImpl::RetrySequence() {
-  LOG4CXX_INFO(logger_, "Start new retry sequence");
+void PolicyManagerImpl::ResetTimeout() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (update_status_manager_.IsUpdatePending()) {
+    if (timer_retry_sequence_.is_running()) {
+      timer_retry_sequence_.Stop();
+    }
+    timer_retry_sequence_.Start(cache_->TimeoutResponse(), timer::kSingleShot);
+  }
+}
+
+void PolicyManagerImpl::OnPTUIterationTimeout() {
+  LOG4CXX_DEBUG(logger_, "Start new retry sequence");
+
+  const bool is_exceeded_retries_count =
+      (retry_sequence_seconds_.size() < retry_sequence_index_);
+
+  if (is_exceeded_retries_count) {
+    LOG4CXX_WARN(logger_, "Exceeded allowed PTU retry count");
+    listener_->OnPTUTimeOut();
+    ResetRetrySequence(ResetRetryCountType::kResetWithStatusUpdate);
+    if (timer_retry_sequence_.is_running()) {
+      timer_retry_sequence_.Stop();
+    }
+
+    if (HasApplicationForPTU()) {
+      StartPTExchange();
+    }
+    return;
+  }
+
   update_status_manager_.OnUpdateTimeoutOccurs();
 
   const uint32_t timeout_msec = NextRetryTimeout();
@@ -1433,14 +1683,21 @@ void PolicyManagerImpl::RetrySequence() {
     return;
   }
 
-  RequestPTUpdate();
+  RequestPTUpdate(PTUIterationType::RetryIteration);
   timer_retry_sequence_.Start(timeout_msec, timer::kPeriodic);
 }
 
-void PolicyManagerImpl::SetDefaultHmiTypes(const std::string& application_id,
-                                           const std::vector<int>& hmi_types) {
+bool PolicyManagerImpl::HasApplicationForPTU() const {
+  return applications_pending_ptu_count_ > 0;
+}
+
+void PolicyManagerImpl::SetDefaultHmiTypes(
+    const transport_manager::DeviceHandle& device_handle,
+    const std::string& application_id,
+    const std::vector<int>& hmi_types) {
   LOG4CXX_INFO(logger_, "SetDefaultHmiTypes");
-  const std::string device_id = GetCurrentDeviceId(application_id);
+  const std::string device_id =
+      GetCurrentDeviceId(device_handle, application_id);
   ApplicationOnDevice who = {device_id, application_id};
   access_remote_->SetDefaultHmiTypes(who, hmi_types);
 }
@@ -1478,7 +1735,7 @@ bool PolicyManagerImpl::CheckModule(const PTString& app_id,
 
 void PolicyManagerImpl::SendHMILevelChanged(const ApplicationOnDevice& who) {
   std::string default_hmi("NONE");
-  if (GetDefaultHmi(who.app_id, &default_hmi)) {
+  if (GetDefaultHmi(who.dev_id, who.app_id, &default_hmi)) {
     listener()->OnUpdateHMIStatus(who.dev_id, who.app_id, default_hmi);
   } else {
     LOG4CXX_WARN(
@@ -1515,16 +1772,14 @@ void PolicyManagerImpl::SendAppPermissionsChanged(
     const std::string& device_id, const std::string& application_id) {
   Permissions notification_data;
   GetPermissions(device_id, application_id, &notification_data);
-  listener()->OnPermissionsUpdated(application_id, notification_data);
+  listener()->OnPermissionsUpdated(
+      device_id, application_id, notification_data);
 }
 
 void PolicyManagerImpl::SendAuthTokenUpdated(const std::string policy_app_id) {
-  bool enabled = false;
-  std::string end, cert, ctt, hap;
-  std::string auth_token;
-  cache_->GetCloudAppParameters(
-      policy_app_id, enabled, end, cert, auth_token, ctt, hap);
-  listener_->OnAuthTokenUpdated(policy_app_id, auth_token);
+  AppProperties app_properties;
+  cache_->GetAppProperties(policy_app_id, app_properties);
+  listener_->OnAuthTokenUpdated(policy_app_id, app_properties.auth_token);
 }
 
 void PolicyManagerImpl::OnPrimaryGroupsChanged(
@@ -1552,4 +1807,111 @@ void PolicyManagerImpl::set_access_remote(
   access_remote_ = access_remote;
 }
 
+bool PolicyManagerImpl::AppNeedEncryption(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto encryption_required =
+      cache_->GetAppEncryptionRequiredFlag(policy_app_id);
+
+  return encryption_required.is_initialized() ? *encryption_required : true;
+}
+
+const rpc::Optional<rpc::Boolean> PolicyManagerImpl::GetAppEncryptionRequired(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return cache_->GetAppEncryptionRequiredFlag(policy_app_id);
+}
+
+const std::vector<std::string> PolicyManagerImpl::GetFunctionalGroupsForApp(
+    const std::string& policy_app_id) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  using namespace rpc::policy_table_interface_base;
+  DCHECK(kDeviceId != policy_app_id);
+
+  std::vector<std::string> function_groups;
+
+  ApplicationParams app_policies;
+  cache_->GetApplicationParams(policy_app_id, app_policies);
+
+  const auto& policy_function_group = app_policies.groups;
+
+  for (const auto& group : policy_function_group) {
+    function_groups.push_back(group);
+  }
+
+  return function_groups;
+}
+
+const std::vector<std::string> PolicyManagerImpl::GetApplicationPolicyIDs()
+    const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  std::vector<std::string> policy_app_ids;
+
+  const auto apps = cache_->GetPolicyAppIDs();
+
+  for (const auto& app : apps) {
+    policy_app_ids.push_back(app);
+  }
+
+  return policy_app_ids;
+}
+
+bool PolicyManagerImpl::FunctionGroupNeedEncryption(
+    const std::string& policy_group) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  FunctionalGroupings functional_groupings;
+  cache_->GetFunctionalGroupings(functional_groupings);
+
+  const auto& grouping_itr = functional_groupings.find(policy_group);
+  if (grouping_itr == functional_groupings.end()) {
+    LOG4CXX_WARN(logger_, "Group " << policy_group << " not found");
+    return false;
+  }
+
+  const auto& grouping = (*grouping_itr).second;
+
+  return grouping.encryption_required.is_initialized()
+             ? *grouping.encryption_required
+             : false;
+}
+
+void PolicyManagerImpl::TriggerPTUOnStartupIfRequired() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (ignition_check) {
+    StartPTExchange();
+  }
+}
+
+const std::string PolicyManagerImpl::GetPolicyFunctionName(
+    const uint32_t function_id) const {
+  return policy_table::EnumToJsonString(
+      static_cast<policy_table::FunctionID>(function_id));
+}
+
+const std::vector<std::string> PolicyManagerImpl::GetRPCsForFunctionGroup(
+    const std::string& group) const {
+  std::vector<std::string> rpcs_for_group;
+
+  FunctionalGroupings functional_groupings;
+  cache_->GetFunctionalGroupings(functional_groupings);
+
+  const auto& rpcs = functional_groupings[group].rpcs;
+
+  for (const auto& rpc : rpcs) {
+    rpcs_for_group.push_back(rpc.first);
+  }
+
+  return rpcs_for_group;
+}
+
 }  //  namespace policy
+
+__attribute__((visibility("default"))) policy::PolicyManager* CreateManager() {
+  return new policy::PolicyManagerImpl();
+}
+
+__attribute__((visibility("default"))) void DeleteManager(
+    policy::PolicyManager* pm) {
+  delete pm;
+  DELETE_THREAD_LOGGER(policy::logger_);
+}
diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc
index 50746b31a0..8aabf54c5d 100644
--- a/src/components/policy/policy_regular/src/policy_table/enums.cc
+++ b/src/components/policy/policy_regular/src/policy_table/enums.cc
@@ -3,1497 +3,6 @@
 
 namespace rpc {
 namespace policy_table_interface_base {
-bool IsValidEnum(Priority val) {
-  switch (val) {
-    case P_EMERGENCY:
-      return true;
-    case P_NAVIGATION:
-      return true;
-    case P_VOICECOM:
-      return true;
-    case P_COMMUNICATION:
-      return true;
-    case P_NORMAL:
-      return true;
-    case P_PROJECTION:
-      return true;
-    case P_NONE:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(Priority val) {
-  switch (val) {
-    case P_EMERGENCY:
-      return "EMERGENCY";
-    case P_NAVIGATION:
-      return "NAVIGATION";
-    case P_VOICECOM:
-      return "VOICECOM";
-    case P_COMMUNICATION:
-      return "COMMUNICATION";
-    case P_NORMAL:
-      return "NORMAL";
-    case P_PROJECTION:
-      return "PROJECTION";
-    case P_NONE:
-      return "NONE";
-    default:
-      return "";
-  }
-}
-bool EnumFromJsonString(const std::string& literal, Priority* result) {
-  if ("EMERGENCY" == literal) {
-    *result = P_EMERGENCY;
-    return true;
-  } else if ("NAVIGATION" == literal) {
-    *result = P_NAVIGATION;
-    return true;
-  } else if ("VOICECOM" == literal) {
-    *result = P_VOICECOM;
-    return true;
-  } else if ("COMMUNICATION" == literal) {
-    *result = P_COMMUNICATION;
-    return true;
-  } else if ("NORMAL" == literal) {
-    *result = P_NORMAL;
-    return true;
-  } else if ("PROJECTION" == literal) {
-    *result = P_PROJECTION;
-    return true;
-  } else if ("NONE" == literal) {
-    *result = P_NONE;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(HmiLevel val) {
-  switch (val) {
-    case HL_BACKGROUND:
-      return true;
-    case HL_FULL:
-      return true;
-    case HL_LIMITED:
-      return true;
-    case HL_NONE:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(HmiLevel val) {
-  switch (val) {
-    case HL_BACKGROUND:
-      return "BACKGROUND";
-    case HL_FULL:
-      return "FULL";
-    case HL_LIMITED:
-      return "LIMITED";
-    case HL_NONE:
-      return "NONE";
-    default:
-      return "";
-  }
-}
-bool EnumFromJsonString(const std::string& literal, HmiLevel* result) {
-  if ("BACKGROUND" == literal) {
-    *result = HL_BACKGROUND;
-    return true;
-  } else if ("FULL" == literal) {
-    *result = HL_FULL;
-    return true;
-  } else if ("LIMITED" == literal) {
-    *result = HL_LIMITED;
-    return true;
-  } else if ("NONE" == literal) {
-    *result = HL_NONE;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(Parameter val) {
-  switch (val) {
-    case P_GPS:
-      return true;
-    case P_SPEED:
-      return true;
-    case P_ENGINETORQUE:
-      return true;
-    case P_EXTERNALTEMPERATURE:
-      return true;
-    case P_TURNSIGNAL:
-      return true;
-    case P_FUELLEVEL:
-      return true;
-    case P_FUELLEVEL_STATE:
-      return true;
-    case P_HEADLAMPSTATUS:
-      return true;
-    case P_INSTANTFUELCONSUMPTION:
-      return true;
-    case P_FUELRANGE:
-      return true;
-    case P_CLOUD_APP_VEHICLE_ID:
-      return true;
-    case P_ODOMETER:
-      return true;
-    case P_TIREPRESSURE:
-      return true;
-    case P_WIPERSTATUS:
-      return true;
-    case P_VIN:
-      return true;
-    case P_ACCPEDALPOSITION:
-      return true;
-    case P_BELTSTATUS:
-      return true;
-    case P_ELECTRONICPARKBRAKESTATUS:
-      return true;
-    case P_DRIVERBRAKING:
-      return true;
-    case P_PRNDL:
-      return true;
-    case P_RPM:
-      return true;
-    case P_STEERINGWHEELANGLE:
-      return true;
-    case P_ENGINEOILLIFE:
-      return true;
-    case P_MYKEY:
-      return true;
-    case P_AIRBAGSTATUS:
-      return true;
-    case P_BODYINFORMATION:
-      return true;
-    case P_CLUSTERMODESTATUS:
-      return true;
-    case P_DEVICESTATUS:
-      return true;
-    case P_EMERGENCYEVENT:
-      return true;
-    case P_ECALLINFO:
-      return true;
-    case P_EMPTY:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(Parameter val) {
-  switch (val) {
-    case P_GPS:
-      return "gps";
-    case P_SPEED:
-      return "speed";
-    case P_ENGINETORQUE:
-      return "engineTorque";
-    case P_EXTERNALTEMPERATURE:
-      return "externalTemperature";
-    case P_TURNSIGNAL:
-      return "turnSignal";
-    case P_FUELLEVEL:
-      return "fuelLevel";
-    case P_FUELLEVEL_STATE:
-      return "fuelLevel_State";
-    case P_HEADLAMPSTATUS:
-      return "headLampStatus";
-    case P_INSTANTFUELCONSUMPTION:
-      return "instantFuelConsumption";
-    case P_FUELRANGE:
-      return "fuelRange";
-    case P_CLOUD_APP_VEHICLE_ID:
-      return "cloudAppVehicleID";
-    case P_ODOMETER:
-      return "odometer";
-    case P_TIREPRESSURE:
-      return "tirePressure";
-    case P_WIPERSTATUS:
-      return "wiperStatus";
-    case P_VIN:
-      return "vin";
-    case P_ACCPEDALPOSITION:
-      return "accPedalPosition";
-    case P_BELTSTATUS:
-      return "beltStatus";
-    case P_ELECTRONICPARKBRAKESTATUS:
-      return "electronicParkBrakeStatus";
-    case P_DRIVERBRAKING:
-      return "driverBraking";
-    case P_PRNDL:
-      return "prndl";
-    case P_RPM:
-      return "rpm";
-    case P_STEERINGWHEELANGLE:
-      return "steeringWheelAngle";
-    case P_ENGINEOILLIFE:
-      return "engineOilLife";
-    case P_MYKEY:
-      return "myKey";
-    case P_AIRBAGSTATUS:
-      return "airbagStatus";
-    case P_BODYINFORMATION:
-      return "bodyInformation";
-    case P_CLUSTERMODESTATUS:
-      return "clusterModeStatus";
-    case P_DEVICESTATUS:
-      return "deviceStatus";
-    case P_EMERGENCYEVENT:
-      return "emergencyEvent";
-    case P_ECALLINFO:
-      return "eCallInfo";
-    case P_EMPTY:
-      return "EMPTY";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal, Parameter* result) {
-  if ("gps" == literal) {
-    *result = P_GPS;
-    return true;
-  } else if ("speed" == literal) {
-    *result = P_SPEED;
-    return true;
-  } else if ("engineTorque" == literal) {
-    *result = P_ENGINETORQUE;
-    return true;
-  } 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;
-  } else if ("fuelLevel_State" == literal) {
-    *result = P_FUELLEVEL_STATE;
-    return true;
-  } else if ("headLampStatus" == literal) {
-    *result = P_HEADLAMPSTATUS;
-    return true;
-  } else if ("instantFuelConsumption" == literal) {
-    *result = P_INSTANTFUELCONSUMPTION;
-    return true;
-  } else if ("fuelRange" == literal) {
-    *result = P_FUELRANGE;
-    return true;
-  } else if ("cloudAppVehicleID" == literal) {
-    *result = P_CLOUD_APP_VEHICLE_ID;
-    return true;
-  } else if ("odometer" == literal) {
-    *result = P_ODOMETER;
-    return true;
-  } else if ("tirePressure" == literal) {
-    *result = P_TIREPRESSURE;
-    return true;
-  } else if ("wiperStatus" == literal) {
-    *result = P_WIPERSTATUS;
-    return true;
-  } else if ("vin" == literal) {
-    *result = P_VIN;
-    return true;
-  } else if ("accPedalPosition" == literal) {
-    *result = P_ACCPEDALPOSITION;
-    return true;
-  } 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;
-  } else if ("prndl" == literal) {
-    *result = P_PRNDL;
-    return true;
-  } else if ("rpm" == literal) {
-    *result = P_RPM;
-    return true;
-  } else if ("steeringWheelAngle" == literal) {
-    *result = P_STEERINGWHEELANGLE;
-    return true;
-  } else if ("engineOilLife" == literal) {
-    *result = P_ENGINEOILLIFE;
-    return true;
-  } else if ("myKey" == literal) {
-    *result = P_MYKEY;
-    return true;
-  } else if ("airbagStatus" == literal) {
-    *result = P_AIRBAGSTATUS;
-    return true;
-  } else if ("bodyInformation" == literal) {
-    *result = P_BODYINFORMATION;
-    return true;
-  } else if ("clusterModeStatus" == literal) {
-    *result = P_CLUSTERMODESTATUS;
-    return true;
-  } else if ("deviceStatus" == literal) {
-    *result = P_DEVICESTATUS;
-    return true;
-  } else if ("emergencyEvent" == literal) {
-    *result = P_EMERGENCYEVENT;
-    return true;
-  } else if ("eCallInfo" == literal) {
-    *result = P_ECALLINFO;
-    return true;
-  } else if ("EMPTY" == literal) {
-    *result = P_EMPTY;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(AppHMIType val) {
-  switch (val) {
-    case AHT_DEFAULT:
-      return true;
-    case AHT_COMMUNICATION:
-      return true;
-    case AHT_MEDIA:
-      return true;
-    case AHT_MESSAGING:
-      return true;
-    case AHT_NAVIGATION:
-      return true;
-    case AHT_INFORMATION:
-      return true;
-    case AHT_SOCIAL:
-      return true;
-    case AHT_BACKGROUND_PROCESS:
-      return true;
-    case AHT_TESTING:
-      return true;
-    case AHT_SYSTEM:
-      return true;
-    case AHT_PROJECTION:
-      return true;
-    case AHT_REMOTE_CONTROL:
-      return true;
-    default:
-      return false;
-  }
-}
-const char* EnumToJsonString(AppHMIType val) {
-  switch (val) {
-    case AHT_DEFAULT:
-      return "DEFAULT";
-    case AHT_COMMUNICATION:
-      return "COMMUNICATION";
-    case AHT_MEDIA:
-      return "MEDIA";
-    case AHT_MESSAGING:
-      return "MESSAGING";
-    case AHT_NAVIGATION:
-      return "NAVIGATION";
-    case AHT_INFORMATION:
-      return "INFORMATION";
-    case AHT_SOCIAL:
-      return "SOCIAL";
-    case AHT_BACKGROUND_PROCESS:
-      return "BACKGROUND_PROCESS";
-    case AHT_TESTING:
-      return "TESTING";
-    case AHT_SYSTEM:
-      return "SYSTEM";
-    case AHT_PROJECTION:
-      return "PROJECTION";
-    case AHT_REMOTE_CONTROL:
-      return "REMOTE_CONTROL";
-    default:
-      return "";
-  }
-}
-bool EnumFromJsonString(const std::string& literal, AppHMIType* result) {
-  if ("DEFAULT" == literal) {
-    *result = AHT_DEFAULT;
-    return true;
-  } else if ("COMMUNICATION" == literal) {
-    *result = AHT_COMMUNICATION;
-    return true;
-  } else if ("MEDIA" == literal) {
-    *result = AHT_MEDIA;
-    return true;
-  } else if ("MESSAGING" == literal) {
-    *result = AHT_MESSAGING;
-    return true;
-  } else if ("NAVIGATION" == literal) {
-    *result = AHT_NAVIGATION;
-    return true;
-  } else if ("INFORMATION" == literal) {
-    *result = AHT_INFORMATION;
-    return true;
-  } else if ("SOCIAL" == literal) {
-    *result = AHT_SOCIAL;
-    return true;
-  } else if ("BACKGROUND_PROCESS" == literal) {
-    *result = AHT_BACKGROUND_PROCESS;
-    return true;
-  } else if ("TESTING" == literal) {
-    *result = AHT_TESTING;
-    return true;
-  } else if ("SYSTEM" == literal) {
-    *result = AHT_SYSTEM;
-    return true;
-  } else if ("PROJECTION" == literal) {
-    *result = AHT_PROJECTION;
-    return true;
-  } else if ("REMOTE_CONTROL" == literal) {
-    *result = AHT_REMOTE_CONTROL;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(RequestType val) {
-  switch (val) {
-    case RT_HTTP:
-      return true;
-    case RT_FILE_RESUME:
-      return true;
-    case RT_AUTH_REQUEST:
-      return true;
-    case RT_AUTH_CHALLENGE:
-      return true;
-    case RT_AUTH_ACK:
-      return true;
-    case RT_PROPRIETARY:
-      return true;
-    case RT_QUERY_APPS:
-      return true;
-    case RT_LAUNCH_APP:
-      return true;
-    case RT_LOCK_SCREEN_ICON_URL:
-      return true;
-    case RT_TRAFFIC_MESSAGE_CHANNEL:
-      return true;
-    case RT_DRIVER_PROFILE:
-      return true;
-    case RT_VOICE_SEARCH:
-      return true;
-    case RT_NAVIGATION:
-      return true;
-    case RT_PHONE:
-      return true;
-    case RT_CLIMATE:
-      return true;
-    case RT_SETTINGS:
-      return true;
-    case RT_VEHICLE_DIAGNOSTICS:
-      return true;
-    case RT_EMERGENCY:
-      return true;
-    case RT_MEDIA:
-      return true;
-    case RT_FOTA:
-      return true;
-    case RT_OEM_SPECIFIC:
-      return true;
-    case RT_EMPTY:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const char* EnumToJsonString(RequestType val) {
-  switch (val) {
-    case RT_HTTP:
-      return "HTTP";
-    case RT_FILE_RESUME:
-      return "FILE_RESUME";
-    case RT_AUTH_REQUEST:
-      return "AUTH_REQUEST";
-    case RT_AUTH_CHALLENGE:
-      return "AUTH_CHALLENGE";
-    case RT_AUTH_ACK:
-      return "AUTH_ACK";
-    case RT_PROPRIETARY:
-      return "PROPRIETARY";
-    case RT_QUERY_APPS:
-      return "QUERY_APPS";
-    case RT_LAUNCH_APP:
-      return "LAUNCH_APP";
-    case RT_LOCK_SCREEN_ICON_URL:
-      return "LOCK_SCREEN_ICON_URL";
-    case RT_TRAFFIC_MESSAGE_CHANNEL:
-      return "TRAFFIC_MESSAGE_CHANNEL";
-    case RT_DRIVER_PROFILE:
-      return "DRIVER_PROFILE";
-    case RT_VOICE_SEARCH:
-      return "VOICE_SEARCH";
-    case RT_NAVIGATION:
-      return "NAVIGATION";
-    case RT_PHONE:
-      return "PHONE";
-    case RT_CLIMATE:
-      return "CLIMATE";
-    case RT_SETTINGS:
-      return "SETTINGS";
-    case RT_VEHICLE_DIAGNOSTICS:
-      return "VEHICLE_DIAGNOSTICS";
-    case RT_EMERGENCY:
-      return "EMERGENCY";
-    case RT_MEDIA:
-      return "MEDIA";
-    case RT_FOTA:
-      return "FOTA";
-    case RT_OEM_SPECIFIC:
-      return "OEM_SPECIFIC";
-    case RT_EMPTY:
-      return "EMPTY";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal, RequestType* result) {
-  if ("HTTP" == literal) {
-    *result = RT_HTTP;
-    return true;
-  }
-  if ("FILE_RESUME" == literal) {
-    *result = RT_FILE_RESUME;
-    return true;
-  }
-  if ("AUTH_REQUEST" == literal) {
-    *result = RT_AUTH_REQUEST;
-    return true;
-  }
-  if ("AUTH_CHALLENGE" == literal) {
-    *result = RT_AUTH_CHALLENGE;
-    return true;
-  }
-  if ("AUTH_ACK" == literal) {
-    *result = RT_AUTH_ACK;
-    return true;
-  }
-  if ("PROPRIETARY" == literal) {
-    *result = RT_PROPRIETARY;
-    return true;
-  }
-  if ("QUERY_APPS" == literal) {
-    *result = RT_QUERY_APPS;
-    return true;
-  }
-  if ("LAUNCH_APP" == literal) {
-    *result = RT_LAUNCH_APP;
-    return true;
-  }
-  if ("LOCK_SCREEN_ICON_URL" == literal) {
-    *result = RT_LOCK_SCREEN_ICON_URL;
-    return true;
-  }
-  if ("TRAFFIC_MESSAGE_CHANNEL" == literal) {
-    *result = RT_TRAFFIC_MESSAGE_CHANNEL;
-    return true;
-  }
-  if ("DRIVER_PROFILE" == literal) {
-    *result = RT_DRIVER_PROFILE;
-    return true;
-  }
-  if ("VOICE_SEARCH" == literal) {
-    *result = RT_VOICE_SEARCH;
-    return true;
-  }
-  if ("NAVIGATION" == literal) {
-    *result = RT_NAVIGATION;
-    return true;
-  }
-  if ("PHONE" == literal) {
-    *result = RT_PHONE;
-    return true;
-  }
-  if ("CLIMATE" == literal) {
-    *result = RT_CLIMATE;
-    return true;
-  }
-  if ("SETTINGS" == literal) {
-    *result = RT_SETTINGS;
-    return true;
-  }
-  if ("VEHICLE_DIAGNOSTICS" == literal) {
-    *result = RT_VEHICLE_DIAGNOSTICS;
-    return true;
-  }
-  if ("EMERGENCY" == literal) {
-    *result = RT_EMERGENCY;
-    return true;
-  }
-  if ("MEDIA" == literal) {
-    *result = RT_MEDIA;
-    return true;
-  }
-  if ("FOTA" == literal) {
-    *result = RT_FOTA;
-    return true;
-  }
-  if ("OEM_SPECIFIC" == literal) {
-    *result = RT_OEM_SPECIFIC;
-    return true;
-  }
-  if ("EMPTY" == literal) {
-    *result = RT_EMPTY;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool IsValidEnum(ModuleType val) {
-  switch (val) {
-    case MT_CLIMATE:
-      return true;
-    case MT_RADIO:
-      return true;
-    case MT_SEAT:
-      return true;
-    case MT_AUDIO:
-      return true;
-    case MT_LIGHT:
-      return true;
-    case MT_HMI_SETTINGS:
-      return true;
-    case MT_EMPTY:
-      return true;
-    default:
-      return false;
-  }
-}
-
-const char* EnumToJsonString(ModuleType val) {
-  switch (val) {
-    case MT_CLIMATE:
-      return "CLIMATE";
-    case MT_RADIO:
-      return "RADIO";
-    case MT_SEAT:
-      return "SEAT";
-    case MT_AUDIO:
-      return "AUDIO";
-    case MT_LIGHT:
-      return "LIGHT";
-    case MT_HMI_SETTINGS:
-      return "HMI_SETTINGS";
-    case MT_EMPTY:
-      return "EMPTY";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal, ModuleType* result) {
-  if ("CLIMATE" == literal) {
-    *result = MT_CLIMATE;
-    return true;
-  } 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;
-  }
-  return false;
-}
-
-bool IsValidEnum(HybridAppPreference val) {
-  return strlen(EnumToJsonString(val)) > 0;
-}
-
-const char* EnumToJsonString(HybridAppPreference val) {
-  switch (val) {
-    case HAP_MOBILE:
-      return "MOBILE";
-    case HAP_CLOUD:
-      return "CLOUD";
-    case HAP_BOTH:
-      return "BOTH";
-    default:
-      return "";
-  }
-}
-
-bool EnumFromJsonString(const std::string& literal,
-                        HybridAppPreference* result) {
-  if ("MOBILE" == literal) {
-    *result = HAP_MOBILE;
-    return true;
-  } else if ("CLOUD" == literal) {
-    *result = HAP_CLOUD;
-    return true;
-  } else if ("BOTH" == literal) {
-    *result = HAP_BOTH;
-    return true;
-  }
-  return false;
-}
-
-bool IsValidEnum(FunctionID val) {
-  switch (val) {
-    case RegisterAppInterfaceID:
-      return true;
-    case UnregisterAppInterfaceID:
-      return true;
-    case SetGlobalPropertiesID:
-      return true;
-    case ResetGlobalPropertiesID:
-      return true;
-    case AddCommandID:
-      return true;
-    case DeleteCommandID:
-      return true;
-    case AddSubMenuID:
-      return true;
-    case DeleteSubMenuID:
-      return true;
-    case CreateInteractionChoiceSetID:
-      return true;
-    case PerformInteractionID:
-      return true;
-    case DeleteInteractionChoiceSetID:
-      return true;
-    case AlertID:
-      return true;
-    case ShowID:
-      return true;
-    case SpeakID:
-      return true;
-    case SetMediaClockTimerID:
-      return true;
-    case PerformAudioPassThruID:
-      return true;
-    case EndAudioPassThruID:
-      return true;
-    case SubscribeButtonID:
-      return true;
-    case UnsubscribeButtonID:
-      return true;
-    case SubscribeVehicleDataID:
-      return true;
-    case UnsubscribeVehicleDataID:
-      return true;
-    case GetVehicleDataID:
-      return true;
-    case ReadDIDID:
-      return true;
-    case GetDTCsID:
-      return true;
-    case ScrollableMessageID:
-      return true;
-    case SliderID:
-      return true;
-    case ShowConstantTBTID:
-      return true;
-    case AlertManeuverID:
-      return true;
-    case UpdateTurnListID:
-      return true;
-    case ChangeRegistrationID:
-      return true;
-    case GenericResponseID:
-      return true;
-    case PutFileID:
-      return true;
-    case DeleteFileID:
-      return true;
-    case ListFilesID:
-      return true;
-    case SetAppIconID:
-      return true;
-    case SetDisplayLayoutID:
-      return true;
-    case DiagnosticMessageID:
-      return true;
-    case SystemRequestID:
-      return true;
-    case SendLocationID:
-      return true;
-    case DialNumberID:
-      return true;
-    case ButtonPressID:
-      return true;
-    case GetInteriorVehicleDataID:
-      return true;
-    case SetInteriorVehicleDataID:
-      return true;
-    case GetWayPointsID:
-      return true;
-    case SubscribeWayPointsID:
-      return true;
-    case UnsubscribeWayPointsID:
-      return true;
-    case GetSystemCapabilityID:
-      return true;
-    case SendHapticDataID:
-      return true;
-    case SetCloudAppPropertiesID:
-      return true;
-    case GetCloudAppPropertiesID:
-      return true;
-    case PublishAppServiceID:
-      return true;
-    case GetFileID:
-      return true;
-    case GetAppServiceDataID:
-      return true;
-    case PerformAppServiceInteractionID:
-      return true;
-    case UnpublishAppServiceID:
-      return true;
-    case CloseApplicationID:
-      return true;
-    case ShowAppMenuID:
-      return true;
-    case OnHMIStatusID:
-      return true;
-    case OnAppInterfaceUnregisteredID:
-      return true;
-    case OnButtonEventID:
-      return true;
-    case OnButtonPressID:
-      return true;
-    case OnVehicleDataID:
-      return true;
-    case OnCommandID:
-      return true;
-    case OnTBTClientStateID:
-      return true;
-    case OnDriverDistractionID:
-      return true;
-    case OnPermissionsChangeID:
-      return true;
-    case OnAudioPassThruID:
-      return true;
-    case OnLanguageChangeID:
-      return true;
-    case OnKeyboardInputID:
-      return true;
-    case OnTouchEventID:
-      return true;
-    case OnSystemRequestID:
-      return true;
-    case OnHashChangeID:
-      return true;
-    case OnInteriorVehicleDataID:
-      return true;
-    case OnWayPointChangeID:
-      return true;
-    case OnRCStatusID:
-      return true;
-    case OnAppServiceDataID:
-      return true;
-    case EncodedSyncPDataID:
-      return true;
-    case SyncPDataID:
-      return true;
-    case OnEncodedSyncPDataID:
-      return true;
-    case OnSyncPDataID:
-      return true;
-    case OnSystemCapabilityUpdatedID:
-      return true;
-    default:
-      return false;
-  }
-};
-
-const char* EnumToJsonString(FunctionID val) {
-  switch (val) {
-    case RegisterAppInterfaceID:
-      return "RegisterAppInterface";
-    case UnregisterAppInterfaceID:
-      return "UnregisterAppInterface";
-    case SetGlobalPropertiesID:
-      return "SetGlobalProperties";
-    case ResetGlobalPropertiesID:
-      return "ResetGlobalProperties";
-    case AddCommandID:
-      return "AddCommand";
-    case DeleteCommandID:
-      return "DeleteCommand";
-    case AddSubMenuID:
-      return "AddSubMenu";
-    case DeleteSubMenuID:
-      return "DeleteSubMenu";
-    case CreateInteractionChoiceSetID:
-      return "CreateInteractionChoiceSet";
-    case PerformInteractionID:
-      return "PerformInteraction";
-    case DeleteInteractionChoiceSetID:
-      return "DeleteInteractionChoiceSet";
-    case AlertID:
-      return "Alert";
-    case ShowID:
-      return "Show";
-    case SpeakID:
-      return "Speak";
-    case SetMediaClockTimerID:
-      return "SetMediaClockTimer";
-    case PerformAudioPassThruID:
-      return "PerformAudioPassThru";
-    case EndAudioPassThruID:
-      return "EndAudioPassThru";
-    case SubscribeButtonID:
-      return "SubscribeButton";
-    case UnsubscribeButtonID:
-      return "UnsubscribeButton";
-    case SubscribeVehicleDataID:
-      return "SubscribeVehicleData";
-    case UnsubscribeVehicleDataID:
-      return "UnsubscribeVehicleData";
-    case GetVehicleDataID:
-      return "GetVehicleData";
-    case ReadDIDID:
-      return "ReadDID";
-    case GetDTCsID:
-      return "GetDTCs";
-    case ScrollableMessageID:
-      return "ScrollableMessage";
-    case SliderID:
-      return "Slider";
-    case ShowConstantTBTID:
-      return "ShowConstantTBT";
-    case AlertManeuverID:
-      return "AlertManeuver";
-    case UpdateTurnListID:
-      return "UpdateTurnList";
-    case ChangeRegistrationID:
-      return "ChangeRegistration";
-    case GenericResponseID:
-      return "GenericResponse";
-    case PutFileID:
-      return "PutFile";
-    case DeleteFileID:
-      return "DeleteFile";
-    case ListFilesID:
-      return "ListFiles";
-    case SetAppIconID:
-      return "SetAppIcon";
-    case SetDisplayLayoutID:
-      return "SetDisplayLayout";
-    case DiagnosticMessageID:
-      return "DiagnosticMessage";
-    case SystemRequestID:
-      return "SystemRequest";
-    case SendLocationID:
-      return "SendLocation";
-    case DialNumberID:
-      return "DialNumber";
-    case ButtonPressID:
-      return "ButtonPress";
-    case GetInteriorVehicleDataID:
-      return "GetInteriorVehicleData";
-    case SetInteriorVehicleDataID:
-      return "SetInteriorVehicleData";
-    case GetWayPointsID:
-      return "GetWayPoints";
-    case SubscribeWayPointsID:
-      return "SubscribeWayPoints";
-    case UnsubscribeWayPointsID:
-      return "UnsubscribeWayPoints";
-    case GetSystemCapabilityID:
-      return "GetSystemCapability";
-    case SendHapticDataID:
-      return "SendHapticData";
-    case SetCloudAppPropertiesID:
-      return "SetCloudAppProperties";
-    case GetCloudAppPropertiesID:
-      return "GetCloudAppProperties";
-    case PublishAppServiceID:
-      return "PublishAppService";
-    case GetFileID:
-      return "GetFile";
-    case GetAppServiceDataID:
-      return "GetAppServiceData";
-    case PerformAppServiceInteractionID:
-      return "PerformAppServiceInteraction";
-    case UnpublishAppServiceID:
-      return "UnpublishAppService";
-    case CloseApplicationID:
-      return "CloseApplication";
-    case ShowAppMenuID:
-      return "ShowAppMenu";
-    case OnHMIStatusID:
-      return "OnHMIStatus";
-    case OnAppInterfaceUnregisteredID:
-      return "OnAppInterfaceUnregistered";
-    case OnButtonEventID:
-      return "OnButtonEvent";
-    case OnButtonPressID:
-      return "OnButtonPress";
-    case OnVehicleDataID:
-      return "OnVehicleData";
-    case OnCommandID:
-      return "OnCommand";
-    case OnTBTClientStateID:
-      return "OnTBTClientState";
-    case OnDriverDistractionID:
-      return "OnDriverDistraction";
-    case OnPermissionsChangeID:
-      return "OnPermissionsChange";
-    case OnAudioPassThruID:
-      return "OnAudioPassThru";
-    case OnLanguageChangeID:
-      return "OnLanguageChange";
-    case OnKeyboardInputID:
-      return "OnKeyboardInput";
-    case OnTouchEventID:
-      return "OnTouchEvent";
-    case OnSystemRequestID:
-      return "OnSystemRequest";
-    case OnHashChangeID:
-      return "OnHashChange";
-    case OnInteriorVehicleDataID:
-      return "OnInteriorVehicleData";
-    case OnWayPointChangeID:
-      return "OnWayPointChange";
-    case OnRCStatusID:
-      return "OnRCStatus";
-    case OnAppServiceDataID:
-      return "OnAppServiceData";
-    case EncodedSyncPDataID:
-      return "EncodedSyncPData";
-    case SyncPDataID:
-      return "SyncPData";
-    case OnEncodedSyncPDataID:
-      return "OnEncodedSyncPData";
-    case OnSyncPDataID:
-      return "OnSyncPData";
-    case OnSystemCapabilityUpdatedID:
-      return "OnSystemCapabilityUpdated";
-    default:
-      return "";
-  }
-};
-
-bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
-  if ("RegisterAppInterface" == literal) {
-    *result = RegisterAppInterfaceID;
-    return true;
-  }
-
-  if ("UnregisterAppInterface" == literal) {
-    *result = UnregisterAppInterfaceID;
-    return true;
-  }
-
-  if ("SetGlobalProperties" == literal) {
-    *result = SetGlobalPropertiesID;
-    return true;
-  }
-
-  if ("ResetGlobalProperties" == literal) {
-    *result = ResetGlobalPropertiesID;
-    return true;
-  }
-
-  if ("AddCommand" == literal) {
-    *result = AddCommandID;
-    return true;
-  }
-
-  if ("DeleteCommand" == literal) {
-    *result = DeleteCommandID;
-    return true;
-  }
-
-  if ("AddSubMenu" == literal) {
-    *result = AddSubMenuID;
-    return true;
-  }
-
-  if ("DeleteSubMenu" == literal) {
-    *result = DeleteSubMenuID;
-    return true;
-  }
-
-  if ("CreateInteractionChoiceSet" == literal) {
-    *result = CreateInteractionChoiceSetID;
-    return true;
-  }
-
-  if ("PerformInteraction" == literal) {
-    *result = PerformInteractionID;
-    return true;
-  }
-
-  if ("DeleteInteractionChoiceSet" == literal) {
-    *result = DeleteInteractionChoiceSetID;
-    return true;
-  }
-
-  if ("Alert" == literal) {
-    *result = AlertID;
-    return true;
-  }
-
-  if ("Show" == literal) {
-    *result = ShowID;
-    return true;
-  }
-
-  if ("Speak" == literal) {
-    *result = SpeakID;
-    return true;
-  }
-
-  if ("SetMediaClockTimer" == literal) {
-    *result = SetMediaClockTimerID;
-    return true;
-  }
-
-  if ("PerformAudioPassThru" == literal) {
-    *result = PerformAudioPassThruID;
-    return true;
-  }
-
-  if ("EndAudioPassThru" == literal) {
-    *result = EndAudioPassThruID;
-    return true;
-  }
-
-  if ("SubscribeButton" == literal) {
-    *result = SubscribeButtonID;
-    return true;
-  }
-
-  if ("UnsubscribeButton" == literal) {
-    *result = UnsubscribeButtonID;
-    return true;
-  }
-
-  if ("SubscribeVehicleData" == literal) {
-    *result = SubscribeVehicleDataID;
-    return true;
-  }
-
-  if ("UnsubscribeVehicleData" == literal) {
-    *result = UnsubscribeVehicleDataID;
-    return true;
-  }
-
-  if ("GetVehicleData" == literal) {
-    *result = GetVehicleDataID;
-    return true;
-  }
-
-  if ("ReadDID" == literal) {
-    *result = ReadDIDID;
-    return true;
-  }
-
-  if ("GetDTCs" == literal) {
-    *result = GetDTCsID;
-    return true;
-  }
-
-  if ("ScrollableMessage" == literal) {
-    *result = ScrollableMessageID;
-    return true;
-  }
-
-  if ("Slider" == literal) {
-    *result = SliderID;
-    return true;
-  }
-
-  if ("ShowConstantTBT" == literal) {
-    *result = ShowConstantTBTID;
-    return true;
-  }
-
-  if ("AlertManeuver" == literal) {
-    *result = AlertManeuverID;
-    return true;
-  }
-
-  if ("UpdateTurnList" == literal) {
-    *result = UpdateTurnListID;
-    return true;
-  }
-
-  if ("ChangeRegistration" == literal) {
-    *result = ChangeRegistrationID;
-    return true;
-  }
-
-  if ("GenericResponse" == literal) {
-    *result = GenericResponseID;
-    return true;
-  }
-
-  if ("PutFile" == literal) {
-    *result = PutFileID;
-    return true;
-  }
-
-  if ("DeleteFile" == literal) {
-    *result = DeleteFileID;
-    return true;
-  }
-
-  if ("ListFiles" == literal) {
-    *result = ListFilesID;
-    return true;
-  }
-
-  if ("SetAppIcon" == literal) {
-    *result = SetAppIconID;
-    return true;
-  }
-
-  if ("SetDisplayLayout" == literal) {
-    *result = SetDisplayLayoutID;
-    return true;
-  }
-
-  if ("DiagnosticMessage" == literal) {
-    *result = DiagnosticMessageID;
-    return true;
-  }
-
-  if ("SystemRequest" == literal) {
-    *result = SystemRequestID;
-    return true;
-  }
-
-  if ("SendLocation" == literal) {
-    *result = SendLocationID;
-    return true;
-  }
-
-  if ("DialNumber" == literal) {
-    *result = DialNumberID;
-    return true;
-  }
-
-  if ("ButtonPress" == literal) {
-    *result = ButtonPressID;
-    return true;
-  }
-
-  if ("GetInteriorVehicleData" == literal) {
-    *result = GetInteriorVehicleDataID;
-    return true;
-  }
-
-  if ("SetInteriorVehicleData" == literal) {
-    *result = SetInteriorVehicleDataID;
-    return true;
-  }
-
-  if ("GetWayPoints" == literal) {
-    *result = GetWayPointsID;
-    return true;
-  }
-
-  if ("SubscribeWayPoints" == literal) {
-    *result = SubscribeWayPointsID;
-    return true;
-  }
-
-  if ("UnsubscribeWayPoints" == literal) {
-    *result = UnsubscribeWayPointsID;
-    return true;
-  }
-
-  if ("GetSystemCapability" == literal) {
-    *result = GetSystemCapabilityID;
-    return true;
-  }
-
-  if ("SendHapticData" == literal) {
-    *result = SendHapticDataID;
-    return true;
-  }
-
-  if ("SetCloudAppProperties" == literal) {
-    *result = SetCloudAppPropertiesID;
-    return true;
-  }
-
-  if ("GetCloudAppProperties" == literal) {
-    *result = GetCloudAppPropertiesID;
-    return true;
-  }
-
-  if ("PublishAppService" == literal) {
-    *result = PublishAppServiceID;
-    return true;
-  }
-
-  if ("GetFile" == literal) {
-    *result = GetFileID;
-    return true;
-  }
-
-  if ("GetAppServiceData" == literal) {
-    *result = GetAppServiceDataID;
-    return true;
-  }
-
-  if ("PerformAppServiceInteraction" == literal) {
-    *result = PerformAppServiceInteractionID;
-    return true;
-  }
-
-  if ("UnpublishAppService" == literal) {
-    *result = UnpublishAppServiceID;
-    return true;
-  }
-
-  if ("CloseApplication" == literal) {
-    *result = CloseApplicationID;
-    return true;
-  }
-
-  if ("ShowAppMenu" == literal) {
-    *result = ShowAppMenuID;
-    return true;
-  }
-
-  if ("OnHMIStatus" == literal) {
-    *result = OnHMIStatusID;
-    return true;
-  }
-
-  if ("OnAppInterfaceUnregistered" == literal) {
-    *result = OnAppInterfaceUnregisteredID;
-    return true;
-  }
-
-  if ("OnButtonEvent" == literal) {
-    *result = OnButtonEventID;
-    return true;
-  }
-
-  if ("OnButtonPress" == literal) {
-    *result = OnButtonPressID;
-    return true;
-  }
-
-  if ("OnVehicleData" == literal) {
-    *result = OnVehicleDataID;
-    return true;
-  }
-
-  if ("OnCommand" == literal) {
-    *result = OnCommandID;
-    return true;
-  }
-
-  if ("OnTBTClientState" == literal) {
-    *result = OnTBTClientStateID;
-    return true;
-  }
-
-  if ("OnDriverDistraction" == literal) {
-    *result = OnDriverDistractionID;
-    return true;
-  }
-
-  if ("OnPermissionsChange" == literal) {
-    *result = OnPermissionsChangeID;
-    return true;
-  }
-
-  if ("OnAudioPassThru" == literal) {
-    *result = OnAudioPassThruID;
-    return true;
-  }
-
-  if ("OnLanguageChange" == literal) {
-    *result = OnLanguageChangeID;
-    return true;
-  }
-
-  if ("OnKeyboardInput" == literal) {
-    *result = OnKeyboardInputID;
-    return true;
-  }
-
-  if ("OnTouchEvent" == literal) {
-    *result = OnTouchEventID;
-    return true;
-  }
-
-  if ("OnSystemRequest" == literal) {
-    *result = OnSystemRequestID;
-    return true;
-  }
-
-  if ("OnHashChange" == literal) {
-    *result = OnHashChangeID;
-    return true;
-  }
-
-  if ("OnInteriorVehicleData" == literal) {
-    *result = OnInteriorVehicleDataID;
-    return true;
-  }
-
-  if ("OnWayPointChange" == literal) {
-    *result = OnWayPointChangeID;
-    return true;
-  }
-
-  if ("OnRCStatus" == literal) {
-    *result = OnRCStatusID;
-    return true;
-  }
-
-  if ("OnAppServiceData" == literal) {
-    *result = OnAppServiceDataID;
-    return true;
-  }
-
-  if ("OnSystemCapabilityUpdated" == literal) {
-    *result = OnSystemCapabilityUpdatedID;
-    return true;
-  }
-
-  if ("EncodedSyncPData" == literal) {
-    *result = EncodedSyncPDataID;
-    return true;
-  }
-
-  if ("SyncPData" == literal) {
-    *result = SyncPDataID;
-    return true;
-  }
-
-  if ("OnEncodedSyncPData" == literal) {
-    *result = OnEncodedSyncPDataID;
-    return true;
-  }
-
-  if ("OnSyncPData" == literal) {
-    *result = OnSyncPDataID;
-    return true;
-  }
-  return false;
-};
 
 const std::string kDefaultApp = "default";
 const std::string kPreDataConsentApp = "pre_DataConsent";
diff --git a/src/components/policy/policy_regular/src/policy_table/types.cc b/src/components/policy/policy_regular/src/policy_table/types.cc
index 7fdfde996c..3029ebb067 100644
--- a/src/components/policy/policy_regular/src/policy_table/types.cc
+++ b/src/components/policy/policy_regular/src/policy_table/types.cc
@@ -31,7 +31,6 @@ PolicyBase::~PolicyBase() {}
 PolicyBase::PolicyBase(const Json::Value* value__)
     : CompositeType(InitHelper(value__, &Json::Value::isObject))
     , priority(impl::ValueMember(value__, "priority")) {}
-
 Json::Value PolicyBase::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
   impl::WriteJsonField("priority", priority, &result__);
@@ -280,7 +279,8 @@ ApplicationParams::ApplicationParams(const Json::Value* value__)
     , icon_url(impl::ValueMember(value__, "icon_url"))
     , app_service_parameters(impl::ValueMember(value__, "app_services"))
     , allow_unknown_rpc_passthrough(
-          impl::ValueMember(value__, "allow_unknown_rpc_passthrough")) {}
+          impl::ValueMember(value__, "allow_unknown_rpc_passthrough"))
+    , encryption_required(impl::ValueMember(value__, "encryption_required")) {}
 
 Json::Value ApplicationParams::ToJsonValue() const {
   Json::Value result__(PolicyBase::ToJsonValue());
@@ -305,6 +305,8 @@ Json::Value ApplicationParams::ToJsonValue() const {
   impl::WriteJsonField("allow_unknown_rpc_passthrough",
                        allow_unknown_rpc_passthrough,
                        &result__);
+  impl::WriteJsonField("encryption_required", encryption_required, &result__);
+
   return result__;
 }
 
@@ -360,6 +362,9 @@ bool ApplicationParams::is_valid() const {
   if (!allow_unknown_rpc_passthrough.is_valid()) {
     return false;
   }
+  if (!encryption_required.is_valid()) {
+    return false;
+  }
   return Validate();
 }
 
@@ -422,6 +427,9 @@ bool ApplicationParams::struct_empty() const {
   if (allow_unknown_rpc_passthrough.is_initialized()) {
     return false;
   }
+  if (encryption_required.is_initialized()) {
+    return false;
+  }
   return true;
 }
 
@@ -487,6 +495,10 @@ void ApplicationParams::ReportErrors(rpc::ValidationReport* report__) const {
     allow_unknown_rpc_passthrough.ReportErrors(
         &report__->ReportSubobject("allow_unknown_rpc_passthrough"));
   }
+  if (!encryption_required.is_valid()) {
+    encryption_required.ReportErrors(
+        &report__->ReportSubobject("encryption_required"));
+  }
 }
 
 void ApplicationParams::SetPolicyTableType(PolicyTableType pt_type) {
@@ -535,6 +547,7 @@ bool RpcParameters::is_valid() const {
   if (!parameters.is_valid()) {
     return false;
   }
+
   return Validate();
 }
 
@@ -581,12 +594,14 @@ Rpcs::~Rpcs() {}
 Rpcs::Rpcs(const Json::Value* value__)
     : CompositeType(InitHelper(value__, &Json::Value::isObject))
     , user_consent_prompt(impl::ValueMember(value__, "user_consent_prompt"))
-    , rpcs(impl::ValueMember(value__, "rpcs")) {}
+    , rpcs(impl::ValueMember(value__, "rpcs"))
+    , encryption_required(impl::ValueMember(value__, "encryption_required")) {}
 
 Json::Value Rpcs::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
   impl::WriteJsonField("user_consent_prompt", user_consent_prompt, &result__);
   impl::WriteJsonField("rpcs", rpcs, &result__);
+  impl::WriteJsonField("encryption_required", encryption_required, &result__);
   return result__;
 }
 
@@ -597,6 +612,9 @@ bool Rpcs::is_valid() const {
   if (!rpcs.is_valid()) {
     return false;
   }
+  if (!encryption_required.is_valid()) {
+    return false;
+  }
   return Validate();
 }
 
@@ -611,7 +629,9 @@ bool Rpcs::struct_empty() const {
   if (rpcs.is_initialized()) {
     return false;
   }
-
+  if (encryption_required.is_initialized()) {
+    return false;
+  }
   return true;
 }
 
@@ -626,6 +646,10 @@ void Rpcs::ReportErrors(rpc::ValidationReport* report__) const {
   if (!rpcs.is_valid()) {
     rpcs.ReportErrors(&report__->ReportSubobject("rpcs"));
   }
+  if (!encryption_required.is_valid()) {
+    encryption_required.ReportErrors(
+        &report__->ReportSubobject("encryption_required"));
+  }
 }
 
 void Rpcs::SetPolicyTableType(PolicyTableType pt_type) {
@@ -634,9 +658,60 @@ void Rpcs::SetPolicyTableType(PolicyTableType pt_type) {
   rpcs.SetPolicyTableType(pt_type);
 }
 
+// EndpointProperties methods
+EndpointProperty::EndpointProperty() : CompositeType(kUninitialized) {}
+
+EndpointProperty::~EndpointProperty() {}
+
+EndpointProperty::EndpointProperty(const Json::Value* value__)
+    : CompositeType(InitHelper(value__, &Json::Value::isObject))
+    , version(impl::ValueMember(value__, "version")) {}
+
+Json::Value EndpointProperty::ToJsonValue() const {
+  Json::Value result__(Json::objectValue);
+  impl::WriteJsonField("version", version, &result__);
+  return result__;
+}
+
+bool EndpointProperty::is_valid() const {
+  if (!version.is_valid()) {
+    return false;
+  }
+  return Validate();
+}
+
+bool EndpointProperty::is_initialized() const {
+  return (initialization_state__ != kUninitialized) || (!struct_empty());
+}
+
+bool EndpointProperty::struct_empty() const {
+  if (version.is_initialized()) {
+    return false;
+  }
+
+  return true;
+}
+
+void EndpointProperty::ReportErrors(rpc::ValidationReport* report__) const {
+  if (struct_empty()) {
+    rpc::CompositeType::ReportErrors(report__);
+  }
+  if (!version.is_valid()) {
+    version.ReportErrors(&report__->ReportSubobject("version"));
+  }
+}
+
+void EndpointProperty::SetPolicyTableType(PolicyTableType pt_type) {
+  CompositeType::SetPolicyTableType(pt_type);
+  version.SetPolicyTableType(pt_type);
+}
+
 // ModuleConfig methods
 ModuleConfig::ModuleConfig() : CompositeType(kUninitialized) {}
 
+const std::string ModuleConfig::kDefaultOemMappingServiceName =
+    "custom_vehicle_data_mapping_url";
+
 ModuleConfig::ModuleConfig(
     uint8_t exchange_after_x_ignition_cycles,
     int64_t exchange_after_x_kilometers,
@@ -644,6 +719,7 @@ ModuleConfig::ModuleConfig(
     uint16_t timeout_after_x_seconds,
     const SecondsBetweenRetries& seconds_between_retries,
     const ServiceEndpoints& endpoints,
+    const ServiceEndpointProperties& endpoint_properties,
     const NumberOfNotificationsPerMinute& notifications_per_minute_by_priority)
     : CompositeType(kUninitialized)
     , exchange_after_x_ignition_cycles(exchange_after_x_ignition_cycles)
@@ -652,6 +728,7 @@ ModuleConfig::ModuleConfig(
     , timeout_after_x_seconds(timeout_after_x_seconds)
     , seconds_between_retries(seconds_between_retries)
     , endpoints(endpoints)
+    , endpoint_properties(endpoint_properties)
     , notifications_per_minute_by_priority(
           notifications_per_minute_by_priority) {}
 
@@ -672,6 +749,7 @@ ModuleConfig::ModuleConfig(const Json::Value* value__)
     , seconds_between_retries(
           impl::ValueMember(value__, "seconds_between_retries"))
     , endpoints(impl::ValueMember(value__, "endpoints"))
+    , endpoint_properties(impl::ValueMember(value__, "endpoint_properties"))
     , notifications_per_minute_by_priority(
           impl::ValueMember(value__, "notifications_per_minute_by_priority"))
     , vehicle_make(impl::ValueMember(value__, "vehicle_make"))
@@ -691,6 +769,7 @@ void ModuleConfig::SafeCopyFrom(const ModuleConfig& from) {
   timeout_after_x_seconds = from.timeout_after_x_seconds;
   seconds_between_retries = from.seconds_between_retries;
   endpoints = from.endpoints;
+  endpoint_properties = from.endpoint_properties;
   notifications_per_minute_by_priority =
       from.notifications_per_minute_by_priority;
 
@@ -719,6 +798,7 @@ Json::Value ModuleConfig::ToJsonValue() const {
   impl::WriteJsonField(
       "seconds_between_retries", seconds_between_retries, &result__);
   impl::WriteJsonField("endpoints", endpoints, &result__);
+  impl::WriteJsonField("endpoint_properties", endpoint_properties, &result__);
   impl::WriteJsonField("notifications_per_minute_by_priority",
                        notifications_per_minute_by_priority,
                        &result__);
@@ -758,6 +838,9 @@ bool ModuleConfig::is_valid() const {
   if (!endpoints.is_valid()) {
     return false;
   }
+  if (!endpoint_properties.is_valid()) {
+    return false;
+  }
   if (!notifications_per_minute_by_priority.is_valid()) {
     return false;
   }
@@ -811,10 +894,15 @@ bool ModuleConfig::struct_empty() const {
   if (seconds_between_retries.is_initialized()) {
     return false;
   }
+
   if (endpoints.is_initialized()) {
     return false;
   }
 
+  if (endpoint_properties.is_initialized()) {
+    return false;
+  }
+
   if (notifications_per_minute_by_priority.is_initialized()) {
     return false;
   }
@@ -872,6 +960,10 @@ void ModuleConfig::ReportErrors(rpc::ValidationReport* report__) const {
   if (!endpoints.is_valid()) {
     endpoints.ReportErrors(&report__->ReportSubobject("endpoints"));
   }
+  if (!endpoint_properties.is_valid()) {
+    endpoint_properties.ReportErrors(
+        &report__->ReportSubobject("endpoint_properties"));
+  }
   if (!notifications_per_minute_by_priority.is_valid()) {
     notifications_per_minute_by_priority.ReportErrors(
         &report__->ReportSubobject("notifications_per_minute_by_priority"));
@@ -918,6 +1010,7 @@ void ModuleConfig::SetPolicyTableType(PolicyTableType pt_type) {
   timeout_after_x_seconds.SetPolicyTableType(pt_type);
   seconds_between_retries.SetPolicyTableType(pt_type);
   endpoints.SetPolicyTableType(pt_type);
+  endpoint_properties.SetPolicyTableType(pt_type);
   notifications_per_minute_by_priority.SetPolicyTableType(pt_type);
   lock_screen_dismissal_enabled.SetPolicyTableType(pt_type);
   vehicle_make.SetPolicyTableType(pt_type);
@@ -1539,6 +1632,414 @@ void DeviceParams::ReportErrors(rpc::ValidationReport* report__) const {
   }
 }
 
+// VehicleDataItem methods
+VehicleDataItem::VehicleDataItem() : CompositeType(kUninitialized) {}
+
+VehicleDataItem::VehicleDataItem(const VehicleDataItem& vehicle_data)
+    : CompositeType(vehicle_data.initialization_state__)
+    , name(vehicle_data.name)
+    , type(vehicle_data.type)
+    , key(vehicle_data.key)
+    , mandatory(vehicle_data.mandatory)
+    , params(vehicle_data.params)
+    , array(vehicle_data.array)
+    , since(vehicle_data.since)
+    , until(vehicle_data.until)
+    , removed(vehicle_data.removed)
+    , deprecated(vehicle_data.deprecated)
+    , minvalue(vehicle_data.minvalue)
+    , maxvalue(vehicle_data.maxvalue)
+    , minsize(vehicle_data.minsize)
+    , maxsize(vehicle_data.maxsize)
+    , minlength(vehicle_data.minlength)
+    , maxlength(vehicle_data.maxlength) {}
+
+VehicleDataItem::VehicleDataItem(const Json::Value* value__)
+    : CompositeType(InitHelper(value__, &Json::Value::isObject))
+    , name(impl::ValueMember(value__, "name"))
+    , type(impl::ValueMember(value__, "type"))
+    , key(impl::ValueMember(value__, "key"))
+    , mandatory(impl::ValueMember(value__, "mandatory"))
+    , params(impl::ValueMember(value__, "params"))
+    , array(impl::ValueMember(value__, "array"))
+    , since(impl::ValueMember(value__, "since"))
+    , until(impl::ValueMember(value__, "until"))
+    , removed(impl::ValueMember(value__, "removed"))
+    , deprecated(impl::ValueMember(value__, "deprecated"))
+    , minvalue(impl::ValueMember(value__, "minvalue"))
+    , maxvalue(impl::ValueMember(value__, "maxvalue"))
+    , minsize(impl::ValueMember(value__, "minsize"))
+    , maxsize(impl::ValueMember(value__, "maxsize"))
+    , minlength(impl::ValueMember(value__, "minlength"))
+    , maxlength(impl::ValueMember(value__, "maxlength")) {}
+
+VehicleDataItem::~VehicleDataItem() {}
+
+const std::string VehicleDataItem::kInteger = "Integer";
+const std::string VehicleDataItem::kStruct = "Struct";
+const std::string VehicleDataItem::kString = "String";
+const std::string VehicleDataItem::kFloat = "Float";
+const std::string VehicleDataItem::kDouble = "Double";
+const std::string VehicleDataItem::kBoolean = "Boolean";
+
+const std::vector<std::string> VehicleDataItem::kPODTypes = {
+    kInteger, kFloat, kDouble, kString, kBoolean};
+
+Json::Value VehicleDataItem::ToJsonValue() const {
+  Json::Value ret(Json::objectValue);
+  impl::WriteJsonField("name", name, &ret);
+  impl::WriteJsonField("type", type, &ret);
+  impl::WriteJsonField("key", key, &ret);
+  impl::WriteJsonField("array", array, &ret);
+  impl::WriteJsonField("mandatory", mandatory, &ret);
+  impl::WriteJsonField("params", params, &ret);
+  impl::WriteJsonField("since", since, &ret);
+  impl::WriteJsonField("until", until, &ret);
+  impl::WriteJsonField("removed", removed, &ret);
+  impl::WriteJsonField("deprecated", deprecated, &ret);
+  impl::WriteJsonField("minvalue", minvalue, &ret);
+  impl::WriteJsonField("maxvalue", maxvalue, &ret);
+  impl::WriteJsonField("minsize", minsize, &ret);
+  impl::WriteJsonField("maxsize", maxsize, &ret);
+  impl::WriteJsonField("minlength", minlength, &ret);
+  impl::WriteJsonField("maxlength", maxlength, &ret);
+  return ret;
+}
+
+bool VehicleDataItem::operator==(const VehicleDataItem& vd) {
+  return (name == vd.name && type == vd.type && key == vd.key &&
+          mandatory == vd.mandatory && params == vd.params &&
+          array == vd.array && since == vd.since && until == vd.until &&
+          removed == vd.removed && deprecated == vd.deprecated &&
+          minvalue == vd.minvalue && maxvalue == vd.maxvalue &&
+          minsize == vd.minsize && maxsize == vd.maxsize &&
+          minlength == vd.minlength && maxlength == vd.maxlength);
+}
+
+bool VehicleDataItem::is_valid() const {
+  if (!name.is_valid()) {
+    return false;
+  }
+  if (!type.is_valid()) {
+    return false;
+  }
+  if (!key.is_valid()) {
+    return false;
+  }
+  if (!array.is_valid()) {
+    return false;
+  }
+  if (!mandatory.is_valid()) {
+    return false;
+  }
+  if (!params.is_valid()) {
+    return false;
+  }
+  if (!since.is_valid()) {
+    return false;
+  }
+  if (!until.is_valid()) {
+    return false;
+  }
+  if (!removed.is_valid()) {
+    return false;
+  }
+  if (!deprecated.is_valid()) {
+    return false;
+  }
+  if (!minvalue.is_valid()) {
+    return false;
+  }
+  if (!maxvalue.is_valid()) {
+    return false;
+  }
+  if (!minsize.is_valid()) {
+    return false;
+  }
+  if (!maxsize.is_valid()) {
+    return false;
+  }
+  if (!minlength.is_valid()) {
+    return false;
+  }
+  if (!maxlength.is_valid()) {
+    return false;
+  }
+  return Validate();
+}
+
+bool VehicleDataItem::is_initialized() const {
+  return (initialization_state__ != kUninitialized) || (struct_not_empty());
+}
+
+bool VehicleDataItem::struct_not_empty() const {
+  if (!name.is_initialized()) {
+    return false;
+  }
+  if (!type.is_initialized()) {
+    return false;
+  }
+  if (!key.is_initialized()) {
+    return false;
+  }
+  if (!array.is_initialized()) {
+    return false;
+  }
+  if (!mandatory.is_initialized()) {
+    return false;
+  }
+  if (!params.is_initialized()) {
+    return false;
+  }
+  if (!since.is_initialized()) {
+    return false;
+  }
+  if (!until.is_initialized()) {
+    return false;
+  }
+  if (!removed.is_initialized()) {
+    return false;
+  }
+  if (!deprecated.is_initialized()) {
+    return false;
+  }
+  if (!minvalue.is_initialized()) {
+    return false;
+  }
+  if (!maxvalue.is_initialized()) {
+    return false;
+  }
+  if (!minsize.is_initialized()) {
+    return false;
+  }
+  if (!maxsize.is_initialized()) {
+    return false;
+  }
+  if (!minlength.is_initialized()) {
+    return false;
+  }
+  if (!maxlength.is_initialized()) {
+    return false;
+  }
+  return true;
+}
+
+void VehicleDataItem::ReportErrors(rpc::ValidationReport* report__) const {
+  if (!struct_not_empty()) {
+    rpc::CompositeType::ReportErrors(report__);
+  }
+  if (!name.is_valid()) {
+    name.ReportErrors(&report__->ReportSubobject("name"));
+  }
+  if (!ValidateNaming(std::string(name))) {
+    report__->set_validation_info(
+        "Invalid name values [" + std::string(name) +
+        "]. It should not contain spaces or invalid chars.");
+  }
+  if (!type.is_valid()) {
+    type.ReportErrors(&report__->ReportSubobject("type"));
+  }
+  if (type.is_initialized() && !ValidateTypes()) {
+    report__->set_validation_info("Unknown type [" + std::string(name) +
+                                  "]: '" + std::string(type) + "'.");
+  }
+  if (!key.is_valid()) {
+    key.ReportErrors(&report__->ReportSubobject("key"));
+  }
+  if (!ValidateNaming(std::string(key))) {
+    report__->set_validation_info(
+        "Invalid key values [" + std::string(key) +
+        "]. It should not contain spaces or invalid chars.");
+  }
+  if (!array.is_valid()) {
+    array.ReportErrors(&report__->ReportSubobject("array"));
+  }
+  if (!mandatory.is_valid()) {
+    mandatory.ReportErrors(&report__->ReportSubobject("mandatory"));
+  }
+  if (!params.is_valid()) {
+    params.ReportErrors(&report__->ReportSubobject("params"));
+  }
+  if (!since.is_valid()) {
+    since.ReportErrors(&report__->ReportSubobject("since"));
+  }
+  if (!until.is_valid()) {
+    until.ReportErrors(&report__->ReportSubobject("until"));
+  }
+  if (!removed.is_valid()) {
+    removed.ReportErrors(&report__->ReportSubobject("removed"));
+  }
+  if (!deprecated.is_valid()) {
+    deprecated.ReportErrors(&report__->ReportSubobject("deprecated"));
+  }
+  if (!minvalue.is_valid()) {
+    minvalue.ReportErrors(&report__->ReportSubobject("minvalue"));
+  }
+  if (!maxvalue.is_valid()) {
+    maxvalue.ReportErrors(&report__->ReportSubobject("maxvalue"));
+  }
+  if (!minsize.is_valid()) {
+    minsize.ReportErrors(&report__->ReportSubobject("minsize"));
+  }
+  if (!maxsize.is_valid()) {
+    maxsize.ReportErrors(&report__->ReportSubobject("maxsize"));
+  }
+  if (!minlength.is_valid()) {
+    minlength.ReportErrors(&report__->ReportSubobject("minlength"));
+  }
+  if (!maxlength.is_valid()) {
+    maxlength.ReportErrors(&report__->ReportSubobject("maxlength"));
+  }
+}
+
+void VehicleDataItem::SetPolicyTableType(PolicyTableType pt_type) {
+  CompositeType::SetPolicyTableType(pt_type);
+  name.SetPolicyTableType(pt_type);
+  type.SetPolicyTableType(pt_type);
+  key.SetPolicyTableType(pt_type);
+  array.SetPolicyTableType(pt_type);
+  mandatory.SetPolicyTableType(pt_type);
+  params.SetPolicyTableType(pt_type);
+  since.SetPolicyTableType(pt_type);
+  until.SetPolicyTableType(pt_type);
+  removed.SetPolicyTableType(pt_type);
+  deprecated.SetPolicyTableType(pt_type);
+  minvalue.SetPolicyTableType(pt_type);
+  maxvalue.SetPolicyTableType(pt_type);
+  minsize.SetPolicyTableType(pt_type);
+  maxsize.SetPolicyTableType(pt_type);
+  minlength.SetPolicyTableType(pt_type);
+  maxlength.SetPolicyTableType(pt_type);
+}
+
+bool VehicleDataItem::ValidateNaming(std::string str) const {
+  auto contains_spec_chars = [](std::string str) {
+    const auto invalid_chars = "!@#$%^&*";
+    return str.npos != str.find_first_of(invalid_chars);
+  };
+
+  auto contains_spaces = [](std::string str) {
+    const auto found_space =
+        std::find_if(str.begin(), str.end(), [](unsigned char ch) {
+          return std::isspace(ch);
+        });
+
+    return found_space != str.end();
+  };
+
+  auto empty_string = [](std::string str) {
+    str.erase(std::remove_if(str.begin(),
+                             str.end(),
+                             [](unsigned char ch) { return std::isspace(ch); }),
+              str.end());
+    return str.length() < 1;
+  };
+
+  return !empty_string(str) && !contains_spaces(str) &&
+         !contains_spec_chars(str);
+}
+
+bool VehicleDataItem::ValidateTypes() const {
+  if (VehicleDataItem::kStruct == std::string(type)) {
+    return params.is_initialized() && !(params->empty()) && params.is_valid();
+  }
+  // params should be empty for POD types and for enum values
+  return (!(params.is_initialized()) || params->empty());
+}
+
+bool VehicleDataItem::IsPrimitiveType() const {
+  return helpers::in_range(kPODTypes, std::string(type));
+}
+
+// VehicleData methods
+VehicleData::VehicleData() : CompositeType(kUninitialized) {}
+
+VehicleData::VehicleData(const VehicleData& vehicle_data)
+    : CompositeType(vehicle_data.initialization_state__)
+    , schema_version(vehicle_data.schema_version)
+    , schema_items(vehicle_data.schema_items) {}
+
+VehicleData::VehicleData(const Json::Value* value__)
+    : CompositeType(InitHelper(value__, &Json::Value::isObject))
+    , schema_version(impl::ValueMember(value__, "schema_version"))
+    , schema_items(impl::ValueMember(value__, "schema_items")) {}
+
+VehicleData::~VehicleData() {}
+
+bool VehicleData::is_valid() const {
+  if (!schema_version.is_valid()) {
+    return false;
+  }
+  if (!schema_items.is_valid()) {
+    return false;
+  }
+  return Validate();
+}
+
+bool VehicleData::is_initialized() const {
+  return (initialization_state__ != kUninitialized) || (!struct_empty());
+}
+
+bool VehicleData::struct_empty() const {
+  if (schema_version.is_initialized()) {
+    return false;
+  }
+  if (schema_items.is_initialized()) {
+    return false;
+  }
+  return true;
+}
+
+Json::Value VehicleData::ToJsonValue() const {
+  Json::Value ret(Json::objectValue);
+  impl::WriteJsonField("schema_version", schema_version, &ret);
+  impl::WriteJsonField("schema_items", schema_items, &ret);
+  return ret;
+}
+
+void VehicleData::ReportErrors(rpc::ValidationReport* report__) const {
+  if (struct_empty()) {
+    rpc::CompositeType::ReportErrors(report__);
+  }
+  const auto pt_type = GetPolicyTableType();
+  const auto pt_type_str = PolicyTableTypeToString(pt_type);
+  std::string validation_info = "";
+
+  if (PT_SNAPSHOT == pt_type) {
+    if (schema_items.is_initialized()) {
+      validation_info +=
+          "; schema_items " + omitted_validation_info + pt_type_str;
+    }
+    if (!schema_version.is_initialized()) {
+      validation_info +=
+          "; schema_version " + required_validation_info + pt_type_str;
+    }
+    report__->set_validation_info(validation_info);
+  }
+
+  if (PT_UPDATE == pt_type || PT_PRELOADED == pt_type) {
+    if ((schema_version.is_initialized() && !schema_items.is_initialized()) ||
+        (!schema_version.is_initialized() && schema_items.is_initialized())) {
+      validation_info += "; schema_version and schema_items " +
+                         required_validation_info + pt_type_str;
+    }
+    report__->set_validation_info(validation_info);
+  }
+
+  if (!schema_version.is_valid()) {
+    schema_version.ReportErrors(&report__->ReportSubobject("schema_version"));
+  }
+  if (!schema_items.is_valid()) {
+    schema_items.ReportErrors(&report__->ReportSubobject("schema_items"));
+  }
+}
+
+void VehicleData::SetPolicyTableType(PolicyTableType pt_type) {
+  CompositeType::SetPolicyTableType(pt_type);
+  schema_version.SetPolicyTableType(pt_type);
+  schema_items.SetPolicyTableType(pt_type);
+}
+
 // PolicyTable methods
 PolicyTable::PolicyTable() : CompositeType(kUninitialized) {}
 
@@ -1565,7 +2066,8 @@ PolicyTable::PolicyTable(const Json::Value* value__)
     , module_meta(impl::ValueMember(value__, "module_meta"))
     , usage_and_error_counts(
           impl::ValueMember(value__, "usage_and_error_counts"))
-    , device_data(impl::ValueMember(value__, "device_data")) {}
+    , device_data(impl::ValueMember(value__, "device_data"))
+    , vehicle_data(impl::ValueMember(value__, "vehicle_data")) {}
 
 Json::Value PolicyTable::ToJsonValue() const {
   Json::Value result__(Json::objectValue);
@@ -1578,6 +2080,7 @@ Json::Value PolicyTable::ToJsonValue() const {
   impl::WriteJsonField(
       "usage_and_error_counts", usage_and_error_counts, &result__);
   impl::WriteJsonField("device_data", device_data, &result__);
+  impl::WriteJsonField("vehicle_data", vehicle_data, &result__);
   return result__;
 }
 
@@ -1603,6 +2106,9 @@ bool PolicyTable::is_valid() const {
   if (!device_data.is_valid()) {
     return false;
   }
+  if (!vehicle_data.is_valid()) {
+    return false;
+  }
   return Validate();
 }
 
@@ -1635,6 +2141,9 @@ bool PolicyTable::struct_empty() const {
   if (device_data.is_initialized()) {
     return false;
   }
+  if (vehicle_data.is_initialized()) {
+    return false;
+  }
   return true;
 }
 
@@ -1677,6 +2186,9 @@ void PolicyTable::ReportErrors(rpc::ValidationReport* report__) const {
   if (!device_data.is_valid()) {
     device_data.ReportErrors(&report__->ReportSubobject("device_data"));
   }
+  if (!vehicle_data.is_valid()) {
+    vehicle_data.ReportErrors(&report__->ReportSubobject("vehicle_data"));
+  }
 }
 
 void PolicyTable::SetPolicyTableType(PolicyTableType pt_type) {
@@ -1688,6 +2200,7 @@ void PolicyTable::SetPolicyTableType(PolicyTableType pt_type) {
   module_meta.SetPolicyTableType(pt_type);
   usage_and_error_counts.SetPolicyTableType(pt_type);
   device_data.SetPolicyTableType(pt_type);
+  vehicle_data.SetPolicyTableType(pt_type);
 }
 
 // Table methods
diff --git a/src/components/policy/policy_regular/src/policy_table/validation.cc b/src/components/policy/policy_regular/src/policy_table/validation.cc
index 059c18d00e..14b6d657c2 100644
--- a/src/components/policy/policy_regular/src/policy_table/validation.cc
+++ b/src/components/policy/policy_regular/src/policy_table/validation.cc
@@ -196,6 +196,14 @@ bool Rpcs::Validate() const {
   return true;
 }
 
+bool EndpointProperty::Validate() const {
+  if (!version.is_valid()) {
+    return false;
+  }
+
+  return true;
+}
+
 bool ModuleConfig::Validate() const {
   if (PT_PRELOADED == GetPolicyTableType()) {
     if (vehicle_make.is_initialized()) {
@@ -221,6 +229,14 @@ bool ModuleConfig::Validate() const {
     }
   }
 
+  if (endpoint_properties.is_initialized()) {
+    const auto& endpoint_property =
+        endpoint_properties->find(kDefaultOemMappingServiceName);
+    if (endpoint_properties->end() != endpoint_property) {
+      return (*endpoint_property).second.version.is_initialized();
+    }
+  }
+
   return true;
 }
 
@@ -268,6 +284,39 @@ bool DeviceParams::Validate() const {
   return true;
 }
 
+bool VehicleDataItem::Validate() const {
+  if (!ValidateNaming(std::string(name))) {
+    return false;
+  };
+
+  if (!ValidateNaming(std::string(key))) {
+    return false;
+  };
+
+  if (!ValidateTypes()) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Unknown type: " << std::string(type) << " of " << std::string(key));
+    return false;
+  }
+  return true;
+}
+
+bool VehicleData::Validate() const {
+  const PolicyTableType policy_table_type = GetPolicyTableType();
+  bool result = true;
+  if (PT_SNAPSHOT == policy_table_type) {
+    result =
+        (!schema_items.is_initialized()) && schema_version.is_initialized();
+  }
+  if (PT_UPDATE == policy_table_type || PT_PRELOADED == policy_table_type) {
+    result =
+        (schema_version.is_initialized() && schema_items.is_initialized()) ||
+        (!schema_version.is_initialized() && !schema_items.is_initialized());
+  }
+  return result;
+}
+
 bool PolicyTable::Validate() const {
   const PolicyTableType policy_table_type = GetPolicyTableType();
 
diff --git a/src/components/policy/policy_regular/src/sql_pt_queries.cc b/src/components/policy/policy_regular/src/sql_pt_queries.cc
index b3816d37f8..79eee10d43 100644
--- a/src/components/policy/policy_regular/src/sql_pt_queries.cc
+++ b/src/components/policy/policy_regular/src/sql_pt_queries.cc
@@ -77,7 +77,8 @@ const std::string kCreateSchema =
     "CREATE TABLE IF NOT EXISTS `functional_group`( "
     "  `id` INTEGER PRIMARY KEY NOT NULL, "
     "  `user_consent_prompt` TEXT, "
-    "  `name` VARCHAR(100) NOT NULL "
+    "  `name` VARCHAR(100) NOT NULL, "
+    "  `encryption_required` BOOLEAN "
     "); "
     "CREATE TABLE IF NOT EXISTS `priority`( "
     "  `value` VARCHAR(45) PRIMARY KEY NOT NULL "
@@ -146,6 +147,7 @@ const std::string kCreateSchema =
     "  `icon_url` VARCHAR(65535), "
     "  `allow_unknown_rpc_passthrough` BOOLEAN, "
     "  `remote_control_denied` BOOLEAN NOT NULL DEFAULT 0, "
+    "  `encryption_required` BOOLEAN, "
     "  CONSTRAINT `fk_application_hmi_level1` "
     "    FOREIGN KEY(`default_hmi`) "
     "    REFERENCES `hmi_level`(`value`), "
@@ -350,6 +352,13 @@ const std::string kCreateSchema =
     "); "
     "CREATE INDEX IF NOT EXISTS `endpoint.fk_endpoint_application1_idx` "
     "  ON `endpoint`(`application_id` COLLATE NOCASE); "
+
+    /*endpoint properties*/
+    "CREATE TABLE IF NOT EXISTS `endpoint_properties`( "
+    "  `service` VARCHAR(100) NOT NULL, "
+    "  `version` VARCHAR(100) NOT NULL "
+    ");"
+
     "CREATE TABLE IF NOT EXISTS `message`( "
     "  `id` INTEGER PRIMARY KEY NOT NULL, "
     "  `tts` TEXT, "
@@ -407,6 +416,42 @@ const std::string kCreateSchema =
     "CREATE TABLE IF NOT EXISTS `_internal_data`( "
     "   `db_version_hash` INTEGER "
     "  ); "
+
+    /*vehicle data*/
+    "CREATE TABLE IF NOT EXISTS `vehicle_data`( "
+    "  `schema_version` VARCHAR(100) NOT NULL "
+    ");"
+
+    /* vehicle data item definition*/
+    "CREATE TABLE IF NOT EXISTS `vehicle_data_item_definition`( "
+    "  `name` VARCHAR(255) NOT NULL, "
+    "  `type` VARCHAR(255) NOT NULL, "
+    "  `key` VARCHAR(255) NOT NULL, "
+    "  `mandatory` BOOL NOT NULL, "
+    "  `array` BOOL, "
+    "  `since` VARCHAR(45), "
+    "  `until` VARCHAR(45), "
+    "  `removed` BOOL, "
+    "  `deprecated` BOOL, "
+    "  `minvalue` INTEGER, "
+    "  `maxvalue` INTEGER, "
+    "  `minsize` INTEGER, "
+    "  `maxsize` INTEGER, "
+    "  `minlength` INTEGER, "
+    "  `maxlength` INTEGER "
+    "); "
+    "CREATE TABLE IF NOT EXISTS `vehicle_data_item_parameters`( "
+    "  `parent_name` VARCHAR(255) NOT NULL, "
+    "  `parent_key` VARCHAR(255) NOT NULL, "
+    "  `param_name` VARCHAR(255) NOT NULL, "
+    "  `param_key` VARCHAR(255) NOT NULL, "
+    "  CONSTRAINT `fk_vdi_id` "
+    "    FOREIGN KEY(`parent_name`, `parent_key`) "
+    "    REFERENCES `vehicle_data_item_definition`(`name`, `key`), "
+    "  CONSTRAINT `fk_vdi_param_id` "
+    "    FOREIGN KEY(`param_name`, `param_key`) "
+    "    REFERENCES `vehicle_data_item_definition`(`name`, `key`) "
+    "); "
     "COMMIT;";
 
 const std::string kInsertInitData =
@@ -422,6 +467,8 @@ const std::string kInsertInitData =
     "  `exchange_after_x_ignition_cycles`, `exchange_after_x_kilometers`, "
     "  `exchange_after_x_days`, `timeout_after_x_seconds`)"
     "  VALUES(1, 0, 0, 0, 0, 0); "
+    "INSERT OR IGNORE INTO `vehicle_data` (`schema_version`) "
+    "VALUES('0'); "
     "INSERT OR IGNORE INTO `priority`(`value`) VALUES ('EMERGENCY'); "
     "INSERT OR IGNORE INTO `priority`(`value`) VALUES ('NAVIGATION'); "
     "INSERT OR IGNORE INTO `priority`(`value`) VALUES ('VOICECOMMUNICATION'); "
@@ -486,6 +533,7 @@ const std::string kDropSchema =
     "DROP TABLE IF EXISTS `message`; "
     "DROP INDEX IF EXISTS `endpoint.fk_endpoint_application1_idx`; "
     "DROP TABLE IF EXISTS `endpoint`; "
+    "DROP TABLE IF EXISTS `endpoint_properties`; "
     "DROP INDEX IF EXISTS `consent_group.fk_consent_group_device1_idx`; "
     "DROP INDEX IF EXISTS "
     "`consent_group.fk_consent_group_functional_group1_idx`; "
@@ -548,6 +596,9 @@ const std::string kDropSchema =
     "DROP TABLE IF EXISTS `usage_and_error_count`; "
     "DROP TABLE IF EXISTS `device`; "
     "DROP TABLE IF EXISTS `_internal_data`; "
+    "DROP TABLE IF EXISTS `vehicle_data`; "
+    "DROP TABLE IF EXISTS `vehicle_data_item_definition`; "
+    "DROP TABLE IF EXISTS `vehicle_data_item_parameters`; "
     "COMMIT; "
     "VACUUM;";
 
@@ -556,6 +607,7 @@ const std::string kDeleteData =
     "DELETE FROM `message`; "
     "DELETE FROM `module_type`; "
     "DELETE FROM `endpoint`; "
+    "DELETE FROM `endpoint_properties`; "
     "DELETE FROM `consent_group`; "
     "DELETE FROM `app_type`; "
     "DELETE FROM `nickname`; "
@@ -579,6 +631,9 @@ const std::string kDeleteData =
     "DELETE FROM `remote_rpc`; "
     "DELETE FROM `usage_and_error_count`; "
     "DELETE FROM `device`; "
+    "DELETE FROM `vehicle_data`; "
+    "DELETE FROM `vehicle_data_item_definition`; "
+    "DELETE FROM `vehicle_data_item_parameters`; "
     "COMMIT; "
     "VACUUM;";
 
@@ -586,6 +641,82 @@ const std::string kCheckDBIntegrity = "PRAGMA integrity_check";
 
 const std::string kCheckPgNumber = "PRAGMA page_count";
 
+const std::string kSelectEndpointProperties =
+    "SELECT `service`, `version` FROM `endpoint_properties`";
+
+const std::string kSelectVehicleDataSchemaVersion =
+    "SELECT `schema_version` FROM `vehicle_data` ";
+
+const std::string kSelectVehicleDataItem =
+    "SELECT * FROM `vehicle_data_item_definition` "
+    "WHERE `name` IS ? AND `key` IS ?";
+
+const std::string kSelectVehicleDataItemWithVersion =
+    "SELECT * FROM `vehicle_data_item_definition` "
+    "WHERE `name` IS ? AND `key` IS ? AND `since` IS ? AND `until` IS ?";
+
+const std::string kSelectVehicleDataItemParams =
+    "SELECT * FROM `vehicle_data_item_parameters` "
+    "WHERE `parent_name` IS ? AND `parent_key` IS ?";
+
+const std::string kSelectCompositeVehicleDataItemsKey =
+    "SELECT DISTINCT `parent_name`, `parent_key` FROM "
+    "`vehicle_data_item_parameters` "
+    "LEFT JOIN "
+    "(SELECT DISTINCT `param_name`, `param_key` FROM "
+    "`vehicle_data_item_parameters`) `vdi_params` ON "
+    "`vehicle_data_item_parameters`.`parent_name` = `vdi_params`.`param_name` "
+    "AND "
+    "`vehicle_data_item_parameters`.`parent_key` = `vdi_params`.`param_key` "
+    "where `vdi_params`.`param_key` is null";
+
+const std::string kSelectPrimitiveVehicleDataItems =
+    "SELECT * FROM `vehicle_data_item_definition` "
+    "LEFT JOIN ( "
+    "SELECT `parent_name`, `parent_key` FROM `vehicle_data_item_parameters` "
+    "UNION "
+    "SELECT `param_name`, `param_key` FROM `vehicle_data_item_parameters`) "
+    "`vdi_params` ON "
+    "`vehicle_data_item_definition`.`name` = `vdi_params`.`parent_name` "
+    "AND "
+    "`vehicle_data_item_definition`.`key` = `vdi_params`.`parent_key` "
+    "WHERE `vdi_params`.`parent_key` IS NULL";
+
+const std::string kInsertVehicleDataSchemaVersion =
+    "UPDATE `vehicle_data` SET `schema_version` = ?";
+
+const std::string kInsertEndpointVersion =
+    "INSERT OR REPLACE INTO `endpoint_properties`(`service`, "
+    "`version`) "
+    "VALUES(?, ?)";
+
+const std::string kInsertVehicleDataItem =
+    "INSERT INTO `vehicle_data_item_definition` ("
+    "  `name`, "
+    "  `type`, "
+    "  `key`, "
+    "  `mandatory`, "
+    "  `array`, "
+    "  `since`, "
+    "  `until`, "
+    "  `removed`, "
+    "  `deprecated`, "
+    "  `minvalue`, "
+    "  `maxvalue`, "
+    "  `minsize`, "
+    "  `maxsize`, "
+    "  `minlength`, "
+    "  `maxlength`) "
+    "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ";
+
+const std::string kInsertVehicleDataItemParams =
+    "INSERT INTO `vehicle_data_item_parameters` ("
+    "  `parent_name`, "
+    "  `parent_key`, "
+    "  `param_name`, "
+    "  `param_key`) "
+    "VALUES (?, ?, ?, ?) ";
+
 const std::string kSelectRpc =
     "SELECT DISTINCT `rpc`.`parameter` FROM `rpc` "
     "  JOIN `app_group` AS `g` ON (`g`.`functional_group_id` = "
@@ -608,12 +739,10 @@ const std::string kSetNotFirstRun =
 const std::string kSelectEndpoint =
     "SELECT `url`, `application_id` FROM `endpoint` WHERE `service` = ? ";
 
-const std::string kSelectLockScreenIcon =
-    "SELECT `url` FROM `endpoint` WHERE `service` = ? AND `application_id` = ?";
-
 const std::string kInsertFunctionalGroup =
-    "INSERT INTO `functional_group` (`id`, `name`, `user_consent_prompt`) "
-    "  VALUES (?, ?, ?)";
+    "INSERT INTO `functional_group` (`id`, `name`, `user_consent_prompt`, "
+    "`encryption_required`) "
+    "  VALUES (?, ?, ?, ?)";
 
 const std::string kInsertRpc =
     "INSERT INTO `rpc` (`name`, `hmi_level_value`, `functional_group_id`) "
@@ -628,9 +757,10 @@ const std::string kInsertApplication =
     "INSERT OR IGNORE INTO `application` (`id`, `priority_value`, "
     "`is_revoked`, `memory_kb`, `heart_beat_timeout_ms`, `certificate`, "
     "`hybrid_app_preference_value`, `endpoint`, `enabled`, `auth_token`, "
-    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough`) "
+    "`cloud_transport_type`, `icon_url`, `allow_unknown_rpc_passthrough` "
+    ",`encryption_required`) "
     "VALUES "
-    "(?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
 const std::string kInsertAppGroup =
     "INSERT INTO `app_group` (`application_id`, `functional_group_id`)"
@@ -744,7 +874,7 @@ const std::string kSelectAppLevels =
 const std::string kSelectDeviceData = "SELECT * FROM `device`";
 
 const std::string kSelectFunctionalGroups =
-    "SELECT `id`,`name`, `user_consent_prompt` "
+    "SELECT `id`,`name`, `user_consent_prompt`, `encryption_required` "
     "FROM `functional_group`";
 
 const std::string kSelectAllRpcs =
@@ -758,7 +888,7 @@ const std::string kSelectAppPolicies =
     "SELECT `id`, `priority_value`, `memory_kb`, "
     " `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, "
     " `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, `icon_url`, "
-    " `allow_unknown_rpc_passthrough` "
+    " `allow_unknown_rpc_passthrough`, `encryption_required`"
     "FROM "
     " `application`";
 
@@ -856,6 +986,12 @@ const std::string kDeleteAppServiceNames = "DELETE FROM `app_service_names`";
 const std::string kDeleteAppServiceHandledRpcs =
     "DELETE FROM `app_service_handled_rpcs`";
 
+const std::string kDeleteVehicleDataItems =
+    "DELETE FROM `vehicle_data_item_definition`";
+
+const std::string kDeleteVehicleDataItemParams =
+    "DELETE FROM `vehicle_data_item_parameters`";
+
 const std::string kSelectApplicationRevoked =
     "SELECT `is_revoked` FROM `application` WHERE `id` = ?";
 
@@ -883,16 +1019,17 @@ const std::string kInsertApplicationFull =
     " `is_predata`, `memory_kb`, `heart_beat_timeout_ms`, "
     " `certificate`, `hybrid_app_preference_value`, `endpoint`, `enabled`, "
     " `auth_token`, `cloud_transport_type`, `icon_url`, "
-    "`allow_unknown_rpc_passthrough`) "
-    "  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+    "`allow_unknown_rpc_passthrough`, `encryption_required`)"
+    "  VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 
 const std::string kSelectApplicationFull =
-    "SELECT `keep_context`, `steal_focus`, `default_hmi`, `priority_value`, "
+    "SELECT  `keep_context`, `steal_focus`, `default_hmi`, "
+    "`priority_value`, "
     "  `is_revoked`, `is_default`, `is_predata`, `memory_kb`,"
     "  `heart_beat_timeout_ms`, `certificate`, `hybrid_app_preference_value`, "
     "  `endpoint`, `enabled`, `auth_token`, `cloud_transport_type`, "
     "`icon_url`, "
-    "  `allow_unknown_rpc_passthrough` "
+    "  `allow_unknown_rpc_passthrough`, `encryption_required`"
     "FROM `application` "
     "WHERE `id` = "
     "?";
diff --git a/src/components/policy/policy_regular/src/sql_pt_representation.cc b/src/components/policy/policy_regular/src/sql_pt_representation.cc
index 8ac04ba5f3..ed5bf37b5b 100644
--- a/src/components/policy/policy_regular/src/sql_pt_representation.cc
+++ b/src/components/policy/policy_regular/src/sql_pt_representation.cc
@@ -67,7 +67,18 @@ void InsertUnique(K value, T* array) {
 const std::string SQLPTRepresentation::kDatabaseName = "policy";
 
 SQLPTRepresentation::SQLPTRepresentation()
-    : db_(new utils::dbms::SQLDatabase(kDatabaseName)) {}
+    : db_(new utils::dbms::SQLDatabase(kDatabaseName)) {
+  is_in_memory = false;
+}
+
+SQLPTRepresentation::SQLPTRepresentation(bool in_memory) {
+  is_in_memory = in_memory;
+  if (in_memory) {
+    db_ = new utils::dbms::SQLDatabase();
+  } else {
+    db_ = new utils::dbms::SQLDatabase(kDatabaseName);
+  }
+}
 
 SQLPTRepresentation::~SQLPTRepresentation() {
   db_->Close();
@@ -241,28 +252,6 @@ EndpointUrls SQLPTRepresentation::GetUpdateUrls(int service_type) {
   return ret;
 }
 
-std::string SQLPTRepresentation::GetLockScreenIconUrl() const {
-  utils::dbms::SQLQuery query(db());
-  std::string ret;
-  if (query.Prepare(sql_pt::kSelectLockScreenIcon)) {
-    query.Bind(0, std::string("lock_screen_icon_url"));
-    query.Bind(1, std::string("default"));
-
-    if (!query.Exec()) {
-      LOG4CXX_WARN(logger_, "Incorrect select from notifications by priority.");
-      return ret;
-    }
-
-    if (!query.IsNull(0)) {
-      ret = query.GetString(0);
-    }
-
-  } else {
-    LOG4CXX_WARN(logger_, "Invalid select endpoints statement.");
-  }
-  return ret;
-}
-
 int SQLPTRepresentation::GetNotificationsNumber(const std::string& priority) {
   LOG4CXX_AUTO_TRACE(logger_);
   utils::dbms::SQLQuery query(db());
@@ -321,10 +310,14 @@ InitResult SQLPTRepresentation::Init(const PolicySettings* settings) {
 #ifdef BUILD_TESTS
   open_counter_ = 0;
 #endif  // BUILD_TESTS
-  std::string path = get_settings().app_storage_folder();
-  if (!path.empty()) {
-    db_->set_path(path + "/");
+
+  if (!is_in_memory) {
+    const std::string& path = get_settings().app_storage_folder();
+    if (!path.empty()) {
+      db_->set_path(path + "/");
+    }
   }
+
   if (!db_->Open()) {
     LOG4CXX_ERROR(logger_, "Failed opening database.");
     LOG4CXX_INFO(logger_, "Starting opening retries.");
@@ -357,13 +350,12 @@ InitResult SQLPTRepresentation::Init(const PolicySettings* settings) {
       return InitResult::FAIL;
     }
   }
-#ifndef __QNX__
+
   if (!db_->IsReadWrite()) {
     LOG4CXX_ERROR(logger_, "There are no read/write permissions for database");
     return InitResult::FAIL;
   }
 
-#endif  // __QNX__
   utils::dbms::SQLQuery check_pages(db());
   if (!check_pages.Prepare(sql_pt::kCheckPgNumber) || !check_pages.Next()) {
     LOG4CXX_WARN(logger_, "Incorrect pragma for page counting.");
@@ -421,16 +413,6 @@ bool SQLPTRepresentation::Close() {
   return db_->LastError().number() == utils::dbms::OK;
 }
 
-const VehicleInfo SQLPTRepresentation::GetVehicleInfo() const {
-  policy_table::ModuleConfig module_config;
-  GatherModuleConfig(&module_config);
-  VehicleInfo vehicle_info;
-  vehicle_info.vehicle_make = *module_config.vehicle_make;
-  vehicle_info.vehicle_model = *module_config.vehicle_model;
-  vehicle_info.vehicle_year = *module_config.vehicle_year;
-  return vehicle_info;
-}
-
 bool SQLPTRepresentation::Drop() {
   utils::dbms::SQLQuery query(db());
   if (!query.Exec(sql_pt::kDropSchema)) {
@@ -495,6 +477,11 @@ std::shared_ptr<policy_table::Table> SQLPTRepresentation::GenerateSnapshot()
   GatherConsumerFriendlyMessages(
       &*table->policy_table.consumer_friendly_messages);
   GatherApplicationPoliciesSection(&table->policy_table.app_policies_section);
+  GatherVehicleData(&*table->policy_table.vehicle_data);
+  if (!table->policy_table.vehicle_data.is_initialized()) {
+    rpc::Optional<rpc::String<0, 100> > null_version;
+    table->policy_table.vehicle_data->schema_version = null_version;
+  }
   return table;
 }
 
@@ -542,6 +529,18 @@ void SQLPTRepresentation::GatherModuleConfig(
     }
   }
 
+  utils::dbms::SQLQuery endpoint_properties(db());
+  if (!endpoint_properties.Prepare(sql_pt::kSelectEndpointProperties)) {
+    LOG4CXX_ERROR(logger_, "Incorrect statement for Endpoint properties");
+  } else {
+    while (endpoint_properties.Next()) {
+      const std::string& service = endpoint_properties.GetString(0);
+      const std::string& version = endpoint_properties.GetString(1);
+      auto& ep_properties = (*config->endpoint_properties);
+      *ep_properties[service].version = version;
+    }
+  }
+
   utils::dbms::SQLQuery notifications(db());
   if (!notifications.Prepare(sql_pt::kSelectNotificationsPerMin)) {
     LOG4CXX_WARN(logger_, "Incorrect select statement for notifications");
@@ -616,6 +615,10 @@ bool SQLPTRepresentation::GatherFunctionalGroupings(
       *rpcs_structure.user_consent_prompt = functional_group.GetString(2);
     }
 
+    if (!functional_group.IsNull(3)) {
+      *rpcs_structure.encryption_required = functional_group.GetBoolean(3);
+    }
+
     const int group_id = functional_group.GetInteger(0);
 
     // Collecting RPCs with their HMI levels and parameters (if any)
@@ -629,18 +632,17 @@ bool SQLPTRepresentation::GatherFunctionalGroupings(
         }
       }
       if (!rpcs.IsNull(2)) {
-        policy_table::Parameter param;
-        if (EnumFromJsonString(rpcs.GetString(2), &param)) {
-          // EMPTY is a special mark to specify that 'parameters' section is
-          // present, but has no parameters. It is not valid parameter value.
-          if (policy_table::P_EMPTY == param) {
-            (*rpcs_structure.rpcs[rpcs.GetString(0)].parameters)
-                .mark_initialized();
-            continue;
-          }
-          InsertUnique(param,
-                       &(*rpcs_structure.rpcs[rpcs.GetString(0)].parameters));
+        std::string param = rpcs.GetString(2);
+        // EMPTY is a special mark to specify that 'parameters' section is
+        // present, but has no parameters. It is not valid parameter value.
+        if (policy_table::EnumToJsonString(policy_table::P_EMPTY) == param) {
+          (*rpcs_structure.rpcs[rpcs.GetString(0)].parameters)
+              .mark_initialized();
+          continue;
         }
+
+        InsertUnique(param,
+                     &(*rpcs_structure.rpcs[rpcs.GetString(0)].parameters));
       }
     }
 
@@ -670,10 +672,33 @@ bool SQLPTRepresentation::GatherConsumerFriendlyMessages(
   if (query.Prepare(sql_pt::kCollectFriendlyMsg)) {
     while (query.Next()) {
       UserFriendlyMessage msg;
+
+      msg.tts = query.GetString(1);
+      msg.label = query.GetString(2);
+      msg.line1 = query.GetString(3);
+      msg.line2 = query.GetString(4);
+      msg.text_body = query.GetString(5);
       msg.message_code = query.GetString(7);
-      std::string language = query.GetString(6);
 
-      (*messages->messages)[msg.message_code].languages[language];
+      std::string language = query.GetString(6);
+      policy_table::Languages& languages =
+          (*messages->messages)[msg.message_code].languages;
+      policy_table::MessageString& specific_message = languages[language];
+      if (!msg.tts.empty()) {
+        *(specific_message).tts = msg.tts;
+      }
+      if (!msg.label.empty()) {
+        *(specific_message).label = msg.label;
+      }
+      if (!msg.line1.empty()) {
+        *(specific_message).line1 = msg.line1;
+      }
+      if (!msg.line2.empty()) {
+        *(specific_message).line2 = msg.line2;
+      }
+      if (!msg.text_body.empty()) {
+        *(specific_message).textBody = msg.text_body;
+      }
     }
   } else {
     LOG4CXX_WARN(logger_, "Incorrect statement for select friendly messages.");
@@ -718,6 +743,7 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
     params.priority = priority;
 
     *params.memory_kb = query.GetInteger(2);
+
     *params.heart_beat_timeout_ms = query.GetUInteger(3);
     if (!query.IsNull(4)) {
       *params.certificate = query.GetString(4);
@@ -738,6 +764,10 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
     *params.icon_url = query.GetString(10);
     *params.allow_unknown_rpc_passthrough = query.GetBoolean(11);
 
+    if (!query.IsNull(12)) {
+      *params.encryption_required = query.GetBoolean(12);
+    }
+
     const auto& gather_app_id = ((*policies).apps[app_id].is_string())
                                     ? (*policies).apps[app_id].get_string()
                                     : app_id;
@@ -780,6 +810,44 @@ bool SQLPTRepresentation::GatherApplicationPoliciesSection(
   return true;
 }
 
+bool SQLPTRepresentation::GatherVehicleData(
+    policy_table::VehicleData* vehicle_data) const {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kSelectVehicleDataSchemaVersion) ||
+      !query.Next()) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrect statement for vehicle data schema version");
+    return false;
+  }
+  *vehicle_data->schema_version = query.GetString(0);
+
+  vehicle_data->mark_initialized();
+  return GatherVehicleDataItems(&*vehicle_data->schema_items);
+}
+
+bool SQLPTRepresentation::GatherVehicleDataItems(
+    policy_table::VehicleDataItems* vehicle_data_items) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto parameterized_vdi = SelectCompositeVehicleDataItems();
+  if (!parameterized_vdi.is_initialized()) {
+    return false;
+  }
+
+  auto non_parameterized_vdi = SelectPrimitiveVehicleDataItems();
+  if (!non_parameterized_vdi.is_initialized()) {
+    return false;
+  }
+
+  vehicle_data_items->insert(vehicle_data_items->end(),
+                             parameterized_vdi.begin(),
+                             parameterized_vdi.end());
+  vehicle_data_items->insert(vehicle_data_items->end(),
+                             non_parameterized_vdi.begin(),
+                             non_parameterized_vdi.end());
+
+  return true;
+}
+
 bool SQLPTRepresentation::Save(const policy_table::Table& table) {
   LOG4CXX_AUTO_TRACE(logger_);
   db_->BeginTransaction();
@@ -814,6 +882,10 @@ bool SQLPTRepresentation::Save(const policy_table::Table& table) {
     db_->RollbackTransaction();
     return false;
   }
+  if (!SaveVehicleData(*table.policy_table.vehicle_data)) {
+    db_->RollbackTransaction();
+    return false;
+  }
   db_->CommitTransaction();
   return true;
 }
@@ -853,7 +925,9 @@ bool SQLPTRepresentation::SaveFunctionalGroupings(
     it->second.user_consent_prompt.is_initialized()
         ? query.Bind(2, *(it->second.user_consent_prompt))
         : query.Bind(2);
-
+    it->second.encryption_required.is_initialized()
+        ? query.Bind(3, *(it->second.encryption_required))
+        : query.Bind(3);
     if (!query.Exec() || !query.Reset()) {
       LOG4CXX_WARN(logger_, "Incorrect insert into functional groups");
       return false;
@@ -890,8 +964,7 @@ bool SQLPTRepresentation::SaveRpcs(int64_t group_id,
           query_parameter.Bind(0, it->first);
           query_parameter.Bind(
               1, std::string(policy_table::EnumToJsonString(*hmi_it)));
-          query_parameter.Bind(
-              2, std::string(policy_table::EnumToJsonString(*ps_it)));
+          query_parameter.Bind(2, std::string(*ps_it));
           query_parameter.Bind(3, group_id);
           if (!query_parameter.Exec() || !query_parameter.Reset()) {
             LOG4CXX_WARN(logger_, "Incorrect insert into rpc with parameter");
@@ -1042,6 +1115,10 @@ bool SQLPTRepresentation::SaveSpecificAppPolicy(
       ? app_query.Bind(12, *app.second.allow_unknown_rpc_passthrough)
       : app_query.Bind(12);
 
+  app.second.encryption_required.is_initialized()
+      ? app_query.Bind(13, *app.second.encryption_required)
+      : app_query.Bind(13);
+
   if (!app_query.Exec() || !app_query.Reset()) {
     LOG4CXX_WARN(logger_, "Incorrect insert into application.");
     return false;
@@ -1103,7 +1180,6 @@ bool policy::SQLPTRepresentation::SaveDevicePolicy(
   app_query.Bind(3, 0);
   app_query.Bind(4, 0);
   app_query.Bind(5);
-
   if (!app_query.Exec() || !app_query.Reset()) {
     LOG4CXX_WARN(logger_, "Incorrect insert into application.");
     return false;
@@ -1235,7 +1311,9 @@ bool SQLPTRepresentation::SaveRequestSubType(
   } else if (request_subtypes.is_initialized()) {
     LOG4CXX_WARN(logger_, "Request subtypes empty.");
     query.Bind(0, app_id);
-    query.Bind(1, std::string("EMPTY"));
+    query.Bind(1,
+               std::string(policy_table::EnumToJsonString(
+                   policy_table::RequestType::RT_EMPTY)));
     if (!query.Exec() || !query.Reset()) {
       LOG4CXX_WARN(logger_, "Incorrect insert into request subtypes.");
       return false;
@@ -1388,6 +1466,10 @@ bool SQLPTRepresentation::SaveModuleConfig(
     return false;
   }
 
+  if (!SaveServiceEndpointProperties(*config.endpoint_properties)) {
+    return false;
+  }
+
   return true;
 }
 
@@ -1426,6 +1508,31 @@ bool SQLPTRepresentation::SaveServiceEndpoints(
   return true;
 }
 
+bool SQLPTRepresentation::SaveServiceEndpointProperties(
+    const policy_table::ServiceEndpointProperties& endpoint_properties) {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kInsertEndpointVersion)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Incorrect insert of endpoint property to endpoint_properties.");
+    return false;
+  }
+
+  for (auto& endpoint_property : endpoint_properties) {
+    query.Bind(0, endpoint_property.first);
+    query.Bind(1, endpoint_property.second.version);
+
+    if (!query.Exec() || !query.Reset()) {
+      LOG4CXX_WARN(
+          logger_,
+          "Failed to insert endpoint property into endpoint_properties.");
+      return false;
+    }
+  }
+
+  return true;
+}
+
 bool SQLPTRepresentation::SaveConsumerFriendlyMessages(
     const policy_table::ConsumerFriendlyMessages& messages) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1645,6 +1752,44 @@ bool SQLPTRepresentation::SaveUsageAndErrorCounts(
   return true;
 }
 
+bool SQLPTRepresentation::SaveVehicleData(
+    const policy_table::VehicleData& vehicle_data) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (vehicle_data.is_initialized() &&
+      vehicle_data.schema_version.is_initialized()) {
+    utils::dbms::SQLQuery query(db());
+    if (!query.Prepare(sql_pt::kInsertVehicleDataSchemaVersion)) {
+      LOG4CXX_WARN(logger_,
+                   "Incorrect insert of schema_version to vehicle_data.");
+      return false;
+    }
+    query.Bind(0, (*vehicle_data.schema_version));
+    if (!query.Exec() || !query.Reset()) {
+      LOG4CXX_WARN(logger_, "Failed to insert schema_version to vehicle_data.");
+      return false;
+    }
+  }
+
+  auto vehicle_data_items = vehicle_data.is_initialized() &&
+                                    vehicle_data.schema_items.is_initialized()
+                                ? *(vehicle_data.schema_items)
+                                : policy_table::VehicleDataItems();
+
+  return SaveVehicleDataItems(vehicle_data_items);
+}
+
+bool SQLPTRepresentation::SaveVehicleDataItems(
+    const policy_table::VehicleDataItems& vehicle_data_items) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  DeleteVehicleDataItems();
+  for (const auto& item : vehicle_data_items) {
+    if (!InsertVehicleDataItem(item)) {
+      return false;
+    }
+  }
+  return true;
+}
+
 void SQLPTRepresentation::IncrementIgnitionCycles() {
   utils::dbms::SQLQuery query(db());
   if (!query.Exec(sql_pt::kIncrementIgnitionCycles)) {
@@ -1774,7 +1919,8 @@ bool SQLPTRepresentation::GatherRequestSubType(
   query.Bind(0, app_id);
   while (query.Next()) {
     const std::string request_subtype = query.GetString(0);
-    if ("EMPTY" == request_subtype) {
+    if (policy_table::EnumToJsonString(policy_table::RT_EMPTY) ==
+        request_subtype) {
       request_subtypes->mark_initialized();
       continue;
     }
@@ -2268,13 +2414,7 @@ const int32_t SQLPTRepresentation::GetDBVersion() const {
 }
 
 utils::dbms::SQLDatabase* SQLPTRepresentation::db() const {
-#ifdef __QNX__
-  utils::dbms::SQLDatabase* db = new utils::dbms::SQLDatabase(kDatabaseName);
-  db->Open();
-  return db;
-#else
   return db_;
-#endif
 }
 
 bool SQLPTRepresentation::CopyApplication(const std::string& source,
@@ -2326,6 +2466,8 @@ bool SQLPTRepresentation::CopyApplication(const std::string& source,
                         : query.Bind(16, source_app.GetString(15));
   source_app.IsNull(16) ? query.Bind(17)
                         : query.Bind(17, source_app.GetBoolean(16));
+  source_app.IsNull(17) ? query.Bind(18)
+                        : query.Bind(18, source_app.GetBoolean(17));
 
   if (!query.Exec()) {
     LOG4CXX_WARN(logger_, "Failed inserting into application.");
@@ -2352,4 +2494,314 @@ bool SQLPTRepresentation::SetVINValue(const std::string& value) {
   return true;
 }
 
+bool SQLPTRepresentation::VehicleDataItemExists(
+    const policy_table::VehicleDataItem& vehicle_data_item) const {
+  utils::dbms::SQLQuery query(db());
+  if (!query.Prepare(sql_pt::kSelectVehicleDataItemWithVersion)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrent select statement for vehicle data item. "
+                      << query.LastError().text());
+    return false;
+  }
+
+  query.Bind(0, vehicle_data_item.name);
+  query.Bind(1, vehicle_data_item.key);
+  vehicle_data_item.since.is_initialized()
+      ? query.Bind(2, std::string(*vehicle_data_item.since))
+      : query.Bind(2);
+  vehicle_data_item.until.is_initialized()
+      ? query.Bind(3, std::string(*vehicle_data_item.until))
+      : query.Bind(3);
+
+  if (!query.Exec()) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed to retrieve vehicle data item: "
+                      << std::string(vehicle_data_item.key)
+                      << ". Error: " << query.LastError().text());
+    return false;
+  }
+  return !query.IsNull(0);
+}
+
+policy_table::VehicleDataItems SQLPTRepresentation::GetVehicleDataItem(
+    const std::string& name, const std::string& key) const {
+  policy_table::VehicleDataItems result;
+  utils::dbms::SQLQuery query(db());
+
+  if (!query.Prepare(sql_pt::kSelectVehicleDataItem)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrent select statement of vehicle data item. "
+                      << query.LastError().text());
+    return result;
+  }
+
+  query.Bind(0, name);
+  query.Bind(1, key);
+
+  while (query.Next()) {
+    auto vdi = PopulateVDIFromQuery(query);
+    if (!vdi.is_initialized()) {
+      return policy_table::VehicleDataItems();
+    }
+
+    utils::dbms::SQLQuery param_query(db());
+    if (policy_table::VehicleDataItem::kStruct ==
+        static_cast<std::string>(vdi.type)) {
+      if (!param_query.Prepare(sql_pt::kSelectVehicleDataItemParams)) {
+        LOG4CXX_ERROR(logger_,
+                      "Incorrent select statement of vehicle data item. "
+                          << param_query.LastError().text());
+        return policy_table::VehicleDataItems();
+      }
+
+      param_query.Bind(0, name);
+      param_query.Bind(1, key);
+
+      while (param_query.Next()) {
+        const auto param_with_diff_versions = GetVehicleDataItem(
+            param_query.GetString(2), param_query.GetString(3));
+        if (!param_with_diff_versions.is_initialized()) {
+          return policy_table::VehicleDataItems();
+        }
+        for (const auto& param : param_with_diff_versions) {
+          vdi.params->push_back(param);
+        }
+      }
+    }
+
+    result.push_back(vdi);
+  }
+  if (!result.empty()) {
+    result.mark_initialized();
+  }
+
+  return result;
+}
+
+policy_table::VehicleDataItem SQLPTRepresentation::PopulateVDIFromQuery(
+    const utils::dbms::SQLQuery& query) const {
+  policy_table::VehicleDataItem result;
+
+  result.name = query.GetString(0);
+  result.type = query.GetString(1);
+  result.key = query.GetString(2);
+  result.mandatory = query.GetBoolean(3);
+
+  if (!query.IsNull(4)) {
+    *result.array = query.GetBoolean(4);
+  }
+  if (!query.IsNull(5)) {
+    *result.since = query.GetString(5);
+  }
+  if (!query.IsNull(6)) {
+    *result.until = query.GetString(6);
+  }
+  if (!query.IsNull(7)) {
+    *result.removed = query.GetBoolean(7);
+  }
+  if (!query.IsNull(8)) {
+    *result.deprecated = query.GetBoolean(8);
+  }
+  if (!query.IsNull(9)) {
+    *result.minvalue = query.GetInteger(9);
+  }
+  if (!query.IsNull(10)) {
+    *result.maxvalue = query.GetInteger(10);
+  }
+  if (!query.IsNull(11)) {
+    *result.minsize = query.GetUInteger(11);
+  }
+  if (!query.IsNull(12)) {
+    *result.maxsize = query.GetUInteger(12);
+  }
+  if (!query.IsNull(13)) {
+    *result.minlength = query.GetUInteger(13);
+  }
+  if (!query.IsNull(14)) {
+    *result.maxlength = query.GetUInteger(14);
+  }
+  result.params->mark_initialized();
+
+  result.mark_initialized();
+  return result;
+}
+
+bool SQLPTRepresentation::InsertVehicleDataItem(
+    const policy_table::VehicleDataItem& vehicle_data_item) {
+  utils::dbms::SQLQuery query(db());
+
+  if (!vehicle_data_item.is_initialized() || !vehicle_data_item.is_valid()) {
+    LOG4CXX_ERROR(logger_, "Vehicle data item is not initialized.");
+    return false;
+  }
+
+  if (VehicleDataItemExists(vehicle_data_item)) {
+    LOG4CXX_INFO(logger_,
+                 static_cast<std::string>(vehicle_data_item.key)
+                     << " is already stored.");
+    return true;
+  }
+
+  if (!query.Prepare(sql_pt::kInsertVehicleDataItem)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrent select statement of vehicle data item. "
+                      << query.LastError().text());
+    return false;
+  }
+
+  query.Bind(0, vehicle_data_item.name);
+  query.Bind(1, vehicle_data_item.type);
+  query.Bind(2, vehicle_data_item.key);
+  query.Bind(3, vehicle_data_item.mandatory);
+  vehicle_data_item.array.is_initialized()
+      ? query.Bind(4, *vehicle_data_item.array)
+      : query.Bind(4);
+  vehicle_data_item.since.is_initialized()
+      ? query.Bind(5, *vehicle_data_item.since)
+      : query.Bind(5);
+  vehicle_data_item.until.is_initialized()
+      ? query.Bind(6, *vehicle_data_item.until)
+      : query.Bind(6);
+  vehicle_data_item.removed.is_initialized()
+      ? query.Bind(7, *vehicle_data_item.removed)
+      : query.Bind(7);
+  vehicle_data_item.deprecated.is_initialized()
+      ? query.Bind(8, *vehicle_data_item.deprecated)
+      : query.Bind(8);
+  vehicle_data_item.minvalue.is_initialized()
+      ? query.Bind(9, *vehicle_data_item.minvalue)
+      : query.Bind(9);
+  vehicle_data_item.maxvalue.is_initialized()
+      ? query.Bind(10, *vehicle_data_item.maxvalue)
+      : query.Bind(10);
+  vehicle_data_item.minsize.is_initialized()
+      ? query.Bind(11, static_cast<int64_t>(*vehicle_data_item.minsize))
+      : query.Bind(11);
+  vehicle_data_item.maxsize.is_initialized()
+      ? query.Bind(12, static_cast<int64_t>(*vehicle_data_item.maxsize))
+      : query.Bind(12);
+  vehicle_data_item.minlength.is_initialized()
+      ? query.Bind(13, static_cast<int64_t>(*vehicle_data_item.minlength))
+      : query.Bind(13);
+  vehicle_data_item.maxlength.is_initialized()
+      ? query.Bind(14, static_cast<int64_t>(*vehicle_data_item.maxlength))
+      : query.Bind(14);
+
+  if (!query.Exec() || !query.Reset()) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed to insert vehicle data item: "
+                      << static_cast<std::string>(vehicle_data_item.key)
+                      << ". Error: " << query.LastError().text());
+    return false;
+  }
+
+  if (vehicle_data_item.params->is_initialized()) {
+    std::map<std::string, std::string> stored_vehicle_data_item_params;
+    for (const auto& param : *(vehicle_data_item.params)) {
+      if (!InsertVehicleDataItem(param)) {
+        return false;
+      }
+
+      if (stored_vehicle_data_item_params.end() !=
+          stored_vehicle_data_item_params.find(param.name)) {
+        LOG4CXX_DEBUG(logger_, "Parameter already stored.");
+        continue;
+      };
+
+      if (!query.Prepare(sql_pt::kInsertVehicleDataItemParams)) {
+        LOG4CXX_ERROR(logger_,
+                      "Incorrent select statement of vehicle data item. "
+                          << query.LastError().text());
+        return false;
+      }
+
+      query.Bind(0, vehicle_data_item.name);
+      query.Bind(1, vehicle_data_item.key);
+      query.Bind(2, param.name);
+      query.Bind(3, param.key);
+
+      if (!query.Exec() || !query.Reset()) {
+        LOG4CXX_ERROR(
+            logger_,
+            "Failed to insert to vehicle data item relations helper table: "
+                << static_cast<std::string>(param.key)
+                << ". Error: " << query.LastError().text());
+        return false;
+      }
+      stored_vehicle_data_item_params[param.name] = param.key;
+    }
+  }
+
+  return true;
+}
+
+policy_table::VehicleDataItems
+SQLPTRepresentation::SelectCompositeVehicleDataItems() const {
+  utils::dbms::SQLQuery query(db());
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!query.Prepare(sql_pt::kSelectCompositeVehicleDataItemsKey)) {
+    LOG4CXX_ERROR(logger_,
+                  "Incorrect statement for parameterized vehicle data items");
+    return policy_table::VehicleDataItems();
+  }
+
+  policy_table::VehicleDataItems result;
+  result.mark_initialized();
+
+  while (query.Next()) {
+    const auto vdi = GetVehicleDataItem(query.GetString(0), query.GetString(1));
+    if (!vdi.is_initialized()) {
+      return policy_table::VehicleDataItems();
+    }
+    for (const auto& item : vdi) {
+      result.push_back(item);
+    }
+  }
+
+  return result;
+}
+
+policy_table::VehicleDataItems
+SQLPTRepresentation::SelectPrimitiveVehicleDataItems() const {
+  utils::dbms::SQLQuery query(db());
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!query.Prepare(sql_pt::kSelectPrimitiveVehicleDataItems)) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Incorrect statement for non parameterized vehicle data items");
+    return policy_table::VehicleDataItems();
+  }
+
+  auto result = policy_table::VehicleDataItems();
+  result.mark_initialized();
+
+  while (query.Next()) {
+    const auto vdi = PopulateVDIFromQuery(query);
+    if (!vdi.is_initialized()) {
+      return policy_table::VehicleDataItems();
+    }
+    result.push_back(vdi);
+  }
+  return result;
+}
+
+bool SQLPTRepresentation::DeleteVehicleDataItems() const {
+  utils::dbms::SQLQuery query(db());
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (!query.Exec(sql_pt::kDeleteVehicleDataItems)) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed clearing database: " << query.LastError().text());
+    return false;
+  }
+
+  if (!query.Exec(sql_pt::kDeleteVehicleDataItemParams)) {
+    LOG4CXX_ERROR(logger_,
+                  "Failed clearing database: " << query.LastError().text());
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace policy
diff --git a/src/components/policy/policy_regular/src/status.cc b/src/components/policy/policy_regular/src/status.cc
index 00a6a95af3..c870658622 100644
--- a/src/components/policy/policy_regular/src/status.cc
+++ b/src/components/policy/policy_regular/src/status.cc
@@ -67,8 +67,10 @@ void policy::UpdateNeededStatus::ProcessEvent(
     case kOnResetPolicyTableNoUpdate:
       manager->SetNextStatus(std::make_shared<UpToDateStatus>());
       break;
+    case kPendingUpdate:
+      manager->SetNextStatus(std::make_shared<UpdatePendingStatus>());
+      break;
     case kOnNewAppRegistered:
-      manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
       break;
     default:
       break;
@@ -79,6 +81,36 @@ bool policy::UpdateNeededStatus::IsUpdateRequired() const {
   return true;
 }
 
+policy::UpdatePendingStatus::UpdatePendingStatus()
+    : Status(kUpdateNeeded,
+             policy::PolicyTableStatus::StatusProcessingSnapshot) {}
+
+void policy::UpdatePendingStatus::ProcessEvent(
+    policy::UpdateStatusManagerInterface* manager, policy::UpdateEvent event) {
+  switch (event) {
+    case kOnUpdateSentOut:
+      manager->SetNextStatus(std::make_shared<UpdatingStatus>());
+      break;
+    case kOnResetPolicyTableRequireUpdate:
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
+      manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
+      break;
+    case kOnResetPolicyTableNoUpdate:
+      manager->SetNextStatus(std::make_shared<UpToDateStatus>());
+      break;
+    default:
+      break;
+  }
+}
+
+bool policy::UpdatePendingStatus::IsUpdatePending() const {
+  return true;
+}
+
+bool policy::UpdatePendingStatus::IsUpdateRequired() const {
+  return true;
+}
+
 policy::UpdatingStatus::UpdatingStatus()
     : Status("UPDATING", policy::PolicyTableStatus::StatusUpdatePending) {}
 
@@ -101,9 +133,11 @@ void policy::UpdatingStatus::ProcessEvent(
       manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
     case kScheduleUpdate:
-    case kOnResetRetrySequence:
       manager->SetPostponedStatus(std::make_shared<UpdateNeededStatus>());
       break;
+    case kOnResetRetrySequence:
+      manager->SetNextStatus(std::make_shared<UpdateNeededStatus>());
+      break;
     default:
       break;
   }
diff --git a/src/components/policy/policy_regular/src/update_status_manager.cc b/src/components/policy/policy_regular/src/update_status_manager.cc
index c37f8bbadc..1ba3d0f394 100644
--- a/src/components/policy/policy_regular/src/update_status_manager.cc
+++ b/src/components/policy/policy_regular/src/update_status_manager.cc
@@ -54,6 +54,11 @@ void UpdateStatusManager::ProcessEvent(UpdateEvent event) {
   DoTransition();
 }
 
+void UpdateStatusManager::PendingUpdate() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  ProcessEvent(kPendingUpdate);
+}
+
 void UpdateStatusManager::SetNextStatus(std::shared_ptr<Status> status) {
   next_status_ = status;
 }
@@ -116,7 +121,12 @@ void UpdateStatusManager::OnNewApplicationAdded(const DeviceConsent consent) {
     return;
   }
   app_registered_from_non_consented_device_ = false;
-  ProcessEvent(kOnNewAppRegistered);
+  if (kOnResetRetrySequence == last_processed_event_) {
+    current_status_.reset(new UpToDateStatus());
+    ProcessEvent(kScheduleUpdate);
+  } else {
+    ProcessEvent(kOnNewAppRegistered);
+  }
 }
 
 void UpdateStatusManager::OnDeviceConsented() {
@@ -173,7 +183,10 @@ void UpdateStatusManager::DoTransition() {
   current_status_ = next_status_;
   next_status_.reset();
   LOG4CXX_DEBUG(logger_, "last_processed_event_ = " << last_processed_event_);
-  if (last_processed_event_ != kScheduleManualUpdate) {
+  const bool is_update_pending =
+      policy::StatusProcessingSnapshot == current_status_->get_status();
+
+  if (last_processed_event_ != kScheduleManualUpdate && !is_update_pending) {
     listener_->OnUpdateStatusChanged(current_status_->get_status_string());
   }
   if (!postponed_status_) {
diff --git a/src/components/policy/policy_regular/test/CMakeLists.txt b/src/components/policy/policy_regular/test/CMakeLists.txt
index bd6af96867..d2cd7be224 100644
--- a/src/components/policy/policy_regular/test/CMakeLists.txt
+++ b/src/components/policy/policy_regular/test/CMakeLists.txt
@@ -44,29 +44,26 @@ include_directories(
   ${POLICY_MOCK_INCLUDE_PATH}/
 )
 
-collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}")
+file (GLOB POLICY_TEST_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/cache_manager_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/policy_manager_impl_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/access_remote_impl_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/sql_pt_representation_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/update_status_manager_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/vehicle_data_item_type_test.cc
+  ${CMAKE_CURRENT_SOURCE_DIR}/shared_library_test.cc
+)
 
 set(LIBRARIES
   gmock
   Utils
-  Policy
+  PolicyStatic
   UsageStatistics
 )
 
-create_test(policy_test "${SOURCES}" "${LIBRARIES}")
+create_test(policy_test "${POLICY_TEST_SOURCES}" "${LIBRARIES}")
 
-file(COPY valid_sdl_pt_update.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY sdl_preloaded_pt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY PTU.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY PTU2.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY PTU3.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY PTU4.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ptu_requestType.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY ptu2_requestType.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY smartDeviceLink.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY smartDeviceLink2.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY smartDeviceLink3.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY sdl_pt_first_update.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY sdl_pt_second_update.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(COPY sdl_pt_update.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+#Copy actual sdl_preloaded_pt.json
+file(COPY ${CMAKE_SOURCE_DIR}/src/appMain/sdl_preloaded_pt.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/json/sdl_preloaded_pt_for_merge_initial.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json/)
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/json/sdl_preloaded_pt_for_merge_latest.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/json/)
diff --git a/src/components/policy/policy_regular/test/PTU.json b/src/components/policy/policy_regular/test/PTU.json
deleted file mode 100644
index dbf16598f0..0000000000
--- a/src/components/policy/policy_regular/test/PTU.json
+++ /dev/null
@@ -1,1968 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-12-08",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 60,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "HTTP",
-                  "FILE_RESUME"
-                ]
-            },
-            "1234": "default",
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": [
-                   "QUERY_APPS",
-                   "LAUNCH_APP",
-                   "PROPRIETARY"
-                ]
-            }
-        }
-      }
-    }
\ No newline at end of file
diff --git a/src/components/policy/policy_regular/test/PTU2.json b/src/components/policy/policy_regular/test/PTU2.json
deleted file mode 100644
index 2c0063f69a..0000000000
--- a/src/components/policy/policy_regular/test/PTU2.json
+++ /dev/null
@@ -1,1973 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-12-08",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 60,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"]
-            },
-            "1234": {
-              "keep_context": false,
-              "steal_focus": false,
-              "priority": "NONE",
-              "default_hmi": "NONE",
-              "groups": ["BaseBeforeDataConsent"],
-              "RequestType": [
-                "TRAFFIC_MESSAGE_CHANNEL",
-                "QUERY_APPS",
-                "LAUNCH_APP",
-                "PROPRIETARY",
-                "NAVIGATION",
-                "MEDIA"
-              ]
-            }
-        }
-    }
-    }
diff --git a/src/components/policy/policy_regular/test/PTU3.json b/src/components/policy/policy_regular/test/PTU3.json
deleted file mode 100644
index d579fd3e3f..0000000000
--- a/src/components/policy/policy_regular/test/PTU3.json
+++ /dev/null
@@ -1,1970 +0,0 @@
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-12-08",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 60,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "HTTP",
-                  "FILE_RESUMED",
-                  "INVALID_REQUEST_TYPE"
-                ]
-            },
-            "1234": "default",
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": [
-                   "QUERY_APPS",
-                   "LAUNCH_APP",
-                   "PROPRIETARY",
-                   "INVALID_REQUEST_TYPE"
-                ]
-            }
-        }
-      }
-    }
\ No newline at end of file
diff --git a/src/components/policy/policy_regular/test/PTU4.json b/src/components/policy/policy_regular/test/PTU4.json
deleted file mode 100644
index 84b6404010..0000000000
--- a/src/components/policy/policy_regular/test/PTU4.json
+++ /dev/null
@@ -1,1974 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-12-08",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 60,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"]
-            },
-            "1234": {
-              "keep_context": false,
-              "steal_focus": false,
-              "priority": "NONE",
-              "default_hmi": "NONE",
-              "groups": ["BaseBeforeDataConsent"],
-              "RequestType": [
-                "TRAFFIC_MESSAGE_CHANNEL",
-                "QUERY_APPS",
-                "LAUNCH_APP",
-                "PROPRIETARY",
-                "NAVIGATION",
-                "MEDIA",
-                "INVALID_REQUEST_TYPE"
-              ]
-            }
-        }
-    }
-    }
diff --git a/src/components/policy/policy_regular/test/cache_manager_test.cc b/src/components/policy/policy_regular/test/cache_manager_test.cc
new file mode 100644
index 0000000000..206ee53604
--- /dev/null
+++ b/src/components/policy/policy_regular/test/cache_manager_test.cc
@@ -0,0 +1,1119 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <stdint.h>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+#include "policy/cache_manager.h"
+#include "policy/policy_table/enums.h"
+#include "policy/policy_types.h"
+
+#include "policy/mock_policy_settings.h"
+
+#include "json/reader.h"
+#include "utils/date_time.h"
+#include "utils/file_system.h"
+#include "utils/gen_hash.h"
+#include "utils/jsoncpp_reader_wrapper.h"
+
+namespace test {
+namespace components {
+namespace policy_test {
+
+using namespace policy;
+namespace policy_table = rpc::policy_table_interface_base;
+
+using ::testing::_;
+using ::testing::NiceMock;
+using ::testing::ReturnRef;
+
+namespace {
+const std::string kDefaultHMILevel = "NONE";
+const std::string kInvalidApp = "invalid_app";
+const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json";
+const std::string kValidAppId = "1234";
+const std::string kDeviceNumber = "XXX123456789ZZZ";
+const std::string kAppStorageFolder = "app_storage_folder";
+const std::string kConnectionType = "Bluetooth";
+
+}  // namespace
+
+void ValidateJsonTable(const std::string& string_table,
+                       Json::Value& json_table) {
+  utils::JsonReader reader;
+  ASSERT_TRUE(reader.parse(string_table, &json_table));
+}
+
+policy_table::Table CreateCustomPT(const std::string& string_table) {
+  Json::Value json_table(Json::objectValue);
+  ValidateJsonTable(string_table, json_table);
+  policy_table::Table table(&json_table);
+  return table;
+}
+
+class CacheManagerTest : public ::testing::Test {
+ public:
+  CacheManagerTest() : cache_manager_(nullptr), pt_(nullptr) {}
+
+ protected:
+  std::shared_ptr<CacheManager> cache_manager_;
+  std::shared_ptr<policy_table::Table> pt_;
+  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
+
+  void SetUp() {
+    cache_manager_ = std::make_shared<CacheManager>();
+    pt_ = cache_manager_->pt();
+
+    ON_CALL(policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
+  }
+};
+
+TEST_F(CacheManagerTest,
+       GetNotificationsNumber_PriorityExists_ReturnNumberFromPT) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"notifications_per_minute_by_priority\": {"
+      "\"EMERGENCY\": 1,"
+      "\"NAVIGATION\": 2,"
+      "\"VOICECOM\": 3,"
+      "\"COMMUNICATION\": 4,"
+      "\"NORMAL\": 5,"
+      "\"NONE\": 6"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  std::string priority = "EMERGENCY";
+  uint32_t notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(1u, notif_number);
+
+  priority = "NAVIGATION";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(2u, notif_number);
+
+  priority = "VOICECOM";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(3u, notif_number);
+
+  priority = "NORMAL";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(5u, notif_number);
+
+  priority = "NONE";
+  notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(6u, notif_number);
+}
+
+TEST_F(CacheManagerTest, GetNotificationsNumber_PriorityNotExist_ReturnZero) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"notifications_per_minute_by_priority\": {"
+      "\"EMERGENCY\": 1,"
+      "\"NAVIGATION\": 2,"
+      "\"VOICECOM\": 3,"
+      "\"COMMUNICATION\": 4,"
+      "\"NORMAL\": 5,"
+      "\"NONE\": 6"
+      "}"
+      "}"
+      "}"
+      "}");
+
+  *pt_ = CreateCustomPT(string_table);
+
+  std::string priority = "OTHER_PRIORITY";
+  uint32_t notif_number = cache_manager_->GetNotificationsNumber(priority);
+  EXPECT_EQ(0u, notif_number);
+}
+
+TEST_F(CacheManagerTest, HeartBeatTimeout_ValueInitialized_ReturnValue) {
+  *pt_->policy_table.app_policies_section.apps[kValidAppId]
+       .heart_beat_timeout_ms = 100u;
+  EXPECT_EQ(100u, cache_manager_->HeartBeatTimeout(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, HeartBeatTimeout_ValueNotInitialized_ReturnZero) {
+  pt_->policy_table.app_policies_section.apps[kValidAppId] = {};
+  EXPECT_EQ(0u, cache_manager_->HeartBeatTimeout(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, HeartBeatTimeout_AppNotRepresented_ReturnZero) {
+  EXPECT_EQ(0u, cache_manager_->HeartBeatTimeout(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, GetHMITypes_NoSuchAppNoHmiTypes_ReturnNull) {
+  EXPECT_EQ(nullptr, cache_manager_->GetHMITypes(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, GetHMITypes_ValidApp_ReturnNotNullPtr) {
+  policy_table::AppHMITypes hmi_types;
+  hmi_types.push_back(policy_table::AHT_DEFAULT);
+
+  *pt_->policy_table.app_policies_section.apps[kValidAppId].AppHMIType =
+      hmi_types;
+  EXPECT_NE(nullptr, cache_manager_->GetHMITypes(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, GetAllAppGroups_AppIdIsDevice_AppendGroupId) {
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetAllAppGroups(kDeviceId, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest, GetAllAppGroups_InvalidAppId_EmptyVectorOfGroupId) {
+  FunctionalGroupIDs group_ids;
+  cache_manager_->GetAllAppGroups(kInvalidApp, group_ids);
+  EXPECT_TRUE(group_ids.empty());
+}
+
+TEST_F(CacheManagerTest, GetAllAppGroups_ValidAppId_AppendGroupID) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"groups\": [\"default\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  FunctionalGroupIDs group_ids;
+
+  cache_manager_->GetAllAppGroups(kValidAppId, group_ids);
+  EXPECT_EQ(1u, group_ids.size());
+}
+
+TEST_F(CacheManagerTest, ApplyUpdate_ValidPT_ReturnTrue) {
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
+
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  ifile.close();
+  policy_table::Table update(&root);
+
+  EXPECT_TRUE(cache_manager_->ApplyUpdate(update));
+  EXPECT_FALSE(cache_manager_->IsPTPreloaded());
+}
+
+TEST_F(CacheManagerTest, AppHasHMIType_NoSuchType_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": []"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_FALSE(
+      cache_manager_->AppHasHMIType(kValidAppId, policy_table::AHT_DEFAULT));
+}
+
+TEST_F(CacheManagerTest, AppHasHMIType_TypeExists_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": [\"AHT_DEFAULT\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(
+      cache_manager_->AppHasHMIType(kValidAppId, policy_table::AHT_DEFAULT));
+}
+
+TEST_F(CacheManagerTest, AppHasHMIType_NoSuchApp_ReturnFalse) {
+  EXPECT_FALSE(
+      cache_manager_->AppHasHMIType(kInvalidApp, policy_table::AHT_DEFAULT));
+}
+
+TEST_F(CacheManagerTest, AddDevice_ReturnTrue) {
+  *pt_->policy_table.module_config.preloaded_pt = true;
+  EXPECT_TRUE(cache_manager_->AddDevice(kDeviceNumber, kConnectionType));
+  EXPECT_FALSE(cache_manager_->IsPTPreloaded());
+}
+
+TEST_F(CacheManagerTest, CheckPermissions_ValidParams_ReturnkRpcAllowed) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"functional_groupings\": {"
+      "\"Base-4\": {"
+      "\"rpcs\": {"
+      "\"AddCommand\": {"
+      "\"hmi_levels\": ["
+      "\"BACKGROUND\","
+      "\"FULL\","
+      "\"LIMITED\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "},"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "\"groups\": ["
+      "\"Base-4\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  policy_table::Strings groups;
+  groups.push_back("Base-4");
+  const PTString hmi_level("FULL");
+  const PTString rpc("AddCommand");
+  CheckPermissionResult result;
+
+  cache_manager_->CheckPermissions(groups, hmi_level, rpc, result);
+  EXPECT_EQ(kRpcAllowed, result.hmi_level_permitted);
+}
+
+TEST_F(CacheManagerTest, CheckPermissions_ValidParams_ReturnkRpcDisallowed) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"functional_groupings\": {"
+      "\"Base-4\": {"
+      "\"rpcs\": {"
+      "\"AddCommand\": {"
+      "}"
+      "}"
+      "}"
+      "},"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "\"groups\": ["
+      "\"Base-4\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  policy_table::Strings groups;
+  groups.push_back("Base-4");
+  const PTString hmi_level("FULL");
+  const PTString rpc("AddCommand");
+  CheckPermissionResult result;
+
+  cache_manager_->CheckPermissions(groups, hmi_level, rpc, result);
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
+}
+
+TEST_F(CacheManagerTest,
+       CheckPermissions_NoSuchFunctionalGroup_ReturnkRpcDisallowed) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"functional_groupings\": {"
+      "},"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "\"groups\": ["
+      "\"Base-4\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  policy_table::Strings groups;
+  groups.push_back("Base-4");
+  const PTString hmi_level("FULL");
+  const PTString rpc("AddCommand");
+  CheckPermissionResult result;
+
+  cache_manager_->CheckPermissions(groups, hmi_level, rpc, result);
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
+}
+
+TEST_F(CacheManagerTest, CheckPermissions_NoSuchRpc_ReturnkRpcDisallowed) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"functional_groupings\": {"
+      "\"Base-4\": {"
+      "\"rpcs\": {"
+      "}"
+      "}"
+      "},"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "\"groups\": ["
+      "\"Base-4\""
+      "]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  policy_table::Strings groups;
+  groups.push_back("Base-4");
+  const PTString hmi_level("FULL");
+  const PTString rpc("AddCommand");
+  CheckPermissionResult result;
+
+  cache_manager_->CheckPermissions(groups, hmi_level, rpc, result);
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypesState_GetAllStates) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestType\": [\"PROPRIETARY\"]"
+      "},"
+      "\"default\": {"
+      "\"RequestType\": [],"
+      "},"
+      "\"pre_DataConsent\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(RequestType::State::EMPTY,
+            cache_manager_->GetAppRequestTypesState(kDefaultId));
+  EXPECT_EQ(RequestType::State::UNAVAILABLE,
+            cache_manager_->GetAppRequestTypesState(kInvalidApp));
+  EXPECT_EQ(RequestType::State::OMITTED,
+            cache_manager_->GetAppRequestTypesState(kPreDataConsentId));
+  EXPECT_EQ(RequestType::State::AVAILABLE,
+            cache_manager_->GetAppRequestTypesState(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypesState_GetAllStates) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestSubType\": [\"PROPRIETARY\"]"
+      "},"
+      "\"default\": {"
+      "\"RequestSubType\": [],"
+      "},"
+      "\"pre_DataConsent\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_EQ(RequestSubType::State::EMPTY,
+            cache_manager_->GetAppRequestSubTypesState(kDefaultId));
+  EXPECT_EQ(RequestSubType::State::UNAVAILABLE,
+            cache_manager_->GetAppRequestSubTypesState(kInvalidApp));
+  EXPECT_EQ(RequestSubType::State::OMITTED,
+            cache_manager_->GetAppRequestSubTypesState(kPreDataConsentId));
+  EXPECT_EQ(RequestSubType::State::AVAILABLE,
+            cache_manager_->GetAppRequestSubTypesState(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IgnitionCyclesBeforeExchange_GetValue) {
+  // if result of computation is positive
+  pt_->policy_table.module_config.exchange_after_x_ignition_cycles = 100u;
+  *(pt_->policy_table.module_meta->ignition_cycles_since_last_exchange) = 80u;
+
+  EXPECT_EQ(20, cache_manager_->IgnitionCyclesBeforeExchange());
+
+  // if result of computation is negative
+  pt_->policy_table.module_config.exchange_after_x_ignition_cycles = 80u;
+  *(pt_->policy_table.module_meta->ignition_cycles_since_last_exchange) = 100u;
+
+  EXPECT_EQ(0, cache_manager_->IgnitionCyclesBeforeExchange());
+}
+
+TEST_F(CacheManagerTest, KilometersBeforeExchange_GetValue) {
+  // if result of computation is positive
+  pt_->policy_table.module_config.exchange_after_x_kilometers = 1000u;
+  *(pt_->policy_table.module_meta->pt_exchanged_at_odometer_x) = 500u;
+
+  EXPECT_EQ(600, cache_manager_->KilometersBeforeExchange(900));
+
+  // if result of computation is negative
+  pt_->policy_table.module_config.exchange_after_x_kilometers = 500u;
+  *(pt_->policy_table.module_meta->pt_exchanged_at_odometer_x) = 200u;
+
+  EXPECT_EQ(0, cache_manager_->KilometersBeforeExchange(800));
+}
+
+TEST_F(CacheManagerTest,
+       DaysBeforeExchange_DaysNotInitialized_ReturnNegativeOne) {
+  EXPECT_EQ(-1, cache_manager_->DaysBeforeExchange(20));
+}
+
+TEST_F(CacheManagerTest, DaysBeforeExchange_DaysIsInitialized_ReturnValue) {
+  *(pt_->policy_table.module_meta->pt_exchanged_x_days_after_epoch) = 5;
+  pt_->policy_table.module_config.exchange_after_x_days = 30;
+  EXPECT_EQ(15, cache_manager_->DaysBeforeExchange(20));
+}
+
+TEST_F(CacheManagerTest,
+       SetCountersPassedForSuccessfulUpdate_AllPositiveCases_ReturnTrue) {
+  EXPECT_TRUE(cache_manager_->SetCountersPassedForSuccessfulUpdate(
+      Counters::KILOMETERS, 1000));
+  EXPECT_TRUE(cache_manager_->SetCountersPassedForSuccessfulUpdate(
+      Counters::DAYS_AFTER_EPOCH, 20));
+}
+
+TEST_F(CacheManagerTest, GetPriority_DeviceAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"device\": {"
+      "\"priority\": [\"NONE\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::string priority;
+  EXPECT_TRUE(cache_manager_->GetPriority(kDeviceId, priority));
+}
+
+TEST_F(CacheManagerTest, GetPriority_ValidAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"priority\": [\"NONE\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+
+  *pt_ = CreateCustomPT(string_table);
+  std::string priority;
+  EXPECT_TRUE(cache_manager_->GetPriority(kValidAppId, priority));
+}
+
+TEST_F(CacheManagerTest, GetPriority_InvalidAppID_ReturnFalse) {
+  std::string priority;
+
+  EXPECT_FALSE(cache_manager_->GetPriority(kInvalidApp, priority));
+  EXPECT_TRUE(priority.empty());
+}
+
+TEST_F(CacheManagerTest, SetDefaultPolicy_DefaultAppExists_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"default\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->SetDefaultPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, IsDefaultPolicy_DefaultValidApp_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsDefaultPolicy_InvalidAppId_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, IsDefaultPolicy_NotDefaultValidAppId_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"priority\": [\"NONE\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetIsDefault_InvalidAppId_DefaultNotAssigned) {
+  EXPECT_TRUE(cache_manager_->SetIsDefault(kInvalidApp));
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, SetIsDefault_ValidAppId_ReturnTrue) {
+  EXPECT_TRUE(cache_manager_->SetIsDefault(kValidAppId));
+  EXPECT_FALSE(cache_manager_->IsDefaultPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsPredataPolicy_InvalidAppId_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsPredataPolicy(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, IsPredataPolicy_NotPredataValidAppId_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"priority\": [\"NONE\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  EXPECT_FALSE(cache_manager_->IsPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetPredataPolicy_NoPredataSection_ReturnFalse) {
+  pt_->policy_table.app_policies_section.apps.erase(kPreDataConsentId);
+  EXPECT_FALSE(cache_manager_->SetPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetPredataPolicy_ValidPredataSection_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"pre_DataConsent\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(cache_manager_->SetPredataPolicy(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, SetUnpairedDevice_NoSuchDevice_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->SetUnpairedDevice(kDeviceNumber, true));
+}
+
+TEST_F(CacheManagerTest, SetUnpairedDevice_UnpairedDevice_ReturnTrue) {
+  cache_manager_->AddDevice(kDeviceNumber, kConnectionType);
+  EXPECT_TRUE(cache_manager_->SetUnpairedDevice(kDeviceNumber, true));
+}
+
+TEST_F(CacheManagerTest, SetUnpairedDevice_NotUnpairedDevice_ReturnTrue) {
+  cache_manager_->AddDevice(kDeviceNumber, kConnectionType);
+  EXPECT_TRUE(cache_manager_->SetUnpairedDevice(kDeviceNumber, false));
+}
+
+TEST_F(CacheManagerTest, GetHMIAppTypeAfterUpdate_NoAppTypes_MapIsEmpty) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": [\"AHT_DEFAULT\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::map<std::string, StringArray> app_hmi_types;
+
+  cache_manager_->GetHMIAppTypeAfterUpdate(app_hmi_types);
+  EXPECT_TRUE(!app_hmi_types.empty());
+}
+
+TEST_F(CacheManagerTest, IsApplicationRevoked_InvalidAppID_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->IsApplicationRevoked(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest,
+       IsApplicationRevoked_ValidAppIDNotRevoked_ReturnFalse) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_FALSE(cache_manager_->IsApplicationRevoked(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, IsApplicationRevoked_ValidAppIDIsRevoked_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": \"default\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  pt_->policy_table.app_policies_section.apps[kValidAppId].set_to_null();
+
+  EXPECT_TRUE(cache_manager_->IsApplicationRevoked(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypes_DeviceAppID_NoTypes) {
+  std::vector<std::string> request_types;
+  cache_manager_->GetAppRequestTypes(kDeviceId, request_types);
+
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypes_InvalidAppID_NoTypes) {
+  std::vector<std::string> request_types;
+  cache_manager_->GetAppRequestTypes(kInvalidApp, request_types);
+
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestTypes_ValidAppID_AddTypesIfPresent) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestType\": [\"OnSystemRequest\", \"AddCommandRequest\"]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::vector<std::string> request_types;
+
+  cache_manager_->GetAppRequestTypes(kValidAppId, request_types);
+  EXPECT_EQ(2u, request_types.size());
+}
+
+TEST_F(CacheManagerTest, GetInitialAppData_ValidAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"AppHMIType\": [\"AHT_DEFAULT\"],"
+      "\"nicknames\": [\"Test app\"],"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  StringArray nicknames;
+  StringArray app_hmi_types;
+
+  EXPECT_TRUE(
+      cache_manager_->GetInitialAppData(kValidAppId, nicknames, app_hmi_types));
+  EXPECT_FALSE(nicknames.empty());
+  EXPECT_FALSE(app_hmi_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetInitialAppData_InvalidAppId_ReturnTrue) {
+  StringArray nicknames;
+  StringArray app_hmi_types;
+
+  EXPECT_TRUE(
+      cache_manager_->GetInitialAppData(kInvalidApp, nicknames, app_hmi_types));
+  EXPECT_TRUE(nicknames.empty());
+  EXPECT_TRUE(app_hmi_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypes_DeviceAppID_NoTypes) {
+  std::vector<std::string> request_types;
+
+  cache_manager_->GetAppRequestSubTypes(kDeviceId, request_types);
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypes_InvalidAppID_NoTypes) {
+  std::vector<std::string> request_types;
+
+  cache_manager_->GetAppRequestSubTypes(kInvalidApp, request_types);
+  EXPECT_TRUE(request_types.empty());
+}
+
+TEST_F(CacheManagerTest, GetAppRequestSubTypes_ValidAppID_AddSubtype) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "\"RequestSubType\": [\"Some_subtype\"]"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::vector<std::string> request_subtypes;
+
+  cache_manager_->GetAppRequestSubTypes(kValidAppId, request_subtypes);
+  EXPECT_FALSE(request_subtypes.empty());
+}
+
+TEST_F(CacheManagerTest, Init_TableAlreadyExistsNotMerged_ReturnFalse) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  EXPECT_TRUE(cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_));
+  const std::string invalid_filename = "invalid_filename.json";
+  EXPECT_FALSE(cache_manager_->Init(invalid_filename, &policy_settings_));
+  file_system::RemoveDirectory(kAppStorageFolder, true);
+}
+
+TEST_F(CacheManagerTest, Init_TableAlreadyExistsAndIsMerged_ReturnTrue) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  const std::string earlier_version_of_preloaded_pt =
+      "json/sdl_preloaded_pt_for_merge_initial.json";
+  const std::string latest_version_of_preloaded_pt =
+      "json/sdl_preloaded_pt_for_merge_latest.json";
+
+  EXPECT_TRUE(
+      cache_manager_->Init(earlier_version_of_preloaded_pt, &policy_settings_));
+  EXPECT_TRUE(
+      cache_manager_->Init(latest_version_of_preloaded_pt, &policy_settings_));
+  file_system::RemoveDirectory(kAppStorageFolder, true);
+}
+
+TEST_F(CacheManagerTest, GetCertificate_NoCertificateReturnEmptyString) {
+  std::string certificate = cache_manager_->GetCertificate();
+  EXPECT_TRUE(certificate.empty());
+}
+
+TEST_F(CacheManagerTest, GetCertificate_CertificateExists_ReturnCertificate) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"certificate\": \"some_certificate\""
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  std::string certificate = cache_manager_->GetCertificate();
+  EXPECT_FALSE(certificate.empty());
+}
+
+TEST_F(CacheManagerTest,
+       GetVehicleDataItems_VehicleDataIsInitialized_GotDataItems) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  cache_manager_->Init(kSdlPreloadedPtJson, &policy_settings_);
+  auto items = cache_manager_->GetVehicleDataItems();
+  EXPECT_FALSE(items.empty());
+  file_system::RemoveDirectory(kAppStorageFolder, true);
+}
+
+TEST_F(CacheManagerTest,
+       GetVehicleDataItems_VehicleDataNotInitialized_ReturnEmptyVector) {
+  const auto items = cache_manager_->GetVehicleDataItems();
+  EXPECT_TRUE(items.empty());
+}
+
+TEST_F(CacheManagerTest, LockScreenDismissalWarningMessage_ReturnValidMessage) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"consumer_friendly_messages\": {"
+      "\"messages\": {"
+      "\"LockScreenDismissalWarning\": {"
+      "\"languages\": {"
+      "\"en-us\": {"
+      "\"textBody\": \"Swipe down to dismiss, acknowledging that you are not "
+      "the driver\""
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  std::string expected_msg(
+      "Swipe down to dismiss, acknowledging that you are not the driver");
+  EXPECT_EQ(expected_msg,
+            *cache_manager_->LockScreenDismissalWarningMessage("en-us"));
+}
+
+TEST_F(CacheManagerTest,
+       LockScreenDismissalEnabledState_EnabledInPT_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"module_config\": {"
+      "\"lock_screen_dismissal_enabled\": true"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  EXPECT_TRUE(*cache_manager_->LockScreenDismissalEnabledState());
+}
+
+TEST_F(CacheManagerTest,
+       UnknownRPCPassthroughAllowed_InvalidAppID_ReturnFalse) {
+  EXPECT_FALSE(cache_manager_->UnknownRPCPassthroughAllowed(kInvalidApp));
+}
+
+TEST_F(CacheManagerTest, UnknownRPCPassthroughAllowed_ValidAppID_ReturnTrue) {
+  pt_->policy_table.app_policies_section.apps[kValidAppId]
+      .allow_unknown_rpc_passthrough = rpc::Optional<rpc::Boolean>(true);
+  EXPECT_TRUE(cache_manager_->UnknownRPCPassthroughAllowed(kValidAppId));
+}
+
+TEST_F(CacheManagerTest, GetAppProperties_InvalidAppID_ReturnFalse) {
+  AppProperties out_app_properties;
+  EXPECT_FALSE(
+      cache_manager_->GetAppProperties(kInvalidApp, out_app_properties));
+}
+
+TEST_F(CacheManagerTest, GetAppProperties_ValidAppID_ReturnTrue) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  AppProperties out_app_properties;
+  cache_manager_->SetAppEndpoint(kValidAppId, "endpoint");
+  cache_manager_->SetAppAuthToken(kValidAppId, "auth_token");
+  cache_manager_->SetAppCloudTransportType(kValidAppId, "transport_type");
+  cache_manager_->SetHybridAppPreference(kValidAppId, "CLOUD");
+  cache_manager_->SetCloudAppEnabled(kValidAppId, true);
+
+  EXPECT_TRUE(
+      cache_manager_->GetAppProperties(kValidAppId, out_app_properties));
+}
+
+TEST_F(CacheManagerTest, Add_MinutesAreAdded) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+  int result, seconds;
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_full = 0;
+  seconds = 60;
+  cache_manager_->Add(kValidAppId, usage_statistics::SECONDS_HMI_FULL, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_full);
+  EXPECT_EQ(1, result);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_limited = 0;
+  seconds = 120;
+  cache_manager_->Add(
+      kValidAppId, usage_statistics::SECONDS_HMI_LIMITED, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_limited);
+  EXPECT_EQ(2, result);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_background = 0;
+  seconds = 180;
+  cache_manager_->Add(
+      kValidAppId, usage_statistics::SECONDS_HMI_BACKGROUND, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_background);
+  EXPECT_EQ(3, result);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .minutes_in_hmi_none = 0;
+  seconds = 240;
+  cache_manager_->Add(kValidAppId, usage_statistics::SECONDS_HMI_NONE, seconds);
+  result = static_cast<int>(
+      (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+          .minutes_in_hmi_none);
+  EXPECT_EQ(4, result);
+}
+
+TEST_F(CacheManagerTest, Set_ValuesAreSetted) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  cache_manager_->Set(kValidAppId, usage_statistics::LANGUAGE_GUI, "eng-eng");
+  EXPECT_EQ(
+      "eng-eng",
+      std::string(
+          (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+              .app_registration_language_gui));
+
+  cache_manager_->Set(kValidAppId, usage_statistics::LANGUAGE_VUI, "ru-ru");
+  EXPECT_EQ(
+      "ru-ru",
+      std::string(
+          (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+              .app_registration_language_vui));
+}
+
+TEST_F(CacheManagerTest, Increment_AppCounterIsIncremented) {
+  const std::string string_table(
+      "{"
+      "\"policy_table\": {"
+      "\"app_policies\": {"
+      "\"1234\": {"
+      "}"
+      "}"
+      "}"
+      "}");
+  *pt_ = CreateCustomPT(string_table);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_user_selections = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::USER_SELECTIONS);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_user_selections);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejections_sync_out_of_memory = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::REJECTIONS_SYNC_OUT_OF_MEMORY);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejections_sync_out_of_memory);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejections_nickname_mismatch = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::REJECTIONS_NICKNAME_MISMATCH);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejections_nickname_mismatch);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejections_duplicate_name = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::REJECTIONS_DUPLICATE_NAME);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejections_duplicate_name);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rejected_rpc_calls = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::REJECTED_RPC_CALLS);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rejected_rpc_calls);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_rpcs_sent_in_hmi_none = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::RPCS_IN_HMI_NONE);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_rpcs_sent_in_hmi_none);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_removals_for_bad_behavior = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::REMOVALS_MISBEHAVED);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_removals_for_bad_behavior);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_run_attempts_while_revoked = 0;
+  cache_manager_->Increment(kValidAppId,
+                            usage_statistics::RUN_ATTEMPTS_WHILE_REVOKED);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_run_attempts_while_revoked);
+
+  (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+      .count_of_tls_errors = 0;
+  cache_manager_->Increment(kValidAppId, usage_statistics::COUNT_OF_TLS_ERRORS);
+  EXPECT_EQ(1,
+            (*pt_->policy_table.usage_and_error_counts->app_level)[kValidAppId]
+                .count_of_tls_errors);
+}
+
+TEST_F(CacheManagerTest, IsApplicationRepresented_DeviceApp_ReturnTrue) {
+  EXPECT_TRUE(cache_manager_->IsApplicationRepresented(kDeviceId));
+}
+
+}  // namespace policy_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/policy/policy_regular/test/counter_test.cc b/src/components/policy/policy_regular/test/counter_test.cc
deleted file mode 100644
index c09347fd9c..0000000000
--- a/src/components/policy/policy_regular/test/counter_test.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Copyright (c) 2016, Ford Motor Company
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the Ford Motor Company nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "gmock/gmock.h"
-
-#include "policy/usage_statistics/counter.h"
-#include "policy/usage_statistics/mock_statistics_manager.h"
-
-using ::testing::InSequence;
-using ::testing::StrictMock;
-
-namespace test {
-namespace components {
-namespace usage_statistics_test {
-
-using namespace usage_statistics;
-
-// TEST(A, B_C_D) { ... }
-// A - What you test
-// B - What you do
-// C - Input data
-// D - Expected result
-
-TEST(
-    StatisticsManagerIncrementMethod1Arg,
-    GlobalCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  GlobalCounter reboots_counter(msm, SYNC_REBOOTS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment(SYNC_REBOOTS));
-
-  // Act
-  ++reboots_counter;
-}
-
-TEST(
-    StatisticsManagerIncrementMethod1Arg,
-    GlobalCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  GlobalCounter reboots_counter(msm, SYNC_REBOOTS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment(SYNC_REBOOTS)).Times(2);
-
-  // Act
-  ++reboots_counter;
-  ++reboots_counter;
-}
-
-TEST(
-    StatisticsManagerIncrementMethod2Args,
-    AppCounterOverloadedIncrement_CallONCE_StatisticsManagerIncrementCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment("HelloApp", USER_SELECTIONS));
-
-  // Act
-  ++user_selections_counter;
-}
-
-TEST(
-    StatisticsManagerIncrementMethod2Args,
-    AppCounterOverloadedIncrement_CallTWICE_StatisticsManagerIncrementCalledTWICE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppCounter user_selections_counter(msm, "HelloApp", USER_SELECTIONS);
-
-  // Assert
-  EXPECT_CALL(*msm, Increment("HelloApp", USER_SELECTIONS)).Times(2);
-
-  // Act
-  ++user_selections_counter;
-  ++user_selections_counter;
-}
-//---
-TEST(StatisticsManagerSetMethod,
-     AppInfoUpdateMethod_CallONCE_StatisticsManagerSetMethodCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI);
-
-  // Assert
-  EXPECT_CALL(*msm, Set("HelloApp", LANGUAGE_GUI, "Klingon"));
-
-  // Act
-  gui_language_info.Update("Klingon");
-}
-
-TEST(StatisticsManagerSetMethod,
-     AppInfoUpdateMethod_CallTWICE_StatisticsManagerSetMethodCalledTWICE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppInfo gui_language_info(msm, "HelloApp", LANGUAGE_GUI);
-
-  // Assert
-  EXPECT_CALL(*msm, Set("HelloApp", LANGUAGE_GUI, "Klingon"));
-  EXPECT_CALL(*msm, Set("HelloApp", LANGUAGE_GUI, "UA"));
-
-  // Act
-  gui_language_info.Update("Klingon");
-  gui_language_info.Update("UA");
-}
-
-TEST(StatisticsManagerAddMethod,
-     AppStopwatchStartMethod_CallONCE_StatisticsManagerAddMethodCalledONCE) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  const std::uint32_t time_out = 1;
-  AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out);
-
-  hmi_full_stopwatch.Start(SECONDS_HMI_FULL);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_FULL, time_out));
-
-  // Act
-  hmi_full_stopwatch.WriteTime();
-}
-
-// Tests disabled due to uncorrect behavior of timer.
-// Will be undisabled after fix.
-TEST(StatisticsManagerAddMethod,
-     DISABLED_AppStopwatchSwitchMethod_Call_StatisticsManagerAddMethodCalled) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp");
-  hmi_full_stopwatch.Start(SECONDS_HMI_FULL);
-
-  hmi_full_stopwatch.Switch(SECONDS_HMI_FULL);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_FULL, 60));
-
-  // Act
-  hmi_full_stopwatch.WriteTime();
-}
-
-TEST(
-    StatisticsManagerAddMethod,
-    DISABLED_AppStopwatchSwitchMethod_CallAnd1SecSleepAfter_StatisticsManagerAddMethodCalledWith1SecTimespan) {
-  // Arrange
-  auto msm = std::make_shared<StrictMock<MockStatisticsManager> >();
-  const std::uint32_t time_out = 1;
-  AppStopwatchImpl hmi_full_stopwatch(msm, "HelloApp", time_out);
-
-  // Act
-  hmi_full_stopwatch.Start(SECONDS_HMI_NONE);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_NONE, time_out));
-  // Act
-  hmi_full_stopwatch.WriteTime();
-
-  hmi_full_stopwatch.Switch(SECONDS_HMI_BACKGROUND);
-  // Assert
-  EXPECT_CALL(*msm, Add("HelloApp", SECONDS_HMI_BACKGROUND, time_out));
-  // Act
-  hmi_full_stopwatch.WriteTime();
-}
-
-}  // namespace usage_statistics_test
-}  // namespace components
-}  // namespace test
diff --git a/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h b/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h
index 44f7733985..8cf3884c11 100644
--- a/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h
+++ b/src/components/policy/policy_regular/test/include/policy/mock_pt_representation.h
@@ -64,7 +64,6 @@ class MockPTRepresentation : virtual public PTRepresentation {
   MOCK_METHOD1(SecondsBetweenRetries, bool(std::vector<int>* seconds));
   MOCK_METHOD2(GetPriority,
                bool(const std::string& app_id, std::string* priority));
-  MOCK_CONST_METHOD0(GetVehicleInfo, const VehicleInfo());
   MOCK_METHOD1(SetVINValue, bool(const std::string& value));
   MOCK_METHOD2(
       GetUserFriendlyMsg,
diff --git a/src/components/policy/policy_regular/test/json/sdl_preloaded_pt_for_merge_initial.json b/src/components/policy/policy_regular/test/json/sdl_preloaded_pt_for_merge_initial.json
new file mode 100644
index 0000000000..909fd2cb2f
--- /dev/null
+++ b/src/components/policy/policy_regular/test/json/sdl_preloaded_pt_for_merge_initial.json
@@ -0,0 +1,2433 @@
+
+{
+  "policy_table" :
+  {
+    "app_policies" :
+    {
+      "default" :
+      {
+        "default_hmi" : "NONE",
+        "groups" : [ "Base-4" ],
+        "keep_context" : false,
+        "priority" : "NONE",
+        "steal_focus" : false
+      },
+      "device" :
+      {
+        "default_hmi" : "NONE",
+        "groups" : [ "DataConsent-2" ],
+        "keep_context" : false,
+        "priority" : "NONE",
+        "steal_focus" : false
+      },
+      "pre_DataConsent" :
+      {
+        "default_hmi" : "BACKGROUND",
+        "groups" : [ "BaseBeforeDataConsent" ],
+        "keep_context" : false,
+        "priority" : "EMERGENCY",
+        "steal_focus" : false
+      }
+    },
+    "consumer_friendly_messages" :
+    {
+      "messages" :
+      {
+        "AppPermissions" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Zugriffsanfrage(n)",
+              "line2" : "erlauben?",
+              "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+            },
+            "en-au" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-gb" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "textBody" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu.",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-ie" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-us" :
+            {
+              "line1" : "Grant Requested",
+              "line2" : "Permission(s)?",
+              "textBody" : "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent.",
+              "tts" : "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny."
+            },
+            "es-en" :
+            {
+              "line1" : "¿Otorgar permiso(s)",
+              "line2" : "solicitado(s)?",
+              "textBody" : "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior.",
+              "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
+            },
+            "es-es" :
+            {
+              "line1" : "¿Conceder permisos",
+              "line2" : "solicitados?",
+              "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
+            },
+            "es-mx" :
+            {
+              "line1" : "¿Otorgar permiso(s)",
+              "line2" : "solicitado(s)?",
+              "textBody" : "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior.",
+              "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Accorder permission(s)",
+              "line2" : "demandée(s)",
+              "textBody" : "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens.",
+              "tts" : "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Accorder permission(s)",
+              "line2" : "demandée(s)",
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+            },
+            "it-it" :
+            {
+              "line1" : "Concedi autorizzaz.",
+              "line2" : "richiesta(e)?",
+              "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Aangevraagde",
+              "line2" : "permissie(s) verlenen?",
+              "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Udzielić żądanych",
+              "line2" : "pozwoleń?",
+              "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
+            },
+            "pt-br" :
+            {
+              "line1" : "Conceder permissão",
+              "line2" : "solicitada?",
+              "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Conceder permiss.",
+              "line2" : "solicitada(s)?",
+              "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Предост. заправш.",
+              "line2" : "разрешения?",
+              "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
+            },
+            "sv-se" :
+            {
+              "line1" : "Vill du ge",
+              "line2" : "tillstånd?",
+              "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
+            },
+            "tr-tr" :
+            {
+              "line1" : "İstenen izinler",
+              "line2" : "verilsin mi?",
+              "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "line1" : "是否允许请求的",
+              "line2" : "权限？",
+              "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "允許",
+              "line2" : "授權請求?",
+              "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
+            }
+          }
+        },
+        "AppPermissionsHelp" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+            },
+            "en-au" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-gb" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-ie" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-us" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
+            },
+            "es-en" :
+            {
+              "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+            },
+            "es-es" :
+            {
+              "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
+            },
+            "es-mx" :
+            {
+              "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+            },
+            "fr-ca" :
+            {
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+            },
+            "fr-fr" :
+            {
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+            },
+            "it-it" :
+            {
+              "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
+            },
+            "nl-nl" :
+            {
+              "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
+            },
+            "pl-pl" :
+            {
+              "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
+            },
+            "pt-br" :
+            {
+              "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
+            },
+            "pt-pt" :
+            {
+              "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
+            },
+            "ru-ru" :
+            {
+              "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
+            },
+            "sv-se" :
+            {
+              "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
+            },
+            "tr-tr" :
+            {
+              "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
+            },
+            "zh-tw" :
+            {
+              "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
+            }
+          }
+        },
+        "AppPermissionsRevoked" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
+            },
+            "en-au" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-gb" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-ie" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-us" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "es-en" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+            },
+            "es-es" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
+            },
+            "es-mx" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+            },
+            "fr-ca" :
+            {
+              "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+            },
+            "fr-fr" :
+            {
+              "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+            },
+            "it-it" :
+            {
+              "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
+            },
+            "nl-nl" :
+            {
+              "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
+            },
+            "pl-pl" :
+            {
+              "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
+            },
+            "pt-br" :
+            {
+              "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
+            },
+            "pt-pt" :
+            {
+              "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
+            },
+            "ru-ru" :
+            {
+              "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
+            },
+            "sv-se" :
+            {
+              "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
+            },
+            "tr-tr" :
+            {
+              "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
+            },
+            "zh-cn" :
+            {
+              "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
+            },
+            "zh-tw" :
+            {
+              "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
+            }
+          }
+        },
+        "AppUnauthorized" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "nicht autorisiert",
+              "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
+            },
+            "en-au" :
+            {
+              "line1" : "not authorized",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-gb" :
+            {
+              "line1" : "not authorized",
+              "textBody" : "This version of %appName% is not authorized and will not work with SYNC.",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-ie" :
+            {
+              "line1" : "not authorized",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-us" :
+            {
+              "line1" : "Not Authorized",
+              "textBody" : "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%.",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "es-en" :
+            {
+              "line1" : "no autorizada",
+              "textBody" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+              "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+            },
+            "es-es" :
+            {
+              "line1" : "No autorizada",
+              "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
+            },
+            "es-mx" :
+            {
+              "line1" : "no autorizada",
+              "textBody" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+              "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+            },
+            "fr-ca" :
+            {
+              "line1" : "non autorisée",
+              "textBody" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
+              "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+            },
+            "fr-fr" :
+            {
+              "line1" : "non autorisée",
+              "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+            },
+            "it-it" :
+            {
+              "line1" : "non autorizzata",
+              "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
+            },
+            "nl-nl" :
+            {
+              "line1" : "niet geautoriseerd",
+              "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
+            },
+            "pl-pl" :
+            {
+              "line1" : "brak autoryzacji",
+              "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
+            },
+            "pt-br" :
+            {
+              "line1" : "não autorizado",
+              "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
+            },
+            "pt-pt" :
+            {
+              "line1" : "não autorizada",
+              "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
+            },
+            "ru-ru" :
+            {
+              "line1" : "не авторизировано",
+              "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
+            },
+            "sv-se" :
+            {
+              "line1" : "är ej godkänd",
+              "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
+            },
+            "tr-tr" :
+            {
+              "line1" : "için izin yok",
+              "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
+            },
+            "zh-cn" :
+            {
+              "line1" : "未得到授权",
+              "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "無授權",
+              "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
+            }
+          }
+        },
+        "AppUnsupported" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "nicht unterstützt",
+              "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
+            },
+            "en-au" :
+            {
+              "line1" : "not supported",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-gb" :
+            {
+              "line1" : "not supported",
+              "textBody" : "This version of %appName% is not supported by SYNC.",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-ie" :
+            {
+              "line1" : "not supported",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-us" :
+            {
+              "line1" : "Not Supported",
+              "textBody" : "Your version of %appName% is not supported by SYNC.",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "es-en" :
+            {
+              "line1" : "no compatible",
+              "textBody" : "Esta versión de %appName% no es compatible con SYNC.",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "es-es" :
+            {
+              "line1" : "No compatible",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "es-mx" :
+            {
+              "line1" : "no compatible",
+              "textBody" : "Esta versión de %appName% no es compatible con SYNC.",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "fr-ca" :
+            {
+              "line1" : "incompatible",
+              "textBody" : "Cette version de %appName% n’est pas prise en charge par SYNC.",
+              "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
+            },
+            "fr-fr" :
+            {
+              "line1" : "incompatible",
+              "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
+            },
+            "it-it" :
+            {
+              "line1" : "non supportata",
+              "tts" : "Questa versione di %appName% non è supportata dal SYNC."
+            },
+            "nl-nl" :
+            {
+              "line1" : "niet ondersteund",
+              "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
+            },
+            "pl-pl" :
+            {
+              "line1" : "aplikacja nie obsług.",
+              "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
+            },
+            "pt-br" :
+            {
+              "line1" : "não suportado",
+              "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
+            },
+            "pt-pt" :
+            {
+              "line1" : "não suportada",
+              "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
+            },
+            "ru-ru" :
+            {
+              "line1" : "не поддерживается",
+              "tts" : "Эта версия %appName% не поддерживается SYNC."
+            },
+            "sv-se" :
+            {
+              "line1" : "stöds ej",
+              "tts" : "SYNC har inte stöd för den här versionen av %appName%."
+            },
+            "tr-tr" :
+            {
+              "line1" : "desteklenmiyor",
+              "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
+            },
+            "zh-cn" :
+            {
+              "line1" : "不受支持",
+              "tts" : "SYNC不支持此版本的%appName%。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "不支援",
+              "tts" : "SYNC 不支援此版本的%appName% 。"
+            }
+          }
+        },
+        "DataConsent" :
+        {
+          "languages" :
+          {
+            "en-gb" :
+            {
+              "textBody" : "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
+            },
+            "en-us" :
+            {
+              "line1" : "Enable Mobile Apps",
+              "line2" : "on SYNC? (Uses Data)",
+              "textBody" : "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
+            }
+          }
+        },
+        "DataConsentHelp" :
+        {
+          "languages" :
+          {
+            "en-us" :
+            {
+              "textBody" : "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
+            }
+          }
+        },
+        "DisableApps" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Auto-Update",
+              "line2" : "und Mobile Apps deaktivieren",
+              "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
+            },
+            "en-au" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-gb" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "textBody" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-ie" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-us" :
+            {
+              "line1" : "Disable Auto-Updates",
+              "line2" : "and Mobile Apps?",
+              "textBody" : "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel.",
+              "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
+            },
+            "es-en" :
+            {
+              "line1" : "¿Deshab. actualiz.",
+              "line2" : "autom. y aplic. móv.?",
+              "textBody" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+              "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+            },
+            "es-es" :
+            {
+              "line1" : "¿Desact. actual. auto",
+              "line2" : "y apl. móviles?",
+              "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
+            },
+            "es-mx" :
+            {
+              "line1" : "¿Deshab. actualiz.",
+              "line2" : "autom. y aplic. móv.?",
+              "textBody" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+              "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Désactiver màj autom.",
+              "line2" : "et app. mobiles?",
+              "textBody" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
+              "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Désactiver màj autom.",
+              "line2" : "et app. mobiles?",
+              "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+            },
+            "it-it" :
+            {
+              "line1" : "Disabilitare agg. aut.",
+              "line2" : "e app mobili?",
+              "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Auto-updates en mob.",
+              "line2" : "apps uitschakelen?",
+              "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Wył. automat. aktual.",
+              "line2" : "i aplikacje mobilne?",
+              "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
+            },
+            "pt-br" :
+            {
+              "line1" : "Desativar atualizações",
+              "line2" : "autom. e aplicativos?",
+              "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Desact. actual. autom.",
+              "line2" : "e aplicações móveis?",
+              "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Откл. автообновления",
+              "line2" : "и мобил. прилож.?",
+              "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
+            },
+            "sv-se" :
+            {
+              "line1" : "Avaktiverar autouppdat.",
+              "line2" : "och mobilappar?",
+              "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Oto. güncelleme ve",
+              "line2" : "mobil uygul. kapat?",
+              "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "line1" : "是否禁用自动更新和",
+              "line2" : "移动应用程序？",
+              "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "停用自動更新",
+              "line2" : "和行動應用程式？",
+              "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
+            }
+          }
+        },
+        "DrivingCharacteristics" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Fahreigenschaften",
+              "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
+            },
+            "en-au" :
+            {
+              "label" : "Driving characteristics",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-gb" :
+            {
+              "label" : "Driving characteristics",
+              "textBody" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-ie" :
+            {
+              "label" : "Driving characteristics",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-us" :
+            {
+              "label" : "Driving Characteristics",
+              "textBody" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
+              "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
+            },
+            "es-en" :
+            {
+              "label" : "Características del manejo",
+              "textBody" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
+              "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
+            },
+            "es-es" :
+            {
+              "label" : "Características de conducción",
+              "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
+            },
+            "es-mx" :
+            {
+              "label" : "Características del manejo",
+              "textBody" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
+              "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
+            },
+            "fr-ca" :
+            {
+              "label" : "Caractéristiques de conduite",
+              "textBody" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
+              "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
+            },
+            "fr-fr" :
+            {
+              "label" : "Caractéristiques de conduite",
+              "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
+            },
+            "it-it" :
+            {
+              "label" : "Caratteristiche di guida",
+              "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
+            },
+            "nl-nl" :
+            {
+              "label" : "Rijkenmerken",
+              "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
+            },
+            "pl-pl" :
+            {
+              "label" : "Informacje dotyczące stylu jazdy",
+              "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
+            },
+            "pt-br" :
+            {
+              "label" : "Características de condução",
+              "line1" : "Caract. Condução",
+              "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
+            },
+            "pt-pt" :
+            {
+              "label" : "Características de condução",
+              "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
+            },
+            "ru-ru" :
+            {
+              "label" : "Характеристики движения",
+              "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
+            },
+            "sv-se" :
+            {
+              "label" : "Köregenskaper",
+              "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
+            },
+            "tr-tr" :
+            {
+              "label" : "Sürüş karakteristikleri",
+              "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
+            },
+            "zh-cn" :
+            {
+              "label" : "行驶特性",
+              "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
+            },
+            "zh-tw" :
+            {
+              "label" : "駕駛特性",
+              "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
+            }
+          }
+        },
+        "Location" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "GPS und Geschwindigkeit",
+              "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
+            },
+            "en-au" :
+            {
+              "label" : "GPS and speed",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-gb" :
+            {
+              "label" : "GPS and speed",
+              "textBody" : "An app can access vehicle GPS and speed.",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-ie" :
+            {
+              "label" : "GPS and speed",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-us" :
+            {
+              "label" : "GPS and Speed",
+              "textBody" : "An app can access vehicle GPS and speed.",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "es-en" :
+            {
+              "label" : "GPS y velocidad",
+              "textBody" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+              "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+            },
+            "es-es" :
+            {
+              "label" : "GPS y velocidad",
+              "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
+            },
+            "es-mx" :
+            {
+              "label" : "GPS y velocidad",
+              "textBody" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+              "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+            },
+            "fr-ca" :
+            {
+              "label" : "GPS et Vitesse",
+              "textBody" : "Une application peut accéder au GPS et à la vitesse du véhicule.",
+              "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
+            },
+            "fr-fr" :
+            {
+              "label" : "GPS et vitesse",
+              "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
+            },
+            "it-it" :
+            {
+              "label" : "GPS e velocità",
+              "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
+            },
+            "nl-nl" :
+            {
+              "label" : "Gps en snelheid",
+              "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
+            },
+            "pl-pl" :
+            {
+              "label" : "GPS i prędkość",
+              "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
+            },
+            "pt-br" :
+            {
+              "label" : "GPS e velocidade",
+              "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
+            },
+            "pt-pt" :
+            {
+              "label" : "GPS e velocidade",
+              "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
+            },
+            "ru-ru" :
+            {
+              "label" : "GPS и скорость",
+              "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
+            },
+            "sv-se" :
+            {
+              "label" : "GPS och hastighet",
+              "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
+            },
+            "tr-tr" :
+            {
+              "label" : "GPS ve hız",
+              "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
+            },
+            "zh-cn" :
+            {
+              "label" : "GPS 和车速",
+              "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
+            },
+            "zh-tw" :
+            {
+              "label" : "GPS和車速",
+              "tts" : "應用程式可存取車輛的GPS和速度。"
+            }
+          }
+        },
+        "Notifications" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Push-Benachrichtigungen",
+              "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
+            },
+            "en-au" :
+            {
+              "label" : "Push notifications",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-gb" :
+            {
+              "label" : "Push notifications",
+              "textBody" : "An app can send notifications when running in the background.",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-ie" :
+            {
+              "label" : "Push notifications",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-us" :
+            {
+              "label" : "Push Notifications",
+              "textBody" : "An app can send notifications when running in the background.",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "es-en" :
+            {
+              "label" : "Notificaciones tipo Push",
+              "textBody" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+              "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+            },
+            "es-es" :
+            {
+              "label" : "Notificaciones push",
+              "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
+            },
+            "es-mx" :
+            {
+              "label" : "Notificaciones tipo Push",
+              "textBody" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+              "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+            },
+            "fr-ca" :
+            {
+              "label" : "Notifications Instantanées",
+              "textBody" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
+              "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+            },
+            "fr-fr" :
+            {
+              "label" : "Notifications push",
+              "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+            },
+            "it-it" :
+            {
+              "label" : "Notifiche push",
+              "tts" : "Un'app può inviare notifiche se eseguita in background."
+            },
+            "nl-nl" :
+            {
+              "label" : "Push-meldingen",
+              "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
+            },
+            "pl-pl" :
+            {
+              "label" : "Powiadomienia Push",
+              "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
+            },
+            "pt-br" :
+            {
+              "label" : "Notificações Push",
+              "line1" : "Notificações",
+              "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
+            },
+            "pt-pt" :
+            {
+              "label" : "Notificações push",
+              "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
+            },
+            "ru-ru" :
+            {
+              "label" : "Оповещения о пересылке",
+              "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
+            },
+            "sv-se" :
+            {
+              "label" : "Push-notiser",
+              "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
+            },
+            "tr-tr" :
+            {
+              "label" : "Anlık bildirimleri",
+              "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
+            },
+            "zh-cn" :
+            {
+              "label" : "推送通知",
+              "tts" : "移动应用程序在后台运行时可推送通知。"
+            },
+            "zh-tw" :
+            {
+              "label" : "傳送通知",
+              "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
+            }
+          }
+        },
+        "SettingAppPermissions" :
+        {
+          "languages" :
+          {
+            "en-us" :
+            {
+              "textBody" : "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
+            }
+          }
+        },
+        "SettingDisableUpdates" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Updates deakt."
+            },
+            "en-au" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-gb" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-ie" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-us" :
+            {
+              "line1" : "Disable Updates",
+              "textBody" : "Disable Updates"
+            },
+            "es-en" :
+            {
+              "line1" : "Deshab. actual.",
+              "textBody" : "Deshab. actual."
+            },
+            "es-es" :
+            {
+              "line1" : "Desact. actual."
+            },
+            "es-mx" :
+            {
+              "line1" : "Deshab. actual.",
+              "textBody" : "Deshab. actual."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Désactiver MAJ",
+              "textBody" : "Désactiver MAJ"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Désactiver màj"
+            },
+            "it-it" :
+            {
+              "line1" : "Disabilita agg."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Upd. uitschak."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Wyłącz aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Desat. atualiz."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Desact. actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Откл. обновл."
+            },
+            "sv-se" :
+            {
+              "line1" : "Inaktivera uppd."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncell. Kapat"
+            },
+            "zh-cn" :
+            {
+              "line1" : "禁用更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "停用更新"
+            }
+          }
+        },
+        "SettingEnableUpdates" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Apps aktivieren"
+            },
+            "en-au" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-gb" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-ie" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-us" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "es-en" :
+            {
+              "line1" : "Hab. aplic."
+            },
+            "es-es" :
+            {
+              "line1" : "Activar apl."
+            },
+            "es-mx" :
+            {
+              "line1" : "Hab. aplic."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Activer app.",
+              "textBody" : "Activer app."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Activer app."
+            },
+            "it-it" :
+            {
+              "line1" : "Abilita app"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Apps inschak."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Włącz aplikacje"
+            },
+            "pt-br" :
+            {
+              "line1" : "Ativar aplic."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Activar actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Вкл. прилож."
+            },
+            "sv-se" :
+            {
+              "line1" : "Aktivera appar"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Uygulamaları aç"
+            },
+            "zh-cn" :
+            {
+              "line1" : "启用应用程序"
+            },
+            "zh-tw" :
+            {
+              "line1" : "啟用應用程式"
+            }
+          }
+        },
+        "SettingUpdateAuto" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Update anford."
+            },
+            "en-au" :
+            {
+              "line1" : "Request update"
+            },
+            "en-gb" :
+            {
+              "line1" : "Request update"
+            },
+            "en-ie" :
+            {
+              "line1" : "Request update"
+            },
+            "en-us" :
+            {
+              "line1" : "Request Update",
+              "textBody" : "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
+            },
+            "es-en" :
+            {
+              "line1" : "Solicit. actualiz.",
+              "textBody" : "Solicit. actualiz."
+            },
+            "es-es" :
+            {
+              "line1" : "Solicitar actual."
+            },
+            "es-mx" :
+            {
+              "line1" : "Solicit. actualiz.",
+              "textBody" : "Solicit. actualiz."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Demander MAJ",
+              "textBody" : "Demander MAJ"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Demander màj"
+            },
+            "it-it" :
+            {
+              "line1" : "Rich. aggiorn."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Upd. aanvragen"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Zażądaj aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Solicitar atualiz."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Solicit. actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Запрос на обн."
+            },
+            "sv-se" :
+            {
+              "line1" : "Begär uppdat."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncelleme iste"
+            },
+            "zh-cn" :
+            {
+              "line1" : "请求更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "請求更新"
+            }
+          }
+        },
+        "StatusNeeded" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Update benötigt"
+            },
+            "en-au" :
+            {
+              "line1" : "Update needed"
+            },
+            "en-gb" :
+            {
+              "line1" : "Update needed",
+              "textBody" : "Update needed"
+            },
+            "en-ie" :
+            {
+              "line1" : "Update needed"
+            },
+            "en-us" :
+            {
+              "line1" : "Update Needed",
+              "textBody" : "Update Needed"
+            },
+            "es-en" :
+            {
+              "line1" : "Actualiz. neces.",
+              "textBody" : "Actualiz. neces."
+            },
+            "es-es" :
+            {
+              "line1" : "Actu. necesaria"
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualiz. neces.",
+              "textBody" : "Actualiz. neces."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Màj requise",
+              "textBody" : "Màj requise"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Mise à jour requise"
+            },
+            "it-it" :
+            {
+              "line1" : "Necess. aggiorn."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Update nodig"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Potrzeba aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualiz. necess."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Actual. necess."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Необх. обновл."
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdat. krävs"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncellenmeli"
+            },
+            "zh-cn" :
+            {
+              "line1" : "需要进行更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "需更新"
+            }
+          }
+        },
+        "StatusPending" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Aktualisieren..."
+            },
+            "en-au" :
+            {
+              "line1" : "Updating..."
+            },
+            "en-gb" :
+            {
+              "line1" : "Updating...",
+              "textBody" : "Updating..."
+            },
+            "en-ie" :
+            {
+              "line1" : "Updating..."
+            },
+            "en-us" :
+            {
+              "line1" : "Updating...",
+              "textBody" : "Updating..."
+            },
+            "es-en" :
+            {
+              "line1" : "Actualizando...",
+              "textBody" : "Actualizando..."
+            },
+            "es-es" :
+            {
+              "line1" : "Actualizando..."
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualizando...",
+              "textBody" : "Actualizando..."
+            },
+            "fr-ca" :
+            {
+              "line1" : "MAJ en cours...",
+              "textBody" : "MAJ en cours..."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Màj en cours..."
+            },
+            "it-it" :
+            {
+              "line1" : "Aggiornamento"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Updaten..."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Aktualizowanie"
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualizando..."
+            },
+            "pt-pt" :
+            {
+              "line1" : "A actualizar..."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Обновление..."
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdaterar..."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncelleniyor..."
+            },
+            "zh-cn" :
+            {
+              "line1" : "正在更新......"
+            },
+            "zh-tw" :
+            {
+              "line1" : "更新中..."
+            }
+          }
+        },
+        "StatusUpToDate" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Aktuelle Version"
+            },
+            "en-au" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "en-gb" :
+            {
+              "line1" : "Up-to-date",
+              "textBody" : "Up-to-date"
+            },
+            "en-ie" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "en-us" :
+            {
+              "line1" : "Up-To-Date",
+              "textBody" : "Up-To-Date"
+            },
+            "es-en" :
+            {
+              "line1" : "Actualizado",
+              "textBody" : "Actualizado"
+            },
+            "es-es" :
+            {
+              "line1" : "Actualizada"
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualizado",
+              "textBody" : "Actualizado"
+            },
+            "fr-ca" :
+            {
+              "line1" : "Déjà à jour",
+              "textBody" : "Déjà à jour"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Déjà à jour"
+            },
+            "it-it" :
+            {
+              "line1" : "più recente"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Aktualne"
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualizado"
+            },
+            "pt-pt" :
+            {
+              "line1" : "Actualizado"
+            },
+            "ru-ru" :
+            {
+              "line1" : "Обновлено"
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdat. krävs ej"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncel"
+            },
+            "zh-cn" :
+            {
+              "line1" : "最新更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "更新最新"
+            }
+          }
+        },
+        "VehicleInfo" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Fahrzeuginformationen",
+              "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
+            },
+            "en-au" :
+            {
+              "label" : "Vehicle information",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
+            },
+            "en-gb" :
+            {
+              "label" : "Vehicle information",
+              "textBody" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
+            },
+            "en-ie" :
+            {
+              "label" : "Vehicle information",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
+            },
+            "en-us" :
+            {
+              "label" : "Vehicle Information",
+              "textBody" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
+              "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
+            },
+            "es-en" :
+            {
+              "label" : "Información del vehículo",
+              "textBody" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
+              "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
+            },
+            "es-es" :
+            {
+              "label" : "Información del vehículo",
+              "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
+            },
+            "es-mx" :
+            {
+              "label" : "Información del Vehículo",
+              "textBody" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
+              "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
+            },
+            "fr-ca" :
+            {
+              "label" : "Renseignements du Véhicule",
+              "textBody" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
+              "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
+            },
+            "fr-fr" :
+            {
+              "label" : "Renseignements du véhicule",
+              "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
+            },
+            "it-it" :
+            {
+              "label" : "Informazioni sul veicolo",
+              "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
+            },
+            "nl-nl" :
+            {
+              "label" : "Voertuiginformatie",
+              "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
+            },
+            "pl-pl" :
+            {
+              "label" : "Informacje o pojeździe",
+              "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
+            },
+            "pt-br" :
+            {
+              "label" : "Informações sobre o veículo",
+              "line1" : "Inform. Veículo",
+              "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
+            },
+            "pt-pt" :
+            {
+              "label" : "Informações do veículo",
+              "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
+            },
+            "ru-ru" :
+            {
+              "label" : "Информация об автомобиле",
+              "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
+            },
+            "sv-se" :
+            {
+              "label" : "Fordonsinformation",
+              "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
+            },
+            "tr-tr" :
+            {
+              "label" : "Araç bilgisi",
+              "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
+            },
+            "zh-cn" :
+            {
+              "label" : "车辆信息",
+              "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
+            },
+            "zh-tw" :
+            {
+              "label" : "車輛資訊",
+              "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
+            }
+          }
+        }
+      },
+      "version" : "001.001.023"
+    },
+    "functional_groupings" :
+    {
+      "BackgroundAPT" :
+      {
+        "rpcs" :
+        {
+          "EndAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          },
+          "OnAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          },
+          "PerformAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          }
+        }
+      },
+      "Base-4" :
+      {
+        "rpcs" :
+        {
+          "AddCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "AddSubMenu" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Alert" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "ChangeRegistration" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "CreateInteractionChoiceSet" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "DeleteInteractionChoiceSet" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteSubMenu" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "EncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "EndAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GenericResponse" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ListFiles" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAppInterfaceUnregistered" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnButtonEvent" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnButtonPress" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnDriverDistraction" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnEncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHMIStatus" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHashChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnLanguageChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnPermissionsChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnSystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "PerformAudioPassThru" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "PerformInteraction" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "PutFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "RegisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ResetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ScrollableMessage" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          },
+          "SetAppIcon" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetDisplayLayout" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetMediaClockTimer" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Show" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Slider" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          },
+          "Speak" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "SubscribeButton" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "SystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnregisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnsubscribeButton" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "BaseBeforeDataConsent" :
+      {
+        "rpcs" :
+        {
+          "ChangeRegistration" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "DeleteFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "EncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ListFiles" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAppInterfaceUnregistered" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnEncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHMIStatus" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHashChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnLanguageChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnPermissionsChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnSystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "PutFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "RegisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ResetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetAppIcon" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetDisplayLayout" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnregisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          }
+        }
+      },
+      "DataConsent-2" :
+      {
+        "rpcs" : null,
+        "user_consent_prompt" : "DataConsent"
+      },
+      "DiagnosticMessageOnly" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "DialNumberOnly" :
+      {
+        "rpcs" :
+        {
+          "DialNumber" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "DrivingCharacteristics-3" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          }
+        },
+        "user_consent_prompt" : "DrivingCharacteristics"
+      },
+      "Emergency-1" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          }
+        }
+      },
+      "Location-1" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          }
+        },
+        "user_consent_prompt" : "Location"
+      },
+      "Navigation-1" :
+      {
+        "rpcs" :
+        {
+          "AlertManeuver" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ShowConstantTBT" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "UpdateTurnList" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "Notifications" :
+      {
+        "rpcs" :
+        {
+          "Alert" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications"
+      },
+      "Notifications-45" :
+      {
+        "rpcs" :
+        {
+          "MWTAA" :
+          {
+            "hmi_levels" : [ "LIMITED" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications-45"
+      },
+      "Notifications-73" :
+      {
+        "rpcs" :
+        {
+          "STEHV" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications-73"
+      },
+      "OnKeyboardInputOnlyGroup" :
+      {
+        "rpcs" :
+        {
+          "OnKeyboardInput" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        }
+      },
+      "OnTouchEventOnlyGroup" :
+      {
+        "rpcs" :
+        {
+          "OnTouchEvent" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        }
+      },
+      "PropriataryData-1" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "PropriataryData-2" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "ProprietaryData-3" :
+      {
+        "rpcs" :
+        {
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "SendLocation" :
+      {
+        "rpcs" :
+        {
+          "SendLocation" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "SendLocationOnly" :
+      {
+        "rpcs" :
+        {
+          "SendLocation" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "VehicleInfo-3" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "vin",
+              "wiperStatus"
+            ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "vin",
+              "wiperStatus"
+            ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "wiperStatus"
+            ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "wiperStatus"
+            ]
+          }
+        },
+        "user_consent_prompt" : "VehicleInfo"
+      }
+    },
+    "module_config" :
+    {
+      "endpoints" :
+      {
+        "0x04" :
+        {
+          "default" : [ "http://x.x.x.x:3000/api/1/softwareUpdate" ]
+        },
+        "0x07" :
+        {
+          "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
+        }
+      },
+      "exchange_after_x_days" : 20,
+      "exchange_after_x_ignition_cycles" : 100,
+      "exchange_after_x_kilometers" : 1800,
+      "notifications_per_minute_by_priority" :
+      {
+        "COMMUNICATION" : 6,
+        "EMERGENCY" : 60,
+        "NAVIGATION" : 15,
+        "NONE" : 0,
+        "NORMAL" : 4,
+        "VOICECOM" : 20
+      },
+      "preloaded_date" : "2012-12-15",
+      "preloaded_pt" : true,
+      "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
+      "timeout_after_x_seconds" : 60
+    }
+  }
+}
diff --git a/src/components/policy/policy_regular/test/json/sdl_preloaded_pt_for_merge_latest.json b/src/components/policy/policy_regular/test/json/sdl_preloaded_pt_for_merge_latest.json
new file mode 100644
index 0000000000..3260558e70
--- /dev/null
+++ b/src/components/policy/policy_regular/test/json/sdl_preloaded_pt_for_merge_latest.json
@@ -0,0 +1,2433 @@
+
+{
+  "policy_table" :
+  {
+    "app_policies" :
+    {
+      "default" :
+      {
+        "default_hmi" : "NONE",
+        "groups" : [ "Base-4" ],
+        "keep_context" : false,
+        "priority" : "NONE",
+        "steal_focus" : false
+      },
+      "device" :
+      {
+        "default_hmi" : "NONE",
+        "groups" : [ "DataConsent-2" ],
+        "keep_context" : false,
+        "priority" : "NONE",
+        "steal_focus" : false
+      },
+      "pre_DataConsent" :
+      {
+        "default_hmi" : "BACKGROUND",
+        "groups" : [ "BaseBeforeDataConsent" ],
+        "keep_context" : false,
+        "priority" : "EMERGENCY",
+        "steal_focus" : false
+      }
+    },
+    "consumer_friendly_messages" :
+    {
+      "messages" :
+      {
+        "AppPermissions" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Zugriffsanfrage(n)",
+              "line2" : "erlauben?",
+              "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+            },
+            "en-au" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-gb" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "textBody" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu.",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-ie" :
+            {
+              "line1" : "Grant requested",
+              "line2" : "permission(s)?",
+              "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
+            },
+            "en-us" :
+            {
+              "line1" : "Grant Requested",
+              "line2" : "Permission(s)?",
+              "textBody" : "The %appName% App is requesting permission to use the following: %functionalGroupLabels%.\r\n\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. I agree and consent.",
+              "tts" : "%appName% is requesting permission to use the following: %functionalGroupLabels%.\r\nTo disable or change these settings at any time visit the SYNC mobile apps settings menu. See App terms of service and privacy policies. Ford is not responsible for App functionality. Avoid distractions and use voice controls where available. Please press yes to allow or no to deny."
+            },
+            "es-en" :
+            {
+              "line1" : "¿Otorgar permiso(s)",
+              "line2" : "solicitado(s)?",
+              "textBody" : "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior.",
+              "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
+            },
+            "es-es" :
+            {
+              "line1" : "¿Conceder permisos",
+              "line2" : "solicitados?",
+              "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
+            },
+            "es-mx" :
+            {
+              "line1" : "¿Otorgar permiso(s)",
+              "line2" : "solicitado(s)?",
+              "textBody" : "La App %appName% solicita permiso para usar: %functionalGroupLabels%. \r\n\r\nPara desactivar o cambiar la configuración, acceda al menú de SYNC® de configuración de apps. Consulte términos de servicio y políticas de privacidad de la App. Ford no es responsable de la funcionalidad de la App. Evite distracciones y use los controles de voz cuando estén disponibles. Estoy de acuerdo y acepto lo anterior.",
+              "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Accorder permission(s)",
+              "line2" : "demandée(s)",
+              "textBody" : "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\n\r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. J’accepte et je consens.",
+              "tts" : "L’application %appName% demande la permission d’utiliser : %functionalGroupLabels%. \r\nPour désactiver ou modifier ces réglages de données à tout moment, consultez le menu de réglages des applications mobiles SYNC. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application. Ford n’est pas responsable de la fonctionnalité de l’application. Évitez les distractions et utilisez les commandes vocales lorsqu’elles sont disponibles. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Accorder permission(s)",
+              "line2" : "demandée(s)",
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
+            },
+            "it-it" :
+            {
+              "line1" : "Concedi autorizzaz.",
+              "line2" : "richiesta(e)?",
+              "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Aangevraagde",
+              "line2" : "permissie(s) verlenen?",
+              "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Udzielić żądanych",
+              "line2" : "pozwoleń?",
+              "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
+            },
+            "pt-br" :
+            {
+              "line1" : "Conceder permissão",
+              "line2" : "solicitada?",
+              "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Conceder permiss.",
+              "line2" : "solicitada(s)?",
+              "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Предост. заправш.",
+              "line2" : "разрешения?",
+              "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
+            },
+            "sv-se" :
+            {
+              "line1" : "Vill du ge",
+              "line2" : "tillstånd?",
+              "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
+            },
+            "tr-tr" :
+            {
+              "line1" : "İstenen izinler",
+              "line2" : "verilsin mi?",
+              "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "line1" : "是否允许请求的",
+              "line2" : "权限？",
+              "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "允許",
+              "line2" : "授權請求?",
+              "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
+            }
+          }
+        },
+        "AppPermissionsHelp" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
+            },
+            "en-au" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-gb" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-ie" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
+            },
+            "en-us" :
+            {
+              "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
+            },
+            "es-en" :
+            {
+              "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+            },
+            "es-es" :
+            {
+              "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
+            },
+            "es-mx" :
+            {
+              "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
+            },
+            "fr-ca" :
+            {
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+            },
+            "fr-fr" :
+            {
+              "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
+            },
+            "it-it" :
+            {
+              "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
+            },
+            "nl-nl" :
+            {
+              "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
+            },
+            "pl-pl" :
+            {
+              "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
+            },
+            "pt-br" :
+            {
+              "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
+            },
+            "pt-pt" :
+            {
+              "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
+            },
+            "ru-ru" :
+            {
+              "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
+            },
+            "sv-se" :
+            {
+              "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
+            },
+            "tr-tr" :
+            {
+              "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
+            },
+            "zh-tw" :
+            {
+              "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
+            }
+          }
+        },
+        "AppPermissionsRevoked" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
+            },
+            "en-au" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-gb" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-ie" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "en-us" :
+            {
+              "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
+            },
+            "es-en" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+            },
+            "es-es" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
+            },
+            "es-mx" :
+            {
+              "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
+            },
+            "fr-ca" :
+            {
+              "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+            },
+            "fr-fr" :
+            {
+              "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
+            },
+            "it-it" :
+            {
+              "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
+            },
+            "nl-nl" :
+            {
+              "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
+            },
+            "pl-pl" :
+            {
+              "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
+            },
+            "pt-br" :
+            {
+              "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
+            },
+            "pt-pt" :
+            {
+              "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
+            },
+            "ru-ru" :
+            {
+              "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
+            },
+            "sv-se" :
+            {
+              "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
+            },
+            "tr-tr" :
+            {
+              "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
+            },
+            "zh-cn" :
+            {
+              "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
+            },
+            "zh-tw" :
+            {
+              "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
+            }
+          }
+        },
+        "AppUnauthorized" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "nicht autorisiert",
+              "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
+            },
+            "en-au" :
+            {
+              "line1" : "not authorized",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-gb" :
+            {
+              "line1" : "not authorized",
+              "textBody" : "This version of %appName% is not authorized and will not work with SYNC.",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-ie" :
+            {
+              "line1" : "not authorized",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "en-us" :
+            {
+              "line1" : "Not Authorized",
+              "textBody" : "This version of %appName% is no longer authorized to work with Mobile Apps. Please update to the latest version of %appName%.",
+              "tts" : "This version of %appName% is not authorized and will not work with SYNC."
+            },
+            "es-en" :
+            {
+              "line1" : "no autorizada",
+              "textBody" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+              "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+            },
+            "es-es" :
+            {
+              "line1" : "No autorizada",
+              "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
+            },
+            "es-mx" :
+            {
+              "line1" : "no autorizada",
+              "textBody" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
+              "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
+            },
+            "fr-ca" :
+            {
+              "line1" : "non autorisée",
+              "textBody" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
+              "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+            },
+            "fr-fr" :
+            {
+              "line1" : "non autorisée",
+              "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
+            },
+            "it-it" :
+            {
+              "line1" : "non autorizzata",
+              "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
+            },
+            "nl-nl" :
+            {
+              "line1" : "niet geautoriseerd",
+              "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
+            },
+            "pl-pl" :
+            {
+              "line1" : "brak autoryzacji",
+              "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
+            },
+            "pt-br" :
+            {
+              "line1" : "não autorizado",
+              "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
+            },
+            "pt-pt" :
+            {
+              "line1" : "não autorizada",
+              "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
+            },
+            "ru-ru" :
+            {
+              "line1" : "не авторизировано",
+              "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
+            },
+            "sv-se" :
+            {
+              "line1" : "är ej godkänd",
+              "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
+            },
+            "tr-tr" :
+            {
+              "line1" : "için izin yok",
+              "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
+            },
+            "zh-cn" :
+            {
+              "line1" : "未得到授权",
+              "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "無授權",
+              "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
+            }
+          }
+        },
+        "AppUnsupported" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "nicht unterstützt",
+              "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
+            },
+            "en-au" :
+            {
+              "line1" : "not supported",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-gb" :
+            {
+              "line1" : "not supported",
+              "textBody" : "This version of %appName% is not supported by SYNC.",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-ie" :
+            {
+              "line1" : "not supported",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "en-us" :
+            {
+              "line1" : "Not Supported",
+              "textBody" : "Your version of %appName% is not supported by SYNC.",
+              "tts" : "This version of %appName% is not supported by SYNC."
+            },
+            "es-en" :
+            {
+              "line1" : "no compatible",
+              "textBody" : "Esta versión de %appName% no es compatible con SYNC.",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "es-es" :
+            {
+              "line1" : "No compatible",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "es-mx" :
+            {
+              "line1" : "no compatible",
+              "textBody" : "Esta versión de %appName% no es compatible con SYNC.",
+              "tts" : "Esta versión de %appName% no es compatible con SYNC."
+            },
+            "fr-ca" :
+            {
+              "line1" : "incompatible",
+              "textBody" : "Cette version de %appName% n’est pas prise en charge par SYNC.",
+              "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
+            },
+            "fr-fr" :
+            {
+              "line1" : "incompatible",
+              "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
+            },
+            "it-it" :
+            {
+              "line1" : "non supportata",
+              "tts" : "Questa versione di %appName% non è supportata dal SYNC."
+            },
+            "nl-nl" :
+            {
+              "line1" : "niet ondersteund",
+              "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
+            },
+            "pl-pl" :
+            {
+              "line1" : "aplikacja nie obsług.",
+              "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
+            },
+            "pt-br" :
+            {
+              "line1" : "não suportado",
+              "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
+            },
+            "pt-pt" :
+            {
+              "line1" : "não suportada",
+              "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
+            },
+            "ru-ru" :
+            {
+              "line1" : "не поддерживается",
+              "tts" : "Эта версия %appName% не поддерживается SYNC."
+            },
+            "sv-se" :
+            {
+              "line1" : "stöds ej",
+              "tts" : "SYNC har inte stöd för den här versionen av %appName%."
+            },
+            "tr-tr" :
+            {
+              "line1" : "desteklenmiyor",
+              "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
+            },
+            "zh-cn" :
+            {
+              "line1" : "不受支持",
+              "tts" : "SYNC不支持此版本的%appName%。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "不支援",
+              "tts" : "SYNC 不支援此版本的%appName% 。"
+            }
+          }
+        },
+        "DataConsent" :
+        {
+          "languages" :
+          {
+            "en-gb" :
+            {
+              "textBody" : "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
+            },
+            "en-us" :
+            {
+              "line1" : "Enable Mobile Apps",
+              "line2" : "on SYNC? (Uses Data)",
+              "textBody" : "Would you like to enable Mobile Apps on SYNC?\r\n\r\nIf you enable the use of mobile apps from your mobile device on SYNC, you agree that SYNC can periodically use your device’s data plan to send and receive data that keeps your settings current and enables app functionality. Data sent to Ford U.S. includes your VIN and SYNC module number. Standard rates may apply.\r\n\r\nTo change settings or turn off later, visit the SYNC mobile apps settings menu. See Owner Guide for more information. I agree and consent."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Si permite el uso de apps de su móvil vía SYNC®, acepta que SYNC® puede utilizar el plan de datos de su equipo para enviar y recibir info para actualizar su configuración y permitir la funcionalidad de la app. Datos enviados a Ford US incluyen VIN y # de módulo de SYNC®. Cargos a su plan de datos pueden aplicar. \r\n\r\nPara cambiar la config. de SYNC® o apagarlo, acceda a Menú de configuración de apps. Vea la Guía del Propietario para más info. Estoy de acuerdo y acepto lo anterior."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Si vous activez les applications mobiles sur SYNC, vous acceptez que SYNC utilise votre forfait de données afin de maintenir vos réglages à jour et assurer la pleine fonctionnalité. Parmi les données envoyées à Ford US, notons le NIV et le numéro de module SYNC. Des frais de base peuvent s’appliquer. \r\n\r\nPour modifier les réglages ou désactiver les applications, consultez le menu des réglages des applications de SYNC. Voir le Manuel du propriétaire. J’accepte et je consens."
+            }
+          }
+        },
+        "DataConsentHelp" :
+        {
+          "languages" :
+          {
+            "en-us" :
+            {
+              "textBody" : "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
+            }
+          }
+        },
+        "DisableApps" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Auto-Update",
+              "line2" : "und Mobile Apps deaktivieren",
+              "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
+            },
+            "en-au" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-gb" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "textBody" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-ie" :
+            {
+              "line1" : "Disable auto-updates",
+              "line2" : "and Mobile Apps?",
+              "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
+            },
+            "en-us" :
+            {
+              "line1" : "Disable Auto-Updates",
+              "line2" : "and Mobile Apps?",
+              "textBody" : "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel.",
+              "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
+            },
+            "es-en" :
+            {
+              "line1" : "¿Deshab. actualiz.",
+              "line2" : "autom. y aplic. móv.?",
+              "textBody" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+              "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+            },
+            "es-es" :
+            {
+              "line1" : "¿Desact. actual. auto",
+              "line2" : "y apl. móviles?",
+              "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
+            },
+            "es-mx" :
+            {
+              "line1" : "¿Deshab. actualiz.",
+              "line2" : "autom. y aplic. móv.?",
+              "textBody" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
+              "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Désactiver màj autom.",
+              "line2" : "et app. mobiles?",
+              "textBody" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
+              "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Désactiver màj autom.",
+              "line2" : "et app. mobiles?",
+              "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
+            },
+            "it-it" :
+            {
+              "line1" : "Disabilitare agg. aut.",
+              "line2" : "e app mobili?",
+              "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Auto-updates en mob.",
+              "line2" : "apps uitschakelen?",
+              "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Wył. automat. aktual.",
+              "line2" : "i aplikacje mobilne?",
+              "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
+            },
+            "pt-br" :
+            {
+              "line1" : "Desativar atualizações",
+              "line2" : "autom. e aplicativos?",
+              "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Desact. actual. autom.",
+              "line2" : "e aplicações móveis?",
+              "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Откл. автообновления",
+              "line2" : "и мобил. прилож.?",
+              "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
+            },
+            "sv-se" :
+            {
+              "line1" : "Avaktiverar autouppdat.",
+              "line2" : "och mobilappar?",
+              "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Oto. güncelleme ve",
+              "line2" : "mobil uygul. kapat?",
+              "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
+            },
+            "zh-cn" :
+            {
+              "line1" : "是否禁用自动更新和",
+              "line2" : "移动应用程序？",
+              "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
+            },
+            "zh-tw" :
+            {
+              "line1" : "停用自動更新",
+              "line2" : "和行動應用程式？",
+              "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
+            }
+          }
+        },
+        "DrivingCharacteristics" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Fahreigenschaften",
+              "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
+            },
+            "en-au" :
+            {
+              "label" : "Driving characteristics",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-gb" :
+            {
+              "label" : "Driving characteristics",
+              "textBody" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-ie" :
+            {
+              "label" : "Driving characteristics",
+              "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
+            },
+            "en-us" :
+            {
+              "label" : "Driving Characteristics",
+              "textBody" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM.",
+              "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status, Gear Position, RPM."
+            },
+            "es-en" :
+            {
+              "label" : "Características del manejo",
+              "textBody" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
+              "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
+            },
+            "es-es" :
+            {
+              "label" : "Características de conducción",
+              "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
+            },
+            "es-mx" :
+            {
+              "label" : "Características del manejo",
+              "textBody" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio.",
+              "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad, RPM del motor, y Posición del cambio."
+            },
+            "fr-ca" :
+            {
+              "label" : "Caractéristiques de conduite",
+              "textBody" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage.",
+              "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité, régime du moteur, et Position d’embrayage."
+            },
+            "fr-fr" :
+            {
+              "label" : "Caractéristiques de conduite",
+              "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
+            },
+            "it-it" :
+            {
+              "label" : "Caratteristiche di guida",
+              "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
+            },
+            "nl-nl" :
+            {
+              "label" : "Rijkenmerken",
+              "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
+            },
+            "pl-pl" :
+            {
+              "label" : "Informacje dotyczące stylu jazdy",
+              "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
+            },
+            "pt-br" :
+            {
+              "label" : "Características de condução",
+              "line1" : "Caract. Condução",
+              "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
+            },
+            "pt-pt" :
+            {
+              "label" : "Características de condução",
+              "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
+            },
+            "ru-ru" :
+            {
+              "label" : "Характеристики движения",
+              "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
+            },
+            "sv-se" :
+            {
+              "label" : "Köregenskaper",
+              "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
+            },
+            "tr-tr" :
+            {
+              "label" : "Sürüş karakteristikleri",
+              "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
+            },
+            "zh-cn" :
+            {
+              "label" : "行驶特性",
+              "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
+            },
+            "zh-tw" :
+            {
+              "label" : "駕駛特性",
+              "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
+            }
+          }
+        },
+        "Location" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "GPS und Geschwindigkeit",
+              "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
+            },
+            "en-au" :
+            {
+              "label" : "GPS and speed",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-gb" :
+            {
+              "label" : "GPS and speed",
+              "textBody" : "An app can access vehicle GPS and speed.",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-ie" :
+            {
+              "label" : "GPS and speed",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "en-us" :
+            {
+              "label" : "GPS and Speed",
+              "textBody" : "An app can access vehicle GPS and speed.",
+              "tts" : "An app can access vehicle GPS and speed."
+            },
+            "es-en" :
+            {
+              "label" : "GPS y velocidad",
+              "textBody" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+              "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+            },
+            "es-es" :
+            {
+              "label" : "GPS y velocidad",
+              "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
+            },
+            "es-mx" :
+            {
+              "label" : "GPS y velocidad",
+              "textBody" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
+              "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
+            },
+            "fr-ca" :
+            {
+              "label" : "GPS et Vitesse",
+              "textBody" : "Une application peut accéder au GPS et à la vitesse du véhicule.",
+              "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
+            },
+            "fr-fr" :
+            {
+              "label" : "GPS et vitesse",
+              "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
+            },
+            "it-it" :
+            {
+              "label" : "GPS e velocità",
+              "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
+            },
+            "nl-nl" :
+            {
+              "label" : "Gps en snelheid",
+              "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
+            },
+            "pl-pl" :
+            {
+              "label" : "GPS i prędkość",
+              "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
+            },
+            "pt-br" :
+            {
+              "label" : "GPS e velocidade",
+              "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
+            },
+            "pt-pt" :
+            {
+              "label" : "GPS e velocidade",
+              "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
+            },
+            "ru-ru" :
+            {
+              "label" : "GPS и скорость",
+              "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
+            },
+            "sv-se" :
+            {
+              "label" : "GPS och hastighet",
+              "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
+            },
+            "tr-tr" :
+            {
+              "label" : "GPS ve hız",
+              "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
+            },
+            "zh-cn" :
+            {
+              "label" : "GPS 和车速",
+              "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
+            },
+            "zh-tw" :
+            {
+              "label" : "GPS和車速",
+              "tts" : "應用程式可存取車輛的GPS和速度。"
+            }
+          }
+        },
+        "Notifications" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Push-Benachrichtigungen",
+              "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
+            },
+            "en-au" :
+            {
+              "label" : "Push notifications",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-gb" :
+            {
+              "label" : "Push notifications",
+              "textBody" : "An app can send notifications when running in the background.",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-ie" :
+            {
+              "label" : "Push notifications",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "en-us" :
+            {
+              "label" : "Push Notifications",
+              "textBody" : "An app can send notifications when running in the background.",
+              "tts" : "An app can send notifications when running in the background."
+            },
+            "es-en" :
+            {
+              "label" : "Notificaciones tipo Push",
+              "textBody" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+              "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+            },
+            "es-es" :
+            {
+              "label" : "Notificaciones push",
+              "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
+            },
+            "es-mx" :
+            {
+              "label" : "Notificaciones tipo Push",
+              "textBody" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
+              "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
+            },
+            "fr-ca" :
+            {
+              "label" : "Notifications Instantanées",
+              "textBody" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
+              "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+            },
+            "fr-fr" :
+            {
+              "label" : "Notifications push",
+              "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
+            },
+            "it-it" :
+            {
+              "label" : "Notifiche push",
+              "tts" : "Un'app può inviare notifiche se eseguita in background."
+            },
+            "nl-nl" :
+            {
+              "label" : "Push-meldingen",
+              "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
+            },
+            "pl-pl" :
+            {
+              "label" : "Powiadomienia Push",
+              "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
+            },
+            "pt-br" :
+            {
+              "label" : "Notificações Push",
+              "line1" : "Notificações",
+              "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
+            },
+            "pt-pt" :
+            {
+              "label" : "Notificações push",
+              "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
+            },
+            "ru-ru" :
+            {
+              "label" : "Оповещения о пересылке",
+              "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
+            },
+            "sv-se" :
+            {
+              "label" : "Push-notiser",
+              "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
+            },
+            "tr-tr" :
+            {
+              "label" : "Anlık bildirimleri",
+              "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
+            },
+            "zh-cn" :
+            {
+              "label" : "推送通知",
+              "tts" : "移动应用程序在后台运行时可推送通知。"
+            },
+            "zh-tw" :
+            {
+              "label" : "傳送通知",
+              "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
+            }
+          }
+        },
+        "SettingAppPermissions" :
+        {
+          "languages" :
+          {
+            "en-us" :
+            {
+              "textBody" : "Change %AppName%’s functionality and use of data as described below. See App terms of service and privacy policies."
+            },
+            "es-mx" :
+            {
+              "textBody" : "Para cambiar la funcionalidad de %appName% y usar los datos como se describe más adelante. Consulte los términos de servicio y políticas de privacidad de la App."
+            },
+            "fr-ca" :
+            {
+              "textBody" : "Pour modifier la fonctionnalité de %appName% et l’usage des données comme décrit ci-dessous. Reportez-vous aux modalités de service et à la politique de confidentialité de l’application."
+            }
+          }
+        },
+        "SettingDisableUpdates" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Updates deakt."
+            },
+            "en-au" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-gb" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-ie" :
+            {
+              "line1" : "Disable updates"
+            },
+            "en-us" :
+            {
+              "line1" : "Disable Updates",
+              "textBody" : "Disable Updates"
+            },
+            "es-en" :
+            {
+              "line1" : "Deshab. actual.",
+              "textBody" : "Deshab. actual."
+            },
+            "es-es" :
+            {
+              "line1" : "Desact. actual."
+            },
+            "es-mx" :
+            {
+              "line1" : "Deshab. actual.",
+              "textBody" : "Deshab. actual."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Désactiver MAJ",
+              "textBody" : "Désactiver MAJ"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Désactiver màj"
+            },
+            "it-it" :
+            {
+              "line1" : "Disabilita agg."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Upd. uitschak."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Wyłącz aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Desat. atualiz."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Desact. actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Откл. обновл."
+            },
+            "sv-se" :
+            {
+              "line1" : "Inaktivera uppd."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncell. Kapat"
+            },
+            "zh-cn" :
+            {
+              "line1" : "禁用更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "停用更新"
+            }
+          }
+        },
+        "SettingEnableUpdates" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Apps aktivieren"
+            },
+            "en-au" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-gb" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-ie" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "en-us" :
+            {
+              "line1" : "Enable Apps"
+            },
+            "es-en" :
+            {
+              "line1" : "Hab. aplic."
+            },
+            "es-es" :
+            {
+              "line1" : "Activar apl."
+            },
+            "es-mx" :
+            {
+              "line1" : "Hab. aplic."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Activer app.",
+              "textBody" : "Activer app."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Activer app."
+            },
+            "it-it" :
+            {
+              "line1" : "Abilita app"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Apps inschak."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Włącz aplikacje"
+            },
+            "pt-br" :
+            {
+              "line1" : "Ativar aplic."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Activar actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Вкл. прилож."
+            },
+            "sv-se" :
+            {
+              "line1" : "Aktivera appar"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Uygulamaları aç"
+            },
+            "zh-cn" :
+            {
+              "line1" : "启用应用程序"
+            },
+            "zh-tw" :
+            {
+              "line1" : "啟用應用程式"
+            }
+          }
+        },
+        "SettingUpdateAuto" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Update anford."
+            },
+            "en-au" :
+            {
+              "line1" : "Request update"
+            },
+            "en-gb" :
+            {
+              "line1" : "Request update"
+            },
+            "en-ie" :
+            {
+              "line1" : "Request update"
+            },
+            "en-us" :
+            {
+              "line1" : "Request Update",
+              "textBody" : "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
+            },
+            "es-en" :
+            {
+              "line1" : "Solicit. actualiz.",
+              "textBody" : "Solicit. actualiz."
+            },
+            "es-es" :
+            {
+              "line1" : "Solicitar actual."
+            },
+            "es-mx" :
+            {
+              "line1" : "Solicit. actualiz.",
+              "textBody" : "Solicit. actualiz."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Demander MAJ",
+              "textBody" : "Demander MAJ"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Demander màj"
+            },
+            "it-it" :
+            {
+              "line1" : "Rich. aggiorn."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Upd. aanvragen"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Zażądaj aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Solicitar atualiz."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Solicit. actualiz."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Запрос на обн."
+            },
+            "sv-se" :
+            {
+              "line1" : "Begär uppdat."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncelleme iste"
+            },
+            "zh-cn" :
+            {
+              "line1" : "请求更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "請求更新"
+            }
+          }
+        },
+        "StatusNeeded" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Update benötigt"
+            },
+            "en-au" :
+            {
+              "line1" : "Update needed"
+            },
+            "en-gb" :
+            {
+              "line1" : "Update needed",
+              "textBody" : "Update needed"
+            },
+            "en-ie" :
+            {
+              "line1" : "Update needed"
+            },
+            "en-us" :
+            {
+              "line1" : "Update Needed",
+              "textBody" : "Update Needed"
+            },
+            "es-en" :
+            {
+              "line1" : "Actualiz. neces.",
+              "textBody" : "Actualiz. neces."
+            },
+            "es-es" :
+            {
+              "line1" : "Actu. necesaria"
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualiz. neces.",
+              "textBody" : "Actualiz. neces."
+            },
+            "fr-ca" :
+            {
+              "line1" : "Màj requise",
+              "textBody" : "Màj requise"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Mise à jour requise"
+            },
+            "it-it" :
+            {
+              "line1" : "Necess. aggiorn."
+            },
+            "nl-nl" :
+            {
+              "line1" : "Update nodig"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Potrzeba aktual."
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualiz. necess."
+            },
+            "pt-pt" :
+            {
+              "line1" : "Actual. necess."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Необх. обновл."
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdat. krävs"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncellenmeli"
+            },
+            "zh-cn" :
+            {
+              "line1" : "需要进行更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "需更新"
+            }
+          }
+        },
+        "StatusPending" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Aktualisieren..."
+            },
+            "en-au" :
+            {
+              "line1" : "Updating..."
+            },
+            "en-gb" :
+            {
+              "line1" : "Updating...",
+              "textBody" : "Updating..."
+            },
+            "en-ie" :
+            {
+              "line1" : "Updating..."
+            },
+            "en-us" :
+            {
+              "line1" : "Updating...",
+              "textBody" : "Updating..."
+            },
+            "es-en" :
+            {
+              "line1" : "Actualizando...",
+              "textBody" : "Actualizando..."
+            },
+            "es-es" :
+            {
+              "line1" : "Actualizando..."
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualizando...",
+              "textBody" : "Actualizando..."
+            },
+            "fr-ca" :
+            {
+              "line1" : "MAJ en cours...",
+              "textBody" : "MAJ en cours..."
+            },
+            "fr-fr" :
+            {
+              "line1" : "Màj en cours..."
+            },
+            "it-it" :
+            {
+              "line1" : "Aggiornamento"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Updaten..."
+            },
+            "pl-pl" :
+            {
+              "line1" : "Aktualizowanie"
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualizando..."
+            },
+            "pt-pt" :
+            {
+              "line1" : "A actualizar..."
+            },
+            "ru-ru" :
+            {
+              "line1" : "Обновление..."
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdaterar..."
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncelleniyor..."
+            },
+            "zh-cn" :
+            {
+              "line1" : "正在更新......"
+            },
+            "zh-tw" :
+            {
+              "line1" : "更新中..."
+            }
+          }
+        },
+        "StatusUpToDate" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "line1" : "Aktuelle Version"
+            },
+            "en-au" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "en-gb" :
+            {
+              "line1" : "Up-to-date",
+              "textBody" : "Up-to-date"
+            },
+            "en-ie" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "en-us" :
+            {
+              "line1" : "Up-To-Date",
+              "textBody" : "Up-To-Date"
+            },
+            "es-en" :
+            {
+              "line1" : "Actualizado",
+              "textBody" : "Actualizado"
+            },
+            "es-es" :
+            {
+              "line1" : "Actualizada"
+            },
+            "es-mx" :
+            {
+              "line1" : "Actualizado",
+              "textBody" : "Actualizado"
+            },
+            "fr-ca" :
+            {
+              "line1" : "Déjà à jour",
+              "textBody" : "Déjà à jour"
+            },
+            "fr-fr" :
+            {
+              "line1" : "Déjà à jour"
+            },
+            "it-it" :
+            {
+              "line1" : "più recente"
+            },
+            "nl-nl" :
+            {
+              "line1" : "Up-to-date"
+            },
+            "pl-pl" :
+            {
+              "line1" : "Aktualne"
+            },
+            "pt-br" :
+            {
+              "line1" : "Atualizado"
+            },
+            "pt-pt" :
+            {
+              "line1" : "Actualizado"
+            },
+            "ru-ru" :
+            {
+              "line1" : "Обновлено"
+            },
+            "sv-se" :
+            {
+              "line1" : "Uppdat. krävs ej"
+            },
+            "tr-tr" :
+            {
+              "line1" : "Güncel"
+            },
+            "zh-cn" :
+            {
+              "line1" : "最新更新"
+            },
+            "zh-tw" :
+            {
+              "line1" : "更新最新"
+            }
+          }
+        },
+        "VehicleInfo" :
+        {
+          "languages" :
+          {
+            "de-de" :
+            {
+              "label" : "Fahrzeuginformationen",
+              "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
+            },
+            "en-au" :
+            {
+              "label" : "Vehicle information",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
+            },
+            "en-gb" :
+            {
+              "label" : "Vehicle information",
+              "textBody" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
+            },
+            "en-ie" :
+            {
+              "label" : "Vehicle information",
+              "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
+            },
+            "en-us" :
+            {
+              "label" : "Vehicle Information",
+              "textBody" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure.",
+              "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Odometer, VIN, External Temperature, Tire Pressure."
+            },
+            "es-en" :
+            {
+              "label" : "Información del vehículo",
+              "textBody" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
+              "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
+            },
+            "es-es" :
+            {
+              "label" : "Información del vehículo",
+              "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
+            },
+            "es-mx" :
+            {
+              "label" : "Información del Vehículo",
+              "textBody" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos.",
+              "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Presión de los neumáticos."
+            },
+            "fr-ca" :
+            {
+              "label" : "Renseignements du Véhicule",
+              "textBody" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus.",
+              "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Odomètre, NIV, Température extérieure, et Pression des pneus."
+            },
+            "fr-fr" :
+            {
+              "label" : "Renseignements du véhicule",
+              "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
+            },
+            "it-it" :
+            {
+              "label" : "Informazioni sul veicolo",
+              "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
+            },
+            "nl-nl" :
+            {
+              "label" : "Voertuiginformatie",
+              "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
+            },
+            "pl-pl" :
+            {
+              "label" : "Informacje o pojeździe",
+              "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
+            },
+            "pt-br" :
+            {
+              "label" : "Informações sobre o veículo",
+              "line1" : "Inform. Veículo",
+              "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
+            },
+            "pt-pt" :
+            {
+              "label" : "Informações do veículo",
+              "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
+            },
+            "ru-ru" :
+            {
+              "label" : "Информация об автомобиле",
+              "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
+            },
+            "sv-se" :
+            {
+              "label" : "Fordonsinformation",
+              "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
+            },
+            "tr-tr" :
+            {
+              "label" : "Araç bilgisi",
+              "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
+            },
+            "zh-cn" :
+            {
+              "label" : "车辆信息",
+              "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
+            },
+            "zh-tw" :
+            {
+              "label" : "車輛資訊",
+              "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
+            }
+          }
+        }
+      },
+      "version" : "001.001.023"
+    },
+    "functional_groupings" :
+    {
+      "BackgroundAPT" :
+      {
+        "rpcs" :
+        {
+          "EndAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          },
+          "OnAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          },
+          "PerformAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          }
+        }
+      },
+      "Base-4" :
+      {
+        "rpcs" :
+        {
+          "AddCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "AddSubMenu" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Alert" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "ChangeRegistration" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "CreateInteractionChoiceSet" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "DeleteInteractionChoiceSet" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "DeleteSubMenu" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "EncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "EndAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GenericResponse" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ListFiles" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAppInterfaceUnregistered" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAudioPassThru" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnButtonEvent" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnButtonPress" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnCommand" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnDriverDistraction" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "OnEncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHMIStatus" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHashChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnLanguageChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnPermissionsChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnSystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "PerformAudioPassThru" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "PerformInteraction" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "PutFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "RegisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ResetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ScrollableMessage" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          },
+          "SetAppIcon" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetDisplayLayout" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetMediaClockTimer" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Show" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "Slider" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          },
+          "Speak" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          },
+          "SubscribeButton" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "SystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnregisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnsubscribeButton" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "BaseBeforeDataConsent" :
+      {
+        "rpcs" :
+        {
+          "ChangeRegistration" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "DeleteFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "EncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ListFiles" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnAppInterfaceUnregistered" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnEncodedSyncPData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHMIStatus" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnHashChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnLanguageChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnPermissionsChange" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "OnSystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "PutFile" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "RegisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "ResetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetAppIcon" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetDisplayLayout" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SetGlobalProperties" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "SystemRequest" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          },
+          "UnregisterAppInterface" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
+          }
+        }
+      },
+      "DataConsent-2" :
+      {
+        "rpcs" : null,
+        "user_consent_prompt" : "DataConsent"
+      },
+      "DiagnosticMessageOnly" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "DialNumberOnly" :
+      {
+        "rpcs" :
+        {
+          "DialNumber" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "DrivingCharacteristics-3" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "accPedalPosition",
+              "beltStatus",
+              "electronicParkBrakeStatus",
+              "driverBraking",
+              "myKey",
+              "prndl",
+              "rpm",
+              "steeringWheelAngle"
+            ]
+          }
+        },
+        "user_consent_prompt" : "DrivingCharacteristics"
+      },
+      "Emergency-1" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "airbagStatus", "clusterModeStatus", "eCallInfo", "emergencyEvent" ]
+          }
+        }
+      },
+      "Location-1" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" : [ "gps", "speed" ]
+          }
+        },
+        "user_consent_prompt" : "Location"
+      },
+      "Navigation-1" :
+      {
+        "rpcs" :
+        {
+          "AlertManeuver" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ShowConstantTBT" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "UpdateTurnList" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "Notifications" :
+      {
+        "rpcs" :
+        {
+          "Alert" :
+          {
+            "hmi_levels" : [ "BACKGROUND" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications"
+      },
+      "Notifications-45" :
+      {
+        "rpcs" :
+        {
+          "MWTAA" :
+          {
+            "hmi_levels" : [ "LIMITED" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications-45"
+      },
+      "Notifications-73" :
+      {
+        "rpcs" :
+        {
+          "STEHV" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        },
+        "user_consent_prompt" : "Notifications-73"
+      },
+      "OnKeyboardInputOnlyGroup" :
+      {
+        "rpcs" :
+        {
+          "OnKeyboardInput" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        }
+      },
+      "OnTouchEventOnlyGroup" :
+      {
+        "rpcs" :
+        {
+          "OnTouchEvent" :
+          {
+            "hmi_levels" : [ "FULL" ]
+          }
+        }
+      },
+      "PropriataryData-1" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "PropriataryData-2" :
+      {
+        "rpcs" :
+        {
+          "DiagnosticMessage" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "ProprietaryData-3" :
+      {
+        "rpcs" :
+        {
+          "GetDTCs" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          },
+          "ReadDID" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "SendLocation" :
+      {
+        "rpcs" :
+        {
+          "SendLocation" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "SendLocationOnly" :
+      {
+        "rpcs" :
+        {
+          "SendLocation" :
+          {
+            "hmi_levels" : [ "FULL", "LIMITED" ]
+          }
+        }
+      },
+      "VehicleInfo-3" :
+      {
+        "rpcs" :
+        {
+          "GetVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "vin",
+              "wiperStatus"
+            ]
+          },
+          "OnVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "vin",
+              "wiperStatus"
+            ]
+          },
+          "SubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "wiperStatus"
+            ]
+          },
+          "UnsubscribeVehicleData" :
+          {
+            "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
+            "parameters" :
+            [
+              "bodyInformation",
+              "deviceStatus",
+              "engineOilLife",
+              "engineTorque",
+              "externalTemperature",
+              "turnSignal",
+              "fuelLevel",
+              "fuelLevel_State",
+              "headLampStatus",
+              "instantFuelConsumption",
+              "fuelRange",
+              "cloudAppVehicleID",
+              "odometer",
+              "tirePressure",
+              "wiperStatus"
+            ]
+          }
+        },
+        "user_consent_prompt" : "VehicleInfo"
+      }
+    },
+    "module_config" :
+    {
+      "endpoints" :
+      {
+        "0x04" :
+        {
+          "default" : [ "http://x.x.x.x:3000/api/1/softwareUpdate" ]
+        },
+        "0x07" :
+        {
+          "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
+        }
+      },
+      "exchange_after_x_days" : 20,
+      "exchange_after_x_ignition_cycles" : 100,
+      "exchange_after_x_kilometers" : 1800,
+      "notifications_per_minute_by_priority" :
+      {
+        "COMMUNICATION" : 6,
+        "EMERGENCY" : 60,
+        "NAVIGATION" : 15,
+        "NONE" : 0,
+        "NORMAL" : 4,
+        "VOICECOM" : 20
+      },
+      "preloaded_date" : "2012-12-16",
+      "preloaded_pt" : true,
+      "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
+      "timeout_after_x_seconds" : 60
+    }
+  }
+}
diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
index 39ff0efa7e..1cd2ca305e 100644
--- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
+++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Ford Motor Company
+ * Copyright (c) 2020, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,1374 +30,565 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ctime>
 #include <fstream>
-#include <string>
-#include <vector>
+#include <utility>
 
 #include "gtest/gtest.h"
+
 #include "json/reader.h"
-#include "json/writer.h"
+#include "utils/date_time.h"
+#include "utils/file_system.h"
+#include "utils/gen_hash.h"
+#include "utils/jsoncpp_reader_wrapper.h"
+
+#include "policy/policy_manager_impl.h"
 
-#include "config_profile/profile.h"
+#include "policy/mock_access_remote.h"
 #include "policy/mock_cache_manager.h"
 #include "policy/mock_policy_listener.h"
 #include "policy/mock_policy_settings.h"
-#include "policy/mock_update_status_manager.h"
-#include "policy/policy_manager_impl.h"
-#include "policy/policy_table/enums.h"
-#include "policy/policy_table/types.h"
 
-#include "utils/date_time.h"
-#include "utils/file_system.h"
-#include "utils/macro.h"
+namespace test {
+namespace components {
+namespace policy_test {
 
-#include "policy/mock_access_remote.h"
-#include "utils/gen_hash.h"
+using namespace policy;
+using namespace rpc::policy_table_interface_base;
 
 using ::testing::_;
-using ::testing::AtLeast;
-using ::testing::DoAll;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
-using ::testing::SetArgReferee;
-
-using ::policy::PolicyManagerImpl;
-using ::policy::PolicyTable;
 
-namespace test {
-namespace components {
-namespace policy_test {
-namespace policy_table = rpc::policy_table_interface_base;
+typedef std::shared_ptr<policy_table::Table> PolicyTableSPtr;
 
-namespace custom_str = utils::custom_string;
+namespace {
+const std::string kSdlPreloadedPtJson = "json/sdl_preloaded_pt.json";
+const int kServiceTypeInt = 0;
+const std::string kDeviceNumber = "XXX123456789ZZZ";
+const std::string kAppStorageFolder = "app_storage_folder";
+const std::string kValidAppId = "1234";
+const std::string kInValidFilename = "invalid_filename.json";
+}  // namespace
 
-typedef std::multimap<std::string, policy_table::Rpcs&>
-    UserConsentPromptToRpcsConnections;
+class PolicyManagerImplTest : public ::testing::Test {
+ public:
+  PolicyManagerImplTest()
+      : policy_manager_(nullptr)
+      , cache_manager_(nullptr)
+      , access_remote_(nullptr) {}
 
-template <typename T>
-std::string NumberToString(T Number) {
-  std::ostringstream ss;
-  ss << Number;
-  return ss.str();
-}
+ protected:
+  std::shared_ptr<PolicyManagerImpl> policy_manager_;
+  NiceMock<MockCacheManagerInterface>* cache_manager_;
+  NiceMock<MockPolicyListener> listener_;
+  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
+  std::shared_ptr<NiceMock<access_remote_test::MockAccessRemote> >
+      access_remote_;
+
+  void SetUp() {
+    policy_manager_ = std::make_shared<PolicyManagerImpl>();
+    cache_manager_ = new NiceMock<MockCacheManagerInterface>();
+    policy_manager_->set_cache_manager(cache_manager_);
+    policy_manager_->set_listener(&listener_);
+    access_remote_ =
+        std::make_shared<NiceMock<access_remote_test::MockAccessRemote> >();
+    policy_manager_->set_access_remote(access_remote_);
 
-template <typename T>
-void SortAndCheckEquality(std::vector<T> first, std::vector<T> second) {
-  ASSERT_EQ(first.size(), second.size());
-  std::sort(first.begin(), first.end());
-  std::sort(second.begin(), second.end());
-  // Checks
-  for (uint32_t i = 0; i < first.size(); ++i) {
-    EXPECT_EQ(first[i], second[i]);
+    ON_CALL(policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
   }
-}
 
-struct StringsForUpdate {
-  std::string new_field_value_;
-  std::string new_field_name_;
-  std::string new_date_;
+  ::testing::AssertionResult IsValid(const policy_table::Table& table) {
+    if (table.is_valid()) {
+      return ::testing::AssertionSuccess();
+    } else {
+      ::rpc::ValidationReport report(" - table");
+      table.ReportErrors(&report);
+      return ::testing::AssertionFailure() << ::rpc::PrettyFormat(report);
+    }
+  }
 };
 
-char GenRandomString(const char* alphanum) {
-  const int stringLength = sizeof(alphanum) - 1;
-  return alphanum[rand() % stringLength];
+TEST_F(PolicyManagerImplTest, InitPT_NoAppStorageFolder_ReturnFalse) {
+  EXPECT_FALSE(policy_manager_->InitPT(kSdlPreloadedPtJson, &policy_settings_));
 }
 
-struct StringsForUpdate CreateNewRandomData(StringsForUpdate& str) {
-  // Generate random date
-  srand(time(NULL));
-  unsigned int day = 1 + rand() % 31;      // Day from 1 - 31
-  unsigned int month = 1 + rand() % 12;    // Month from 1 - 12
-  unsigned int year = 1985 + rand() % 31;  // Year from 1985 - 2015
-
-  // Convert date to string
-  str.new_date_ = NumberToString(year) + '-' + NumberToString(month) + '-' +
-                  NumberToString(day);
+TEST_F(PolicyManagerImplTest, InitPT_InitializationNotSuccessful_ReturnFalse) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  EXPECT_CALL(*cache_manager_, Init(kSdlPreloadedPtJson, &policy_settings_))
+      .WillOnce(Return(false));
+  EXPECT_FALSE(policy_manager_->InitPT(kSdlPreloadedPtJson, &policy_settings_));
+  file_system::RemoveDirectory(kAppStorageFolder, true);
+}
 
-  // Create new field
-  unsigned int number = 1 + rand() % 100;  // Number from 1 - 100
-  str.new_field_name_ += NumberToString(number);
+TEST_F(PolicyManagerImplTest, InitPT_InitializationIsSuccessful_ReturnTrue) {
+  file_system::CreateDirectory(kAppStorageFolder);
+  EXPECT_CALL(*cache_manager_, Init(kSdlPreloadedPtJson, &policy_settings_))
+      .WillOnce(Return(true));
+  EXPECT_TRUE(policy_manager_->InitPT(kSdlPreloadedPtJson, &policy_settings_));
+  file_system::RemoveDirectory(kAppStorageFolder, true);
+}
 
-  // Create new field random value
-  const char alphanum[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+TEST_F(PolicyManagerImplTest, ResetPT_NoRefreshRetrySequence_ReturnFalse) {
+  EXPECT_CALL(*cache_manager_, ResetCalculatedPermissions());
+  EXPECT_CALL(*cache_manager_, ResetPT(kSdlPreloadedPtJson))
+      .WillOnce(Return(false));
+  EXPECT_CALL(*cache_manager_, TimeoutResponse()).Times(0);
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_)).Times(0);
 
-  for (unsigned int i = 0; i < 5; ++i) {
-    str.new_field_value_ += GenRandomString(alphanum);
-  }
-  return str;
+  EXPECT_FALSE(policy_manager_->ResetPT(kSdlPreloadedPtJson));
 }
 
-policy_table::AppHmiTypes HmiTypes(const policy_table::AppHMIType hmi_type) {
-  policy_table::AppHmiTypes hmi_types;
-  hmi_types.push_back(hmi_type);
-  return hmi_types;
+TEST_F(PolicyManagerImplTest, ResetPT_ExecuteRefreshRetrySequence_ReturnTrue) {
+  EXPECT_CALL(*cache_manager_, ResetCalculatedPermissions());
+  EXPECT_CALL(*cache_manager_, ResetPT(kSdlPreloadedPtJson))
+      .WillOnce(Return(true));
+  EXPECT_CALL(*cache_manager_, TimeoutResponse());
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_));
+
+  EXPECT_TRUE(policy_manager_->ResetPT(kSdlPreloadedPtJson));
 }
 
-class PolicyManagerImplTest : public ::testing::Test {
- public:
-  PolicyManagerImplTest() : device_id("08-00-27-CE-76-FE") {}
+TEST_F(PolicyManagerImplTest,
+       AppNeedEncryption_EncryptionNotRequired_ReturnFalse) {
+  EncryptionRequired encryption_required;
+  *encryption_required = false;
+  EXPECT_CALL(*cache_manager_, GetAppEncryptionRequiredFlag(kValidAppId))
+      .WillOnce(Return(encryption_required));
 
- protected:
-  PolicyManagerImpl* manager;
-  MockCacheManagerInterface* cache_manager;
-  NiceMock<MockPolicyListener> listener;
-  const std::string device_id;
-  std::shared_ptr<access_remote_test::MockAccessRemote> access_remote;
-
-  void SetUp() OVERRIDE {
-    manager = new PolicyManagerImpl();
-    manager->set_listener(&listener);
-    cache_manager = new MockCacheManagerInterface();
-    manager->set_cache_manager(cache_manager);
-    access_remote = std::shared_ptr<access_remote_test::MockAccessRemote>();
-    manager->set_access_remote(access_remote);
-  }
+  EXPECT_FALSE(policy_manager_->AppNeedEncryption(kValidAppId));
+}
 
-  void TearDown() OVERRIDE {
-    delete manager;
-  }
+TEST_F(PolicyManagerImplTest,
+       AppNeedEncryption_EncryptionNotInitialized_ReturnTrue) {
+  EncryptionRequired encryption_required;
+  EXPECT_CALL(*cache_manager_, GetAppEncryptionRequiredFlag(kValidAppId))
+      .WillOnce(Return(encryption_required));
 
-  ::testing::AssertionResult IsValid(const policy_table::Table& table) {
-    if (table.is_valid()) {
-      return ::testing::AssertionSuccess();
-    } else {
-      ::rpc::ValidationReport report(" - table");
-      table.ReportErrors(&report);
-      return ::testing::AssertionFailure() << ::rpc::PrettyFormat(report);
-    }
-  }
-};
+  EXPECT_TRUE(policy_manager_->AppNeedEncryption(kValidAppId));
+}
 
-class PolicyManagerImplTest2 : public ::testing::Test {
- public:
-  PolicyManagerImplTest2()
-      : app_id1("123456789")
-      , app_id2("1010101010")
-      , dev_id1("XXX123456789ZZZ")
-      , dev_id2("08-00-27-CE-76-FE")
-      , PTU_request_types(Json::arrayValue) {}
+TEST_F(PolicyManagerImplTest,
+       FunctionGroupNeedEncryption_NoGroups_ReturnFalse) {
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupings(_));
+  const std::string absent_group("Base-6");
 
- protected:
-  PolicyManagerImpl* manager;
-  NiceMock<MockPolicyListener> listener;
-  std::vector<std::string> hmi_level;
-  std::vector<std::string> PT_request_types;
-  uint32_t PTU_request_types_size;
-  unsigned int index;
-  const std::string app_id1;
-  const std::string app_id2;
-  const std::string dev_id1;
-  const std::string dev_id2;
-  Json::Value PTU_request_types;
-  NiceMock<policy_handler_test::MockPolicySettings> policy_settings_;
-  const std::string kAppStorageFolder = "storage_PolicyManagerImplTest2";
+  EXPECT_FALSE(policy_manager_->FunctionGroupNeedEncryption(absent_group));
+}
 
-  void SetUp() OVERRIDE {
-    file_system::CreateDirectory(kAppStorageFolder);
-    file_system::DeleteFile("policy.sqlite");
+TEST_F(PolicyManagerImplTest,
+       CheckPermissions_AppNotRepresented_ReturnRpcAllowed) {
+  const std::string hmi_level = "NONE";
+  const std::string rpc = "OnHMIStatus";
+  const RPCParams params;
+  CheckPermissionResult result;
 
-    manager = new PolicyManagerImpl();
-    ON_CALL(policy_settings_, app_storage_folder())
-        .WillByDefault(ReturnRef(kAppStorageFolder));
-    ON_CALL(policy_settings_, use_full_app_id()).WillByDefault(Return(true));
-    manager->set_listener(&listener);
-    const char* levels[] = {"BACKGROUND", "FULL", "LIMITED", "NONE"};
-    hmi_level.assign(levels, levels + sizeof(levels) / sizeof(levels[0]));
-    srand(time(NULL));
-    index = rand() % 3;
-  }
+  EXPECT_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillOnce(Return(false));
 
-  std::vector<std::string> JsonToVectorString(
-      const Json::Value& PTU_request_types) {
-    std::vector<std::string> result;
-    for (uint32_t i = 0; i < PTU_request_types.size(); ++i) {
-      result.push_back(PTU_request_types[i].asString());
-    }
-    return result;
-  }
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
+}
 
-  const Json::Value GetPTU(std::string file_name) {
-    // Get PTU
-    std::ifstream ifile(file_name);
-    Json::Reader reader;
-    std::string json;
-    Json::Value root(Json::objectValue);
-    if (ifile.is_open() && reader.parse(ifile, root, true)) {
-      json = root.toStyledString();
-    }
-    ifile.close();
-    ::policy::BinaryMessage msg(json.begin(), json.end());
-    // Load Json to cache
-    EXPECT_TRUE(manager->LoadPT("file_pt_update.json", msg));
-    return root;
-  }
+TEST_F(PolicyManagerImplTest,
+       CheckPermissions_AppIsRemoteControlAndNotRevoked_ReturnkRpcDisallowed) {
+  const std::string hmi_level = "NONE";
+  const std::string rpc = "OnHMIStatus";
+  const RPCParams params;
+  CheckPermissionResult result;
+  Strings groups;
 
-  void CreateLocalPT(const std::string& file_name) {
-    file_system::remove_directory_content(kAppStorageFolder);
-    ON_CALL(policy_settings_, app_storage_folder())
-        .WillByDefault(ReturnRef(kAppStorageFolder));
-    ON_CALL(policy_settings_, use_full_app_id()).WillByDefault(Return(true));
-    ASSERT_TRUE(manager->InitPT(file_name, &policy_settings_));
-  }
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*access_remote_, IsAppRemoteControl(_)).WillByDefault(Return(true));
+  ON_CALL(*access_remote_, GetGroups(_)).WillByDefault(ReturnRef(groups));
 
-  void AddRTtoPT(const std::string& update_file_name,
-                 const std::string& section_name,
-                 const uint32_t rt_number,
-                 const uint32_t invalid_rt_number) {
-    // Arrange
-    CreateLocalPT("sdl_preloaded_pt.json");
-    // Get RequestTypes from section of preloaded_pt app_policies
-    PT_request_types = manager->GetAppRequestTypes(section_name);
-    EXPECT_EQ(rt_number, PT_request_types.size());
-    Json::Value root = GetPTU(update_file_name);
-    // Get Request Types from JSON (PTU)
-    PTU_request_types =
-        root["policy_table"]["app_policies"][section_name]["RequestType"];
-    PTU_request_types_size = PTU_request_types.size();
-    PT_request_types.clear();
-    // Get RequestTypes from section of PT app policies after update
-    PT_request_types = manager->GetAppRequestTypes(section_name);
-    // Check number of RT in PTU and PT now are equal
-    ASSERT_EQ(PTU_request_types_size - invalid_rt_number,
-              PT_request_types.size());
-  }
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
+}
 
-  void AddRTtoAppSectionPT(const std::string& update_file_name,
-                           const std::string& section_name,
-                           const uint32_t rt_number,
-                           const uint32_t invalid_rt_number) {
-    // Arrange
-    CreateLocalPT("sdl_preloaded_pt.json");
-    // Add app
-    manager->AddApplication(section_name, HmiTypes(policy_table::AHT_DEFAULT));
-    // Check app gets RequestTypes from pre_DataConsent of app_policies
-    // section
-    PT_request_types = manager->GetAppRequestTypes(section_name);
-    EXPECT_EQ(rt_number, PT_request_types.size());
-    EXPECT_CALL(listener, OnPendingPermissionChange(section_name)).Times(1);
-    Json::Value root = GetPTU(update_file_name);
-
-    // Get App Request Types from PTU
-    PTU_request_types =
-        root["policy_table"]["app_policies"][section_name]["RequestType"];
-    PTU_request_types_size = PTU_request_types.size();
-
-    PT_request_types.clear();
-    // Get RequestTypes from <app_id> section of app policies after PT update
-    PT_request_types = manager->GetAppRequestTypes(section_name);
-    // Check sizes of Request types of PT and PTU
-    ASSERT_EQ(PTU_request_types_size - invalid_rt_number,
-              PT_request_types.size());
-
-    ::policy::AppPermissions permissions =
-        manager->GetAppPermissionsChanges(section_name);
-    EXPECT_TRUE(permissions.requestTypeChanged);
-  }
+TEST_F(PolicyManagerImplTest,
+       CheckPermissions_NotRemoteControlAppIsRevoked_ReturnkRpcAllowed) {
+  const std::string hmi_level = "NONE";
+  const std::string rpc = "OnHMIStatus";
+  const RPCParams params;
+  CheckPermissionResult result;
+  Strings groups;
 
-  std::vector<policy_table::RequestType> PushRequestTypesToContainer(
-      const std::vector<std::string>& temp_result) {
-    policy_table::RequestType filtered_result;
-    std::vector<policy_table::RequestType> final_result;
-    for (uint32_t i = 0; i < temp_result.size(); ++i) {
-      if (policy_table::EnumFromJsonString(temp_result[i], &filtered_result)) {
-        final_result.push_back(filtered_result);
-      }
-    }
-    return final_result;
-  }
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetGroups(_)).WillByDefault(ReturnRef(groups));
+  ON_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId))
+      .WillByDefault(Return(true));
 
-  void CheckResultForValidRT() {
-    // Convert Json Array to std::vector<std::string>
-    const std::vector<std::string>& result =
-        JsonToVectorString(PTU_request_types);
-    // Checks
-    SortAndCheckEquality(PT_request_types, result);
-  }
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
 
-  void CheckResultForInvalidRT() {
-    // Convert Json Array to std::vector<std::string>
-    const std::vector<std::string>& temp_result =
-        JsonToVectorString(PTU_request_types);
-    std::vector<policy_table::RequestType> result1 =
-        PushRequestTypesToContainer(temp_result);
-    std::vector<policy_table::RequestType> result2 =
-        PushRequestTypesToContainer(PT_request_types);
-    // Checks
-    SortAndCheckEquality(result1, result2);
-  }
-  void FillMultimapFromFunctionalGroupings(
-      UserConsentPromptToRpcsConnections& input_multimap,
-      policy_table::FunctionalGroupings& fg_table) {
-    policy_table::FunctionalGroupings::iterator fg_itter = fg_table.begin();
-    const policy_table::FunctionalGroupings::iterator fg_itter_end =
-        fg_table.end();
-    for (; fg_itter != fg_itter_end; ++fg_itter) {
-      // RPCS getting
-      policy_table::Rpcs& rpcs_ref = fg_itter->second;
-      // User_consent_prompt getting
-      rpc::Optional<rpc::String<1, 255> >& optional_ref =
-          rpcs_ref.user_consent_prompt;
-      rpc::String<1, 255>& ucp_string = *optional_ref;
-      const std::string& ucp_std_string =
-          static_cast<const std::string&>(ucp_string);
-      // Multimap inserting
-      input_multimap.insert(std::pair<std::string, policy_table::Rpcs&>(
-          ucp_std_string, rpcs_ref));
-    }
-  }
+  EXPECT_EQ(kRpcAllowed, result.hmi_level_permitted);
+}
 
-  void GetFunctionalGroupingsFromManager(
-      policy_table::FunctionalGroupings& input_functional_groupings) {
-    // Get cache
-    ::policy::CacheManagerInterfaceSPtr cache = manager->GetCache();
-    // Get table_snapshot
-    std::shared_ptr<policy_table::Table> table = cache->GenerateSnapshot();
-    // Set functional groupings from policy table
-    input_functional_groupings = table->policy_table.functional_groupings;
-  }
+TEST_F(PolicyManagerImplTest,
+       CheckPermissions_NotRemoteControlAppIsRevoked_ReturnkRpcDisallowed) {
+  const std::string hmi_level = "FULL";
+  const std::string rpc = "OnHMIStatus";
+  const RPCParams params;
+  CheckPermissionResult result;
+  Strings groups;
 
-  void TearDown() OVERRIDE {
-    delete manager;
-    file_system::remove_directory_content(kAppStorageFolder);
-    file_system::RemoveDirectory(kAppStorageFolder, true);
-  }
-};
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_, GetGroups(_)).WillByDefault(ReturnRef(groups));
+  ON_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId))
+      .WillByDefault(Return(true));
+
+  policy_manager_->CheckPermissions(
+      kDeviceNumber, kValidAppId, hmi_level, rpc, params, result);
 
-Json::Value CreatePTforLoad() {
-  const std::string load_table(
-      "{"
-      "\"policy_table\": {"
-      "\"module_config\": {"
-      "\"preloaded_pt\": true,"
-      "\"exchange_after_x_ignition_cycles\": 10,"
-      "\"exchange_after_x_kilometers\": 100,"
-      "\"exchange_after_x_days\": 5,"
-      "\"timeout_after_x_seconds\": 500,"
-      "\"seconds_between_retries\": [10, 20, 30],"
-      "\"endpoints\": {"
-      "\"0x00\": {"
-      "\"default\": [\"http://ford.com/cloud/default\"]"
-      "}"
-      "},"
-      "\"notifications_per_minute_by_priority\": {"
-      "\"EMERGENCY\": 1,"
-      "\"NAVIGATION\": 2,"
-      "\"VOICECOM\": 3,"
-      "\"COMMUNICATION\": 4,"
-      "\"NORMAL\": 5,"
-      "\"NONE\": 6"
-      "},"
-      "\"vehicle_make\" : \"MakeT\","
-      "\"vehicle_model\" : \"ModelT\","
-      "\"vehicle_year\": \"2014\""
-      "},"
-      "\"app_policies\": {"
-      "\"default\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "},   "
-      "\"pre_DataConsent\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "},         "
-      "\"device\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "},"
-      "\"1234\": {"
-      "\"memory_kb\": 50,"
-      "\"heart_beat_timeout_ms\": 100,"
-      "\"groups\": [\"default\"],"
-      "\"keep_context\": true,"
-      "\"steal_focus\": true,"
-      "\"priority\": \"EMERGENCY\","
-      "\"default_hmi\": \"FULL\","
-      "\"certificate\": \"sign\""
-      "}"
-      "},"
-      "\"consumer_friendly_messages\": {"
-      "\"version\": \"1.2\""
-      "},"
-      "\"functional_groupings\": {"
-      "\"default\": {"
-      "\"rpcs\": {"
-      "\"Update\": {"
-      "\"hmi_levels\": [\"FULL\"],"
-      "\"parameters\" : [\"speed\"]"
-      "}"
-      "}"
-      "}"
-      "}"
-      "}"
-      "}");
-  Json::Value table(Json::objectValue);
-  Json::Reader reader;
-  EXPECT_TRUE(reader.parse(load_table, table));
-  return table;
+  EXPECT_EQ(kRpcDisallowed, result.hmi_level_permitted);
 }
 
-TEST_F(PolicyManagerImplTest, GetNotificationsNumber) {
-  const std::string priority = "EMERGENCY";
-  const uint32_t notif_number = 100u;
-  EXPECT_CALL(*cache_manager, GetNotificationsNumber(priority))
-      .WillOnce(Return(notif_number));
+TEST_F(
+    PolicyManagerImplTest,
+    GetPermissionsForApp_CannotGetPermissionsForRemoteDefaultApp_GetEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  ON_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*access_remote_, IsAppRemoteControl(_)).WillByDefault(Return(true));
+  EXPECT_CALL(*access_remote_,
+              GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillOnce(Return(false));
 
-  EXPECT_EQ(notif_number, manager->GetNotificationsNumber(priority));
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest2, GetNotificationsNumberAfterPTUpdate) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  Json::Value table = CreatePTforLoad();
-  manager->ForcePTExchange();
-  manager->SetSendOnUpdateSentOut(false);
-  manager->OnUpdateStarted();
-  policy_table::Table update(&table);
-  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
-  // Act
-  const std::string json = table.toStyledString();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  EXPECT_CALL(listener, OnUpdateStatusChanged(_));
-  EXPECT_TRUE(manager->LoadPT("file_pt_update.json", msg));
-
-  std::string priority = "EMERGENCY";
-  uint32_t notif_number = manager->GetNotificationsNumber(priority);
-  EXPECT_EQ(1u, notif_number);
-
-  priority = "NAVIGATION";
-  notif_number = manager->GetNotificationsNumber(priority);
-  EXPECT_EQ(2u, notif_number);
-
-  priority = "EMERGENCY";
-  notif_number = manager->GetNotificationsNumber(priority);
-  EXPECT_EQ(1u, notif_number);
-
-  priority = "VOICECOM";
-  notif_number = manager->GetNotificationsNumber(priority);
-  EXPECT_EQ(3u, notif_number);
-
-  priority = "NORMAL";
-  notif_number = manager->GetNotificationsNumber(priority);
-  EXPECT_EQ(5u, notif_number);
-
-  priority = "NONE";
-  notif_number = manager->GetNotificationsNumber(priority);
-  EXPECT_EQ(6u, notif_number);
+TEST_F(
+    PolicyManagerImplTest,
+    GetPermissionsForApp_CannotGetFunctionalGroupsNamesForNotRemotePredataApp_GetEmptyVector) {
+  std::vector<FunctionalGroupPermission> permissions;
+
+  ON_CALL(*cache_manager_, IsPredataPolicy(kValidAppId))
+      .WillByDefault(Return(true));
+  ON_CALL(*cache_manager_,
+          GetPermissionsForApp(kDeviceNumber, kPreDataConsentId, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillOnce(Return(false));
+
+  policy_manager_->GetPermissionsForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest2, IsAppRevoked_SetRevokedAppID_ExpectAppRevoked) {
-  CreateLocalPT("sdl_preloaded_pt.json");
-  // Arrange
-  std::ifstream ifile("sdl_preloaded_pt.json");
-  Json::Reader reader;
-  std::string json;
+TEST_F(PolicyManagerImplTest, LoadPT_InvalidPT_ReturnkWrongPtReceived) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
+
+  Json::CharReaderBuilder reader_builder;
   Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    root["policy_table"]["app_policies"][app_id1] = Json::nullValue;
-    json = root.toStyledString();
-  }
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"].removeMember("app_policies");
   ifile.close();
+  policy_table::Table update(&root);
+  update.SetPolicyTableType(policy_table::PT_UPDATE);
+
+  ASSERT_FALSE(IsValid(update));
 
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  ASSERT_TRUE(manager->LoadPT("file_pt_update.json", msg));
-  EXPECT_TRUE(manager->IsApplicationRevoked(app_id1));
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
+
+  EXPECT_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillOnce(Return(vehicle_items));
+  EXPECT_CALL(*cache_manager_, SaveUpdateRequired(false)).Times(0);
+  EXPECT_EQ(PolicyManager::PtProcessingResult::kWrongPtReceived,
+            policy_manager_->LoadPT(kInValidFilename, msg));
 }
 
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_SetRevokedAppID_ExpectRPCDisallowed) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  (manager->GetCache())->AddDevice(dev_id1, "Bluetooth");
-  (manager->GetCache())
-      ->SetDeviceData(dev_id1,
-                      "hardware IPX",
-                      "v.8.0.1",
-                      "Android",
-                      "4.4.2",
-                      "Life",
-                      2,
-                      "Bluetooth");
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id1))
-      .WillRepeatedly(Return(dev_id1));
-  manager->SetUserConsentForDevice(dev_id1, true);
-  // Add app from consented device. App will be assigned with default policies
-  manager->AddApplication(app_id1, HmiTypes(policy_table::AHT_DEFAULT));
-  // Check before action
-  policy_table::RpcParameters rpc_parameters;
-  rpc_parameters.hmi_levels.push_back(policy_table::HL_FULL);
-
-  policy_table::Rpc rpc;
-  rpc["Alert"] = rpc_parameters;
-
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-
-  manager->CheckPermissions(
-      dev_id1, app_id1, std::string("FULL"), "Alert", input_params, output);
-
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-  // Act
-  std::ifstream ifile("sdl_preloaded_pt.json");
-  Json::Reader reader;
-  std::string json;
+TEST_F(PolicyManagerImplTest,
+       LoadPT_SnapshotNotGenerated_ReturnkNewPtRequired) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
+
+  Json::CharReaderBuilder reader_builder;
   Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    root["policy_table"]["app_policies"][app_id1] = Json::nullValue;
-    json = root.toStyledString();
-  }
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
   ifile.close();
+  policy_table::Table update(&root);
+
+  update.SetPolicyTableType(policy_table::PT_UPDATE);
 
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  ASSERT_TRUE(manager->LoadPT("file_pt_update.json", msg));
+  ASSERT_TRUE(IsValid(update));
+
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
 
-  manager->CheckPermissions(
-      dev_id1, app_id1, std::string("FULL"), "Alert", input_params, output);
-  // Check RPC is disallowed
-  EXPECT_EQ(::policy::kRpcDisallowed, output.hmi_level_permitted);
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
+  EXPECT_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillOnce(Return(vehicle_items));
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(nullptr));
+  EXPECT_EQ(PolicyManager::PtProcessingResult::kNewPtRequired,
+            policy_manager_->LoadPT(kInValidFilename, msg));
 }
 
-TEST_F(PolicyManagerImplTest2,
-       CheckPermissions_SetAppIDwithPolicies_ExpectRPCAllowed) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->AddDevice(dev_id1, "Bluetooth");
-
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id1,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired("1234"))
-      .WillRepeatedly(Return(dev_id1));
-  manager->SetUserConsentForDevice(dev_id1, true);
-  // Add app from consented device. App will be assigned with default policies
-  manager->AddApplication("1234", HmiTypes(policy_table::AHT_MEDIA));
-  // Emulate PTU with new policies for app added above
-  std::ifstream ifile("sdl_preloaded_pt.json");
-  Json::Reader reader;
-  std::string json;
+TEST_F(PolicyManagerImplTest, LoadPT_UpdateNotApplied_ReturnkNewPtRequired) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
+
+  Json::CharReaderBuilder reader_builder;
   Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    // Add AppID with policies
-    root["policy_table"]["app_policies"]["1234"] =
-        Json::Value(Json::objectValue);
-    root["policy_table"]["app_policies"]["1234"]["memory_kb"] = Json::Value(50);
-    root["policy_table"]["app_policies"]["1234"]["heart_beat_timeout_ms"] =
-        Json::Value(100);
-    root["policy_table"]["app_policies"]["1234"]["AppHMIType"] =
-        Json::Value(Json::arrayValue);
-    root["policy_table"]["app_policies"]["1234"]["AppHMIType"][0] =
-        Json::Value("MEDIA");
-    root["policy_table"]["app_policies"]["1234"]["groups"] =
-        Json::Value(Json::arrayValue);
-    root["policy_table"]["app_policies"]["1234"]["groups"][0] =
-        Json::Value("Base-4");
-    root["policy_table"]["app_policies"]["1234"]["priority"] =
-        Json::Value("EMERGENCY");
-    root["policy_table"]["app_policies"]["1234"]["default_hmi"] =
-        Json::Value("FULL");
-    root["policy_table"]["app_policies"]["1234"]["keep_context"] =
-        Json::Value(true);
-    root["policy_table"]["app_policies"]["1234"]["steal_focus"] =
-        Json::Value(true);
-    root["policy_table"]["app_policies"]["1234"]["certificate"] =
-        Json::Value("sign");
-    json = root.toStyledString();
-  }
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
   ifile.close();
+  policy_table::Table update(&root);
 
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-  // Load Json to cache
-  EXPECT_TRUE(manager->LoadPT("file_pt_update.json", msg));
-
-  policy_table::RpcParameters rpc_parameters;
-  rpc_parameters.hmi_levels.push_back(policy_table::HL_FULL);
-
-  policy_table::Rpc rpc;
-  rpc["Alert"] = rpc_parameters;
-  ::policy::RPCParams input_params;
-  ::policy::CheckPermissionResult output;
-
-  (manager->GetCache())->AddDevice(dev_id1, "Bluetooth");
-  (manager->GetCache())
-      ->SetDeviceData(dev_id1,
-                      "hardware IPX",
-                      "v.8.0.1",
-                      "Android",
-                      "4.4.2",
-                      "Life",
-                      2,
-                      "Bluetooth");
-  manager->CheckPermissions(dev_id1,
-                            std::string("1234"),
-                            std::string("FULL"),
-                            "Alert",
-                            input_params,
-                            output);
-  // Check RPC is allowed
-  EXPECT_EQ(::policy::kRpcAllowed, output.hmi_level_permitted);
-  // Check list of parameters empty
-  ASSERT_TRUE(output.list_of_allowed_params.empty());
-}
+  update.SetPolicyTableType(policy_table::PT_UPDATE);
 
-TEST_F(PolicyManagerImplTest, IncrementGlobalCounter) {
-  // Assert
-  EXPECT_CALL(*cache_manager, Increment(usage_statistics::SYNC_REBOOTS));
-  manager->Increment(usage_statistics::SYNC_REBOOTS);
-}
+  ASSERT_TRUE(IsValid(update));
 
-TEST_F(PolicyManagerImplTest, IncrementAppCounter) {
-  // Assert
-  EXPECT_CALL(*cache_manager,
-              Increment("12345", usage_statistics::USER_SELECTIONS));
-  manager->Increment("12345", usage_statistics::USER_SELECTIONS);
-}
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
 
-TEST_F(PolicyManagerImplTest, SetAppInfo) {
-  // Assert
-  EXPECT_CALL(*cache_manager,
-              Set("12345", usage_statistics::LANGUAGE_GUI, "de-de"));
-  manager->Set("12345", usage_statistics::LANGUAGE_GUI, "de-de");
+  EXPECT_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillOnce(Return(vehicle_items));
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot())
+      .WillOnce(Return(std::make_shared<policy_table::Table>(update)));
+  EXPECT_CALL(*cache_manager_, ApplyUpdate(_)).WillOnce(Return(false));
+  EXPECT_EQ(PolicyManager::PtProcessingResult::kNewPtRequired,
+            policy_manager_->LoadPT(kInValidFilename, msg));
 }
+TEST_F(PolicyManagerImplTest, LoadPT_NoHMIAppTypes_ReturnkSuccess) {
+  std::vector<policy_table::VehicleDataItem> vehicle_items;
 
-TEST_F(PolicyManagerImplTest, AddAppStopwatch) {
-  // Assert
-  EXPECT_CALL(*cache_manager,
-              Add("12345", usage_statistics::SECONDS_HMI_FULL, 30));
-  manager->Add("12345", usage_statistics::SECONDS_HMI_FULL, 30);
-}
-
-TEST_F(PolicyManagerImplTest, ResetPT) {
-  EXPECT_CALL(*cache_manager, ResetPT("filename"))
-      .WillOnce(Return(true))
-      .WillOnce(Return(false));
-  EXPECT_CALL(*cache_manager, ResetCalculatedPermissions()).Times(AtLeast(1));
-  EXPECT_CALL(*cache_manager, TimeoutResponse());
-  EXPECT_CALL(*cache_manager, SecondsBetweenRetries(_));
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
 
-  EXPECT_TRUE(manager->ResetPT("filename"));
-  EXPECT_FALSE(manager->ResetPT("filename"));
-}
+  Json::CharReaderBuilder reader_builder;
+  Json::Value root(Json::objectValue);
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  ifile.close();
+  policy_table::Table update(&root);
 
-TEST_F(PolicyManagerImplTest, LoadPT_SetPT_PTIsLoaded) {
-  // Arrange
-  manager->ForcePTExchange();
-  manager->OnUpdateStarted();
-  Json::Value table = CreatePTforLoad();
-  policy_table::Table update(&table);
-  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
+  update.SetPolicyTableType(policy_table::PT_UPDATE);
 
-  // Assert
   ASSERT_TRUE(IsValid(update));
 
-  EXPECT_CALL(*cache_manager, GetHMIAppTypeAfterUpdate(_)).Times(AtLeast(1));
-
-  // Act
-  const std::string json = table.toStyledString();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-
-  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));
-  EXPECT_CALL(listener, GetAppName("1234"))
-      .WillOnce(Return(custom_str::CustomString("")));
-  EXPECT_CALL(listener, OnUpdateStatusChanged(_));
-  EXPECT_CALL(*cache_manager, SaveUpdateRequired(false));
-  EXPECT_CALL(*cache_manager, TimeoutResponse());
-  EXPECT_CALL(*cache_manager, SecondsBetweenRetries(_));
-
-  EXPECT_TRUE(manager->LoadPT("file_pt_update.json", msg));
+  std::string json = root.toStyledString();
+  BinaryMessage msg(json.begin(), json.end());
+
+  ON_CALL(*cache_manager_, GetVehicleDataItems())
+      .WillByDefault(Return(vehicle_items));
+  ON_CALL(*cache_manager_, GenerateSnapshot())
+      .WillByDefault(Return(std::make_shared<policy_table::Table>(update)));
+  ON_CALL(*cache_manager_, ApplyUpdate(_)).WillByDefault(Return(true));
+
+  EXPECT_EQ(PolicyManager::PtProcessingResult::kSuccess,
+            policy_manager_->LoadPT(kInValidFilename, msg));
 }
 
-TEST_F(PolicyManagerImplTest, LoadPT_SetInvalidUpdatePT_PTIsNotLoaded) {
-  // Arrange
-  Json::Value table(Json::objectValue);
-  manager->ForcePTExchange();
-  manager->OnUpdateStarted();
+TEST_F(PolicyManagerImplTest,
+       AddApplication_NewApplication_ReturnCallStatusChanges) {
+  AppHmiTypes hmi_types;
 
-  policy_table::Table update(&table);
-  update.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(false));
 
-  // Assert update is invalid
-  ASSERT_FALSE(IsValid(update));
+  EXPECT_CALL(*cache_manager_, IsPredataPolicy(kValidAppId)).Times(0);
 
-  // Act
-  std::string json = table.toStyledString();
-  ::policy::BinaryMessage msg(json.begin(), json.end());
-
-  // Assert
-  EXPECT_CALL(*cache_manager, GenerateSnapshot()).Times(0);
-  EXPECT_CALL(*cache_manager, ApplyUpdate(_)).Times(0);
-  EXPECT_CALL(listener, GetAppName(_)).Times(0);
-  EXPECT_CALL(listener, OnUpdateStatusChanged(_)).Times(1);
-  EXPECT_CALL(*cache_manager, SaveUpdateRequired(false)).Times(0);
-  EXPECT_CALL(*cache_manager, TimeoutResponse()).Times(0);
-  EXPECT_CALL(*cache_manager, SecondsBetweenRetries(_)).Times(0);
-  EXPECT_FALSE(manager->LoadPT("file_pt_update.json", msg));
+  policy_manager_->AddApplication(kDeviceNumber, kValidAppId, hmi_types);
 }
 
-TEST_F(PolicyManagerImplTest2,
-       KmsChanged_SetExceededKms_ExpectCorrectSchedule) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  ::policy::Counters counter = ::policy::Counters::KILOMETERS;
-  manager->PTUpdatedAt(counter, 50000);
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  // Set kms changed but not exceed limit
-  manager->KmsChanged(51500);
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  // Set kms changed and exceed limit
-  manager->KmsChanged(52500);
-  EXPECT_EQ("UPDATE_NEEDED", manager->GetPolicyTableStatus());
-}
+TEST_F(PolicyManagerImplTest,
+       AddApplication_ExistedApplication_ReturnCallNothing) {
+  AppHmiTypes hmi_types;
 
-TEST_F(
-    PolicyManagerImplTest2,
-    AddApplication_AddNewApplicationFromDeviceWithoutConsent_ExpectUpdateRequired) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  ::policy::StatusNotifier notifyer =
-      manager->AddApplication(app_id1, HmiTypes(policy_table::AHT_DEFAULT));
-  DCHECK(notifyer);
-  (*notifyer)();
-  EXPECT_EQ("UPDATE_NEEDED", manager->GetPolicyTableStatus());
-}
+  ON_CALL(*cache_manager_, IsApplicationRepresented(kValidAppId))
+      .WillByDefault(Return(true));
 
-TEST_F(
-    PolicyManagerImplTest2,
-    ReactOnUserDevConsentForApp_AddNewApplicationFromDeviceWithConsent_ExpectDefault) {
-  // Arrange
-  // RequestTypes for default & preDataConsent are different
-  CreateLocalPT("ptu_requestType.json");
-  manager->AddApplication(app_id1, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id1));
-  manager->ReactOnUserDevConsentForApp(app_id1, true);
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id1));
-  EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id1));
-}
+  EXPECT_CALL(*cache_manager_, IsPredataPolicy(kValidAppId))
+      .WillOnce(Return(true));
 
-TEST_F(
-    PolicyManagerImplTest2,
-    ReactOnUserDevConsentForApp_AddNewApplicationFromDeviceWithConsent_ExpectPreDataConsent) {
-  // Arrange
-  // RequestTypes for default & preDataConsent are the same
-  CreateLocalPT("ptu2_requestType.json");
-  manager->AddApplication(app_id1, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id1));
-  EXPECT_CALL(listener, OnPendingPermissionChange(app_id1)).Times(0);
-  manager->ReactOnUserDevConsentForApp(app_id1, true);
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id1));
-  EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id1));
+  policy_manager_->AddApplication(kDeviceNumber, kValidAppId, hmi_types);
 }
 
-TEST_F(
-    PolicyManagerImplTest2,
-    AddApplication_AddExistingApplicationFromDeviceWithoutConsent_ExpectNoUpdateRequired) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  GetPTU("valid_sdl_pt_update.json");
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  // Try to add existing app
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  // Check no update required
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-}
+TEST_F(PolicyManagerImplTest,
+       OnPTUFinished_PtuResultIskNewPtRequired_InvokeForcePTExchange) {
+  const std::string initial_pt_status = policy_manager_->GetPolicyTableStatus();
 
-TEST_F(PolicyManagerImplTest2, UpdateApplication_AppServices) {
-  std::string kServiceType = "MEDIA";
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  GetPTU("valid_sdl_pt_update.json");
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  // Try to add existing app
-  policy_table::AppServiceParameters app_service_parameters =
-      policy_table::AppServiceParameters();
-  manager->GetAppServiceParameters(app_id2, &app_service_parameters);
+  EXPECT_CALL(*cache_manager_, GenerateSnapshot()).WillOnce(Return(nullptr));
 
-  ASSERT_FALSE(app_service_parameters.find(kServiceType) ==
-               app_service_parameters.end());
+  policy_manager_->OnPTUFinished(
+      PolicyManager::PtProcessingResult::kNewPtRequired);
+  const std::string final_pt_status = policy_manager_->GetPolicyTableStatus();
+  EXPECT_NE(initial_pt_status, final_pt_status);
+}
 
-  auto service_names = *(app_service_parameters[kServiceType].service_names);
+TEST_F(
+    PolicyManagerImplTest,
+    OnPTUFinished_PtuResultIskWrongPtReceived_NoPTExchangeAndNoRefreshRetrySequence) {
+  const std::string initial_pt_status = policy_manager_->GetPolicyTableStatus();
 
-  ASSERT_TRUE(service_names.is_initialized());
-  ASSERT_EQ(service_names.size(), 2u);
-  EXPECT_EQ(static_cast<std::string>(service_names[0]), "SDL App");
-  EXPECT_EQ(static_cast<std::string>(service_names[1]), "SDL Music");
+  EXPECT_CALL(*cache_manager_, TimeoutResponse()).Times(0);
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_)).Times(0);
 
-  auto handled_rpcs = app_service_parameters[kServiceType].handled_rpcs;
+  policy_manager_->OnPTUFinished(
+      PolicyManager::PtProcessingResult::kWrongPtReceived);
+  const std::string final_pt_status = policy_manager_->GetPolicyTableStatus();
+  EXPECT_EQ(initial_pt_status, final_pt_status);
+}
 
-  ASSERT_TRUE(handled_rpcs.is_initialized());
-  EXPECT_EQ(handled_rpcs[0].function_id, 41);
+TEST_F(PolicyManagerImplTest,
+       OnPTUFinished_PtuResultIskSuccess_InvokeRefreshRetrySequence) {
+  const std::string initial_pt_status = policy_manager_->GetPolicyTableStatus();
 
-  // Check no update required
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-}
+  EXPECT_CALL(*cache_manager_, TimeoutResponse());
+  EXPECT_CALL(*cache_manager_, SecondsBetweenRetries(_));
 
-TEST_F(PolicyManagerImplTest2,
-       PTUpdatedAt_DaysNotExceedLimit_ExpectNoUpdateRequired) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  date_time::TimeDuration current_time = date_time::getCurrentTime();
-  const int kSecondsInDay = 60 * 60 * 24;
-  int days = date_time::getSecs(current_time) / kSecondsInDay;
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-
-  GetPTU("valid_sdl_pt_update.json");
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  ::policy::Counters counter = ::policy::Counters::DAYS_AFTER_EPOCH;
-  // Set PT was updated 10 days ago (limit is 30 days for now)
-  // So no limit exceeded
-  manager->PTUpdatedAt(counter, days - 10);
-  manager->OnAppRegisteredOnMobile(app_id2);
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
+  policy_manager_->OnPTUFinished(PolicyManager::PtProcessingResult::kSuccess);
+  const std::string final_pt_status = policy_manager_->GetPolicyTableStatus();
+  EXPECT_EQ(initial_pt_status, final_pt_status);
 }
 
-TEST_F(PolicyManagerImplTest2, ForcePTExchange_ExpectUpdateNeeded) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-  // Force OT Exchange
-  manager->ForcePTExchange();
-  // Check update required
-  EXPECT_EQ("UPDATE_NEEDED", manager->GetPolicyTableStatus());
-}
+TEST_F(PolicyManagerImplTest, RequestPTUpdate_SnapshotPtrIsNull_ReturnFalse) {
+  ON_CALL(*cache_manager_, GenerateSnapshot()).WillByDefault(Return(nullptr));
 
-TEST_F(PolicyManagerImplTest2, OnSystemReady) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  // Check
-  EXPECT_CALL(listener, OnSystemInfoUpdateRequired());
-  manager->OnSystemReady();
+  EXPECT_FALSE(
+      policy_manager_->RequestPTUpdate(PTUIterationType::DefaultIteration));
 }
 
-TEST_F(PolicyManagerImplTest2, ResetRetrySequence) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->ResetRetrySequence();
-  EXPECT_EQ("UPDATE_NEEDED", manager->GetPolicyTableStatus());
-  manager->SetSendOnUpdateSentOut(false);
-  manager->OnUpdateStarted();
-  EXPECT_EQ("UPDATING", manager->GetPolicyTableStatus());
-}
+TEST_F(PolicyManagerImplTest, RequestPTUpdate_PTIsValid_PTIsUpdated) {
+  std::ifstream ifile(kSdlPreloadedPtJson);
+  ASSERT_TRUE(ifile.good());
 
-TEST_F(PolicyManagerImplTest2, NextRetryTimeout_ExpectTimeoutsFromPT) {
-  // Arrange
-  std::ifstream ifile("sdl_preloaded_pt.json");
-  Json::Reader reader;
+  Json::CharReaderBuilder reader_builder;
   Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    Json::Value seconds_between_retries = Json::Value(Json::arrayValue);
-    seconds_between_retries =
-        root["policy_table"]["module_config"]["seconds_between_retries"];
-    CreateLocalPT("sdl_preloaded_pt.json");
-    // Check data
-    uint32_t timeout_after_x_seconds =
-        root["policy_table"]["module_config"]["timeout_after_x_seconds"]
-            .asInt() *
-        date_time::MILLISECONDS_IN_SECOND;
-    const uint32_t first_retry = timeout_after_x_seconds;
-    EXPECT_EQ(first_retry, manager->NextRetryTimeout());
-    uint32_t next_retry = first_retry + seconds_between_retries[0].asInt() *
-                                            date_time::MILLISECONDS_IN_SECOND;
-    EXPECT_EQ(next_retry, manager->NextRetryTimeout());
-    next_retry =
-        first_retry + next_retry +
-        seconds_between_retries[1].asInt() * date_time::MILLISECONDS_IN_SECOND;
-    EXPECT_EQ(next_retry, manager->NextRetryTimeout());
-    next_retry =
-        first_retry + next_retry +
-        seconds_between_retries[2].asInt() * date_time::MILLISECONDS_IN_SECOND;
-    EXPECT_EQ(next_retry, manager->NextRetryTimeout());
-    next_retry =
-        first_retry + next_retry +
-        seconds_between_retries[3].asInt() * date_time::MILLISECONDS_IN_SECOND;
-    EXPECT_EQ(next_retry, manager->NextRetryTimeout());
+  Json::parseFromStream(reader_builder, ifile, &root, nullptr);
+  root["policy_table"]["consumer_friendly_messages"].removeMember("messages");
+  ifile.close();
+  policy_table::Table update(&root);
+  auto snapshot = std::make_shared<policy_table::Table>();
+  snapshot->policy_table = update.policy_table;
+  if (update.policy_table.vehicle_data.is_initialized()) {
+    snapshot->policy_table.vehicle_data =
+        rpc::Optional<policy_table::VehicleData>();
+    snapshot->policy_table.vehicle_data->mark_initialized();
+    snapshot->policy_table.vehicle_data->schema_version =
+        update.policy_table.vehicle_data->schema_version;
   }
-}
 
-TEST_F(PolicyManagerImplTest2, TimeOutExchange) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  // Check value taken from PT
-  EXPECT_EQ(70000u, manager->TimeoutExchangeMSec());
-}
+  snapshot->SetPolicyTableType(policy_table::PT_SNAPSHOT);
+  ASSERT_TRUE(IsValid(*snapshot));
 
-TEST_F(PolicyManagerImplTest2, UpdatedPreloadedPT_ExpectLPT_IsUpdated) {
-  // Arrange necessary pre-conditions
-  StringsForUpdate new_data;
-  new_data.new_field_name_ = "Notifications-";
-  CreateNewRandomData(new_data);
-  // Create Initial LocalPT from preloadedPT
-  CreateLocalPT("sdl_preloaded_pt.json");
-  // Update preloadedPT
-  std::ifstream ifile("sdl_preloaded_pt.json");
-  Json::Reader reader;
-  Json::Value root(Json::objectValue);
+  ON_CALL(*cache_manager_, GenerateSnapshot()).WillByDefault(Return(snapshot));
+  EXPECT_CALL(listener_,
+              OnSnapshotCreated(_, PTUIterationType::DefaultIteration));
+  EXPECT_TRUE(
+      policy_manager_->RequestPTUpdate(PTUIterationType::DefaultIteration));
+}
 
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    root["policy_table"]["module_config"]["preloaded_date"] =
-        new_data.new_date_;
-    Json::Value val(Json::objectValue);
-    Json::Value val2(Json::arrayValue);
-    val2[0] = hmi_level[index];
-    val[new_data.new_field_value_]["hmi_levels"] = val2;
-    root["policy_table"]["functional_groupings"][new_data.new_field_name_]
-        ["rpcs"] = val;
-    root["policy_table"]["functional_groupings"][new_data.new_field_name_]
-        ["user_consent_prompt"] = new_data.new_field_name_;
-  }
-  ifile.close();
+TEST_F(
+    PolicyManagerImplTest,
+    SendNotificationOnPermissionsUpdated_AppIsRemoteControl_PermissionsUpdated) {
+  EXPECT_CALL(*access_remote_, IsAppRemoteControl(_))
+      .WillRepeatedly(Return(true));
+  EXPECT_CALL(listener_, OnPermissionsUpdated(kDeviceNumber, _, _));
 
-  Json::StyledStreamWriter writer;
-  std::ofstream ofile("sdl_preloaded_pt.json");
-  writer.write(ofile, root);
-  ofile.flush();
-  ofile.close();
-
-  //  Make PolicyManager to update LocalPT
-  EXPECT_TRUE(manager->InitPT("sdl_preloaded_pt.json", &policy_settings_));
-
-  // Arrange
-  ::policy::CacheManagerInterfaceSPtr cache = manager->GetCache();
-  std::shared_ptr<policy_table::Table> table = cache->GenerateSnapshot();
-  // Get FunctionalGroupings
-  policy_table::FunctionalGroupings& fc =
-      table->policy_table.functional_groupings;
-  // Get RPCs for new added field in functional_group
-  policy_table::Rpcs& rpcs = fc[new_data.new_field_name_];
-  // Get user consent prompt
-  const std::string& ucp = *(rpcs.user_consent_prompt);
-  // Get Rpcs
-  policy_table::Rpc& rpc = rpcs.rpcs;
-  // Get RPC's parameters
-  policy_table::RpcParameters& rpc_param = rpc[new_data.new_field_value_];
-
-  // Check preloaded date
-  EXPECT_EQ(static_cast<std::string>(
-                *(table->policy_table.module_config.preloaded_date)),
-            new_data.new_date_);
-  // Check if new field exists in Local PT
-  EXPECT_TRUE(fc.find(new_data.new_field_name_) != fc.end());
-  // Check if user_consent_propmp is correct
-  EXPECT_EQ(new_data.new_field_name_, ucp);
-  // Check if new RPC exists
-  EXPECT_TRUE(rpc.find(new_data.new_field_value_) != rpc.end());
-  // Check HMI level of new RPC
-  EXPECT_EQ(index, static_cast<uint32_t>(rpc_param.hmi_levels[0]));
-  // Check if new field matches field added to preloaded PT
-  EXPECT_EQ(std::string((*(fc.find(new_data.new_field_name_))).first),
-            new_data.new_field_name_);
+  policy_manager_->SendNotificationOnPermissionsUpdated(kDeviceNumber,
+                                                        kValidAppId);
 }
 
-TEST_F(PolicyManagerImplTest2, GetPolicyTableStatus_ExpectUpToDate) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  // Check
-  EXPECT_EQ("UP_TO_DATE", manager->GetPolicyTableStatus());
-}
+TEST_F(
+    PolicyManagerImplTest,
+    SendNotificationOnPermissionsUpdated_NotRemoteControlApp_PermissionsUpdated) {
+  const std::string default_hmi = "NONE";
+  EXPECT_CALL(listener_,
+              OnPermissionsUpdated(kDeviceNumber, _, _, default_hmi));
 
-TEST_F(PolicyManagerImplTest2,
-       RetrySequenceDelaysSeconds_Expect_CorrectValues) {
-  // Arrange
-  std::ifstream ifile("sdl_preloaded_pt.json");
-  Json::Reader reader;
-  Json::Value root(Json::objectValue);
-  if (ifile.is_open() && reader.parse(ifile, root, true)) {
-    Json::Value seconds_between_retries = Json::Value(Json::arrayValue);
-    seconds_between_retries =
-        root["policy_table"]["module_config"]["seconds_between_retries"];
-    uint32_t size = seconds_between_retries.size();
-    CreateLocalPT("sdl_preloaded_pt.json");
-    std::vector<int> delaySecs = manager->RetrySequenceDelaysSeconds();
-    // Check
-    ASSERT_EQ(size, delaySecs.size());
-    for (uint32_t i = 0; i < size; ++i) {
-      EXPECT_EQ(seconds_between_retries[i], delaySecs[i]);
-    }
-  }
+  policy_manager_->SendNotificationOnPermissionsUpdated(kDeviceNumber,
+                                                        kValidAppId);
 }
 
-TEST_F(PolicyManagerImplTest2,
-       OnExceededTimeout_GetPolicyTableStatus_ExpectUpdateNeeded) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->ForcePTExchange();
-  manager->OnExceededTimeout();
-  // Check
-  EXPECT_EQ("UPDATE_NEEDED", manager->GetPolicyTableStatus());
-}
+TEST_F(PolicyManagerImplTest,
+       GetUserConsentForApp_NoPermissionsForApp_NoConsent) {
+  std::vector<FunctionalGroupPermission> permissions;
 
-TEST_F(PolicyManagerImplTest2,
-       GetUserConsentForDevice_SetDeviceAllowed_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  ASSERT_TRUE((manager->GetCache())->AddDevice(dev_id2, "Bluetooth"));
-
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id2,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  manager->SetUserConsentForDevice(dev_id2, true);
-  ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-}
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(false));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_)).Times(0);
 
-TEST_F(PolicyManagerImplTest2,
-       DISABLED_GetDefaultHmi_SetDeviceAllowed_ExpectReceivedHmiCorrect) {
-  // Arrange
-  CreateLocalPT("ptu2_requestType.json");
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id2));
-  std::string default_hmi1;
-  manager->GetDefaultHmi(app_id2, &default_hmi1);
-  EXPECT_EQ("", default_hmi1);
-  ASSERT_TRUE((manager->GetCache())->AddDevice(dev_id2, "Bluetooth"));
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id2,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  manager->SetUserConsentForDevice(dev_id2, true);
-  ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2))
-      .WillRepeatedly(Return(dev_id2));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id2));
-  std::string default_hmi2;
-  manager->GetDefaultHmi(app_id2, &default_hmi2);
-  EXPECT_EQ("", default_hmi2);
+  policy_manager_->GetUserConsentForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest2,
-       GetDefaultPriority_SetDeviceAllowed_ExpectReceivedPriorityCorrect) {
-  // Arrange
-  CreateLocalPT("ptu2_requestType.json");
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id2));
-  std::string priority1;
-  EXPECT_TRUE(manager->GetPriority(app_id2, &priority1));
-  EXPECT_EQ("EMERGENCY", priority1);
-  ASSERT_TRUE((manager->GetCache())->AddDevice(dev_id2, "Bluetooth"));
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id2,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  manager->SetUserConsentForDevice(dev_id2, true);
-  ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2);
-  // Check
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2))
-      .WillRepeatedly(Return(dev_id2));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id2));
-  std::string priority2;
-  EXPECT_TRUE(manager->GetPriority(app_id2, &priority2));
-  EXPECT_EQ("EMERGENCY", priority2);
-}
+TEST_F(PolicyManagerImplTest,
+       GetUserConsentForApp_NoFunctionalGroupsNames_NoConsent) {
+  std::vector<FunctionalGroupPermission> permissions;
 
-TEST_F(PolicyManagerImplTest2, GetInitialAppData_ExpectReceivedConsentCorrect) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  ::policy::StringArray app_nicknames;
-  ::policy::StringArray app_hmi_types;
-  manager->GetInitialAppData(app_id2, &app_nicknames, &app_hmi_types);
-  // Expect Empty nicknames and AppHmiTypes
-  EXPECT_EQ(0u, app_nicknames.size());
-  EXPECT_EQ(0u, app_hmi_types.size());
-
-  Json::Value root = GetPTU("valid_sdl_pt_update.json");
-
-  Json::Value appHmiTypes = Json::Value(Json::arrayValue);
-  appHmiTypes = root["policy_table"]["app_policies"][app_id2]["AppHMIType"];
-  uint32_t appHmiType_size = appHmiTypes.size();
-
-  Json::Value appNicknames = Json::Value(Json::arrayValue);
-  appNicknames = root["policy_table"]["app_policies"][app_id2]["nicknames"];
-  uint32_t appNicknames_size = appNicknames.size();
-
-  ::policy::StringArray app_nicknames1;
-  ::policy::StringArray app_hmi_types1;
-  manager->GetInitialAppData(app_id2, &app_nicknames1, &app_hmi_types1);
-  uint32_t nick_names_size = app_nicknames1.size();
-  uint32_t app_hmi_types_size = app_hmi_types1.size();
-  ASSERT_EQ(appHmiType_size, app_hmi_types_size);
-  ASSERT_EQ(appNicknames_size, nick_names_size);
-  ASSERT_GT(nick_names_size, 0u);
-  ASSERT_GT(app_hmi_types_size, 0u);
-  // Check nicknames match
-  for (uint32_t i = 0; i < nick_names_size; ++i) {
-    EXPECT_EQ(app_nicknames1[i], appNicknames[i].asString());
-  }
-  // Check AppHmiTypes match
-  for (uint32_t i = 0; i < app_hmi_types_size; ++i) {
-    EXPECT_EQ(app_hmi_types1[i], appHmiTypes[i].asString());
-  }
-}
+  ON_CALL(*cache_manager_, GetPermissionsForApp(kDeviceNumber, kValidAppId, _))
+      .WillByDefault(Return(true));
+  EXPECT_CALL(*cache_manager_, GetFunctionalGroupNames(_))
+      .WillOnce(Return(false));
 
-TEST_F(
-    PolicyManagerImplTest2,
-    CanAppKeepContext_AddAppFromUnconsentedDevice_ExpectAppCannotKeepContext) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  // Check if app has preData policy
-  EXPECT_FALSE(manager->IsPredataPolicy(app_id2));
-  // Check keep context in preData policy
-  EXPECT_TRUE(manager->CanAppKeepContext(app_id2));
+  policy_manager_->GetUserConsentForApp(
+      kDeviceNumber, kValidAppId, permissions);
+  EXPECT_TRUE(permissions.empty());
 }
 
-TEST_F(PolicyManagerImplTest2,
-       CanAppKeepContext_AddAppFromConsentedDevice_ExpectAppCannotKeepContext) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  ASSERT_TRUE((manager->GetCache())->AddDevice(dev_id2, "Bluetooth"));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id2,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  manager->SetUserConsentForDevice(dev_id2, true);
-  ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2);
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2))
-      .WillRepeatedly(Return(dev_id2));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id2));
-  // Check keep context in default policy
-  EXPECT_TRUE(manager->CanAppKeepContext(app_id2));
+TEST_F(PolicyManagerImplTest,
+       GetInitialAppData_HandleNullPointers_ReturnFalse) {
+  EXPECT_FALSE(
+      policy_manager_->GetInitialAppData(kValidAppId, nullptr, nullptr));
 }
 
-TEST_F(PolicyManagerImplTest2,
-       CanAppKeepContext_SetPoliciesForAppUpdated_ExpectAppCanKeepContext) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  GetPTU("valid_sdl_pt_update.json");
-  // Check keep context in updated policies for app
-  EXPECT_TRUE(manager->CanAppKeepContext(app_id2));
-}
+TEST_F(PolicyManagerImplTest,
+       GetInitialAppData_HandleValidPointers_ReturnTrue) {
+  StringArray nicknames;
+  StringArray app_hmi_types;
+  ON_CALL(*cache_manager_,
+          GetInitialAppData(kValidAppId, nicknames, app_hmi_types))
+      .WillByDefault(Return(true));
 
-TEST_F(PolicyManagerImplTest2,
-       CanAppStealFocus_AddAppFromConsentedDevice_ExpectAppCannotStealFocus) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  ASSERT_TRUE((manager->GetCache())->AddDevice(dev_id2, "Bluetooth"));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id2,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-  manager->SetUserConsentForDevice(dev_id2, true);
-  ::policy::DeviceConsent consent = manager->GetUserConsentForDevice(dev_id2);
-  EXPECT_EQ(::policy::DeviceConsent::kDeviceAllowed, consent);
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2))
-      .WillRepeatedly(Return(dev_id2));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  EXPECT_TRUE((manager->GetCache())->IsDefaultPolicy(app_id2));
-  // Check keep context in default policy
-  EXPECT_TRUE(manager->CanAppStealFocus(app_id2));
+  EXPECT_TRUE(policy_manager_->GetInitialAppData(
+      kValidAppId, &nicknames, &app_hmi_types));
 }
 
-TEST_F(PolicyManagerImplTest2,
-       CanAppStealFocus_SetPoliciesForAppUpdated_ExpectAppCanStealFocus) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  GetPTU("valid_sdl_pt_update.json");
-  // Check keep context in updated policies for app
-  EXPECT_TRUE(manager->CanAppKeepContext(app_id2));
-}
+TEST_F(PolicyManagerImplTest,
+       GetAppPermissionsChanges_NoPermissionsChanges_GeneratePermissions) {
+  EXPECT_CALL(*cache_manager_, IsApplicationRevoked(kValidAppId));
+  EXPECT_CALL(*cache_manager_, GetPriority(kValidAppId, _));
 
-TEST_F(PolicyManagerImplTest2, GetCurrentDeviceId) {
-  // Arrange
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2)).Times(2);
-  EXPECT_EQ(custom_str::CustomString(""), manager->GetCurrentDeviceId(app_id2));
-  EXPECT_EQ("", manager->GetCurrentDeviceId(app_id2));
+  policy_manager_->GetAppPermissionsChanges(kDeviceNumber, kValidAppId);
 }
 
-TEST_F(PolicyManagerImplTest2,
-       GetVehicleInfo_SetVehicleInfo_ExpectReceivedInfoCorrect) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  GetPTU("valid_sdl_pt_update.json");
-  std::shared_ptr<policy_table::Table> pt = (manager->GetCache())->pt();
-  policy_table::ModuleConfig& module_config = pt->policy_table.module_config;
-  ::policy::VehicleInfo vehicle_info = manager->GetVehicleInfo();
-
-  EXPECT_EQ(static_cast<std::string>(*module_config.vehicle_make),
-            vehicle_info.vehicle_make);
-  EXPECT_EQ(static_cast<std::string>(*module_config.vehicle_model),
-            vehicle_info.vehicle_model);
-  EXPECT_EQ(static_cast<std::string>(*module_config.vehicle_year),
-            vehicle_info.vehicle_year);
-}
+TEST_F(PolicyManagerImplTest, GetHMITypes_AppIsDefaultPolicy_ReturnFalse) {
+  std::vector<int> app_types;
+  EXPECT_CALL(*cache_manager_, IsDefaultPolicy(kValidAppId))
+      .WillOnce(Return(true));
 
-TEST_F(
-    PolicyManagerImplTest2,
-    GetPermissionsForApp_SetUserConsentForApp_ExpectReceivedPermissionsCorrect) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-
-  ASSERT_TRUE((manager->GetCache())->AddDevice(dev_id2, "Bluetooth"));
-  ASSERT_TRUE((manager->GetCache())
-                  ->SetDeviceData(dev_id2,
-                                  "hardware IPX",
-                                  "v.8.0.1",
-                                  "Android",
-                                  "4.4.2",
-                                  "Life",
-                                  2,
-                                  "Bluetooth"));
-
-  ::policy::StringArray consented_groups;
-  ::policy::StringArray disallowed_groups;
-  consented_groups.push_back(std::string("Notifications"));
-  (manager->GetCache())
-      ->SetUserPermissionsForDevice(
-          dev_id2, consented_groups, disallowed_groups);
-  manager->SetUserConsentForDevice(dev_id2, true);
-  EXPECT_CALL(listener, OnCurrentDeviceIdUpdateRequired(app_id2))
-      .WillRepeatedly(Return(dev_id2));
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-
-  GetPTU("valid_sdl_pt_update.json");
-  ::policy::PermissionConsent perm_consent;
-  perm_consent.device_id = dev_id2;
-  perm_consent.policy_app_id = app_id2;
-  perm_consent.consent_source = "VR";
-
-  ::policy::FunctionalGroupPermission group1_perm;
-  group1_perm.group_alias = "Notifications";
-  group1_perm.group_name = "Notifications";
-  group1_perm.group_id = ::utils::Djb2HashFromString("Notifications");
-  group1_perm.state = ::policy::GroupConsent::kGroupAllowed;
-
-  std::vector< ::policy::FunctionalGroupPermission> groups_permissions;
-  groups_permissions.push_back(group1_perm);
-  perm_consent.group_permissions = groups_permissions;
-
-  manager->SetUserConsentForApp(perm_consent);
-  manager->SendNotificationOnPermissionsUpdated(app_id2);
-  std::vector< ::policy::FunctionalGroupPermission> actual_groups_permissions;
-  std::vector< ::policy::FunctionalGroupPermission>::iterator it;
-  manager->GetPermissionsForApp(dev_id2, app_id2, actual_groups_permissions);
-  uint32_t index = 0;
-  for (; index < actual_groups_permissions.size(); ++index) {
-    if (actual_groups_permissions[index].group_id == group1_perm.group_id) {
-      break;
-    }
-  }
-  // Check
-  EXPECT_EQ(group1_perm.group_alias,
-            actual_groups_permissions[index].group_alias);
-  EXPECT_EQ(group1_perm.group_name,
-            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);
+  EXPECT_FALSE(policy_manager_->GetHMITypes(kValidAppId, &app_types));
 }
 
-TEST_F(
-    PolicyManagerImplTest2,
-    HertBeatTimeout_AddApp_UpdateAppPolicies_ExpectReceivedHertBeatTimeoutCorrect) {
-  // Arrange
-  CreateLocalPT("sdl_preloaded_pt.json");
-  std::shared_ptr<policy_table::Table> pt = (manager->GetCache())->pt();
-  ::policy_table::PolicyTableType type1 =
-      ::policy_table::PolicyTableType::PT_PRELOADED;
-  pt->SetPolicyTableType(type1);
-  if (!pt->is_valid()) {
-    std::cout << "\nPolicy table is not valid."
-              << "\n";
-    rpc::ValidationReport report("policy_table");
-    pt->ReportErrors(&report);
-  }
-  // Add new app
-  manager->AddApplication(app_id2, HmiTypes(policy_table::AHT_DEFAULT));
-  uint32_t result = manager->HeartBeatTimeout(app_id2);
-  // By default hertbeat timeout is 0
-  EXPECT_EQ(0u, result);
-  Json::Value root = GetPTU("valid_sdl_pt_update.json");
-
-  ::policy_table::PolicyTableType type2 =
-      ::policy_table::PolicyTableType::PT_UPDATE;
-  pt->SetPolicyTableType(type2);
-  if (!pt->is_valid()) {
-    std::cout << "\nPolicy table is not valid."
-              << "\n";
-    rpc::ValidationReport report("policy_table");
-    pt->ReportErrors(&report);
-  }
+TEST_F(PolicyManagerImplTest, GetHMITypes_NoHmiTypes_ReturnFalse) {
+  std::vector<int> app_types;
+  EXPECT_CALL(*cache_manager_, GetHMITypes(kValidAppId))
+      .WillOnce(Return(nullptr));
+  EXPECT_FALSE(policy_manager_->GetHMITypes(kValidAppId, &app_types));
+}
 
-  Json::Value heart_beat_timeout = Json::Value(Json::uintValue);
-  heart_beat_timeout =
-      root["policy_table"]["app_policies"][app_id2]["heart_beat_timeout_ms"];
-  result = manager->HeartBeatTimeout(app_id2);
-  EXPECT_EQ(heart_beat_timeout.asUInt(), result);
+TEST_F(PolicyManagerImplTest, GetHMITypes_ValidHmiTypes_ReturnTrue) {
+  std::vector<int> app_types;
+  AppHMITypes hmi_types;
+  EXPECT_CALL(*cache_manager_, GetHMITypes(kValidAppId))
+      .WillOnce(Return(&hmi_types));
+  EXPECT_TRUE(policy_manager_->GetHMITypes(kValidAppId, &app_types));
 }
 
 }  // namespace policy_test
diff --git a/src/components/policy/policy_regular/test/ptu2_requestType.json b/src/components/policy/policy_regular/test/ptu2_requestType.json
deleted file mode 100644
index 9013971990..0000000000
--- a/src/components/policy/policy_regular/test/ptu2_requestType.json
+++ /dev/null
@@ -1,2635 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "preloaded_pt": true,
-      "preloaded_date": "2015-12-02",
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        },
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Base-6": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnTBTClientState": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.021",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. \n\nSi presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. \n\nLas actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. \n\nPresione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements.\r\n\r\nVeuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "EMERGENCY",
-        "default_hmi": "LIMITED",
-        "groups": [
-          "Base-4"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ],
-        "preconsented_groups": [
-          "BaseBeforeDataConsent"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "123454321": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "TRAFFIC_MESSAGE_CHANNEL",
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      }
-    }
-  }
-}
diff --git a/src/components/policy/policy_regular/test/ptu_requestType.json b/src/components/policy/policy_regular/test/ptu_requestType.json
deleted file mode 100644
index 892a77f970..0000000000
--- a/src/components/policy/policy_regular/test/ptu_requestType.json
+++ /dev/null
@@ -1,2630 +0,0 @@
-{
-  "policy_table": {
-    "module_config": {
-      "preloaded_pt": true,
-      "preloaded_date": "2015-12-02",
-      "exchange_after_x_ignition_cycles": 100,
-      "exchange_after_x_kilometers": 1800,
-      "exchange_after_x_days": 30,
-      "timeout_after_x_seconds": 60,
-      "seconds_between_retries": [
-        1,
-        5,
-        25,
-        125,
-        625
-      ],
-      "endpoints": {
-        "0x07": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/policies"
-          ]
-        },
-        "0x04": {
-          "default": [
-            "http://x.x.x.x:3000/api/1/softwareUpdate"
-          ]
-        }
-      },
-      "notifications_per_minute_by_priority": {
-        "EMERGENCY": 60,
-        "NAVIGATION": 15,
-        "VOICECOM": 20,
-        "COMMUNICATION": 6,
-        "NORMAL": 4,
-        "NONE": 0
-      }
-    },
-    "functional_groupings": {
-      "Base-4": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED",
-              "BACKGROUND"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Location-1": {
-        "user_consent_prompt": "Location",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "gps",
-              "speed"
-            ]
-          }
-        }
-      },
-      "Notifications": {
-        "user_consent_prompt": "Notifications",
-        "rpcs": {
-          "Alert": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      },
-      "DrivingCharacteristics-3": {
-        "user_consent_prompt": "DrivingCharacteristics",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "accPedalPosition",
-              "beltStatus",
-              "electronicParkBrakeStatus",
-              "driverBraking",
-              "myKey",
-              "prndl",
-              "rpm",
-              "steeringWheelAngle"
-            ]
-          }
-        }
-      },
-      "VehicleInfo-3": {
-        "user_consent_prompt": "VehicleInfo",
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "vin",
-              "wiperStatus"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "bodyInformation",
-              "deviceStatus",
-              "engineOilLife",
-              "engineTorque",
-              "externalTemperature",
-              "turnSignal",
-              "fuelLevel",
-              "fuelLevel_State",
-              "headLampStatus",
-              "instantFuelConsumption",
-              "fuelRange",
-              "cloudAppVehicleID",
-              "odometer",
-              "tirePressure",
-              "wiperStatus"
-            ]
-          }
-        }
-      },
-      "PropriataryData-1": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "PropriataryData-2": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "ProprietaryData-3": {
-        "rpcs": {
-          "GetDTCs": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ReadDID": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Emergency-1": {
-        "rpcs": {
-          "GetVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "OnVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "SubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          },
-          "UnsubscribeVehicleData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ],
-            "parameters": [
-              "airbagStatus",
-              "clusterModeStatus",
-              "eCallInfo",
-              "emergencyEvent"
-            ]
-          }
-        }
-      },
-      "Navigation-1": {
-        "rpcs": {
-          "AlertManeuver": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ShowConstantTBT": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "UpdateTurnList": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "Base-6": {
-        "rpcs": {
-          "AddCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "AddSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Alert": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "CreateInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteCommand": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteInteractionChoiceSet": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "DeleteSubMenu": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "GenericResponse": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonEvent": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnButtonPress": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnCommand": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnDriverDistraction": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnTBTClientState": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PerformInteraction": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "ScrollableMessage": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SetMediaClockTimer": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Show": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "Slider": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          },
-          "Speak": {
-            "hmi_levels": [
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          },
-          "SyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnsubscribeButton": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "OnKeyboardInputOnlyGroup": {
-        "rpcs": {
-          "OnKeyboardInput": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "OnTouchEventOnlyGroup": {
-        "rpcs": {
-          "OnTouchEvent": {
-            "hmi_levels": [
-              "FULL"
-            ]
-          }
-        }
-      },
-      "DiagnosticMessageOnly": {
-        "rpcs": {
-          "DiagnosticMessage": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "DataConsent-2": {
-        "user_consent_prompt": "DataConsent",
-        "rpcs": null
-      },
-      "BaseBeforeDataConsent": {
-        "rpcs": {
-          "ChangeRegistration": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "DeleteFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "EncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ListFiles": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnAppInterfaceUnregistered": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnEncodedSyncPData": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHashChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnHMIStatus": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnLanguageChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnPermissionsChange": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "OnSystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "PutFile": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "RegisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "ResetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetGlobalProperties": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetAppIcon": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SetDisplayLayout": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "SystemRequest": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          },
-          "UnregisterAppInterface": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED",
-              "NONE"
-            ]
-          }
-        }
-      },
-      "SendLocation": {
-        "rpcs": {
-          "SendLocation": {
-            "hmi_levels": [
-              "BACKGROUND",
-              "FULL",
-              "LIMITED"
-            ]
-          }
-        }
-      },
-      "BackgroundAPT": {
-        "rpcs": {
-          "EndAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "OnAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          },
-          "PerformAudioPassThru": {
-            "hmi_levels": [
-              "BACKGROUND"
-            ]
-          }
-        }
-      }
-    },
-    "consumer_friendly_messages": {
-      "version": "001.001.021",
-      "messages": {
-        "AppPermissions": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-              "line1": "Zugriffsanfrage(n)",
-              "line2": "erlauben?"
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-              "line1": "Grant requested",
-              "line2": "permission(s)?"
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-              "line1": "Grant Requested",
-              "line2": "Permission(s)?",
-              "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-            },
-            "es-en": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-              "line1": "¿Conceder permisos",
-              "line2": "solicitados?"
-            },
-            "es-mx": {
-              "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-              "line1": "¿Otorgar permiso(s)",
-              "line2": "solicitado(s)?",
-              "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. \n\nSi presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)",
-              "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-              "line1": "Accorder permission(s)",
-              "line2": "demandée(s)"
-            },
-            "it-it": {
-              "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-              "line1": "Concedi autorizzaz.",
-              "line2": "richiesta(e)?"
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-              "line1": "Aangevraagde",
-              "line2": "permissie(s) verlenen?"
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-              "line1": "Udzielić żądanych",
-              "line2": "pozwoleń?"
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-              "line1": "Conceder permissão",
-              "line2": "solicitada?"
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-              "line1": "Conceder permiss.",
-              "line2": "solicitada(s)?"
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-              "line1": "Предост. заправш.",
-              "line2": "разрешения?"
-            },
-            "sv-se": {
-              "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-              "line1": "Vill du ge",
-              "line2": "tillstånd?"
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-              "line1": "İstenen izinler",
-              "line2": "verilsin mi?"
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-              "line1": "是否允许请求的",
-              "line2": "权限？"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-              "line1": "允許",
-              "line2": "授權請求?"
-            }
-          }
-        },
-        "AppPermissionsHelp": {
-          "languages": {
-            "de-de": {
-              "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-            },
-            "en-au": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-gb": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-ie": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-            },
-            "en-us": {
-              "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-            },
-            "es-en": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "es-es": {
-              "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-            },
-            "es-mx": {
-              "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-            },
-            "fr-ca": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "fr-fr": {
-              "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-            },
-            "it-it": {
-              "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-            },
-            "nl-nl": {
-              "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-            },
-            "pl-pl": {
-              "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-            },
-            "pt-br": {
-              "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-            },
-            "pt-pt": {
-              "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-            },
-            "ru-ru": {
-              "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-            },
-            "sv-se": {
-              "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-            },
-            "tr-tr": {
-              "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-            },
-            "zh-cn": {
-              "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-            },
-            "zh-tw": {
-              "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-            }
-          }
-        },
-        "AppPermissionsRevoked": {
-          "languages": {
-            "de-de": {
-              "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-            },
-            "en-au": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-gb": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-ie": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "en-us": {
-              "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-            },
-            "es-en": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "es-es": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-            },
-            "es-mx": {
-              "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-            },
-            "fr-ca": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "fr-fr": {
-              "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-            },
-            "it-it": {
-              "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-            },
-            "nl-nl": {
-              "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-            },
-            "pl-pl": {
-              "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-            },
-            "pt-br": {
-              "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-            },
-            "pt-pt": {
-              "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-            },
-            "ru-ru": {
-              "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-            },
-            "sv-se": {
-              "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-            },
-            "tr-tr": {
-              "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-            },
-            "zh-cn": {
-              "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-            },
-            "zh-tw": {
-              "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-            }
-          }
-        },
-        "AppUnauthorized": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-              "line1": "nicht autorisiert"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized",
-              "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "not authorized"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-              "line1": "Not Authorized",
-              "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-              "line1": "No autorizada"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-              "line1": "no autorizada",
-              "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée",
-              "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-              "line1": "non autorisée"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-              "line1": "non autorizzata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-              "line1": "niet geautoriseerd"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-              "line1": "brak autoryzacji"
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-              "line1": "não autorizado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-              "line1": "não autorizada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-              "line1": "не авторизировано"
-            },
-            "sv-se": {
-              "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-              "line1": "är ej godkänd"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-              "line1": "için izin yok"
-            },
-            "zh-cn": {
-              "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-              "line1": "未得到授权"
-            },
-            "zh-tw": {
-              "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-              "line1": "無授權"
-            }
-          }
-        },
-        "AppUnsupported": {
-          "languages": {
-            "de-de": {
-              "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-              "line1": "nicht unterstützt"
-            },
-            "en-au": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-gb": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported",
-              "textBody": "This version of %appName% is not supported by SYNC."
-            },
-            "en-ie": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "not supported"
-            },
-            "en-us": {
-              "tts": "This version of %appName% is not supported by SYNC.",
-              "line1": "Not Supported",
-              "textBody": "Your version of %appName% is not supported by SYNC."
-            },
-            "es-en": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "es-es": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "No compatible"
-            },
-            "es-mx": {
-              "tts": "Esta versión de %appName% no es compatible con SYNC.",
-              "line1": "no compatible",
-              "textBody": "Esta versión de %appName% no es compatible con SYNC."
-            },
-            "fr-ca": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible",
-              "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-            },
-            "fr-fr": {
-              "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-              "line1": "incompatible"
-            },
-            "it-it": {
-              "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-              "line1": "non supportata"
-            },
-            "nl-nl": {
-              "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-              "line1": "niet ondersteund"
-            },
-            "pl-pl": {
-              "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-              "line1": "aplikacja nie obsług."
-            },
-            "pt-br": {
-              "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-              "line1": "não suportado"
-            },
-            "pt-pt": {
-              "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-              "line1": "não suportada"
-            },
-            "ru-ru": {
-              "tts": "Эта версия %appName% не поддерживается SYNC.",
-              "line1": "не поддерживается"
-            },
-            "sv-se": {
-              "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-              "line1": "stöds ej"
-            },
-            "tr-tr": {
-              "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-              "line1": "desteklenmiyor"
-            },
-            "zh-cn": {
-              "tts": "SYNC不支持此版本的%appName%。",
-              "line1": "不受支持"
-            },
-            "zh-tw": {
-              "tts": "SYNC 不支援此版本的%appName% 。",
-              "line1": "不支援"
-            }
-          }
-        },
-        "DataConsent": {
-          "languages": {
-            "en-gb": {
-              "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. \r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "en-us": {
-              "line1": "Enable Mobile Apps",
-              "line2": "on SYNC? (Uses Data)",
-              "textBody": "Would you like to enable Mobile Apps on SYNC?\r\n\r\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\r\n\r\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. \n\nLas actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. \n\nPresione Sí para permitir y No para denegar."
-            },
-            "fr-ca": {
-              "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements.\r\n\r\nVeuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-            }
-          }
-        },
-        "DataConsentHelp": {
-          "languages": {
-            "en-us": {
-              "textBody": "By enabling mobile apps, you consent to allowing SYNC to communicate with Ford at least once per month using your mobile device’s data plan. Disabling will stop all data usage, but you will not be able to use mobile apps on SYNC. See your Owner Guide for more information."
-            },
-            "es-mx": {
-              "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-            },
-            "fr-ca": {
-              "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-            }
-          }
-        },
-        "DisableApps": {
-          "languages": {
-            "de-de": {
-              "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-              "line1": "Auto-Update",
-              "line2": "und Mobile Apps deaktivieren"
-            },
-            "en-au": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-gb": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-            },
-            "en-ie": {
-              "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-              "line1": "Disable auto-updates",
-              "line2": "and Mobile Apps?"
-            },
-            "en-us": {
-              "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-              "line1": "Disable Auto-Updates",
-              "line2": "and Mobile Apps?",
-              "textBody": "If you disable, you will not be able to use any mobile apps with SYNC and your vehicle will stop receiving mobile app permission updates via your device`s data plan. Please press yes to disable mobile apps or no to cancel."
-            },
-            "es-en": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "es-es": {
-              "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-              "line1": "¿Desact. actual. auto",
-              "line2": "y apl. móviles?"
-            },
-            "es-mx": {
-              "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-              "line1": "¿Deshab. actualiz.",
-              "line2": "autom. y aplic. móv.?",
-              "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-            },
-            "fr-ca": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?",
-              "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-            },
-            "fr-fr": {
-              "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-              "line1": "Désactiver màj autom.",
-              "line2": "et app. mobiles?"
-            },
-            "it-it": {
-              "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-              "line1": "Disabilitare agg. aut.",
-              "line2": "e app mobili?"
-            },
-            "nl-nl": {
-              "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-              "line1": "Auto-updates en mob.",
-              "line2": "apps uitschakelen?"
-            },
-            "pl-pl": {
-              "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-              "line1": "Wył. automat. aktual.",
-              "line2": "i aplikacje mobilne?"
-            },
-            "pt-br": {
-              "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-              "line1": "Desativar atualizações",
-              "line2": "autom. e aplicativos?"
-            },
-            "pt-pt": {
-              "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-              "line1": "Desact. actual. autom.",
-              "line2": "e aplicações móveis?"
-            },
-            "ru-ru": {
-              "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-              "line1": "Откл. автообновления",
-              "line2": "и мобил. прилож.?"
-            },
-            "sv-se": {
-              "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-              "line1": "Avaktiverar autouppdat.",
-              "line2": "och mobilappar?"
-            },
-            "tr-tr": {
-              "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-              "line1": "Oto. güncelleme ve",
-              "line2": "mobil uygul. kapat?"
-            },
-            "zh-cn": {
-              "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-              "line1": "是否禁用自动更新和",
-              "line2": "移动应用程序？"
-            },
-            "zh-tw": {
-              "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-              "line1": "停用自動更新",
-              "line2": "和行動應用程式？"
-            }
-          }
-        },
-        "DrivingCharacteristics": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-              "label": "Fahreigenschaften"
-            },
-            "en-au": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-gb": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-            },
-            "en-ie": {
-              "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-              "label": "Driving characteristics"
-            },
-            "en-us": {
-              "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-              "label": "Driving Characteristics",
-              "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-              "label": "Características de conducción"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-              "label": "Características del manejo",
-              "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite",
-              "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-              "label": "Caractéristiques de conduite"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-              "label": "Caratteristiche di guida"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-              "label": "Rijkenmerken"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-              "label": "Informacje dotyczące stylu jazdy"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-              "label": "Características de condução"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-              "label": "Características de condução"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-              "label": "Характеристики движения"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-              "label": "Köregenskaper"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-              "label": "Sürüş karakteristikleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-              "label": "行驶特性"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-              "label": "駕駛特性"
-            }
-          }
-        },
-        "Location": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-              "label": "GPS und Geschwindigkeit"
-            },
-            "en-au": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-gb": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "en-ie": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed"
-            },
-            "en-us": {
-              "tts": "An app can access vehicle GPS and speed.",
-              "label": "GPS and speed",
-              "textBody": "An app can access vehicle GPS and speed."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-              "label": "GPS y velocidad"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-              "label": "GPS y velocidad",
-              "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse",
-              "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-              "label": "GPS et vitesse"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-              "label": "GPS e velocità"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-              "label": "Gps en snelheid"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-              "label": "GPS i prędkość"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-              "label": "GPS e velocidade"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-              "label": "GPS и скорость"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-              "label": "GPS och hastighet"
-            },
-            "tr-tr": {
-              "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-              "label": "GPS ve hız"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-              "label": "GPS 和车速"
-            },
-            "zh-tw": {
-              "tts": "應用程式可存取車輛的GPS和速度。",
-              "label": "GPS和車速"
-            }
-          }
-        },
-        "Notifications": {
-          "languages": {
-            "de-de": {
-              "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-              "label": "Push-Benachrichtigungen"
-            },
-            "en-au": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-gb": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "en-ie": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications"
-            },
-            "en-us": {
-              "tts": "An app can send notifications when running in the background.",
-              "label": "Push notifications",
-              "textBody": "An app can send notifications when running in the background."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-              "label": "Notificaciones push"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-              "label": "Notificaciones tipo Push",
-              "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-            },
-            "fr-ca": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications instantanées",
-              "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-            },
-            "fr-fr": {
-              "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-              "label": "Notifications push"
-            },
-            "it-it": {
-              "tts": "Un'app può inviare notifiche se eseguita in background.",
-              "label": "Notifiche push"
-            },
-            "nl-nl": {
-              "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-              "label": "Push-meldingen"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-              "label": "Powiadomienia Push"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-              "label": "Notificações Push"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-              "label": "Notificações push"
-            },
-            "ru-ru": {
-              "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-              "label": "Оповещения о пересылке"
-            },
-            "sv-se": {
-              "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-              "label": "Push-notiser"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-              "label": "Anlık bildirimleri"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序在后台运行时可推送通知。",
-              "label": "推送通知"
-            },
-            "zh-tw": {
-              "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-              "label": "傳送通知"
-            }
-          }
-        },
-        "SettingDisableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Updates deakt."
-            },
-            "en-au": {
-              "line1": "Disable updates"
-            },
-            "en-gb": {
-              "line1": "Disable updates"
-            },
-            "en-ie": {
-              "line1": "Disable updates"
-            },
-            "en-us": {
-              "line1": "Disable Updates",
-              "textBody": "Disable Updates"
-            },
-            "es-en": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "es-es": {
-              "line1": "Desact. actual."
-            },
-            "es-mx": {
-              "line1": "Deshab. actual.",
-              "textBody": "Deshab. actual."
-            },
-            "fr-ca": {
-              "line1": "Désactiver MAJ",
-              "textBody": "Désactiver MAJ"
-            },
-            "fr-fr": {
-              "line1": "Désactiver màj"
-            },
-            "it-it": {
-              "line1": "Disabilita agg."
-            },
-            "nl-nl": {
-              "line1": "Upd. uitschak."
-            },
-            "pl-pl": {
-              "line1": "Wyłącz aktual."
-            },
-            "pt-br": {
-              "line1": "Desat. atualiz."
-            },
-            "pt-pt": {
-              "line1": "Desact. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Откл. обновл."
-            },
-            "sv-se": {
-              "line1": "Inaktivera uppd."
-            },
-            "tr-tr": {
-              "line1": "Güncell. Kapat"
-            },
-            "zh-cn": {
-              "line1": "禁用更新"
-            },
-            "zh-tw": {
-              "line1": "停用更新"
-            }
-          }
-        },
-        "SettingEnableUpdates": {
-          "languages": {
-            "de-de": {
-              "line1": "Apps aktivieren"
-            },
-            "en-au": {
-              "line1": "Enable Apps"
-            },
-            "en-gb": {
-              "line1": "Enable Apps"
-            },
-            "en-ie": {
-              "line1": "Enable Apps"
-            },
-            "en-us": {
-              "line1": "Enable Apps"
-            },
-            "es-en": {
-              "line1": "Hab. aplic."
-            },
-            "es-es": {
-              "line1": "Activar apl."
-            },
-            "es-mx": {
-              "line1": "Hab. aplic."
-            },
-            "fr-ca": {
-              "line1": "Activer app.",
-              "textBody": "Activer app."
-            },
-            "fr-fr": {
-              "line1": "Activer app."
-            },
-            "it-it": {
-              "line1": "Abilita app"
-            },
-            "nl-nl": {
-              "line1": "Apps inschak."
-            },
-            "pl-pl": {
-              "line1": "Włącz aplikacje"
-            },
-            "pt-br": {
-              "line1": "Ativar aplic."
-            },
-            "pt-pt": {
-              "line1": "Activar actualiz."
-            },
-            "ru-ru": {
-              "line1": "Вкл. прилож."
-            },
-            "sv-se": {
-              "line1": "Aktivera appar"
-            },
-            "tr-tr": {
-              "line1": "Uygulamaları aç"
-            },
-            "zh-cn": {
-              "line1": "启用应用程序"
-            },
-            "zh-tw": {
-              "line1": "啟用應用程式"
-            }
-          }
-        },
-        "SettingUpdateAuto": {
-          "languages": {
-            "de-de": {
-              "line1": "Update anford."
-            },
-            "en-au": {
-              "line1": "Request update"
-            },
-            "en-gb": {
-              "line1": "Request update"
-            },
-            "en-ie": {
-              "line1": "Request update"
-            },
-            "en-us": {
-              "line1": "Request Update",
-              "textBody": "Select `Update now` to receive app permissions for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-            },
-            "es-en": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "es-es": {
-              "line1": "Solicitar actual."
-            },
-            "es-mx": {
-              "line1": "Solicit. actualiz.",
-              "textBody": "Solicit. actualiz."
-            },
-            "fr-ca": {
-              "line1": "Demander MAJ",
-              "textBody": "Demander MAJ"
-            },
-            "fr-fr": {
-              "line1": "Demander màj"
-            },
-            "it-it": {
-              "line1": "Rich. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Upd. aanvragen"
-            },
-            "pl-pl": {
-              "line1": "Zażądaj aktual."
-            },
-            "pt-br": {
-              "line1": "Solicitar atualiz."
-            },
-            "pt-pt": {
-              "line1": "Solicit. actualiz."
-            },
-            "ru-ru": {
-              "line1": "Запрос на обн."
-            },
-            "sv-se": {
-              "line1": "Begär uppdat."
-            },
-            "tr-tr": {
-              "line1": "Güncelleme iste"
-            },
-            "zh-cn": {
-              "line1": "请求更新"
-            },
-            "zh-tw": {
-              "line1": "請求更新"
-            }
-          }
-        },
-        "StatusNeeded": {
-          "languages": {
-            "de-de": {
-              "line1": "Update benötigt"
-            },
-            "en-au": {
-              "line1": "Update needed"
-            },
-            "en-gb": {
-              "line1": "Update needed",
-              "textBody": "Update needed"
-            },
-            "en-ie": {
-              "line1": "Update needed"
-            },
-            "en-us": {
-              "line1": "Update Needed",
-              "textBody": "Update Needed"
-            },
-            "es-en": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "es-es": {
-              "line1": "Actu. necesaria"
-            },
-            "es-mx": {
-              "line1": "Actualiz. neces.",
-              "textBody": "Actualiz. neces."
-            },
-            "fr-ca": {
-              "line1": "Màj requise",
-              "textBody": "Màj requise"
-            },
-            "fr-fr": {
-              "line1": "Mise à jour requise"
-            },
-            "it-it": {
-              "line1": "Necess. aggiorn."
-            },
-            "nl-nl": {
-              "line1": "Update nodig"
-            },
-            "pl-pl": {
-              "line1": "Potrzeba aktual."
-            },
-            "pt-br": {
-              "line1": "Atualiz. necess."
-            },
-            "pt-pt": {
-              "line1": "Actual. necess."
-            },
-            "ru-ru": {
-              "line1": "Необх. обновл."
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs"
-            },
-            "tr-tr": {
-              "line1": "Güncellenmeli"
-            },
-            "zh-cn": {
-              "line1": "需要进行更新"
-            },
-            "zh-tw": {
-              "line1": "需更新"
-            }
-          }
-        },
-        "StatusPending": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktualisieren..."
-            },
-            "en-au": {
-              "line1": "Updating..."
-            },
-            "en-gb": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "en-ie": {
-              "line1": "Updating..."
-            },
-            "en-us": {
-              "line1": "Updating...",
-              "textBody": "Updating..."
-            },
-            "es-en": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "es-es": {
-              "line1": "Actualizando..."
-            },
-            "es-mx": {
-              "line1": "Actualizando...",
-              "textBody": "Actualizando..."
-            },
-            "fr-ca": {
-              "line1": "MAJ en cours...",
-              "textBody": "MAJ en cours..."
-            },
-            "fr-fr": {
-              "line1": "Màj en cours..."
-            },
-            "it-it": {
-              "line1": "Aggiornamento"
-            },
-            "nl-nl": {
-              "line1": "Updaten..."
-            },
-            "pl-pl": {
-              "line1": "Aktualizowanie"
-            },
-            "pt-br": {
-              "line1": "Atualizando..."
-            },
-            "pt-pt": {
-              "line1": "A actualizar..."
-            },
-            "ru-ru": {
-              "line1": "Обновление..."
-            },
-            "sv-se": {
-              "line1": "Uppdaterar..."
-            },
-            "tr-tr": {
-              "line1": "Güncelleniyor..."
-            },
-            "zh-cn": {
-              "line1": "正在更新......"
-            },
-            "zh-tw": {
-              "line1": "更新中..."
-            }
-          }
-        },
-        "StatusUpToDate": {
-          "languages": {
-            "de-de": {
-              "line1": "Aktuelle Version"
-            },
-            "en-au": {
-              "line1": "Up-to-date"
-            },
-            "en-gb": {
-              "line1": "Up-to-date",
-              "textBody": "Up-to-date"
-            },
-            "en-ie": {
-              "line1": "Up-to-date"
-            },
-            "en-us": {
-              "line1": "Up-To-Date",
-              "textBody": "Up-To-Date"
-            },
-            "es-en": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "es-es": {
-              "line1": "Actualizada"
-            },
-            "es-mx": {
-              "line1": "Actualizado",
-              "textBody": "Actualizado"
-            },
-            "fr-ca": {
-              "line1": "Déjà à jour",
-              "textBody": "Déjà à jour"
-            },
-            "fr-fr": {
-              "line1": "Déjà à jour"
-            },
-            "it-it": {
-              "line1": "più recente"
-            },
-            "nl-nl": {
-              "line1": "Up-to-date"
-            },
-            "pl-pl": {
-              "line1": "Aktualne"
-            },
-            "pt-br": {
-              "line1": "Atualizado"
-            },
-            "pt-pt": {
-              "line1": "Actualizado"
-            },
-            "ru-ru": {
-              "line1": "Обновлено"
-            },
-            "sv-se": {
-              "line1": "Uppdat. krävs ej"
-            },
-            "tr-tr": {
-              "line1": "Güncel"
-            },
-            "zh-cn": {
-              "line1": "最新更新"
-            },
-            "zh-tw": {
-              "line1": "更新最新"
-            }
-          }
-        },
-        "VehicleInfo": {
-          "languages": {
-            "de-de": {
-              "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-              "label": "Fahrzeuginformationen"
-            },
-            "en-au": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-gb": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-            },
-            "en-ie": {
-              "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-              "label": "Vehicle information"
-            },
-            "en-us": {
-              "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-              "label": "Vehicle information",
-              "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-            },
-            "es-en": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "es-es": {
-              "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-              "label": "Información del vehículo"
-            },
-            "es-mx": {
-              "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-              "label": "Información del vehículo",
-              "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-            },
-            "fr-ca": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-              "label": "Renseignements du véhicule",
-              "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-            },
-            "fr-fr": {
-              "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-              "label": "Renseignements du véhicule"
-            },
-            "it-it": {
-              "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-              "label": "Informazioni sul veicolo"
-            },
-            "nl-nl": {
-              "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-              "label": "Voertuiginformatie"
-            },
-            "pl-pl": {
-              "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-              "label": "Informacje o pojeździe"
-            },
-            "pt-br": {
-              "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-              "label": "Informações sobre o veículo"
-            },
-            "pt-pt": {
-              "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-              "label": "Informações do veículo"
-            },
-            "ru-ru": {
-              "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-              "label": "Информация об автомобиле"
-            },
-            "sv-se": {
-              "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-              "label": "Fordonsinformation"
-            },
-            "tr-tr": {
-              "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-              "label": "Araç bilgisi"
-            },
-            "zh-cn": {
-              "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-              "label": "车辆信息"
-            },
-            "zh-tw": {
-              "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-              "label": "車輛資訊"
-            }
-          }
-        }
-      }
-    },
-    "app_policies": {
-      "default": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "Base-4"
-        ],
-        "RequestType": [
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      },
-      "device": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "DataConsent-2"
-        ]
-      },
-      "pre_DataConsent": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "PROPRIETARY"
-        ]
-      },
-      "123454321": {
-        "keep_context": false,
-        "steal_focus": false,
-        "priority": "NONE",
-        "default_hmi": "NONE",
-        "groups": [
-          "BaseBeforeDataConsent"
-        ],
-        "RequestType": [
-          "TRAFFIC_MESSAGE_CHANNEL",
-          "QUERY_APPS",
-          "LAUNCH_APP",
-          "PROPRIETARY"
-        ]
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/components/policy/policy_regular/test/sdl_preloaded_pt.json b/src/components/policy/policy_regular/test/sdl_preloaded_pt.json
deleted file mode 100644
index ad264c8518..0000000000
--- a/src/components/policy/policy_regular/test/sdl_preloaded_pt.json
+++ /dev/null
@@ -1,1965 +0,0 @@
-    {
-    "policy_table": {
-        "module_config": {
-            "preloaded_pt": true,
-            "preloaded_date": "2015-02-12",
-            "exchange_after_x_ignition_cycles": 100,
-            "exchange_after_x_kilometers": 1800,
-            "exchange_after_x_days": 30,
-            "timeout_after_x_seconds": 70,
-            "seconds_between_retries": [1,
-            5,
-            25,
-            125,
-            625],
-            "endpoints": {
-                "0x07": {
-                    "default": ["http://x.x.x.x:3000/api/1/policies"]
-                }
-            },
-            "notifications_per_minute_by_priority": {
-                "EMERGENCY": 60,
-                "NAVIGATION": 15,
-                "PROJECTION": 15,
-                "COMMUNICATION": 6,
-                "NORMAL": 4,
-                "NONE": 0
-            }
-        },
-        "functional_groupings": {
-            "Base-4": {
-                "rpcs": {
-                    "AddCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "AddSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Alert": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "CreateInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteInteractionChoiceSet": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "DeleteSubMenu": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EndAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GenericResponse": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAudioPassThru": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonEvent": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnButtonPress": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "OnCommand": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnDriverDistraction": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PerformAudioPassThru": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PerformInteraction": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ResetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ScrollableMessage": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetGlobalProperties": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SetMediaClockTimer": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "Show": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "Slider": {
-                        "hmi_levels": ["FULL"]
-                    },
-                    "Speak": {
-                        "hmi_levels": ["FULL",
-                        "LIMITED"]
-                    },
-                    "SubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnsubscribeButton": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Location-1": {
-                "user_consent_prompt": "Location",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["gps",
-                        "speed"]
-                    }
-                }
-            },
-            "Notifications": {
-                "user_consent_prompt": "Notifications",
-                "rpcs": {
-                    "Alert": {
-                        "hmi_levels": ["BACKGROUND"]
-                    }
-                }
-            },
-            "DrivingCharacteristics-3": {
-                "user_consent_prompt": "DrivingCharacteristics",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["accPedalPosition",
-                        "beltStatus",
-                        "electronicParkBrakeStatus",
-                        "driverBraking",
-                        "myKey",
-                        "prndl",
-                        "rpm",
-                        "steeringWheelAngle"]
-                    }
-                }
-            },
-            "VehicleInfo-3": {
-                "user_consent_prompt": "VehicleInfo",
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "vin",
-                        "wiperStatus"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["bodyInformation",
-                        "deviceStatus",
-                        "engineOilLife",
-                        "engineTorque",
-                        "externalTemperature",
-                        "turnSignal",
-                        "fuelLevel",
-                        "fuelLevel_State",
-                        "headLampStatus",
-                        "instantFuelConsumption",
-                        "fuelRange",
-                        "cloudAppVehicleID",
-                        "odometer",
-                        "tirePressure",
-                        "wiperStatus"]
-                    }
-                }
-            },
-            "PropriataryData-1": {
-                "rpcs": {
-                    "DiagnosticMessage": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "GetDTCs": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ReadDID": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "Emergency-1": {
-                "rpcs": {
-                    "GetVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "OnVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "SubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    },
-                    "UnsubscribeVehicleData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"],
-                        "parameters": ["airbagStatus",
-                        "clusterModeStatus",
-                        "eCallInfo",
-                        "emergencyEvent"]
-                    }
-                }
-            },
-            "Navigation-1": {
-                "rpcs": {
-                    "AlertManeuver": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "ShowConstantTBT": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    },
-                    "UpdateTurnList": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED"]
-                    }
-                }
-            },
-            "DataConsent-2": {
-                "user_consent_prompt": "DataConsent",
-                "rpcs": null
-            },
-            "BaseBeforeDataConsent": {
-                "rpcs": {
-                    "ChangeRegistration": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "DeleteFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "EncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "ListFiles": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnAppInterfaceUnregistered": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnEncodedSyncPData": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHashChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnHMIStatus": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnLanguageChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnPermissionsChange": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "OnSystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "PutFile": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "RegisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetAppIcon": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SetDisplayLayout": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "SystemRequest": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    },
-                    "UnregisterAppInterface": {
-                        "hmi_levels": ["BACKGROUND",
-                        "FULL",
-                        "LIMITED",
-                        "NONE"]
-                    }
-                }
-            }
-        },
-        "consumer_friendly_messages": {
-            "version": "001.001.019",
-            "messages": {
-                "AppPermissions": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab.",
-                            "line1": "Zugriffsanfrage(n)",
-                            "line2": "erlauben?"
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%`s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny.",
-                            "line1": "Grant requested",
-                            "line2": "permission(s)?"
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. Please press yes to allow or no to deny.",
-                            "line1": "Grant Requested",
-                            "line2": "Permission(s)?",
-                            "textBody": "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. \n\nIf you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%’s use of your data. You can change these permissions and hear detailed descriptions in the mobile apps settings menu."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?",
-                            "textBody": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar. \n\n Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar.",
-                            "line1": "¿Conceder permisos",
-                            "line2": "solicitados?"
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar.",
-                            "line1": "¿Otorgar permiso(s)",
-                            "line2": "solicitado(s)?"
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)",
-                            "textBody": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser.",
-                            "line1": "Accorder permission(s)",
-                            "line2": "demandée(s)"
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare.",
-                            "line1": "Concedi autorizzaz.",
-                            "line2": "richiesta(e)?"
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren.",
-                            "line1": "Aangevraagde",
-                            "line2": "permissie(s) verlenen?"
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania.",
-                            "line1": "Udzielić żądanych",
-                            "line2": "pozwoleń?"
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar.",
-                            "line1": "Conceder permissão",
-                            "line2": "solicitada?"
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar.",
-                            "line1": "Conceder permiss.",
-                            "line2": "solicitada(s)?"
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны.",
-                            "line1": "Предост. заправш.",
-                            "line2": "разрешения?"
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka.",
-                            "line1": "Vill du ge",
-                            "line2": "tillstånd?"
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın.",
-                            "line1": "İstenen izinler",
-                            "line2": "verilsin mi?"
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。",
-                            "line1": "是否允许请求的",
-                            "line2": "权限？"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。",
-                            "line1": "允許",
-                            "line2": "授權請求?"
-                        }
-                    }
-                },
-                "AppPermissionsHelp": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                        },
-                        "en-au": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-gb": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-ie": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                        },
-                        "en-us": {
-                            "tts": "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                        },
-                        "es-en": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "es-es": {
-                            "tts": "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                        },
-                        "es-mx": {
-                            "tts": "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                        },
-                        "fr-ca": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "fr-fr": {
-                            "tts": "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                        },
-                        "it-it": {
-                            "tts": "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                        },
-                        "nl-nl": {
-                            "tts": "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                        },
-                        "pl-pl": {
-                            "tts": "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                        },
-                        "pt-br": {
-                            "tts": "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                        },
-                        "pt-pt": {
-                            "tts": "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                        },
-                        "ru-ru": {
-                            "tts": "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                        },
-                        "sv-se": {
-                            "tts": "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                        },
-                        "tr-tr": {
-                            "tts": "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                        },
-                        "zh-cn": {
-                            "tts": "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                        }
-                    }
-                },
-                "AppPermissionsRevoked": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                        },
-                        "en-au": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-gb": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-ie": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "en-us": {
-                            "tts": "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                        },
-                        "es-en": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "es-es": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                        },
-                        "es-mx": {
-                            "tts": "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                        },
-                        "fr-ca": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "fr-fr": {
-                            "tts": "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                        },
-                        "it-it": {
-                            "tts": "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                        },
-                        "nl-nl": {
-                            "tts": "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                        },
-                        "pl-pl": {
-                            "tts": "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                        },
-                        "pt-br": {
-                            "tts": "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                        },
-                        "pt-pt": {
-                            "tts": "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                        },
-                        "ru-ru": {
-                            "tts": "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                        },
-                        "sv-se": {
-                            "tts": "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                        },
-                        "tr-tr": {
-                            "tts": "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                        },
-                        "zh-cn": {
-                            "tts": "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                        }
-                    }
-                },
-                "AppUnauthorized": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren.",
-                            "line1": "nicht autorisiert"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized",
-                            "textBody": "This version of %appName% is not authorized and will not work with SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "not authorized"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not authorized and will not work with SYNC.",
-                            "line1": "Not Authorized",
-                            "textBody": "This version of %appName% is no longer authorized to work with AppLink. Please update to the latest version of %appName%."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada",
-                            "textBody": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no está autorizada y no funcionará con SYNC.",
-                            "line1": "No autorizada"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no tiene autorización y no funcionará con SYNC.",
-                            "line1": "no autorizada"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée",
-                            "textBody": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC.",
-                            "line1": "non autorisée"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è autorizzata e non funziona con il SYNC.",
-                            "line1": "non autorizzata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC.",
-                            "line1": "niet geautoriseerd"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC.",
-                            "line1": "brak autoryzacji"
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não tem autorização e não funcionará com o SYNC.",
-                            "line1": "não autorizado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não está autorizada e não funcionará com o SYNC.",
-                            "line1": "não autorizada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не авторизирована и не будет работать с SYNC.",
-                            "line1": "не авторизировано"
-                        },
-                        "sv-se": {
-                            "tts": "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC.",
-                            "line1": "är ej godkänd"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz.",
-                            "line1": "için izin yok"
-                        },
-                        "zh-cn": {
-                            "tts": "此版本的%appName% 未得到授权，无法在SYNC上使用。",
-                            "line1": "未得到授权"
-                        },
-                        "zh-tw": {
-                            "tts": "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。",
-                            "line1": "無授權"
-                        }
-                    }
-                },
-                "AppUnsupported": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Diese Version von %appName% wird von SYNC nicht unterstützt.",
-                            "line1": "nicht unterstützt"
-                        },
-                        "en-au": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-gb": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported",
-                            "textBody": "This version of %appName% is not supported by SYNC."
-                        },
-                        "en-ie": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "not supported"
-                        },
-                        "en-us": {
-                            "tts": "This version of %appName% is not supported by SYNC.",
-                            "line1": "Not Supported",
-                            "textBody": "Your version of %appName% is not supported by SYNC."
-                        },
-                        "es-en": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible",
-                            "textBody": "Esta versión de %appName% no es compatible con SYNC."
-                        },
-                        "es-es": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "No compatible"
-                        },
-                        "es-mx": {
-                            "tts": "Esta versión de %appName% no es compatible con SYNC.",
-                            "line1": "no compatible"
-                        },
-                        "fr-ca": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible",
-                            "textBody": "Cette version de %appName% n’est pas prise en charge par SYNC."
-                        },
-                        "fr-fr": {
-                            "tts": "Cette version de %appName% n’est pas prise en charge par SYNC.",
-                            "line1": "incompatible"
-                        },
-                        "it-it": {
-                            "tts": "Questa versione di %appName% non è supportata dal SYNC.",
-                            "line1": "non supportata"
-                        },
-                        "nl-nl": {
-                            "tts": "Deze versie van %appName% wordt niet ondersteund door SYNC.",
-                            "line1": "niet ondersteund"
-                        },
-                        "pl-pl": {
-                            "tts": "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC.",
-                            "line1": "aplikacja nie obsług."
-                        },
-                        "pt-br": {
-                            "tts": "Esta versão do %appName% não é suportada pelo SYNC.",
-                            "line1": "não suportado"
-                        },
-                        "pt-pt": {
-                            "tts": "Esta versão de %appName% não é suportado pelo SYNC.",
-                            "line1": "não suportada"
-                        },
-                        "ru-ru": {
-                            "tts": "Эта версия %appName% не поддерживается SYNC.",
-                            "line1": "не поддерживается"
-                        },
-                        "sv-se": {
-                            "tts": "SYNC har inte stöd för den här versionen av %appName%.",
-                            "line1": "stöds ej"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu %appName% sürümü SYNC tarafından desteklenmiyor.",
-                            "line1": "desteklenmiyor"
-                        },
-                        "zh-cn": {
-                            "tts": "SYNC不支持此版本的%appName%。",
-                            "line1": "不受支持"
-                        },
-                        "zh-tw": {
-                            "tts": "SYNC 不支援此版本的%appName% 。",
-                            "line1": "不支援"
-                        }
-                    }
-                },
-                "DataConsent": {
-                    "languages": {
-                        "en-gb": {
-                            "textBody": "Would you like to enable Mobile Apps on SYNC? To use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "en-us": {
-                            "line1": "Enable Mobile Apps",
-                            "line2": "on SYNC? (Uses Data)",
-                            "textBody": "Would you like to enable Mobile Apps on SYNC?\n\nTo use Mobile Apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device’s data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S.\n\nUpdates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC Settings menu. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Para usar aplicaciones móviles con SYNC, este debe comunicarse con Ford al menos una vez al mes a través del plan de datos de su dispositivo móvil. Pueden aplicar tarifas normales. SYNC enviará su VIN y el número de módulo de SYNC a Ford de Estados Unidos de América. Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario. /r Presione Sí para permitir y No para denegar."
-                        },
-                        "fr-ca": {
-                            "textBody": "Pour utiliser AppLink, SYNC devra communiquer avec Ford au moins une fois par mois en utilisant le forfait de données de votre appareil mobile. Les tarifs réguliers peuvent s’appliquer. SYNC enverra votre NIV et le numéro de votre module SYNC à Ford États-Unis. Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements. /r Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                        }
-                    }
-                },
-                "DataConsentHelp": {
-                    "languages": {
-                        "en-us": {
-                            "textBody": "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. See your Owner Guide for more information."
-                        },
-                        "es-en": {
-                            "textBody": "Las actualizaciones tienen el tamaño aproximado de un mensaje de correo electrónico, y la frecuencia de las actualizaciones depende del uso de su vehículo y de si se encuentran nuevas aplicaciones en su dispositivo. Para obtener más información, consulte la Guía del propietario."
-                        },
-                        "fr-ca": {
-                            "textBody": "Les mises à jour ont la taille d’un courriel et la fréquence des mises à jour dépend de l’utilisation de votre véhicule et si une nouvelle application se trouve sur votre appareil. Consultez le Guide de l’utilisateur pour obtenir d’autres renseignements."
-                        }
-                    }
-                },
-                "DisableApps": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen.",
-                            "line1": "Auto-Update",
-                            "line2": "und Mobile Apps deaktivieren"
-                        },
-                        "en-au": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-gb": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                        },
-                        "en-ie": {
-                            "tts": "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel.",
-                            "line1": "Disable auto-updates",
-                            "line2": "and Mobile Apps?"
-                        },
-                        "en-us": {
-                            "tts": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel.",
-                            "line1": "Disable Auto-Updates",
-                            "line2": "and Mobile Apps?",
-                            "textBody": "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                        },
-                        "es-en": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?",
-                            "textBody": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                        },
-                        "es-es": {
-                            "tts": "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar.",
-                            "line1": "¿Desact. actual. auto",
-                            "line2": "y apl. móviles?"
-                        },
-                        "es-mx": {
-                            "tts": "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar.",
-                            "line1": "¿Deshab. actualiz.",
-                            "line2": "autom. y aplic. móv.?"
-                        },
-                        "fr-ca": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?",
-                            "textBody": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                        },
-                        "fr-fr": {
-                            "tts": "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler.",
-                            "line1": "Désactiver màj autom.",
-                            "line2": "et app. mobiles?"
-                        },
-                        "it-it": {
-                            "tts": "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare.",
-                            "line1": "Disabilitare agg. aut.",
-                            "line2": "e app mobili?"
-                        },
-                        "nl-nl": {
-                            "tts": "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren.",
-                            "line1": "Auto-updates en mob.",
-                            "line2": "apps uitschakelen?"
-                        },
-                        "pl-pl": {
-                            "tts": "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować.",
-                            "line1": "Wył. automat. aktual.",
-                            "line2": "i aplikacje mobilne?"
-                        },
-                        "pt-br": {
-                            "tts": "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar.",
-                            "line1": "Desativar atualizações",
-                            "line2": "autom. e aplicativos?"
-                        },
-                        "pt-pt": {
-                            "tts": "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar.",
-                            "line1": "Desact. actual. autom.",
-                            "line2": "e aplicações móveis?"
-                        },
-                        "ru-ru": {
-                            "tts": "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены.",
-                            "line1": "Откл. автообновления",
-                            "line2": "и мобил. прилож.?"
-                        },
-                        "sv-se": {
-                            "tts": "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta.",
-                            "line1": "Avaktiverar autouppdat.",
-                            "line2": "och mobilappar?"
-                        },
-                        "tr-tr": {
-                            "tts": "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın.",
-                            "line1": "Oto. güncelleme ve",
-                            "line2": "mobil uygul. kapat?"
-                        },
-                        "zh-cn": {
-                            "tts": "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。",
-                            "line1": "是否禁用自动更新和",
-                            "line2": "移动应用程序？"
-                        },
-                        "zh-tw": {
-                            "tts": "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。",
-                            "line1": "停用自動更新",
-                            "line2": "和行動應用程式？"
-                        }
-                    }
-                },
-                "DrivingCharacteristics": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus.",
-                            "label": "Fahreigenschaften"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status.",
-                            "label": "Driving characteristics"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status.",
-                            "label": "Driving Characteristics",
-                            "textBody": "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo",
-                            "textBody": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad.",
-                            "label": "Características de conducción"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad.",
-                            "label": "Características del manejo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite",
-                            "textBody": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité.",
-                            "label": "Caractéristiques de conduite"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza.",
-                            "label": "Caratteristiche di guida"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus.",
-                            "label": "Rijkenmerken"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa.",
-                            "label": "Informacje dotyczące stylu jazdy"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança.",
-                            "label": "Características de condução"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности.",
-                            "label": "Характеристики движения"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus.",
-                            "label": "Köregenskaper"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu.",
-                            "label": "Sürüş karakteristikleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态",
-                            "label": "行驶特性"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態",
-                            "label": "駕駛特性"
-                        }
-                    }
-                },
-                "Location": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs.",
-                            "label": "GPS und Geschwindigkeit"
-                        },
-                        "en-au": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed"
-                        },
-                        "en-us": {
-                            "tts": "An app can access vehicle GPS and speed.",
-                            "label": "GPS and speed",
-                            "textBody": "An app can access vehicle GPS and speed."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad",
-                            "textBody": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder al GPS y la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo.",
-                            "label": "GPS y velocidad"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse",
-                            "textBody": "Une application peut accéder au GPS et à la vitesse du véhicule."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder au GPS et à la vitesse du véhicule.",
-                            "label": "GPS et vitesse"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso a GPS e velocità del veicolo.",
-                            "label": "GPS e velocità"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot gps en de snelheid van het voertuig.",
-                            "label": "Gps en snelheid"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu.",
-                            "label": "GPS i prędkość"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar o GPS e a velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder ao GPS e à velocidade do veículo.",
-                            "label": "GPS e velocidade"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к GPS и скорости автомобиля.",
-                            "label": "GPS и скорость"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt fordonets GPS och hastighetsmätare.",
-                            "label": "GPS och hastighet"
-                        },
-                        "tr-tr": {
-                            "tts": "Bu uygulama aracın GPS ve hız bilgilerine erişebilir.",
-                            "label": "GPS ve hız"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可以访问车辆 GPS 和车速信息。",
-                            "label": "GPS 和车速"
-                        },
-                        "zh-tw": {
-                            "tts": "應用程式可存取車輛的GPS和速度。",
-                            "label": "GPS和車速"
-                        }
-                    }
-                },
-                "Notifications": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden.",
-                            "label": "Push-Benachrichtigungen"
-                        },
-                        "en-au": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-gb": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "en-ie": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications"
-                        },
-                        "en-us": {
-                            "tts": "An app can send notifications when running in the background.",
-                            "label": "Push notifications",
-                            "textBody": "An app can send notifications when running in the background."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push",
-                            "textBody": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano.",
-                            "label": "Notificaciones push"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano.",
-                            "label": "Notificaciones tipo Push"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications instantanées",
-                            "textBody": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan.",
-                            "label": "Notifications push"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può inviare notifiche se eseguita in background.",
-                            "label": "Notifiche push"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app kan meldingen versturen als deze op de achtergrond actief is.",
-                            "label": "Push-meldingen"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może wysyłać powiadomienia, działając w tle.",
-                            "label": "Powiadomienia Push"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano.",
-                            "label": "Notificações Push"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue enviar notificações quando está activa em segundo plano.",
-                            "label": "Notificações push"
-                        },
-                        "ru-ru": {
-                            "tts": "Если приложение работает в фоновом режиме, оно может отправлять оповещения.",
-                            "label": "Оповещения о пересылке"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan skicka meddelanden när den körs i bakgrunden.",
-                            "label": "Push-notiser"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama arka planda çalışırken bildirim gönderebilir.",
-                            "label": "Anlık bildirimleri"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序在后台运行时可推送通知。",
-                            "label": "推送通知"
-                        },
-                        "zh-tw": {
-                            "tts": "車輛行進時，應用程式可在背景中傳送通知。",
-                            "label": "傳送通知"
-                        }
-                    }
-                },
-                "SettingDisableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Updates deakt."
-                        },
-                        "en-au": {
-                            "line1": "Disable updates"
-                        },
-                        "en-gb": {
-                            "line1": "Disable updates"
-                        },
-                        "en-ie": {
-                            "line1": "Disable updates"
-                        },
-                        "en-us": {
-                            "line1": "Disable Updates",
-                            "textBody": "Disable Updates"
-                        },
-                        "es-en": {
-                            "line1": "Deshab. actual.",
-                            "textBody": "Deshab. actual."
-                        },
-                        "es-es": {
-                            "line1": "Desact. actual."
-                        },
-                        "es-mx": {
-                            "line1": "Deshab. actual."
-                        },
-                        "fr-ca": {
-                            "line1": "Désactiver MAJ",
-                            "textBody": "Désactiver MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Désactiver màj"
-                        },
-                        "it-it": {
-                            "line1": "Disabilita agg."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. uitschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Wyłącz aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Desat. atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Desact. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Откл. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Inaktivera uppd."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncell. Kapat"
-                        },
-                        "zh-cn": {
-                            "line1": "禁用更新"
-                        },
-                        "zh-tw": {
-                            "line1": "停用更新"
-                        }
-                    }
-                },
-                "SettingEnableUpdates": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Apps aktivieren"
-                        },
-                        "en-au": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-gb": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-ie": {
-                            "line1": "Enable Apps"
-                        },
-                        "en-us": {
-                            "line1": "Enable Apps"
-                        },
-                        "es-en": {
-                            "line1": "Hab. aplic."
-                        },
-                        "es-es": {
-                            "line1": "Activar apl."
-                        },
-                        "es-mx": {
-                            "line1": "Hab. aplic."
-                        },
-                        "fr-ca": {
-                            "line1": "Activer app.",
-                            "textBody": "Activer app."
-                        },
-                        "fr-fr": {
-                            "line1": "Activer app."
-                        },
-                        "it-it": {
-                            "line1": "Abilita app"
-                        },
-                        "nl-nl": {
-                            "line1": "Apps inschak."
-                        },
-                        "pl-pl": {
-                            "line1": "Włącz aplikacje"
-                        },
-                        "pt-br": {
-                            "line1": "Ativar aplic."
-                        },
-                        "pt-pt": {
-                            "line1": "Activar actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Вкл. прилож."
-                        },
-                        "sv-se": {
-                            "line1": "Aktivera appar"
-                        },
-                        "tr-tr": {
-                            "line1": "Uygulamaları aç"
-                        },
-                        "zh-cn": {
-                            "line1": "启用应用程序"
-                        },
-                        "zh-tw": {
-                            "line1": "啟用應用程式"
-                        }
-                    }
-                },
-                "SettingUpdateAuto": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update anford."
-                        },
-                        "en-au": {
-                            "line1": "Request update"
-                        },
-                        "en-gb": {
-                            "line1": "Request update"
-                        },
-                        "en-ie": {
-                            "line1": "Request update"
-                        },
-                        "en-us": {
-                            "line1": "Request Update",
-                            "textBody": "Select `Update now` to receive app authorization information for your SYNC-enabled mobile apps. This may enable additional functionality depending on the app and your settings. If your phone has a working data connection, an update should complete in less than 1 minute."
-                        },
-                        "es-en": {
-                            "line1": "Solicit. actualiz.",
-                            "textBody": "Solicit. actualiz."
-                        },
-                        "es-es": {
-                            "line1": "Solicitar actual."
-                        },
-                        "es-mx": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "fr-ca": {
-                            "line1": "Demander MAJ",
-                            "textBody": "Demander MAJ"
-                        },
-                        "fr-fr": {
-                            "line1": "Demander màj"
-                        },
-                        "it-it": {
-                            "line1": "Rich. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Upd. aanvragen"
-                        },
-                        "pl-pl": {
-                            "line1": "Zażądaj aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Solicitar atualiz."
-                        },
-                        "pt-pt": {
-                            "line1": "Solicit. actualiz."
-                        },
-                        "ru-ru": {
-                            "line1": "Запрос на обн."
-                        },
-                        "sv-se": {
-                            "line1": "Begär uppdat."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleme iste"
-                        },
-                        "zh-cn": {
-                            "line1": "请求更新"
-                        },
-                        "zh-tw": {
-                            "line1": "請求更新"
-                        }
-                    }
-                },
-                "StatusNeeded": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Update benötigt"
-                        },
-                        "en-au": {
-                            "line1": "Update needed"
-                        },
-                        "en-gb": {
-                            "line1": "Update needed",
-                            "textBody": "Update needed"
-                        },
-                        "en-ie": {
-                            "line1": "Update needed"
-                        },
-                        "en-us": {
-                            "line1": "Update Needed",
-                            "textBody": "Update Needed"
-                        },
-                        "es-en": {
-                            "line1": "Actualiz. neces.",
-                            "textBody": "Actualiz. neces."
-                        },
-                        "es-es": {
-                            "line1": "Actu. necesaria"
-                        },
-                        "es-mx": {
-                            "line1": "Actualiz. neces."
-                        },
-                        "fr-ca": {
-                            "line1": "Màj requise",
-                            "textBody": "Màj requise"
-                        },
-                        "fr-fr": {
-                            "line1": "Mise à jour requise"
-                        },
-                        "it-it": {
-                            "line1": "Necess. aggiorn."
-                        },
-                        "nl-nl": {
-                            "line1": "Update nodig"
-                        },
-                        "pl-pl": {
-                            "line1": "Potrzeba aktual."
-                        },
-                        "pt-br": {
-                            "line1": "Atualiz. necess."
-                        },
-                        "pt-pt": {
-                            "line1": "Actual. necess."
-                        },
-                        "ru-ru": {
-                            "line1": "Необх. обновл."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncellenmeli"
-                        },
-                        "zh-cn": {
-                            "line1": "需要进行更新"
-                        },
-                        "zh-tw": {
-                            "line1": "需更新"
-                        }
-                    }
-                },
-                "StatusPending": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktualisieren..."
-                        },
-                        "en-au": {
-                            "line1": "Updating..."
-                        },
-                        "en-gb": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "en-ie": {
-                            "line1": "Updating..."
-                        },
-                        "en-us": {
-                            "line1": "Updating...",
-                            "textBody": "Updating..."
-                        },
-                        "es-en": {
-                            "line1": "Actualizando...",
-                            "textBody": "Actualizando..."
-                        },
-                        "es-es": {
-                            "line1": "Actualizando..."
-                        },
-                        "es-mx": {
-                            "line1": "Actualizando..."
-                        },
-                        "fr-ca": {
-                            "line1": "MAJ en cours...",
-                            "textBody": "MAJ en cours..."
-                        },
-                        "fr-fr": {
-                            "line1": "Màj en cours..."
-                        },
-                        "it-it": {
-                            "line1": "Aggiornamento"
-                        },
-                        "nl-nl": {
-                            "line1": "Updaten..."
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualizowanie"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizando..."
-                        },
-                        "pt-pt": {
-                            "line1": "A actualizar..."
-                        },
-                        "ru-ru": {
-                            "line1": "Обновление..."
-                        },
-                        "sv-se": {
-                            "line1": "Uppdaterar..."
-                        },
-                        "tr-tr": {
-                            "line1": "Güncelleniyor..."
-                        },
-                        "zh-cn": {
-                            "line1": "正在更新......"
-                        },
-                        "zh-tw": {
-                            "line1": "更新中..."
-                        }
-                    }
-                },
-                "StatusUpToDate": {
-                    "languages": {
-                        "de-de": {
-                            "line1": "Aktuelle Version"
-                        },
-                        "en-au": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-gb": {
-                            "line1": "Up-to-date",
-                            "textBody": "Up-to-date"
-                        },
-                        "en-ie": {
-                            "line1": "Up-to-date"
-                        },
-                        "en-us": {
-                            "line1": "Up-To-Date",
-                            "textBody": "Up-To-Date"
-                        },
-                        "es-en": {
-                            "line1": "Actualizado",
-                            "textBody": "Actualizado"
-                        },
-                        "es-es": {
-                            "line1": "Actualizada"
-                        },
-                        "es-mx": {
-                            "line1": "Actualizado"
-                        },
-                        "fr-ca": {
-                            "line1": "Déjà à jour",
-                            "textBody": "Déjà à jour"
-                        },
-                        "fr-fr": {
-                            "line1": "Déjà à jour"
-                        },
-                        "it-it": {
-                            "line1": "più recente"
-                        },
-                        "nl-nl": {
-                            "line1": "Up-to-date"
-                        },
-                        "pl-pl": {
-                            "line1": "Aktualne"
-                        },
-                        "pt-br": {
-                            "line1": "Atualizado"
-                        },
-                        "pt-pt": {
-                            "line1": "Actualizado"
-                        },
-                        "ru-ru": {
-                            "line1": "Обновлено"
-                        },
-                        "sv-se": {
-                            "line1": "Uppdat. krävs ej"
-                        },
-                        "tr-tr": {
-                            "line1": "Güncel"
-                        },
-                        "zh-cn": {
-                            "line1": "最新更新"
-                        },
-                        "zh-tw": {
-                            "line1": "更新最新"
-                        }
-                    }
-                },
-                "VehicleInfo": {
-                    "languages": {
-                        "de-de": {
-                            "tts": "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck.",
-                            "label": "Fahrzeuginformationen"
-                        },
-                        "en-au": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-gb": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tire pressure."
-                        },
-                        "en-ie": {
-                            "tts": "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure.",
-                            "label": "Vehicle information"
-                        },
-                        "en-us": {
-                            "tts": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure.",
-                            "label": "Vehicle information",
-                            "textBody": "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                        },
-                        "es-en": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo",
-                            "textBody": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                        },
-                        "es-es": {
-                            "tts": "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "es-mx": {
-                            "tts": "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos.",
-                            "label": "Información del vehículo"
-                        },
-                        "fr-ca": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus.",
-                            "label": "Renseignements du véhicule",
-                            "textBody": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                        },
-                        "fr-fr": {
-                            "tts": "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus.",
-                            "label": "Renseignements du véhicule"
-                        },
-                        "it-it": {
-                            "tts": "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici.",
-                            "label": "Informazioni sul veicolo"
-                        },
-                        "nl-nl": {
-                            "tts": "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning.",
-                            "label": "Voertuiginformatie"
-                        },
-                        "pl-pl": {
-                            "tts": "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon.",
-                            "label": "Informacje o pojeździe"
-                        },
-                        "pt-br": {
-                            "tts": "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus.",
-                            "label": "Informações sobre o veículo"
-                        },
-                        "pt-pt": {
-                            "tts": "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus.",
-                            "label": "Informações do veículo"
-                        },
-                        "ru-ru": {
-                            "tts": "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин.",
-                            "label": "Информация об автомобиле"
-                        },
-                        "sv-se": {
-                            "tts": "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck.",
-                            "label": "Fordonsinformation"
-                        },
-                        "tr-tr": {
-                            "tts": "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı.",
-                            "label": "Araç bilgisi"
-                        },
-                        "zh-cn": {
-                            "tts": "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压.",
-                            "label": "车辆信息"
-                        },
-                        "zh-tw": {
-                            "tts": "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓.",
-                            "label": "車輛資訊"
-                        }
-                    }
-                }
-            }
-        },
-        "app_policies": {
-            "default": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["Base-4"],
-                "RequestType": [
-                  "QUERY_APPS",
-                  "LAUNCH_APP",
-                  "PROPRIETARY"
-                ]
-            },
-            "device": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["DataConsent-2"]
-            },
-            "pre_DataConsent": {
-                "keep_context": false,
-                "steal_focus": false,
-                "priority": "NONE",
-                "default_hmi": "NONE",
-                "groups": ["BaseBeforeDataConsent"],
-                "RequestType": ["HTTP"]
-            }
-        }
-    }
-    }
diff --git a/src/components/policy/policy_regular/test/sdl_pt_first_update.json b/src/components/policy/policy_regular/test/sdl_pt_first_update.json
deleted file mode 100644
index 440963ba48..0000000000
--- a/src/components/policy/policy_regular/test/sdl_pt_first_update.json
+++ /dev/null
@@ -1,1764 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "Notifications-2" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "FULL" ]
-               }
-            },
-            "user_consent_prompt" : "Old_Notifications"
-         },
-         "Notifications-3" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "LIMITED" ]
-               }
-            },
-            "user_consent_prompt" : "Old_Notifications"
-         },
-         "Notifications-4" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "NONE" ]
-               }
-            },
-            "user_consent_prompt" : "New_Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_regular/test/sdl_pt_second_update.json b/src/components/policy/policy_regular/test/sdl_pt_second_update.json
deleted file mode 100644
index 5900acbcfb..0000000000
--- a/src/components/policy/policy_regular/test/sdl_pt_second_update.json
+++ /dev/null
@@ -1,1764 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "Notifications-2" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "FULL" ]
-               }
-            },
-            "user_consent_prompt" : "Old_Notifications"
-         },
-         "Notifications-3" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "LIMITED" ]
-               }
-            },
-            "user_consent_prompt" : "New_Notifications"
-         },
-         "Notifications-4" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "NONE" ]
-               }
-            },
-            "user_consent_prompt" : "New_Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_regular/test/sdl_pt_update.json b/src/components/policy/policy_regular/test/sdl_pt_update.json
deleted file mode 100644
index 6f5e223cae..0000000000
--- a/src/components/policy/policy_regular/test/sdl_pt_update.json
+++ /dev/null
@@ -1,1742 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "watchdog_timer_ms" : 20000
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "watchdog_timer_ms" : 20000
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false,
-            "watchdog_timer_ms" : 20000
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_regular/test/shared_library_test.cc b/src/components/policy/policy_regular/test/shared_library_test.cc
index b7183a9085..110a283095 100644
--- a/src/components/policy/policy_regular/test/shared_library_test.cc
+++ b/src/components/policy/policy_regular/test/shared_library_test.cc
@@ -73,4 +73,4 @@ TEST(SharedLibraryTest,
 
 }  // namespace policy_test
 }  // namespace components
-}  // namespace test
+}  // namespace test
\ No newline at end of file
diff --git a/src/components/policy/policy_regular/test/smartDeviceLink.ini b/src/components/policy/policy_regular/test/smartDeviceLink.ini
deleted file mode 100644
index 550630161c..0000000000
--- a/src/components/policy/policy_regular/test/smartDeviceLink.ini
+++ /dev/null
@@ -1,3 +0,0 @@
- [MAIN]
-; Contains output files, e.g. .wav
-AppStorageFolder =
\ No newline at end of file
diff --git a/src/components/policy/policy_regular/test/smartDeviceLink2.ini b/src/components/policy/policy_regular/test/smartDeviceLink2.ini
deleted file mode 100644
index 6aec231dbb..0000000000
--- a/src/components/policy/policy_regular/test/smartDeviceLink2.ini
+++ /dev/null
@@ -1,12 +0,0 @@
- [MAIN]
-; Contains output files, e.g. .wav
-AppStorageFolder = storage1
-
-[Policy]
-EnablePolicy = true
-PreloadedPT = sdl_preloaded_pt.json
-;PathToSnapshot = sdl_snapshot.json
-; Number of attempts to open policy DB
-;AttemptsToOpenPolicyDB = 5
-; Timeout between attempts during opening DB in milliseconds
-;OpenAttemptTimeoutMs = 500
diff --git a/src/components/policy/policy_regular/test/smartDeviceLink3.ini b/src/components/policy/policy_regular/test/smartDeviceLink3.ini
deleted file mode 100644
index d96694313a..0000000000
--- a/src/components/policy/policy_regular/test/smartDeviceLink3.ini
+++ /dev/null
@@ -1,12 +0,0 @@
- [MAIN]
-; Contains output files, e.g. .wav
-AppStorageFolder = storage123
-
-[Policy]
-EnablePolicy = true
-PreloadedPT = sdl_preloaded_pt.json
-;PathToSnapshot = sdl_snapshot.json
-; Number of attempts to open policy DB
-AttemptsToOpenPolicyDB = 8
-; Timeout between attempts during opening DB in milliseconds
-OpenAttemptTimeoutMs = 700
\ No newline at end of file
diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_storage_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_storage_test.cc
new file mode 100644
index 0000000000..f719edf391
--- /dev/null
+++ b/src/components/policy/policy_regular/test/sql_pt_representation_storage_test.cc
@@ -0,0 +1,133 @@
+/* Copyright (c) 2018, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "policy/sql_pt_representation.h"
+
+#include <stdio.h>
+#include <sys/stat.h>
+
+#include <algorithm>
+#include <fstream>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "gtest/gtest.h"
+
+#include "json/reader.h"
+#include "json/writer.h"
+#include "policy/driver_dbms.h"
+#include "policy/mock_policy_settings.h"
+#include "policy/policy_table/enums.h"
+#include "policy/policy_table/types.h"
+#include "policy/policy_types.h"
+#include "rpc_base/rpc_base.h"
+#include "sqlite_wrapper/sql_query.h"
+#include "utils/file_system.h"
+#include "utils/sqlite_wrapper/sql_database.h"
+
+using testing::NiceMock;
+using testing::ReturnRef;
+
+namespace test {
+namespace components {
+namespace policy_test {
+
+class SQLPTRepresentationStorageTest : public ::testing::Test {
+ protected:
+  const std::string kAppStorageFolder =
+      "storage_SQLPTRepresentationStorageTest";
+
+  std::shared_ptr<utils::dbms::SQLQuery> query_wrapper_;
+  std::shared_ptr<policy::SQLPTRepresentation> reps;
+  std::shared_ptr<NiceMock<policy_handler_test::MockPolicySettings> >
+      policy_settings_;
+
+  void SetUp() OVERRIDE {
+    file_system::CreateDirectory(kAppStorageFolder);
+
+    reps = std::make_shared<policy::SQLPTRepresentation>();
+    ASSERT_TRUE(reps != NULL);
+
+    policy_settings_ =
+        std::make_shared<NiceMock<policy_handler_test::MockPolicySettings> >();
+    ON_CALL(*policy_settings_, app_storage_folder())
+        .WillByDefault(ReturnRef(kAppStorageFolder));
+    ASSERT_EQ(policy::SUCCESS, reps->Init(policy_settings_.get()));
+
+    query_wrapper_ = std::make_shared<utils::dbms::SQLQuery>(reps->db());
+    ASSERT_TRUE(query_wrapper_ != NULL);
+  }
+
+  void TearDown() OVERRIDE {
+    EXPECT_TRUE(reps->Drop());
+    EXPECT_TRUE(reps->Close());
+
+    file_system::remove_directory_content(kAppStorageFolder);
+    file_system::RemoveDirectory(kAppStorageFolder, true);
+  }
+};
+
+TEST_F(
+    SQLPTRepresentationStorageTest,
+    CheckPermissionsAllowedWithoutParameters_SetLimitedPermissions_ExpectEmptyListOfAllowedParams) {
+  // Arrange
+  const std::string value_12345 = "12345";
+  const std::string query =
+      "INSERT OR REPLACE INTO `application` (`id`, `memory_kb`,"
+      " `heart_beat_timeout_ms`) VALUES ('" +
+      value_12345 +
+      "', 5, 10); "
+      "INSERT OR REPLACE INTO functional_group (`id`, `name`)"
+      "  VALUES (1, 'Base-4'); "
+      "INSERT OR REPLACE INTO `app_group` (`application_id`,"
+      " `functional_group_id`) VALUES ('" +
+      value_12345 +
+      "', 1); "
+      "DELETE FROM `rpc`; "
+      "INSERT OR REPLACE INTO `rpc` (`name`, `hmi_level_value`,"
+      " `functional_group_id`) VALUES ('Update', 'LIMITED', 1);";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query));
+
+  // Act
+  policy::CheckPermissionResult ret;
+  reps->CheckPermissions(value_12345, "LIMITED", "Update", ret);
+
+  // Assert
+  EXPECT_TRUE(ret.hmi_level_permitted == ::policy::kRpcAllowed);
+  EXPECT_TRUE(ret.list_of_allowed_params.empty());
+}
+
+}  // namespace policy_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc
index d456aa26e4..eadcd0ba4f 100644
--- a/src/components/policy/policy_regular/test/sql_pt_representation_test.cc
+++ b/src/components/policy/policy_regular/test/sql_pt_representation_test.cc
@@ -29,8 +29,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "policy/sql_pt_representation.h"
+
 #include <stdio.h>
 #include <sys/stat.h>
+
 #include <algorithm>
 #include <fstream>
 #include <memory>
@@ -38,6 +41,7 @@
 #include <vector>
 
 #include "gtest/gtest.h"
+
 #include "json/reader.h"
 #include "json/writer.h"
 #include "policy/driver_dbms.h"
@@ -45,9 +49,8 @@
 #include "policy/policy_table/enums.h"
 #include "policy/policy_table/types.h"
 #include "policy/policy_types.h"
-#include "policy/sql_pt_representation.h"
 #include "rpc_base/rpc_base.h"
-
+#include "sqlite_wrapper/sql_query.h"
 #include "utils/file_system.h"
 #include "utils/sqlite_wrapper/sql_database.h"
 
@@ -69,38 +72,25 @@ namespace policy_test {
 
 using policy_handler_test::MockPolicySettings;
 
-class SQLPTRepresentationTest : public SQLPTRepresentation,
+class SQLPTRepresentationTest : protected SQLPTRepresentation,
                                 public ::testing::Test {
  protected:
-  DBMS* dbms;
-  SQLPTRepresentation* reps;
-  static const std::string kDatabaseName;
-  static const std::string kAppStorageFolder;
-  // Gtest can show message that this object doesn't destroyed
-  std::unique_ptr<NiceMock<MockPolicySettings> > policy_settings_;
+  std::shared_ptr<utils::dbms::SQLQuery> query_wrapper_;
+  std::shared_ptr<SQLPTRepresentation> reps;
+  policy_handler_test::MockPolicySettings policy_settings_;
 
   void SetUp() OVERRIDE {
-    file_system::CreateDirectory(kAppStorageFolder);
-    reps = new SQLPTRepresentation;
-    policy_settings_ = std::unique_ptr<NiceMock<MockPolicySettings> >(
-        new NiceMock<MockPolicySettings>());
-    ON_CALL(*policy_settings_, app_storage_folder())
-        .WillByDefault(ReturnRef(kAppStorageFolder));
-    EXPECT_EQ(::policy::SUCCESS, reps->Init(policy_settings_.get()));
-    dbms = new DBMS(kAppStorageFolder + "/" + kDatabaseName);
-    EXPECT_TRUE(dbms->Open());
+    reps = std::make_shared<SQLPTRepresentation>(true);
+    ASSERT_TRUE(reps != NULL);
+    ASSERT_EQ(policy::SUCCESS, reps->Init(&policy_settings_));
+
+    query_wrapper_ = std::make_shared<utils::dbms::SQLQuery>(reps->db());
+    ASSERT_TRUE(query_wrapper_ != NULL);
   }
 
   void TearDown() OVERRIDE {
-    EXPECT_TRUE(reps->Clear());
     EXPECT_TRUE(reps->Drop());
     EXPECT_TRUE(reps->Close());
-    reps->RemoveDB();
-    delete reps;
-    dbms->Close();
-    file_system::remove_directory_content(kAppStorageFolder);
-    file_system::RemoveDirectory(kAppStorageFolder, true);
-    policy_settings_.reset();
   }
 
   virtual utils::dbms::SQLDatabase* db() const {
@@ -160,6 +150,14 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
     return ::SQLPTRepresentation::GatherNickName(app_id, nicknames);
   }
 
+  int FetchOneInt(const std::string& query) {
+    query_wrapper_->Prepare(query);
+    query_wrapper_->Exec();
+    const int ret = query_wrapper_->GetInteger(0);
+    query_wrapper_->Finalize();
+    return ret;
+  }
+
   void CheckAppPoliciesSection(
       policy_table::ApplicationPoliciesSection& policies,
       uint16_t apps_size,
@@ -374,10 +372,6 @@ class SQLPTRepresentationTest : public SQLPTRepresentation,
   }
 };
 
-const std::string SQLPTRepresentationTest::kDatabaseName = "policy.sqlite";
-const std::string SQLPTRepresentationTest::kAppStorageFolder =
-    "storage_SQLPTRepresentationTest";
-
 class SQLPTRepresentationTest2 : public ::testing::Test {
  protected:
   SQLPTRepresentationTest2()
@@ -398,7 +392,7 @@ class SQLPTRepresentationTest2 : public ::testing::Test {
   }
 
   void TearDown() OVERRIDE {
-    file_system::RemoveDirectory(kAppStorageFolder, true);
+    ASSERT_TRUE(file_system::RemoveDirectory(kAppStorageFolder, true));
     delete reps;
   }
 
@@ -415,25 +409,169 @@ class SQLPTRepresentationTest3 : public ::testing::Test {
 
   void SetUp() OVERRIDE {
     file_system::CreateDirectory(kAppStorageFolder);
-    reps = new SQLPTRepresentation;
+    reps = std::make_shared<SQLPTRepresentation>();
   }
 
   void TearDown() OVERRIDE {
     file_system::RemoveDirectory(kAppStorageFolder, true);
-    delete reps;
+    reps.reset();
   }
 
-  SQLPTRepresentation* reps;
+  std::shared_ptr<SQLPTRepresentation> reps;
   NiceMock<MockPolicySettings> policy_settings_;
   const std::string kAppStorageFolder;
 };
 
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Store_Item) {
+  policy_table::VehicleDataItem rpm;
+  rpm.mark_initialized();
+  rpm.name = "rpm";
+  rpm.type = "Integer";
+  rpm.key = "OEM_REF_RPM";
+  rpm.mandatory = false;
+  *rpm.array = false;
+  rpm.params->mark_initialized();
+  ASSERT_FALSE(reps->VehicleDataItemExists(rpm));
+  ASSERT_TRUE(reps->InsertVehicleDataItem(rpm));
+  ASSERT_TRUE(reps->VehicleDataItemExists(rpm));
+
+  auto rpm_retrieved = reps->GetVehicleDataItem(rpm.name, rpm.key);
+  ASSERT_EQ(rpm.ToJsonValue(), rpm_retrieved.begin()->ToJsonValue());
+}
+
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Store_Complete_Item) {
+  policy_table::VehicleDataItem message;
+  message.mark_initialized();
+  message.name = "messsageName";
+  message.type = "String";
+  message.key = "OEM_REF_MSG";
+  message.mandatory = false;
+  *message.array = false;
+  message.params->mark_initialized();
+  *message.since = "1.0";
+  *message.until = "5.0";
+  *message.removed = false;
+  *message.deprecated = false;
+  *message.minvalue = 0;
+  *message.maxvalue = 255;
+  *message.minsize = 0;
+  *message.maxsize = 255;
+  *message.minlength = 0;
+  *message.maxlength = 255;
+  ASSERT_TRUE(reps->InsertVehicleDataItem(message));
+
+  auto message_retrieved = reps->GetVehicleDataItem(message.name, message.key);
+  ASSERT_EQ(message.ToJsonValue(), message_retrieved.begin()->ToJsonValue());
+}
+
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Store_Struct) {
+  policy_table::VehicleDataItem alss;
+  alss.mark_initialized();
+  alss.name = "ambientLightSensorStatus";
+  alss.type = "AmbientLightStatus";
+  alss.key = "OEM_REF_AMB_LIGHT";
+  alss.mandatory = false;
+  alss.params->mark_initialized();
+  policy_table::VehicleDataItem lss;
+  lss.mark_initialized();
+  lss.name = "LightSensorStatus";
+  lss.type = "Struct";
+  lss.key = "OEM_REF_SEN_LIGHT";
+  lss.mandatory = false;
+  lss.params->mark_initialized();
+  lss.params->push_back(alss);
+
+  policy_table::VehicleDataItem hbo;
+  hbo.mark_initialized();
+  hbo.name = "highBeamsOn";
+  hbo.type = "Boolean";
+  hbo.key = "OEM_REF_HIGH_BEAM";
+  hbo.mandatory = true;
+  hbo.params->mark_initialized();
+  policy_table::VehicleDataItem lbo;
+  lbo.mark_initialized();
+  lbo.name = "lowBeamsOn";
+  lbo.type = "Boolean";
+  lbo.key = "OEM_REF_LOW_BEAM";
+  lbo.mandatory = false;
+  lbo.params->mark_initialized();
+  policy_table::VehicleDataItem hls;
+  hls.mark_initialized();
+  hls.name = "headLampStatus";
+  hls.type = "Struct";
+  hls.key = "OEM_REF_HLSTATUS";
+  hls.mandatory = false;
+  hls.params->mark_initialized();
+  hls.params->push_back(lss);
+  hls.params->push_back(lbo);
+  hls.params->push_back(hbo);
+  ASSERT_TRUE(reps->InsertVehicleDataItem(alss));
+  ASSERT_TRUE(reps->InsertVehicleDataItem(hls));
+
+  auto hls_retrieved = reps->GetVehicleDataItem(hls.name, hls.key);
+  ASSERT_EQ(hls.ToJsonValue(), hls_retrieved.begin()->ToJsonValue());
+}
+
+TEST_F(SQLPTRepresentationTest, VehicleDataItem_Select_NonParameterizedVDI) {
+  policy_table::VehicleDataItems non_parameterized_vdis;
+  policy_table::VehicleDataItem rpm;
+  rpm.mark_initialized();
+  rpm.name = "rpm";
+  rpm.type = "Integer";
+  rpm.key = "OEM_REF_RPM";
+  rpm.mandatory = false;
+  *rpm.array = false;
+  rpm.params->mark_initialized();
+  ASSERT_TRUE(reps->InsertVehicleDataItem(rpm));
+  policy_table::VehicleDataItem message;
+  message.mark_initialized();
+  message.name = "rpm";
+  message.type = "String";
+  message.key = "OEM_REF_MSG";
+  message.mandatory = false;
+  *message.array = false;
+  message.params->mark_initialized();
+  ASSERT_TRUE(reps->InsertVehicleDataItem(message));
+  non_parameterized_vdis.push_back(rpm);
+  non_parameterized_vdis.push_back(message);
+
+  policy_table::VehicleDataItems parameterized_vdis;
+  policy_table::VehicleDataItem alss;
+  alss.mark_initialized();
+  alss.name = "ambientLightSensorStatus";
+  alss.type = "AmbientLightStatus";
+  alss.key = "OEM_REF_AMB_LIGHT";
+  alss.mandatory = false;
+  alss.params->mark_initialized();
+  policy_table::VehicleDataItem lss;
+  lss.mark_initialized();
+  lss.name = "LightSensorStatus";
+  lss.type = "Struct";
+  lss.key = "OEM_REF_SEN_LIGHT";
+  lss.mandatory = false;
+  lss.params->mark_initialized();
+  lss.params->push_back(alss);
+  ASSERT_TRUE(reps->InsertVehicleDataItem(lss));
+  parameterized_vdis.push_back(lss);
+
+  auto non_param_vdi_retrieved = reps->SelectPrimitiveVehicleDataItems();
+
+  ASSERT_EQ(non_parameterized_vdis.ToJsonValue(),
+            non_param_vdi_retrieved.ToJsonValue());
+
+  auto param_vdi_retrieved = reps->SelectCompositeVehicleDataItems();
+  ASSERT_EQ(parameterized_vdis.ToJsonValue(),
+            param_vdi_retrieved.ToJsonValue());
+}
+
 // {AKozoriz} : Unknown behavior (must try 8 times, tried 2 and opened)
 TEST_F(SQLPTRepresentationTest2,
        DISABLED_OpenAttemptTimeOut_ExpectCorrectNumber) {
   EXPECT_EQ(::policy::FAIL, reps->Init(&policy_settings_));
+
   // Check  Actual attempts number made to try to open DB
   EXPECT_EQ(kAttemptsToOpenPolicyDB, reps->open_counter());
+
   // Check timeot value correctly read from config file.
   EXPECT_EQ(700u, kOpenAttemptTimeoutMs);
 }
@@ -441,74 +579,89 @@ TEST_F(SQLPTRepresentationTest2,
 TEST_F(SQLPTRepresentationTest,
        RefreshDB_DropExistedPTThenRefreshDB_ExpectTablesWithInitialData) {
   // Check
-  const char* query_select =
+  const std::string query_select =
       "SELECT COUNT(*) FROM sqlite_master WHERE `type` = 'table'";
   // In normally created PT there are more than 0 tables
-  ASSERT_GT(dbms->FetchOneInt(query_select), 0);
+  ASSERT_GT(FetchOneInt(query_select), 0);
   ASSERT_TRUE(reps->Drop());
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select));
+
+  ASSERT_EQ(0, FetchOneInt(query_select));
   ASSERT_TRUE(reps->RefreshDB());
   // Check PT structure destroyed and tables number is 0
 
-  // There are 33 tables in the database, now.
-  const int32_t total_tables_number = 33;
-  ASSERT_EQ(total_tables_number, dbms->FetchOneInt(query_select));
-  const char* query_select_count_of_iap_buffer_full =
+  // There are 37 tables in the database, now.
+  const int32_t total_tables_number = 37;
+  ASSERT_EQ(total_tables_number, FetchOneInt(query_select));
+
+  const std::string query_select_count_of_iap_buffer_full =
       "SELECT `count_of_iap_buffer_full` FROM `usage_and_error_count`";
-  const char* query_select_count_sync_out_of_memory =
+  ASSERT_EQ(0, FetchOneInt(query_select_count_of_iap_buffer_full));
+
+  const std::string query_select_count_sync_out_of_memory =
       "SELECT `count_sync_out_of_memory` FROM `usage_and_error_count`";
-  const char* query_select_count_of_sync_reboots =
+  ASSERT_EQ(0, FetchOneInt(query_select_count_sync_out_of_memory));
+
+  const std::string query_select_count_of_sync_reboots =
       "SELECT `count_of_sync_reboots` FROM `usage_and_error_count`";
-  const char* query_select_pt_exchanged_at_odometer_x =
+  ASSERT_EQ(0, FetchOneInt(query_select_count_of_sync_reboots));
+
+  const std::string query_select_pt_exchanged_at_odometer_x =
       "SELECT `pt_exchanged_at_odometer_x` FROM `module_meta`";
-  const char* query_select_pt_exchanged_x_days_after_epoch =
+  ASSERT_EQ(0, FetchOneInt(query_select_pt_exchanged_at_odometer_x));
+
+  const std::string query_select_pt_exchanged_x_days_after_epoch =
       "SELECT `pt_exchanged_x_days_after_epoch` FROM `module_meta`";
-  const char* query_select_flag_update_required =
+  ASSERT_EQ(0, FetchOneInt(query_select_pt_exchanged_x_days_after_epoch));
+
+  const std::string query_select_flag_update_required =
       "SELECT `flag_update_required` FROM `module_meta`";
-  const char* query_select_ignition_cycles_since_last_exchange =
+  ASSERT_EQ(0, FetchOneInt(query_select_flag_update_required));
+
+  const std::string query_select_ignition_cycles_since_last_exchange =
       "SELECT `ignition_cycles_since_last_exchange` FROM `module_meta`";
-  const char* query_select_preloaded_pt =
+  ASSERT_EQ(0, FetchOneInt(query_select_ignition_cycles_since_last_exchange));
+
+  const std::string query_select_preloaded_pt =
       "SELECT `preloaded_pt` FROM `module_config`";
-  const char* query_select_is_first_run =
+  ASSERT_EQ(1, FetchOneInt(query_select_preloaded_pt));
+
+  const std::string query_select_is_first_run =
       "SELECT `is_first_run` FROM `module_config`";
-  const char* query_select_exchange_after_x_ignition_cycles =
+  ASSERT_EQ(0, FetchOneInt(query_select_is_first_run));
+
+  const std::string query_select_exchange_after_x_ignition_cycles =
       "SELECT `exchange_after_x_ignition_cycles` FROM `module_config`";
-  const char* query_select_exchange_after_x_kilometers =
+  ASSERT_EQ(0, FetchOneInt(query_select_exchange_after_x_ignition_cycles));
+
+  const std::string query_select_exchange_after_x_kilometers =
       "SELECT `exchange_after_x_kilometers` FROM `module_config`";
-  const char* query_select_exchange_after_x_days =
+  ASSERT_EQ(0, FetchOneInt(query_select_exchange_after_x_kilometers));
+
+  const std::string query_select_exchange_after_x_days =
       "SELECT `exchange_after_x_days` FROM `module_config`";
-  const char* query_select_timeout_after_x_seconds =
+  ASSERT_EQ(0, FetchOneInt(query_select_exchange_after_x_days));
+
+  const std::string query_select_timeout_after_x_seconds =
       "SELECT `timeout_after_x_seconds` FROM `module_config`";
-  const char* query_select_priorities = "SELECT COUNT(`value`) FROM `priority`";
-  const char* query_select_hmi_levels =
+  ASSERT_EQ(0, FetchOneInt(query_select_timeout_after_x_seconds));
+
+  const std::string query_select_priorities =
+      "SELECT COUNT(`value`) FROM `priority`";
+  ASSERT_EQ(6, FetchOneInt(query_select_priorities));
+
+  const std::string query_select_hmi_levels =
       "SELECT COUNT(`value`) FROM `hmi_level`";
-  const char* query_select_version = "SELECT `number` FROM `version`";
-
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_count_of_iap_buffer_full));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_count_sync_out_of_memory));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_count_of_sync_reboots));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_pt_exchanged_at_odometer_x));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_pt_exchanged_x_days_after_epoch));
-  ASSERT_EQ(
-      0, dbms->FetchOneInt(query_select_ignition_cycles_since_last_exchange));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_flag_update_required));
-  ASSERT_EQ(1, dbms->FetchOneInt(query_select_preloaded_pt));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_is_first_run));
-  ASSERT_EQ(0,
-            dbms->FetchOneInt(query_select_exchange_after_x_ignition_cycles));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_exchange_after_x_kilometers));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_exchange_after_x_days));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_timeout_after_x_seconds));
-  ASSERT_EQ(6, dbms->FetchOneInt(query_select_priorities));
-  ASSERT_EQ(4, dbms->FetchOneInt(query_select_hmi_levels));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_version));
+  ASSERT_EQ(4, FetchOneInt(query_select_hmi_levels));
+
+  const std::string query_select_version = "SELECT `number` FROM `version`";
+  ASSERT_EQ(0, FetchOneInt(query_select_version));
 }
 
 TEST_F(
     SQLPTRepresentationTest,
     CheckPermissionsAllowed_SetValuesInAppGroupRpcFunctionalGroup_GetEqualParamsInCheckPermissionResult) {
   // Arrange
-  const char* query =
+  const std::string query =
       "INSERT OR REPLACE INTO `application` (`id`, `memory_kb`,"
       " `heart_beat_timeout_ms`) VALUES ('12345', 5, 10); "
       "INSERT OR REPLACE INTO functional_group (`id`, `name`)"
@@ -521,7 +674,7 @@ TEST_F(
       " `functional_group_id`) VALUES ('Update', 'speed', 'FULL', 1);";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query));
+  ASSERT_TRUE(query_wrapper_->Exec(query));
 
   // Act
   CheckPermissionResult ret;
@@ -539,7 +692,7 @@ TEST_F(
     SQLPTRepresentationTest,
     CheckPermissionsAllowedWithoutParameters_SetLimitedPermissions_ExpectEmptyListOfAllowedParams) {
   // Arrange
-  const char* query =
+  const std::string query =
       "INSERT OR REPLACE INTO `application` (`id`, `memory_kb`,"
       " `heart_beat_timeout_ms`) VALUES ('12345', 5, 10); "
       "INSERT OR REPLACE INTO functional_group (`id`, `name`)"
@@ -551,7 +704,7 @@ TEST_F(
       " `functional_group_id`) VALUES ('Update', 'LIMITED', 1);";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query));
+  ASSERT_TRUE(query_wrapper_->Exec(query));
 
   // Act
   CheckPermissionResult ret;
@@ -566,10 +719,10 @@ TEST_F(
     SQLPTRepresentationTest,
     CheckPermissionsDisallowedWithoutParameters_DeletedAppGroupAndSetFULLLevel_ExpectHmiLevelIsDissalowed) {
   // Arrange
-  const char* query = "DELETE FROM `app_group`";
+  const std::string query = "DELETE FROM `app_group`";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query));
+  ASSERT_TRUE(query_wrapper_->Exec(query));
 
   // Act
   CheckPermissionResult ret;
@@ -583,20 +736,20 @@ TEST_F(
 TEST_F(SQLPTRepresentationTest,
        PTPReloaded_UpdateModuleConfig_ReturnIsPTPreloadedTRUE) {
   // Arrange
-  const char* query = "UPDATE `module_config` SET `preloaded_pt` = 1";
+  const std::string query = "UPDATE `module_config` SET `preloaded_pt` = 1";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query));
+  ASSERT_TRUE(query_wrapper_->Exec(query));
   EXPECT_TRUE(reps->IsPTPreloaded());
 }
 
 TEST_F(SQLPTRepresentationTest,
        GetUpdateUrls_DeleteAndInsertEndpoints_ExpectUpdateUrls) {
   // Arrange
-  const char* query_delete = "DELETE FROM `endpoint`; ";
+  const std::string query_delete = "DELETE FROM `endpoint`; ";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_delete));
+  ASSERT_TRUE(query_wrapper_->Exec(query_delete));
 
   // Act
   EndpointUrls ret = reps->GetUpdateUrls(7);
@@ -605,14 +758,15 @@ TEST_F(SQLPTRepresentationTest,
   EXPECT_TRUE(ret.empty());
 
   // Act
-  const char* query_insert =
+  const std::string query_insert =
       "INSERT INTO `endpoint` (`application_id`, `url`, `service`) "
       "  VALUES ('12345', 'http://ford.com/cloud/1', 7);"
       "INSERT INTO `endpoint` (`application_id`, `url`, `service`) "
       "  VALUES ('12345', 'http://ford.com/cloud/2', 7);";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
+
   // Act
   ret = reps->GetUpdateUrls(7);
 
@@ -631,13 +785,13 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IgnitionCyclesBeforeExchange_WithParametersOfQueryEqualZero) {
   // Arrange
-  const char* query_zeros =
+  const std::string query_zeros =
       "UPDATE `module_meta` SET "
       "  `ignition_cycles_since_last_exchange` = 0; "
       "  UPDATE `module_config` SET `exchange_after_x_ignition_cycles` = 0";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_zeros));
+  ASSERT_TRUE(query_wrapper_->Exec(query_zeros));
   EXPECT_EQ(0, reps->IgnitionCyclesBeforeExchange());
 
   // Act
@@ -650,13 +804,13 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IgnitionCyclesBeforeExchange_WithParametersOfQueryAreLessLimit) {
   // Arrange
-  const char* query_less_limit =
+  const std::string query_less_limit =
       "UPDATE `module_meta` SET "
       "  `ignition_cycles_since_last_exchange` = 5; "
       "  UPDATE `module_config` SET `exchange_after_x_ignition_cycles` = 10";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_less_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_less_limit));
   EXPECT_EQ(5, reps->IgnitionCyclesBeforeExchange());
 
   // Act
@@ -669,16 +823,18 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IgnitionCyclesBeforeExchange_WithLimitCountOfParametersOfQuery) {
   // Arrange
-  const char* query_limit =
+  const std::string query_limit =
       "UPDATE `module_meta` SET "
       "  `ignition_cycles_since_last_exchange` = 9; "
       "  UPDATE `module_config` SET `exchange_after_x_ignition_cycles` = 10";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_limit));
   EXPECT_EQ(1, reps->IgnitionCyclesBeforeExchange());
+
   // Act
   reps->IncrementIgnitionCycles();
+
   // Assert
   EXPECT_EQ(0, reps->IgnitionCyclesBeforeExchange());
 }
@@ -686,13 +842,14 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IgnitionCyclesBeforeExchange_WithMoreLimitCountOfParametersOfQuery) {
   // Arrange
-  const char* query_more_limit =
+  const std::string query_more_limit =
       "UPDATE `module_meta` SET "
       "  `ignition_cycles_since_last_exchange` = 12; "
       "  UPDATE `module_config` SET `exchange_after_x_ignition_cycles` = 10";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_more_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_more_limit));
+
   // Chceck
   EXPECT_EQ(0, reps->IgnitionCyclesBeforeExchange());
 }
@@ -700,13 +857,14 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IgnitionCyclesBeforeExchange_WithNegativeLimitOfParametersOfQuery) {
   // Arrange
-  const char* query_negative_limit =
+  const std::string query_negative_limit =
       "UPDATE `module_meta` SET "
       "  `ignition_cycles_since_last_exchange` = 3; "
       "  UPDATE `module_config` SET `exchange_after_x_ignition_cycles` = -1";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_negative_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_negative_limit));
+
   // Check
   EXPECT_EQ(0, reps->IgnitionCyclesBeforeExchange());
 }
@@ -715,13 +873,14 @@ TEST_F(
     SQLPTRepresentationTest,
     IgnitionCyclesBeforeExchange_WithNegativeLimitOfCurrentParameterOfQuery) {
   // Arrange
-  const char* query_negative_current =
+  const std::string query_negative_current =
       "UPDATE `module_meta` SET "
       "  `ignition_cycles_since_last_exchange` = -1; "
       "  UPDATE `module_config` SET `exchange_after_x_ignition_cycles` = 2";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_negative_current));
+  ASSERT_TRUE(query_wrapper_->Exec(query_negative_current));
+
   // Check
   EXPECT_EQ(0, reps->IgnitionCyclesBeforeExchange());
 }
@@ -729,13 +888,14 @@ TEST_F(
 TEST_F(SQLPTRepresentationTest,
        KilometersBeforeExchange_WithParametersOfQueryEqualZero) {
   // Arrange
-  const char* query_zeros =
+  const std::string query_zeros =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_at_odometer_x` = 0; "
       "  UPDATE `module_config` SET `exchange_after_x_kilometers` = 0";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_zeros));
+  ASSERT_TRUE(query_wrapper_->Exec(query_zeros));
+
   // Checks
   EXPECT_EQ(0, reps->KilometersBeforeExchange(0));
   EXPECT_EQ(0, reps->KilometersBeforeExchange(-10));
@@ -745,13 +905,14 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        KilometersBeforeExchange_QueryWithNegativeLimit) {
   // Arrange
-  const char* query_negative_limit =
+  const std::string query_negative_limit =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_at_odometer_x` = 10; "
       "  UPDATE `module_config` SET `exchange_after_x_kilometers` = -10";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_negative_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_negative_limit));
+
   // Checks
   EXPECT_EQ(0, reps->KilometersBeforeExchange(0));
   EXPECT_EQ(0, reps->KilometersBeforeExchange(10));
@@ -760,13 +921,14 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        KilometersBeforeExchange_QueryWithNegativeCurrentLimit) {
   // Arrange
-  const char* query_negative_last =
+  const std::string query_negative_last =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_at_odometer_x` = -10; "
       "  UPDATE `module_config` SET `exchange_after_x_kilometers` = 20";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_negative_last));
+  ASSERT_TRUE(query_wrapper_->Exec(query_negative_last));
+
   // Checks
   EXPECT_EQ(0, reps->KilometersBeforeExchange(0));
   EXPECT_EQ(0, reps->KilometersBeforeExchange(10));
@@ -775,13 +937,14 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        KilometersBeforeExchange_QueryWithLimitParameters) {
   // Arrange
-  const char* query_limit =
+  const std::string query_limit =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_at_odometer_x` = 10; "
       "  UPDATE `module_config` SET `exchange_after_x_kilometers` = 100";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_limit));
+
   // Checks
   EXPECT_EQ(0, reps->KilometersBeforeExchange(120));
   EXPECT_EQ(60, reps->KilometersBeforeExchange(50));
@@ -791,13 +954,14 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        DaysBeforeExchange_WithParametersOfQueryEqualZero) {
   // Arrange
-  const char* query_zeros =
+  const std::string query_zeros =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_x_days_after_epoch` = 0; "
       "  UPDATE `module_config` SET `exchange_after_x_days` = 0";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_zeros));
+  ASSERT_TRUE(query_wrapper_->Exec(query_zeros));
+
   // Checks
   EXPECT_EQ(0, reps->DaysBeforeExchange(0));
   EXPECT_EQ(0, reps->DaysBeforeExchange(-10));
@@ -806,13 +970,14 @@ TEST_F(SQLPTRepresentationTest,
 
 TEST_F(SQLPTRepresentationTest, DaysBeforeExchange_QueryWithNegativeLimit) {
   // Arrange
-  const char* query_negative_limit =
+  const std::string query_negative_limit =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_x_days_after_epoch` = 10; "
       "  UPDATE `module_config` SET `exchange_after_x_days` = -10";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_negative_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_negative_limit));
+
   // Checks
   EXPECT_EQ(0, reps->DaysBeforeExchange(0));
   EXPECT_EQ(0, reps->DaysBeforeExchange(10));
@@ -821,13 +986,14 @@ TEST_F(SQLPTRepresentationTest, DaysBeforeExchange_QueryWithNegativeLimit) {
 TEST_F(SQLPTRepresentationTest,
        DaysBeforeExchange_QueryWithNegativeCurrentLimit) {
   // Arrange
-  const char* query_negative_last =
+  const std::string query_negative_last =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_x_days_after_epoch` = -10; "
       "  UPDATE `module_config` SET `exchange_after_x_days` = 20";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_negative_last));
+  ASSERT_TRUE(query_wrapper_->Exec(query_negative_last));
+
   // Checks
   EXPECT_EQ(0, reps->DaysBeforeExchange(0));
   EXPECT_EQ(0, reps->DaysBeforeExchange(10));
@@ -835,13 +1001,14 @@ TEST_F(SQLPTRepresentationTest,
 
 TEST_F(SQLPTRepresentationTest, DaysBeforeExchange_QueryWithLimitParameters) {
   // Arrange
-  const char* query_limit =
+  const std::string query_limit =
       "UPDATE `module_meta` SET "
       "  `pt_exchanged_x_days_after_epoch` = 10; "
       "  UPDATE `module_config` SET `exchange_after_x_days` = 100";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_limit));
+  ASSERT_TRUE(query_wrapper_->Exec(query_limit));
+
   // Checks
   EXPECT_EQ(0, reps->DaysBeforeExchange(120));
   EXPECT_EQ(60, reps->DaysBeforeExchange(50));
@@ -853,23 +1020,24 @@ TEST_F(
     SecondsBetweenRetries_DeletedAndInsertedSecondsBetweenRetry_ExpectCountOfSecondsEqualInserted) {
   // Arrange
   std::vector<int> seconds;
-  const char* query_delete = "DELETE FROM `seconds_between_retry`; ";
+  const std::string query_delete = "DELETE FROM `seconds_between_retry`; ";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_delete));
+  ASSERT_TRUE(query_wrapper_->Exec(query_delete));
   ASSERT_TRUE(reps->SecondsBetweenRetries(&seconds));
   EXPECT_EQ(0u, seconds.size());
 
   // Arrange
-  const char* query_insert =
+  const std::string query_insert =
       "INSERT INTO `seconds_between_retry` (`index`, `value`) "
       "  VALUES (0, 10); "
       "INSERT INTO `seconds_between_retry` (`index`, `value`) "
       "  VALUES (1, 20); ";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
   ASSERT_TRUE(reps->SecondsBetweenRetries(&seconds));
+
   // Checks
   ASSERT_EQ(2u, seconds.size());
   EXPECT_EQ(10, seconds[0]);
@@ -878,11 +1046,12 @@ TEST_F(
 
 TEST_F(SQLPTRepresentationTest, TimeoutResponse_Set60Seconds_GetEqualTimeout) {
   // Arrange
-  const char* query =
+  const std::string query =
       "UPDATE `module_config` SET `timeout_after_x_seconds` = 60";
 
   // Assert
-  ASSERT_TRUE(dbms->Exec(query));
+  ASSERT_TRUE(query_wrapper_->Exec(query));
+
   // Check
   EXPECT_EQ(60000, reps->TimeoutResponse());
 }
@@ -890,8 +1059,12 @@ TEST_F(SQLPTRepresentationTest, TimeoutResponse_Set60Seconds_GetEqualTimeout) {
 TEST_F(SQLPTRepresentationTest,
        IsPTPreloaded_SetPTPreloadedThenCheck_ExpectCorrectValue) {
   // Arrange
-  const char* query_insert = "UPDATE `module_config` SET `preloaded_pt` = 1";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  const std::string query_insert =
+      "UPDATE `module_config` SET `preloaded_pt` = 1";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
+
   // Check
   ASSERT_TRUE(reps->IsPTPreloaded());
 }
@@ -900,65 +1073,81 @@ TEST_F(
     SQLPTRepresentationTest,
     SetCountersPassedForSuccessfulUpdate_SetCounters_ExpectValueChangedInPT) {
   // Arrange
-  const char* query_select_odometer =
+  const std::string query_select_odometer =
       "SELECT  `pt_exchanged_at_odometer_x` FROM`module_meta`";
-  const char* query_select_days_after_epoch =
+  const std::string query_select_days_after_epoch =
       "SELECT `pt_exchanged_x_days_after_epoch` FROM`module_meta`";
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_odometer));
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select_days_after_epoch));
+  ASSERT_EQ(0, FetchOneInt(query_select_odometer));
+  ASSERT_EQ(0, FetchOneInt(query_select_days_after_epoch));
   // Act
   ASSERT_TRUE(reps->SetCountersPassedForSuccessfulUpdate(100, 10000));
-  ASSERT_EQ(100, dbms->FetchOneInt(query_select_odometer));
-  ASSERT_EQ(10000, dbms->FetchOneInt(query_select_days_after_epoch));
+  ASSERT_EQ(100, FetchOneInt(query_select_odometer));
+  ASSERT_EQ(10000, FetchOneInt(query_select_days_after_epoch));
 }
 
 TEST_F(
     SQLPTRepresentationTest,
     IncrementIgnitionCycles_SetIgnitionCyclesValueThenIncrement_ExpectValueIncrementedInPT) {
   // Arrange
-  const char* query_insert =
+  const std::string query_insert =
       "UPDATE `module_meta` SET `ignition_cycles_since_last_exchange` = 54";
-  const char* query_select =
+  const std::string query_select =
       "SELECT `ignition_cycles_since_last_exchange`FROM `module_meta`";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
+
   // Act
   reps->IncrementIgnitionCycles();
+
   // Check
-  ASSERT_EQ(55, dbms->FetchOneInt(query_select));
+  ASSERT_EQ(55, FetchOneInt(query_select));
 }
 
 TEST_F(
     SQLPTRepresentationTest,
     ResetIgnitionCycles_SetIgnitionCyclesValueThenReset_ExpectZeroValueInPT) {
   // Arrange
-  const char* query_insert =
+  const std::string query_insert =
       "UPDATE `module_meta` SET `ignition_cycles_since_last_exchange` = 55";
-  const char* query_select =
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
+
+  const std::string query_select =
       "SELECT `ignition_cycles_since_last_exchange` FROM `module_meta`";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+
   // Act
   reps->ResetIgnitionCycles();
+
   // Check
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select));
+  ASSERT_EQ(0, FetchOneInt(query_select));
 }
 
 TEST_F(SQLPTRepresentationTest,
        GetUserFriendlyMsg_SetMsg_ExpectReceivedMsgSetInParams) {
   // Arrange
 
-  const char* query_insert =
+  const std::string query_insert_language_code =
       "INSERT INTO `message` (`language_code`, `message_type_name`) VALUES "
       "('en-en', 'AppPermissions')";
 
-  ASSERT_TRUE(dbms->Exec(query_insert));
-  query_insert =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_language_code));
+
+  const std::string query_insert_name =
       "INSERT INTO `message_type` (`name`) VALUES ('AppPermissions')";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_name));
+
   std::vector<std::string> msg_code;
   msg_code.push_back("AppPermissions");
+
   // Act
   std::vector<UserFriendlyMessage> result =
       reps->GetUserFriendlyMsg(msg_code, std::string("en-en"));
+
   // Checks
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ(result[0].message_code, "AppPermissions");
@@ -968,13 +1157,14 @@ TEST_F(
     SQLPTRepresentationTest,
     GetNotificationNumber_SetNotificationsPriorities_ExpectReceivedValuesCorrect) {
   // Arrange
-  const char* query_insert =
+  const std::string query_insert =
       "INSERT INTO `notifications_by_priority` (`priority_value`, `value`) "
       "VALUES ('NAVIGATION', 15) , "
       "('COMMUNICATION', 6), ('EMERGENCY', 60), ('NONE', 0), ('NORMAL', 4), "
       "('VOICECOMMUNICATION', 20)";
 
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
   EXPECT_EQ(6, reps->GetNotificationsNumber("COMMUNICATION"));
   EXPECT_EQ(60, reps->GetNotificationsNumber("EMERGENCY"));
   EXPECT_EQ(15, reps->GetNotificationsNumber("NAVIGATION"));
@@ -986,7 +1176,7 @@ TEST_F(
 TEST_F(SQLPTRepresentationTest,
        GetPriority_SetAppsPrioritiesThenGet_ExpectReceivedValuesCorrect) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app_default =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -994,9 +1184,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'default', 0, 0, 'NONE', 'NONE', 0, "
       "0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_default));
+
+  const std::string query_insert_app_predataconsent =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1004,9 +1196,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'pre_DataConsent', 0, 0, 'NONE', "
       "'NONE', 0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_predataconsent));
+
+  const std::string query_insert_app_device =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1014,9 +1208,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'device', 0, 0, 'NONE', "
       "'COMMUNICATION', 0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_device));
+
+  const std::string query_insert_app_12345 =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1024,7 +1220,9 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( '12345', 0, 0, 'NONE', 'EMERGENCY', "
       "0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_12345));
 
   std::string priority;
   // Checks
@@ -1074,7 +1272,7 @@ TEST_F(SQLPTRepresentationTest3,
 TEST_F(SQLPTRepresentationTest,
        Clear_InitNewDataBaseThenClear_ExpectResultSuccess) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app_default =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1082,9 +1280,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'default', 0, 0, 'NONE', 'NONE', 0, "
       "0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_default));
+
+  const std::string query_insert_app_predataconsent =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1092,9 +1292,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'pre_DataConsent', 0, 0, 'NONE', "
       "'NONE', 0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_predataconsent));
+
+  const std::string query_insert_app_device =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1102,9 +1304,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'device', 0, 0, 'NONE', "
       "'COMMUNICATION', 0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_device));
+
+  const std::string query_insert_app_12345 =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1112,15 +1316,18 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( '12345', 0, 0, 'NONE', 'EMERGENCY', "
       "0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  const char* query_insert =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_12345));
+
+  const std::string query_insert =
       "INSERT INTO `notifications_by_priority` (`priority_value`, `value`) "
       "VALUES ('NAVIGATION', 15) , "
       "('COMMUNICATION', 6), ('EMERGENCY', 60), ('NONE', 0), ('NORMAL', 4), "
       "('VOICECOMMUNICATION', 20)";
 
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
   EXPECT_TRUE(reps->Clear());
   utils::dbms::SQLError error(utils::dbms::Error::OK);
   EXPECT_EQ(error.number(), (reps->db()->LastError().number()));
@@ -1129,17 +1336,22 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        GetInitialAppData_SetData_ExpectCorrectValuesReceived) {
   // Arrange
-  const char* query_insert =
+  const std::string query_insert_nickname =
       "INSERT INTO `nickname` (`application_id`, `name`) "
       "VALUES ('1111', 'first_app') , "
       "('2222', 'second_app'), ('3333', 'third_app')";
-  ASSERT_TRUE(dbms->Exec(query_insert));
 
-  query_insert =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_nickname));
+
+  const std::string query_insert_app_type =
       "INSERT INTO `app_type` (`application_id`, `name`)"
       "VALUES ('1111', 'NAVIGATION') , "
       "('1111', 'MEDIA'), ('3333', 'COMMUNICATION')";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_type));
+
   ::policy::StringArray nicknames;
   ::policy::StringArray app_types;
   ASSERT_TRUE(reps->GetInitialAppData("1111", &nicknames, &app_types));
@@ -1173,22 +1385,28 @@ TEST_F(
     SQLPTRepresentationTest,
     GetFunctionalGroupings_SetFunctionalGroupings_ExpectCorrectValuesReceived) {
   // Arrange
-  const char* query_insert =
+  const std::string query_insert_functional_group =
       "INSERT INTO `functional_group` (`id`, `user_consent_prompt`, `name`) "
       "VALUES (73072936, null, 'SendLocation'), (1533011474, null, "
       "'OnKeyboardInputOnlyGroup')";
-  ASSERT_TRUE(dbms->Exec(query_insert));
 
-  query_insert =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_functional_group));
+
+  const std::string query_insert_rpc_sendlocation =
       "INSERT INTO `rpc` (`name`, `hmi_level_value`, `functional_group_id`) "
       "VALUES ('SendLocation', 'BACKGROUND', 73072936), ('SendLocation', "
       "'FULL', 73072936), ('SendLocation', 'LIMITED', 73072936)";
-  ASSERT_TRUE(dbms->Exec(query_insert));
 
-  query_insert =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_rpc_sendlocation));
+
+  const std::string query_insert_rpc_onkeyboard_input =
       "INSERT INTO `rpc` (`name`, `hmi_level_value`, `functional_group_id`) "
       "VALUES ('OnKeyboardInput', 'FULL', 1533011474)";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_rpc_onkeyboard_input));
 
   policy_table::FunctionalGroupings func_groups;
   ASSERT_TRUE(reps->GetFunctionalGroupings(func_groups));
@@ -1241,10 +1459,12 @@ TEST_F(
 TEST_F(SQLPTRepresentationTest,
        UpdateRequired_SetUpdateRequiredFlagThenCheck_ExpectUpdateRequired) {
   // Arrange
-  const char* query_insert =
+  const std::string query_insert =
       "UPDATE `module_meta` SET `flag_update_required` = 1";
+
   // Assert
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
+
   // Check
   EXPECT_TRUE(reps->UpdateRequired());
 }
@@ -1253,10 +1473,13 @@ TEST_F(SQLPTRepresentationTest,
        SaveUpdateRequired_SaveUpdateRequired_ExpectCorrectValues) {
   // Arrange
   reps->SaveUpdateRequired(true);
+
   // Check
   EXPECT_TRUE(reps->UpdateRequired());
+
   // Act
   reps->SaveUpdateRequired(false);
+
   // Check
   EXPECT_FALSE(reps->UpdateRequired());
 }
@@ -1264,7 +1487,7 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IsApplicationRepresented_Check_ExpectCorrectResult) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app_default =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1272,18 +1495,22 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'default', 0, 0, 'NONE', 'NONE', 0, "
       "0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_default));
+
+  const std::string query_insert_app_device =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
       "`is_predata`, `memory_kb`, "
       " `heart_beat_timeout_ms`) VALUES( 'device', 0, 0, 'NONE', "
       "'COMMUNICATION', 0, 0, 0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_device));
+
+  const std::string query_insert_app_12345 =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1291,7 +1518,10 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( '12345', 0, 0, 'NONE', 'EMERGENCY', "
       "0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_12345));
+
   // Checks
   EXPECT_TRUE(reps->IsApplicationRepresented("default"));
   EXPECT_TRUE(reps->IsApplicationRepresented("device"));
@@ -1302,7 +1532,7 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IsApplicationRevoked_CheckApps_ExpectCorrectResult) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app_7777 =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1310,9 +1540,11 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( '7777', 0, 0, 'NONE', 'NONE', 1, "
       "0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_7777));
+
+  const std::string query_insert_app_12345 =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1320,7 +1552,10 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( '12345', 0, 0, 'NONE', 'EMERGENCY', "
       "0, 0, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_12345));
+
   // Checks
   EXPECT_TRUE(reps->IsApplicationRevoked("7777"));
   EXPECT_FALSE(reps->IsApplicationRevoked("12345"));
@@ -1329,7 +1564,7 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        CopyApplication_CopyApplication_ExpectAppCopiedSuccesfully) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app_default =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1337,21 +1572,28 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( 'default', 0, 0, 'NONE', 'NONE', 0, "
       "1, "
       "0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
 
-  query_insert_app =
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_default));
+
+  const std::string query_insert_app_123 =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
       "`is_predata`, `memory_kb`, "
       " `heart_beat_timeout_ms`) VALUES( '123', 1, 0, 'FULL', "
       "'COMMUNICATION', 1, 1, 0, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app_123));
+
   EXPECT_FALSE(reps->IsApplicationRepresented("7777"));
   EXPECT_FALSE(reps->IsApplicationRepresented("9999"));
+
   // Act
   EXPECT_TRUE(reps->CopyApplication("default", "7777"));
   EXPECT_TRUE(reps->CopyApplication("123", "9999"));
+
   // Checks
   EXPECT_TRUE(reps->IsApplicationRepresented("7777"));
   EXPECT_TRUE(reps->IsApplicationRepresented("9999"));
@@ -1371,7 +1613,7 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IsDefaultPolicy_SetAppPreDataThenCheck_ExpectNotDefaultPolicySet) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, "
       " `default_hmi`, `priority_value`, `is_revoked`, `is_default`, "
@@ -1379,7 +1621,10 @@ TEST_F(SQLPTRepresentationTest,
       " `heart_beat_timeout_ms`) VALUES( '12345', 0, 0, 'NONE', 'NONE', 0, "
       "0, "
       "1, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app));
+
   // Check
   EXPECT_FALSE(reps->IsDefaultPolicy("12345"));
 }
@@ -1387,28 +1632,35 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        IsDefaultPolicy_SetAppDefaultThenCheck_ExpectNotDefaultPolicySet) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, `default_hmi`, `priority_value`, `is_revoked`, "
       "`is_default`, `is_predata`, `memory_kb`, `heart_beat_timeout_ms`) "
       "VALUES( '1234567', 0, 0, 'NONE', 'NONE', 0, 1, 0, 64, 10) ";
 
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app));
+
   // Check
   EXPECT_TRUE(reps->IsDefaultPolicy("1234567"));
 }
 
 TEST_F(SQLPTRepresentationTest, Drop_DropExistedPT_ExpectZeroTables) {
   // Check
-  const char* query_select =
+  const std::string query_select =
       "SELECT COUNT(*) FROM `sqlite_master` WHERE `type` = 'table'";
   // In normally created PT there are more than 0 tables
-  ASSERT_TRUE(dbms->Exec(query_select));
-  ASSERT_GT(dbms->FetchOneInt(query_select), 0);
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_select));
+  ASSERT_GT(FetchOneInt(query_select), 0);
+
   // Destroy schema
   ASSERT_TRUE(reps->Drop());
+
   // Check PT structure destroyed and tables number is 0
-  ASSERT_EQ(0, dbms->FetchOneInt(query_select));
+  ASSERT_EQ(0, FetchOneInt(query_select));
+
   // Restore schema
   ASSERT_TRUE(reps->RefreshDB());
 }
@@ -1430,21 +1682,24 @@ TEST_F(SQLPTRepresentationTest,
       "VALUES( '" +
       kDefaultId + "', 0, 0, 'NONE', 'NONE', 0, 0, 0, 64, 10) ";
 
-  ASSERT_TRUE(dbms->Exec(query_insert_default_app.c_str()));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_default_app));
 
   const std::string query_insert_default_app_request_types =
       "INSERT INTO `request_type` (`application_id`, `request_type`)  "
       "VALUES ('" +
       kDefaultId + "', '" + kRequestType + "')";
 
-  ASSERT_TRUE(dbms->Exec(query_insert_default_app_request_types.c_str()));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_default_app_request_types));
 
   const std::string query_insert_default_app_hmi_types =
       "INSERT INTO `app_type` (`application_id`, `name`)  "
       "VALUES ('" +
       kDefaultId + "', '" + kHmiType + "')";
 
-  ASSERT_TRUE(dbms->Exec(query_insert_default_app_hmi_types.c_str()));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_default_app_hmi_types));
 
   const std::string query_insert_new_app =
       "INSERT INTO `application`(`id`, `keep_context`, "
@@ -1453,11 +1708,14 @@ TEST_F(SQLPTRepresentationTest,
       "VALUES('" +
       kAppId + "', 0, 0, 'NONE', 'NONE', 0, 0, 1, 64, 10)";
 
-  ASSERT_TRUE(dbms->Exec(query_insert_new_app.c_str()));
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_new_app));
 
   EXPECT_FALSE(reps->IsDefaultPolicy(kAppId));
+
   // Act
   ASSERT_TRUE(reps->SetDefaultPolicy(kAppId));
+
   // Check
   EXPECT_TRUE(reps->IsDefaultPolicy(kAppId));
 
@@ -1475,16 +1733,24 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        SetPreloaded_SetPreloaded_ExpectPTSetToPreloaded) {
   // Arrange
-  const char* query_insert = "UPDATE `module_config` SET `preloaded_pt` = 0";
-  ASSERT_TRUE(dbms->Exec(query_insert));
+  const std::string query_insert =
+      "UPDATE `module_config` SET `preloaded_pt` = 0";
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert));
+
   // Check
   ASSERT_FALSE(reps->IsPTPreloaded());
+
   // Act
   reps->SetPreloaded(true);
+
   // Check
   ASSERT_TRUE(reps->IsPTPreloaded());
+
   // Act
   reps->SetPreloaded(false);
+
   // Check
   ASSERT_FALSE(reps->IsPTPreloaded());
 }
@@ -1492,23 +1758,30 @@ TEST_F(SQLPTRepresentationTest,
 TEST_F(SQLPTRepresentationTest,
        SetIsDefault_SetIsDefault_ExpectDefaultFlagSet) {
   // Arrange
-  const char* query_insert_app =
+  const std::string query_insert_app =
       "INSERT OR IGNORE INTO `application`(`id`, `keep_context`, "
       "`steal_focus`, `default_hmi`, `priority_value`, `is_revoked`, "
       "`is_default`, `is_predata`, `memory_kb`, `heart_beat_timeout_ms`) "
       "VALUES( '1234567', 0, 0, 'NONE', 'NONE', 0, 0, 1, 64, 10) ";
-  ASSERT_TRUE(dbms->Exec(query_insert_app));
-  const char* query_select =
+
+  // Assert
+  ASSERT_TRUE(query_wrapper_->Exec(query_insert_app));
+
+  const std::string query_select =
       "SELECT `is_default` FROM `application`WHERE`id`= '1234567' ";
-  EXPECT_EQ(0, dbms->FetchOneInt(query_select));
+  EXPECT_EQ(0, FetchOneInt(query_select));
+
   // Act
   EXPECT_TRUE(reps->SetIsDefault("1234567", true));
+
   // Check
-  EXPECT_EQ(1, dbms->FetchOneInt(query_select));
+  EXPECT_EQ(1, FetchOneInt(query_select));
+
   // Act
   EXPECT_TRUE(reps->SetIsDefault("1234567", false));
+
   // Check
-  EXPECT_EQ(0, dbms->FetchOneInt(query_select));
+  EXPECT_EQ(0, FetchOneInt(query_select));
 }
 
 TEST_F(SQLPTRepresentationTest3, RemoveDB_RemoveDB_ExpectFileDeleted) {
@@ -1563,10 +1836,10 @@ TEST_F(SQLPTRepresentationTest,
   table["policy_table"]["device_data"] = Json::Value(Json::objectValue);
   table["policy_table"]["module_meta"] = Json::Value(Json::objectValue);
   policy_table::Table expected(&table);
-  Json::StyledWriter writer;
+  Json::StreamWriterBuilder writer_builder;
   // Checks
-  EXPECT_EQ(writer.write(expected.ToJsonValue()),
-            writer.write(snapshot->ToJsonValue()));
+  EXPECT_EQ(Json::writeString(writer_builder, expected.ToJsonValue()),
+            Json::writeString(writer_builder, snapshot->ToJsonValue()));
   EXPECT_EQ(expected.ToJsonValue().toStyledString(),
             snapshot->ToJsonValue().toStyledString());
 }
@@ -1644,9 +1917,11 @@ TEST_F(SQLPTRepresentationTest, Save_SetPolicyTableThenSave_ExpectSavedToPT) {
 
   const ::policy_table::Parameters& parameters = *(rpc_iter->second.parameters);
   EXPECT_EQ(1u, parameters.size());
-  EXPECT_TRUE(parameters.end() != std::find(parameters.begin(),
-                                            parameters.end(),
-                                            policy_table::Parameter::P_SPEED));
+  EXPECT_TRUE(parameters.end() !=
+              std::find(parameters.begin(),
+                        parameters.end(),
+                        policy_table::EnumToJsonString(
+                            policy_table::Parameter::P_SPEED)));
   // Check Application Policies Section
   GatherApplicationPoliciesSection(&policies);
   const uint32_t apps_size = 3u;
diff --git a/src/components/policy/policy_regular/test/valid_sdl_pt_update.json b/src/components/policy/policy_regular/test/valid_sdl_pt_update.json
deleted file mode 100644
index acf18c5706..0000000000
--- a/src/components/policy/policy_regular/test/valid_sdl_pt_update.json
+++ /dev/null
@@ -1,1746 +0,0 @@
-{
-   "policy_table" : {
-      "app_policies" : {
-         "1010101010" : {
-            "AppHMIType" : [ "MEDIA" ],
-            "certificate" : "akdjfhaliuygrglurng",
-            "default_hmi" : "BACKGROUND",
-            "groups" : [
-               "Notifications",
-               "Location-1",
-               "PropriataryData-1",
-               "Navigation-1",
-               "Base-4",
-               "VehicleInfo-3",
-               "DrivingCharacteristics-3",
-               "Emergency-1"
-            ],
-            "keep_context" : true,
-            "memory_kb" : 1000,
-            "nicknames" : [ "SyncProxyTester" ],
-            "priority" : "EMERGENCY",
-            "steal_focus" : true,
-            "heart_beat_timeout_ms": 5000,
-            "app_services": {
-               "MEDIA": {
-                  "service_names" : ["SDL App", "SDL Music"],
-                  "handled_rpcs" : [{"function_id": 41}]
-               }
-            }
-         },
-         "default" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "device" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "Base-4" ],
-            "memory_kb" : 1000,
-            "watchdog_timer_ms" : 20000,
-            "keep_context" : false,
-            "priority" : "NONE",
-            "steal_focus" : false
-         },
-         "pre_DataConsent" : {
-            "default_hmi" : "NONE",
-            "groups" : [ "pre_Base-1" ],
-            "keep_context" : false,
-            "memory_kb" : 1000,
-            "priority" : "NONE",
-            "steal_focus" : false
-         }
-      },
-      "consumer_friendly_messages" : {
-         "messages" : {
-            "AppPermissions" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Zugriffsanfrage(n)",
-                     "line2" : "erlauben?",
-                     "tts" : "%appName% benötigt die folgenden Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Wenn Sie Ja drücken, erklären Sie sich damit einverstanden, dass %vehicleMake% nicht für Schäden oder Verletzungen der Privatsphäre haftet, die im Zusammenhang mit der Nutzung Ihrer Benutzerdaten durch %appName% entstehen. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-gb" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-ie" : {
-                     "line1" : "Grant requested",
-                     "line2" : "permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press Yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press Yes to allow or No to deny."
-                  },
-                  "en-us" : {
-                     "line1" : "Grant Requested",
-                     "line2" : "Permission(s)?",
-                     "tts" : "%appName% is requesting the use of the following vehicle information and permissions: %functionalGroupLabels%. If you press yes, you agree that %vehicleMake% will not be liable for any damages or loss of privacy related to %appName%'s use of your data. Please press yes to allow or no to deny."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Conceder permisos",
-                     "line2" : "solicitados?",
-                     "tts" : "%appName% está solicitando el uso de los siguientes permisos e información del vehículo: %functionalGroupLabels%. Si pulsa sí, acepta que %vehicleMake% no será responsable de los daños o la pérdida de privacidad relacionados con el uso de sus datos por parte de %appName%. Pulse sí para permitir o no para denegar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Otorgar permiso(s)",
-                     "line2" : "solicitado(s)?",
-                     "tts" : "%appName% solicita el uso de la siguiente información y permisos del vehículo: %functionalGroupLabels%. Si presiona Sí, acepta que %vehicleMake% no se hará responsable por los daños o pérdidas de privacidad relacionados con el uso que %appName% haga de sus datos. Presione Sí para permitir y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Accorder permission(s)",
-                     "line2" : "demandée(s)",
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Si vous appuyez sur Oui, vous acceptez que %vehicleMake% ne sera pas responsable des dommages ou des pertes de confidentialité reliées à l’utilisation de vos données par %appName%. Veuillez appuyer sur Oui pour autoriser ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "line1" : "Concedi autorizzaz.",
-                     "line2" : "richiesta(e)?",
-                     "tts" : "%appName% richiede l'uso delle seguenti informazioni e autorizzazioni sul veicolo: %functionalGroupLabels%. Se si preme Sì, si acconsente che %vehicleMake% non sarà responsabile per danni o perdita di privacy in relazione all'impiego dei dati da parte di %appName%. Premere Sì per consentire e No per negare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Aangevraagde",
-                     "line2" : "permissie(s) verlenen?",
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. Als u op Ja drukt, gaat u ermee akkoord dat %vehicleMake% in geen geval aansprakelijk gesteld kan worden voor schade of verlies van privacy als gevolg van het feit dat %appName% gebruik maakt van uw gegevens. Druk op Ja om dit toe te staan of Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Udzielić żądanych",
-                     "line2" : "pozwoleń?",
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz pozwoleń: %functionalGroupLabels%. Naciśnięcie TAK oznacza zgodę na fakt, iż %vehicleMake% nie będzie ponosić odpowiedzialności za szkody ani utratę prywatności w związku z wykorzystaniem przez %appName% danych, należących do użytkownika. Naciśnij TAK w celu udzielenia zgody lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "line1" : "Conceder permissão",
-                     "line2" : "solicitada?",
-                     "tts" : "%appName% está solicitando o uso das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se pressionar sim, você concorda que a %vehicleMake% não será responsável por danos ou perdas de privacidade relacionados ao uso dos seus dados por %appName%. Pressione sim para permitir ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Conceder permiss.",
-                     "line2" : "solicitada(s)?",
-                     "tts" : "%appName% está a solicitar a utilização das seguintes informações e permissões do veículo: %functionalGroupLabels%. Se premir “Sim”, concorda que %vehicleMake% não será responsável por quaisquer danos ou perda de privacidade relacionada com a utilização dos seus dados por parte de %appName%. Prima “Sim” para permitir ou “Não” para recusar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Предост. заправш.",
-                     "line2" : "разрешения?",
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Нажатием \"\"да\"\", Вы соглашаетесь, что %vehicleMake% не будет нести ответственность за какие-либо убытки или потерю прайвеси, связанные с использованием Ваших данных компанией %appName%. Нажмите \"\"Да\"\", если Вы согласны, или \"\"Нет\"\" - если не согласны."
-                  },
-                  "sv-se" : {
-                     "line1" : "Vill du ge",
-                     "line2" : "tillstånd?",
-                     "tts" : "%appName% begär att få tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Om du trycker Ja godkänner du att %vehicleMake% ska hållas skadeslös för alla skador som kan uppstå eller eventuella integritetsintrång som uppstår när %appName% använder dina data. Tryck Ja för att godkänna eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "line1" : "İstenen izinler",
-                     "line2" : "verilsin mi?",
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri kullanma isteğinde bulunuyor: %functionalGroupLabels%. Evet'e basarsanız, %appName%'in verilerinizi kullanması sonucunda oluşabilecek hasarlardan veya gizlilik kaybından %vehicleMake%'in sorumlu olmayacağını kabul etmiş olacaksınız. Lütfen kabul etmek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否允许请求的",
-                     "line2" : "权限？",
-                     "tts" : "%appName% 正在请求使用下列车辆信息和权限： %functionalGroupLabels%。如果您按“是”，则表示您同意。 %vehicleMake% 将不会对因 %appName% 使用您的数据而引起的任何损毁或隐私损失负责。 请按“是”允许或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "允許",
-                     "line2" : "授權請求?",
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。按「是」，表示您同意，如因 %appName% 使用您的資料導致任何損害或損失，%vehicleMake% 將不負賠償責任。同意請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsHelp" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "%appName% fordert folgende Fahrzeuginformationen und Zugriffsberechtigungen: %functionalGroupLabels%. Im Einstellungsmenü der mobilen Apps können Sie diese Berechtigungen ändern und sich detaillierte Beschreibungen anhören. Mit Ja stimmen Sie zu; mit Nein lehnen Sie ab."
-                  },
-                  "en-au" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-gb" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-ie" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press Yes to grant permissions or No to deny."
-                  },
-                  "en-us" : {
-                     "tts" : "%appName% is requesting the following vehicle information and permissions: %functionalGroupLabels%. You can change these permissions and hear detailed descriptions in the mobile apps settings menu. Please press yes to grant permissions or no to deny."
-                  },
-                  "es-en" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "es-es" : {
-                     "tts" : "%appName% está solicitando los siguientes permisos e información del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y escuchar descripciones detalladas en el menú de configuración de la aplicación móvil. Pulse sí para conceder el permiso o no para denegarlo."
-                  },
-                  "es-mx" : {
-                     "tts" : "%appName% solicita la siguiente información y permisos del vehículo: %functionalGroupLabels%. Puede cambiar estos permisos y consultar descripciones detalladas en el menú de configuración de las aplicaciones móviles. Presione Sí para otorgar permisos y No para denegar."
-                  },
-                  "fr-ca" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "fr-fr" : {
-                     "tts" : "%appName% demande d’utiliser les informations du véhicule et les permissions suivantes : %functionalGroupLabels%. Vous pouvez modifier ces permissions et entendre les descriptions détaillées dans le menu des réglages des applications mobiles. Veuillez appuyer sur Oui pour accorder les permissions ou sur Non pour refuser."
-                  },
-                  "it-it" : {
-                     "tts" : "%appName% richiede le seguenti informazioni e autorizzazioni riguardo il veicolo: %functionalGroupLabels%. È possibile modificare tali autorizzazioni e ascoltare descrizioni dettagliate nel menu impostazioni delle app mobili. Premere Sì per concedere le autorizzazioni e No per negarle."
-                  },
-                  "nl-nl" : {
-                     "tts" : "%appName% vraagt gebruikmaking van de volgende voertuiginformatie en toestemmingen aan: %functionalGroupLabels%. U kunt deze toestemmingen wijzigen en gedetailleerde beschrijvingen beluisteren in het instellingenmenu voor mobiele apps. Druk op Ja om permissies te verlenen of op Nee om te weigeren."
-                  },
-                  "pl-pl" : {
-                     "tts" : "%appName% wymaga następujących informacji o pojeździe oraz zezwoleń: %functionalGroupLabels%. W menu ustawień aplikacji mobilnych można zmienić owe zezwolenia i usłyszeć ich szczegółowy opis. Naciśnij TAK, aby wyrazić zgodę lub NIE w celu odrzucenia żądania."
-                  },
-                  "pt-br" : {
-                     "tts" : "%appName% está solicitando as seguintes informações e permissões do veículo: %functionalGroupLabels%. Você pode alterar estas permissões e ouvir descrições detalhadas no menu de configurações de aplicativos móveis. Pressione sim para conceder as permissões ou não para negar."
-                  },
-                  "pt-pt" : {
-                     "tts" : "%appName% está a solicitar as seguintes informações e permissões do veículo: %functionalGroupLabels%. Pode alterar estas permissões e ouvir descrições detalhadas no menu de definições das aplicações móveis. Prima \"\"Sim\"\" para permitir ou \"\"Não\"\" para recusar."
-                  },
-                  "ru-ru" : {
-                     "tts" : "%appName% запрашивает следующую информацию об автомобиле и разрешения: %functionalGroupLabels%. Вы можете изменить эти разрешения и прослушать подробные их описания в меню настроек мобильного приложения. Нажмите \"\"да\"\", чтобы предоставить разрешения, или \"\"нет\"\", чтобы не предоставлять."
-                  },
-                  "sv-se" : {
-                     "tts" : "%appName% begär tillgång till följande fordonsinformation och tillstånd: %functionalGroupLabels%. Du kan ändra tillstånden och höra detaljerade beskrivningar i menyn för mobilappsinställningar. Tryck Ja för att ge tillstånd eller Nej för att neka."
-                  },
-                  "tr-tr" : {
-                     "tts" : "%appName%, şu araç bilgilerini ve izinleri istiyor: %functionalGroupLabels%. Bu izinleri değiştirebilir ve mobil uygulamalar ayarlar menüsünden ayrıntılı açıklamaları dinleyebilirsiniz. Lütfen izin vermek için Evet'e veya reddetmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "tts" : "%appName% 正在请求下列车辆信息和权限： %functionalGroupLabels%。您可在移动应用程序设置菜单中更改这些权限，并听取详细说明。请按“是”允许权限或按“否”拒绝。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "%appName% 正請求使用 %functionalGroupLabels% 的車輛資訊和許可。您可在行動應用程式設定清單中更改這些許可，並聆聽詳細說明。給予許可請按「是」，拒絕請按「否」。"
-                  }
-               }
-            },
-            "AppPermissionsRevoked" : {
-               "languages" : {
-                  "de-de" : {
-                     "tts" : "Die Autorisierungsdaten der App wurden geändert. %appName% hat keinen Zugriff auf %functionalGroupLabels% mehr. Installieren Sie die neueste Version der App auf Ihrem Gerät.."
-                  },
-                  "en-au" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-gb" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-ie" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "en-us" : {
-                     "tts" : "App authorizations have changed. %appName% can no longer access %functionalGroupLabels%. Please ensure you have the most recent app version installed on your mobile device."
-                  },
-                  "es-en" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "es-es" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de que tiene la versión más reciente de la aplicación instalada en su dispositivo móvil."
-                  },
-                  "es-mx" : {
-                     "tts" : "Las autorizaciones de la aplicación han cambiado. %appName% ya no puede acceder a %functionalGroupLabels%. Asegúrese de haber instalado la versión más reciente de la aplicación en su dispositivo móvil."
-                  },
-                  "fr-ca" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "fr-fr" : {
-                     "tts" : "Les autorisations pour app ont changé. %appName% ne peut plus accéder à %functionalGroupLabels%. Veuillez vous assurer que la plus récente version de l’application est installée sur votre appareil mobile."
-                  },
-                  "it-it" : {
-                     "tts" : "Le autorizzazioni dell'app sono cambiate. %appName% non è più in grado di accedere a %functionalGroupLabels%. Assicurarsi di avere la versione più recente dell'app installata sul dispositivo mobile."
-                  },
-                  "nl-nl" : {
-                     "tts" : "De app-autorisaties zijn gewijzigd. %appName% heeft geen toegang meer tot %functionalGroupLabels%. Zorg ervoor dat u de meest recente app-versie op uw mobiele apparaat geïnstalleerd hebt."
-                  },
-                  "pl-pl" : {
-                     "tts" : "Dane dostępu aplikacji zostały zmienione. %appName% nie ma już dostępu do %functionalGroupLabels%. Sprawdź, czy na telefonie komórkowym zainstalowano najnowszą wersję aplikacji."
-                  },
-                  "pt-br" : {
-                     "tts" : "As autorizações dos aplicativos foram alteradas. %appName% não pode mais acessar %functionalGroupLabels%. Certifique-se de que a versão mais recente do aplicativo está instalada no seu dispositivo móvel."
-                  },
-                  "pt-pt" : {
-                     "tts" : "As autorizações das aplicações mudaram. %appName% já não consegue aceder a %functionalGroupLabels%. Certifique-se de que tem a última versão da aplicação no seu dispositivo móvel."
-                  },
-                  "ru-ru" : {
-                     "tts" : "Авторизации приложения изменены. %appName% больше не имеет доступа к %functionalGroupLabels%. Убедитесь, что на вашем мобильном устройстве установлена самая новая версия приложения."
-                  },
-                  "sv-se" : {
-                     "tts" : "Appens behörigheter har ändrats. %appName% har inte längre åtkomst till %functionalGroupLabels%. Kontrollera att du har installerat den senaste versionen av appen på mobilenheten."
-                  },
-                  "tr-tr" : {
-                     "tts" : "Uygulama yetkileri değişti. %appName% artık %functionalGroupLabels%'e erişemeyecek. Lütfen mobil aygıtınızda en son uygulama sürümünün yüklü olduğundan emin olun."
-                  },
-                  "zh-cn" : {
-                     "tts" : "应用程序授权已变更。 %appName% 将不能再访问 %functionalGroupLabels%。 请确认您的移动设备上安装的应用程序是最新版本。"
-                  },
-                  "zh-tw" : {
-                     "tts" : "應用程式授權已改變。%appName% 已無法進入 %functionalGroupLabels%。請確認您的行動裝置上安裝了最新版應用程式。"
-                  }
-               }
-            },
-            "AppUnauthorized" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht autorisiert",
-                     "tts" : "Diese Version von %appName% ist nicht autorisiert und wird nicht mit SYNC funktionieren."
-                  },
-                  "en-au" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Authorized",
-                     "tts" : "This version of %appName% is not authorized and will not work with SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No autorizada",
-                     "tts" : "Esta versión de %appName% no está autorizada y no funcionará con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no autorizada",
-                     "tts" : "Esta versión de %appName% no tiene autorización y no funcionará con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "non autorisée",
-                     "tts" : "Cette version de %appName% n’est pas autorisée et ne fonctionnera pas avec SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non autorizzata",
-                     "tts" : "Questa versione di %appName% non è autorizzata e non funziona con il SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet geautoriseerd",
-                     "tts" : "Deze versie van %appName% is niet geautoriseerd en werkt niet met SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "brak autoryzacji",
-                     "tts" : "Niniejsza wersja %appName% nie posiada autoryzacji i nie będzie działać z SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não autorizado",
-                     "tts" : "Esta versão do %appName% não tem autorização e não funcionará com o SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não autorizada",
-                     "tts" : "Esta versão de %appName% não está autorizada e não funcionará com o SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не авторизировано",
-                     "tts" : "Эта версия %appName% не авторизирована и не будет работать с SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "är ej godkänd",
-                     "tts" : "Den här versionen av %appName% är inte godkänd och fungerar inte med SYNC."
-                  },
-                  "tr-tr" : {
-                     "line1" : "için izin yok",
-                     "tts" : "Bu %appName% sürümüne izin verilmediğinden SYNC ile çalışamaz."
-                  },
-                  "zh-cn" : {
-                     "line1" : "未得到授权",
-                     "tts" : "此版本的%appName% 未得到授权，无法在SYNC上使用。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "無授權",
-                     "tts" : "%appName% 的版本未獲得授權，將無法透過 SYNC 使用。"
-                  }
-               }
-            },
-            "AppUnsupported" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "nicht unterstützt",
-                     "tts" : "Diese Version von %appName% wird von SYNC nicht unterstützt."
-                  },
-                  "en-au" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-gb" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-ie" : {
-                     "line1" : "not supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "en-us" : {
-                     "line1" : "Not Supported",
-                     "tts" : "This version of %appName% is not supported by SYNC."
-                  },
-                  "es-en" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-es" : {
-                     "line1" : "No compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "es-mx" : {
-                     "line1" : "no compatible",
-                     "tts" : "Esta versión de %appName% no es compatible con SYNC."
-                  },
-                  "fr-ca" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "fr-fr" : {
-                     "line1" : "incompatible",
-                     "tts" : "Cette version de %appName% n’est pas prise en charge par SYNC."
-                  },
-                  "it-it" : {
-                     "line1" : "non supportata",
-                     "tts" : "Questa versione di %appName% non è supportata dal SYNC."
-                  },
-                  "nl-nl" : {
-                     "line1" : "niet ondersteund",
-                     "tts" : "Deze versie van %appName% wordt niet ondersteund door SYNC."
-                  },
-                  "pl-pl" : {
-                     "line1" : "aplikacja nie obsług.",
-                     "tts" : "Niniejsza wersja %appName% nie jest obsługiwana przez system SYNC."
-                  },
-                  "pt-br" : {
-                     "line1" : "não suportado",
-                     "tts" : "Esta versão do %appName% não é suportada pelo SYNC."
-                  },
-                  "pt-pt" : {
-                     "line1" : "não suportada",
-                     "tts" : "Esta versão de %appName% não é suportado pelo SYNC."
-                  },
-                  "ru-ru" : {
-                     "line1" : "не поддерживается",
-                     "tts" : "Эта версия %appName% не поддерживается SYNC."
-                  },
-                  "sv-se" : {
-                     "line1" : "stöds ej",
-                     "tts" : "SYNC har inte stöd för den här versionen av %appName%."
-                  },
-                  "tr-tr" : {
-                     "line1" : "desteklenmiyor",
-                     "tts" : "Bu %appName% sürümü SYNC tarafından desteklenmiyor."
-                  },
-                  "zh-cn" : {
-                     "line1" : "不受支持",
-                     "tts" : "SYNC不支持此版本的%appName%。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "不支援",
-                     "tts" : "SYNC 不支援此版本的%appName% 。"
-                  }
-               }
-            },
-            "DataConsent" : {
-               "languages" : {
-                  "en-us" : {
-                     "line1" : "Enable Mobile Apps",
-                     "line2" : "on SYNC? (Uses Data)",
-                     "tts" : "To use mobile apps with SYNC, SYNC will communicate with Ford at least once per month using your mobile device's data plan. Standard rates may apply. SYNC will send your VIN and SYNC module number to Ford U.S. Please press yes or no, or help for more information. "
-                  }
-               }
-            },
-            "DataConsentHelp" : {
-               "languages" : {
-                  "en-us" : {
-                     "tts" : "Updates are about the size of an email, and the occurrence of updates depends on your vehicle usage and when a new app is found on your device. To turn on or off, visit the SYNC mobile apps settings menu. See your Owner Guide for more information. "
-                  }
-               }
-            },
-            "DisableApps" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Auto-Update",
-                     "line2" : "und Mobile Apps deaktivieren",
-                     "tts" : "Ausschalten der automatischen Updates führt zum Ausschalten von SYNC mobile Apps. Sie können Ihre mobilen Apps dann nicht mehr mit SYNC nutzen. Bitte drücken Sie Ja zur Bestätigung oder Nein, um abzubrechen."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable auto-updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable SYNC mobile apps. You will not be able to use any mobile apps with SYNC. Please press Yes to confirm or No to cancel."
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Auto-Updates",
-                     "line2" : "and Mobile Apps?",
-                     "tts" : "Disabling automatic updates will also disable sync mobile apps. You will not be able to use any mobile apps with SYNC. Please press yes to confirm or no to cancel."
-                  },
-                  "es-en" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "es-es" : {
-                     "line1" : "¿Desact. actual. auto",
-                     "line2" : "y apl. móviles?",
-                     "tts" : "Si desactiva las actualizaciones automáticas, también se desactivará la sincronización de las aplicaciones móviles. No podrá utilizar ninguna aplicación móvil con SYNC. Pulse sí para confirmar o no para cancelar."
-                  },
-                  "es-mx" : {
-                     "line1" : "¿Deshab. actualiz.",
-                     "line2" : "autom. y aplic. móv.?",
-                     "tts" : "Si se desactivan las actualizaciones automáticas, también se desactivarán las aplicaciones móviles de SYNC. No podrá usar ninguna aplicación móvil con SYNC. Presione Sí para confirmar o No para cancelar."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj autom.",
-                     "line2" : "et app. mobiles?",
-                     "tts" : "La désactivation des mises à jour automatiques désactivera aussi les applications mobiles SYNC. Vous ne pourrez pas utiliser d’application mobile avec SYNC. Veuillez appuyer sur Oui pour confirmer ou sur Non pour annuler."
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilitare agg. aut.",
-                     "line2" : "e app mobili?",
-                     "tts" : "Disabilitando gli aggiornamenti automatici si disattiva anche la sincronizzazione delle app mobili. Non sarà possibile usare app mobili con il SYNC. Premere Sì per confermare e No per cancellare."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Auto-updates en mob.",
-                     "line2" : "apps uitschakelen?",
-                     "tts" : "Door automatische updates uit te schakelen, schakelt u ook SYNC-mobiele apps uit. U kunt dan geen mobiele apps meer gebruiken met SYNC. Druk op Ja om te bevestigen of op Nee om te annuleren."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wył. automat. aktual.",
-                     "line2" : "i aplikacje mobilne?",
-                     "tts" : "Wyłączenie automatycznych aktualizacji spowoduje także wyłączenie aplikacji mobilnych SYNC. Korzystanie z mobilnych aplikacji za pomocą SYNC będzie niemożliwe. Naciśnij TAK, by potwierdzić lub NIE, by anulować."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desativar atualizações",
-                     "line2" : "autom. e aplicativos?",
-                     "tts" : "Se as atualizações automáticas forem desativadas, os aplicativos também serão desativados. Você não poderá usar nenhum aplicativo com o SYNC. Pressione sim para confirmar ou não para cancelar."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actual. autom.",
-                     "line2" : "e aplicações móveis?",
-                     "tts" : "A desactivação das actualizações automáticas desactiva igualmente as aplicações móveis do SYNC. Não poderá utilizar quaisquer aplicações móveis com o SYNC. Prima \"\"Sim\"\" para confirmar ou \"\"Não\"\" para cancelar."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. автообновления",
-                     "line2" : "и мобил. прилож.?",
-                     "tts" : "При отключении автоматических обновлений также будут отключены мобильные приложения sync. Вы не сможете использовать какие-либо мобильные приложения с SYNC. Нажмите \"\"Да\"\" для подтверждения или \"\"Нет\"\" для отмены."
-                  },
-                  "sv-se" : {
-                     "line1" : "Avaktiverar autouppdat.",
-                     "line2" : "och mobilappar?",
-                     "tts" : "Om du avaktiverar automatisk uppdatering avaktiverar du även synkning av mobilappar. Du kommer inte längre att kunna använda dina mobilappar med SYNC. Tryck Ja för att bekräfta eller Nej för att avbryta."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Oto. güncelleme ve",
-                     "line2" : "mobil uygul. kapat?",
-                     "tts" : "Otomatik güncellemeleri devre dışı bırakırsanız sync mobil uygulamalar da devre dışı kalır. SYNC ile mobil uygulama kullanmanız mümkün olmaz. Lütfen onaylamak için Evet'e veya iptal etmek için Hayır'a basın."
-                  },
-                  "zh-cn" : {
-                     "line1" : "是否禁用自动更新和",
-                     "line2" : "移动应用程序？",
-                     "tts" : "禁用自动更新同时也会禁用SYNC移动应用程序。您将无法在 SYNC 中使用任何移动应用程序。请按“是”确认或按“否”取消。"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用自動更新",
-                     "line2" : "和行動應用程式？",
-                     "tts" : "停用自動更新也將停用 sync 行動應用程式。您將無法透過 SYNC 使用任何行動應用程式。確認請按「是」，取消請按「否」。"
-                  }
-               }
-            },
-            "DrivingCharacteristics" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahreigenschaften",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahreigenschaften: Kraftstoffverbrauch, MyKey, Sicherheitsgurtstatus."
-                  },
-                  "en-au" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-gb" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-ie" : {
-                     "label" : "Driving characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel consumption, MyKey, Seat belt status."
-                  },
-                  "en-us" : {
-                     "label" : "Driving Characteristics",
-                     "tts" : "An app can access the following driving characteristics: Fuel Consumption, MyKey, Seat Belt Status."
-                  },
-                  "es-en" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "es-es" : {
-                     "label" : "Características de conducción",
-                     "tts" : "Una aplicación puede acceder a las siguientes características de conducción: Consumo de combustible, MyKey, Estado cinturones de seguridad."
-                  },
-                  "es-mx" : {
-                     "label" : "Características del manejo",
-                     "tts" : "Las aplicaciones pueden acceder a las siguientes características del manejo: Consumo de combustible, MyKey, Estado del cinturón de seguridad."
-                  },
-                  "fr-ca" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "fr-fr" : {
-                     "label" : "Caractéristiques de conduite",
-                     "tts" : "Une application peut accéder aux caractéristiques de conduite suivantes: Consommation de carburant, MyKey, État des ceintures de sécurité."
-                  },
-                  "it-it" : {
-                     "label" : "Caratteristiche di guida",
-                     "tts" : "Un'app può avere accesso alle seguenti caratteristiche di guida: Consumo carburante, MyKey, Stato cinture di sicurezza."
-                  },
-                  "nl-nl" : {
-                     "label" : "Rijkenmerken",
-                     "tts" : "Een app heeft toegang tot de volgende rijkenmerken: Brandstofverbruik, MyKey, Veiligheidsgordelstatus."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje dotyczące stylu jazdy",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji dotyczących jazdy: Zużycie paliwa, MyKey, Stan pasów bezpieczeństwa."
-                  },
-                  "pt-br" : {
-                     "label" : "Características de condução",
-                     "tts" : "Um aplicativo pode acessar as seguintes características de condução: Consumo de combustível, MyKey, Estado do cinto de segurança."
-                  },
-                  "pt-pt" : {
-                     "label" : "Características de condução",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações de condução: Consumo de combustível, MyKey, Estado dos cintos de segurança."
-                  },
-                  "ru-ru" : {
-                     "label" : "Характеристики движения",
-                     "tts" : "Приложение имеет доступ к следующим характеристикам движения: Расход топлива, MyKey, Состояние ремней безопасности."
-                  },
-                  "sv-se" : {
-                     "label" : "Köregenskaper",
-                     "tts" : "Appen kan komma åt följande köregenskaper: Bränsleförbrukning, MyKey, Bältesstatus."
-                  },
-                  "tr-tr" : {
-                     "label" : "Sürüş karakteristikleri",
-                     "tts" : "Bir uygulama şu sürüş karakteristiklerine erişebilir: Yakıt tüketimi, MyKey, Emniyet kemeri durumu."
-                  },
-                  "zh-cn" : {
-                     "label" : "行驶特性",
-                     "tts" : "移动应用程序可访问下列行驶特性： 油耗, MyKey, 安全带状态"
-                  },
-                  "zh-tw" : {
-                     "label" : "駕駛特性",
-                     "tts" : "應用程式可存取以下駕駛特性： 油耗, MyKey, 安全帶狀態"
-                  }
-               }
-            },
-            "Location" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "GPS und Geschwindigkeit",
-                     "tts" : "Eine App hat Zugriff auf die GPS-Daten und die Geschwindigkeit des Fahrzeugs."
-                  },
-                  "en-au" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-gb" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-ie" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "en-us" : {
-                     "label" : "GPS and speed",
-                     "tts" : "An app can access vehicle GPS and speed."
-                  },
-                  "es-en" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "es-es" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Una aplicación puede acceder al GPS y la velocidad del vehículo."
-                  },
-                  "es-mx" : {
-                     "label" : "GPS y velocidad",
-                     "tts" : "Las aplicaciones pueden acceder al GPS y a la velocidad del vehículo."
-                  },
-                  "fr-ca" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "fr-fr" : {
-                     "label" : "GPS et vitesse",
-                     "tts" : "Une application peut accéder au GPS et à la vitesse du véhicule."
-                  },
-                  "it-it" : {
-                     "label" : "GPS e velocità",
-                     "tts" : "Un'app può avere accesso a GPS e velocità del veicolo."
-                  },
-                  "nl-nl" : {
-                     "label" : "Gps en snelheid",
-                     "tts" : "Een app heeft toegang tot gps en de snelheid van het voertuig."
-                  },
-                  "pl-pl" : {
-                     "label" : "GPS i prędkość",
-                     "tts" : "Aplikacja może uzyskać dostęp do modułu GPS i prędkości pojazdu."
-                  },
-                  "pt-br" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Um aplicativo pode acessar o GPS e a velocidade do veículo."
-                  },
-                  "pt-pt" : {
-                     "label" : "GPS e velocidade",
-                     "tts" : "Uma aplicação consegue aceder ao GPS e à velocidade do veículo."
-                  },
-                  "ru-ru" : {
-                     "label" : "GPS и скорость",
-                     "tts" : "Приложение имеет доступ к GPS и скорости автомобиля."
-                  },
-                  "sv-se" : {
-                     "label" : "GPS och hastighet",
-                     "tts" : "Appen kan komma åt fordonets GPS och hastighetsmätare."
-                  },
-                  "tr-tr" : {
-                     "label" : "GPS ve hız",
-                     "tts" : "Bu uygulama aracın GPS ve hız bilgilerine erişebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "GPS 和车速",
-                     "tts" : "移动应用程序可以访问车辆 GPS 和车速信息。"
-                  },
-                  "zh-tw" : {
-                     "label" : "GPS和車速",
-                     "tts" : "應用程式可存取車輛的GPS和速度。"
-                  }
-               }
-            },
-            "Notifications" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Push-Benachrichtigungen",
-                     "tts" : "Läuft die App im Hintergrund, kann Sie Benachrichtigungen senden."
-                  },
-                  "en-au" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-gb" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-ie" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "en-us" : {
-                     "label" : "Push notifications",
-                     "tts" : "An app can send notifications when running in the background."
-                  },
-                  "es-en" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "es-es" : {
-                     "label" : "Notificaciones push",
-                     "tts" : "Una aplicación puede enviar notificaciones cuando se está ejecutando en segundo plano."
-                  },
-                  "es-mx" : {
-                     "label" : "Notificaciones tipo Push",
-                     "tts" : "Las aplicaciones pueden enviar notificaciones cuando se ejecutan en segundo plano."
-                  },
-                  "fr-ca" : {
-                     "label" : "Notifications instantanées",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "fr-fr" : {
-                     "label" : "Notifications push",
-                     "tts" : "Une application peut envoyer des avis lorsqu’elle fonctionne en arrière-plan."
-                  },
-                  "it-it" : {
-                     "label" : "Notifiche push",
-                     "tts" : "Un'app può inviare notifiche se eseguita in background."
-                  },
-                  "nl-nl" : {
-                     "label" : "Push-meldingen",
-                     "tts" : "Een app kan meldingen versturen als deze op de achtergrond actief is."
-                  },
-                  "pl-pl" : {
-                     "label" : "Powiadomienia Push",
-                     "tts" : "Aplikacja może wysyłać powiadomienia, działając w tle."
-                  },
-                  "pt-br" : {
-                     "label" : "Notificações Push",
-                     "tts" : "Um aplicativo pode enviar notificações quando estiver sendo executado em segundo plano."
-                  },
-                  "pt-pt" : {
-                     "label" : "Notificações push",
-                     "tts" : "Uma aplicação consegue enviar notificações quando está activa em segundo plano."
-                  },
-                  "ru-ru" : {
-                     "label" : "Оповещения о пересылке",
-                     "tts" : "Если приложение работает в фоновом режиме, оно может отправлять оповещения."
-                  },
-                  "sv-se" : {
-                     "label" : "Push-notiser",
-                     "tts" : "Appen kan skicka meddelanden när den körs i bakgrunden."
-                  },
-                  "tr-tr" : {
-                     "label" : "Anlık bildirimleri",
-                     "tts" : "Bir uygulama arka planda çalışırken bildirim gönderebilir."
-                  },
-                  "zh-cn" : {
-                     "label" : "推送通知",
-                     "tts" : "移动应用程序在后台运行时可推送通知。"
-                  },
-                  "zh-tw" : {
-                     "label" : "傳送通知",
-                     "tts" : "車輛行進時，應用程式可在背景中傳送通知。"
-                  }
-               }
-            },
-            "SettingDisableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Updates deakt."
-                  },
-                  "en-au" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-gb" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-ie" : {
-                     "line1" : "Disable updates"
-                  },
-                  "en-us" : {
-                     "line1" : "Disable Updates"
-                  },
-                  "es-en" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "es-es" : {
-                     "line1" : "Desact. actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Deshab. actual."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Désactiver MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Désactiver màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Disabilita agg."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. uitschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Wyłącz aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Desat. atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Desact. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Откл. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Inaktivera uppd."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncell. Kapat"
-                  },
-                  "zh-cn" : {
-                     "line1" : "禁用更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "停用更新"
-                  }
-               }
-            },
-            "SettingEnableUpdates" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Apps aktivieren"
-                  },
-                  "en-au" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-gb" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-ie" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "en-us" : {
-                     "line1" : "Enable Apps"
-                  },
-                  "es-en" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "es-es" : {
-                     "line1" : "Activar apl."
-                  },
-                  "es-mx" : {
-                     "line1" : "Hab. aplic."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Activer app."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Activer app."
-                  },
-                  "it-it" : {
-                     "line1" : "Abilita app"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Apps inschak."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Włącz aplikacje"
-                  },
-                  "pt-br" : {
-                     "line1" : "Ativar aplic."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Activar actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Вкл. прилож."
-                  },
-                  "sv-se" : {
-                     "line1" : "Aktivera appar"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Uygulamaları aç"
-                  },
-                  "zh-cn" : {
-                     "line1" : "启用应用程序"
-                  },
-                  "zh-tw" : {
-                     "line1" : "啟用應用程式"
-                  }
-               }
-            },
-            "SettingUpdateAuto" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update anford."
-                  },
-                  "en-au" : {
-                     "line1" : "Request update"
-                  },
-                  "en-gb" : {
-                     "line1" : "Request update"
-                  },
-                  "en-ie" : {
-                     "line1" : "Request update"
-                  },
-                  "en-us" : {
-                     "line1" : "Request Update"
-                  },
-                  "es-en" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "es-es" : {
-                     "line1" : "Solicitar actual."
-                  },
-                  "es-mx" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Demander MAJ"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Demander màj"
-                  },
-                  "it-it" : {
-                     "line1" : "Rich. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Upd. aanvragen"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Zażądaj aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Solicitar atualiz."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Solicit. actualiz."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Запрос на обн."
-                  },
-                  "sv-se" : {
-                     "line1" : "Begär uppdat."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleme iste"
-                  },
-                  "zh-cn" : {
-                     "line1" : "请求更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "請求更新"
-                  }
-               }
-            },
-            "StatusNeeded" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Update benötigt"
-                  },
-                  "en-au" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-gb" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-ie" : {
-                     "line1" : "Update needed"
-                  },
-                  "en-us" : {
-                     "line1" : "Update Needed"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "es-es" : {
-                     "line1" : "Actu. necesaria"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualiz. neces."
-                  },
-                  "fr-ca" : {
-                     "line1" : "Màj requise"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Mise à jour requise"
-                  },
-                  "it-it" : {
-                     "line1" : "Necess. aggiorn."
-                  },
-                  "nl-nl" : {
-                     "line1" : "Update nodig"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Potrzeba aktual."
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualiz. necess."
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actual. necess."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Необх. обновл."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncellenmeli"
-                  },
-                  "zh-cn" : {
-                     "line1" : "需要进行更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "需更新"
-                  }
-               }
-            },
-            "StatusPending" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktualisieren..."
-                  },
-                  "en-au" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-gb" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-ie" : {
-                     "line1" : "Updating..."
-                  },
-                  "en-us" : {
-                     "line1" : "Updating..."
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizando..."
-                  },
-                  "fr-ca" : {
-                     "line1" : "MAJ en cours..."
-                  },
-                  "fr-fr" : {
-                     "line1" : "Màj en cours..."
-                  },
-                  "it-it" : {
-                     "line1" : "Aggiornamento"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Updaten..."
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualizowanie"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizando..."
-                  },
-                  "pt-pt" : {
-                     "line1" : "A actualizar..."
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновление..."
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdaterar..."
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncelleniyor..."
-                  },
-                  "zh-cn" : {
-                     "line1" : "正在更新......"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新中..."
-                  }
-               }
-            },
-            "StatusUpToDate" : {
-               "languages" : {
-                  "de-de" : {
-                     "line1" : "Aktuelle Version"
-                  },
-                  "en-au" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-gb" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-ie" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "en-us" : {
-                     "line1" : "Up-To-Date"
-                  },
-                  "es-en" : {
-                     "line1" : "Actualizado"
-                  },
-                  "es-es" : {
-                     "line1" : "Actualizada"
-                  },
-                  "es-mx" : {
-                     "line1" : "Actualizado"
-                  },
-                  "fr-ca" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "fr-fr" : {
-                     "line1" : "Déjà à jour"
-                  },
-                  "it-it" : {
-                     "line1" : "più recente"
-                  },
-                  "nl-nl" : {
-                     "line1" : "Up-to-date"
-                  },
-                  "pl-pl" : {
-                     "line1" : "Aktualne"
-                  },
-                  "pt-br" : {
-                     "line1" : "Atualizado"
-                  },
-                  "pt-pt" : {
-                     "line1" : "Actualizado"
-                  },
-                  "ru-ru" : {
-                     "line1" : "Обновлено"
-                  },
-                  "sv-se" : {
-                     "line1" : "Uppdat. krävs ej"
-                  },
-                  "tr-tr" : {
-                     "line1" : "Güncel"
-                  },
-                  "zh-cn" : {
-                     "line1" : "最新更新"
-                  },
-                  "zh-tw" : {
-                     "line1" : "更新最新"
-                  }
-               }
-            },
-            "VehicleInfo" : {
-               "languages" : {
-                  "de-de" : {
-                     "label" : "Fahrzeuginformationen",
-                     "tts" : "Eine App hat Zugriff auf die folgenden Fahrzeuginformationen: Kraftstoff-Füllstand, Kraftstoffverbrauch, Motordrehzahl, Kilometerzähler, FIN, Außentemperatur, Gangstellung, Reifenluftdruck."
-                  },
-                  "en-au" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-gb" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-ie" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel level, Fuel economy, Engine RPMs, Odometer, VIN, Outside air temperature, Gear position, Tyre pressure."
-                  },
-                  "en-us" : {
-                     "label" : "Vehicle information",
-                     "tts" : "An app can access the following vehicle information: Fuel Level, Fuel Economy, Engine RPMs, Odometer, VIN, External Temperature, Gear Position, Tire Pressure."
-                  },
-                  "es-en" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "es-es" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Una aplicación puede acceder a la siguiente información del vehículo: Nivel de combustible, Ahorro de combustible, RPM del motor, Cuentakilómetros, VIN, Temperatura aire exterior, Marcha engranada, Presión de neumáticos."
-                  },
-                  "es-mx" : {
-                     "label" : "Información del vehículo",
-                     "tts" : "Las aplicaciones pueden acceder a la siguiente información del vehículo: Nivel de combustible, Economía de combustible, RPM del motor, Cuentakilómetros, Número de identificación del vehículo, Temperatura externa, Posición del cambio, Presión de los neumáticos."
-                  },
-                  "fr-ca" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Au régime du moteur, Odomètre, NIV, Température extérieure, Position d’embrayage, Pression des pneus."
-                  },
-                  "fr-fr" : {
-                     "label" : "Renseignements du véhicule",
-                     "tts" : "Une application peut accéder aux informations suivantes du véhicule: Niveau de carburant, Économie de carburant, Vitesse de moteur, Compteur kilométrique, NIV, Température extérieure, Position de vitesse, Pression des pneus."
-                  },
-                  "it-it" : {
-                     "label" : "Informazioni sul veicolo",
-                     "tts" : "Un'app può avere accesso alle seguenti informazioni del veicolo: Livello carburante, Consumi carburante, Numero giri motore, Contachilometri, VIN, Temperatura esterna, Posizione marcia, Pressione pneumatici."
-                  },
-                  "nl-nl" : {
-                     "label" : "Voertuiginformatie",
-                     "tts" : "Een app heeft toegang tot de volgende voertuiginformatie: Brandstofpeil, Brandstofverbruik, Motortoerental, Kilometerteller, VIN, Buitentemperatuur, Versnellingsstand, Bandenspanning."
-                  },
-                  "pl-pl" : {
-                     "label" : "Informacje o pojeździe",
-                     "tts" : "Aplikacja może uzyskać dostęp do następujących informacji o pojeździe: Poziom paliwa, Zużycie paliwa, Obroty silnika, Licznik przebiegu, Numer VIN, Temperatura zewnętrzna, Aktualny bieg, Ciśnienie opon."
-                  },
-                  "pt-br" : {
-                     "label" : "Informações sobre o veículo",
-                     "tts" : "Um aplicativo pode acessar as seguintes informações sobre o veículo: Nível de combustível, Economia de combustível, RPM do motor, Hodômetro, VIN, Temperatura externa, Posição das marchas, Pressão dos pneus."
-                  },
-                  "pt-pt" : {
-                     "label" : "Informações do veículo",
-                     "tts" : "Uma aplicação consegue aceder às seguintes informações do veículo: Nível de combustível, Poupança de combustível, RPM do motor, Conta-quilómetros, VIN, Temperatura exterior, Posição da mudança de velocidade, Pressão dos pneus."
-                  },
-                  "ru-ru" : {
-                     "label" : "Информация об автомобиле",
-                     "tts" : "Приложение имеет доступ к следующим данным автомобиля: Уровень топлива, Економия топлива, Число оборотов двигателя, Одометр, Номер VIN, Температура за бортом, Положение передачи, Давление шин."
-                  },
-                  "sv-se" : {
-                     "label" : "Fordonsinformation",
-                     "tts" : "Appen kan komma åt följande fordonsinformation: Bränslenivå, Bränsleekonomi, Motorns varvtal, Vägmätare, VIN, Utetemperatur, Växelläge, Däcktryck."
-                  },
-                  "tr-tr" : {
-                     "label" : "Araç bilgisi",
-                     "tts" : "Bir uygulama şu araç bilgilerine erişebilir: Yakıt seviyesi, Yakıt ekonomisi, Motor devirleri, Kilometre sayacı, VIN, Dış sıcaklık, Vites konumu, Lastik basıncı."
-                  },
-                  "zh-cn" : {
-                     "label" : "车辆信息",
-                     "tts" : "移动应用程序可访问下列车辆信息 ： 燃油量, 燃油经济性, 发动机转速(RPM), 里程表, VIN, 车外温度, 档位, 胎压."
-                  },
-                  "zh-tw" : {
-                     "label" : "車輛資訊",
-                     "tts" : "一個應用程式可存取以下車輛資訊 : 燃油存量, 燃油經濟性, 引擎轉速, 里程表, 車輛識別號碼, 車外溫度, 檔位, 胎壓."
-                  }
-               }
-            }
-         },
-         "version" : "001.001.015"
-      },
-      "functional_groupings" : {
-         "Base-4" : {
-            "rpcs" : {
-               "AddCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "AddSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Alert" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "CreateInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteCommand" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteInteractionChoiceSet" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "DeleteSubMenu" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "EncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "EndAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAudioPassThru" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnButtonEvent" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnButtonPress" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnCommand" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "OnDriverDistraction" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "OnEncodedSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnHMIStatus" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnSyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnTBTClientState" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "PerformAudioPassThru" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PerformInteraction" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ScrollableMessage" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetMediaClockTimer" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "Show" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "Slider" : {
-                  "hmi_levels" : [ "FULL" ]
-               },
-               "Speak" : {
-                  "hmi_levels" : [ "FULL", "LIMITED" ]
-               },
-               "SubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SyncPData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "UnsubscribeButton" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "DrivingCharacteristics-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "accPedalPosition",
-                     "beltStatus",
-                     "electronicParkBrakeStatus",
-                     "driverBraking",
-                     "myKey",
-                     "prndl",
-                     "rpm",
-                     "steeringWheelAngle"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "DrivingCharacteristics"
-         },
-         "Emergency-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "airbagStatus",
-                     "bodyInformation",
-                     "clusterModeStatus",
-                     "deviceStatus",
-                     "eCallInfo",
-                     "emergencyEvent"
-                  ]
-               }
-            }
-         },
-         "Location-1" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [ "gps", "speed" ]
-               }
-            },
-            "user_consent_prompt" : "Location"
-         },
-         "Navigation-1" : {
-            "rpcs" : {
-               "AlertManeuver" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ShowConstantTBT" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UpdateTurnList" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "Notifications" : {
-            "rpcs" : {
-               "Alert" : {
-                  "hmi_levels" : [ "BACKGROUND" ]
-               }
-            },
-            "user_consent_prompt" : "Notifications"
-         },
-         "PropriataryData-1" : {
-            "rpcs" : {
-               "DiagnosticMessage" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "GetDTCs" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ReadDID" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               }
-            }
-         },
-         "VehicleInfo-3" : {
-            "rpcs" : {
-               "GetVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "OnVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "vin",
-                     "wiperStatus"
-                  ]
-               },
-               "SubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               },
-               "UnsubscribeVehicleData" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ],
-                  "parameters" : [
-                     "engineOilLife",
-                     "engineTorque",
-                     "externalTemperature",
-                     "turnSignal",
-                     "fuelLevel",
-                     "fuelLevel_State",
-                     "headLampStatus",
-                     "instantFuelConsumption",
-                     "fuelRange",
-                     "cloudAppVehicleID",
-                     "odometer",
-                     "tirePressure",
-                     "wiperStatus"
-                  ]
-               }
-            },
-            "user_consent_prompt" : "VehicleInfo"
-         },
-         "pre_Base-1" : {
-            "rpcs" : {
-               "ChangeRegistration" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "DeleteFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "GenericResponse" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "ListFiles" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnAppInterfaceUnregistered" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnLanguageChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "OnPermissionsChange" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "PutFile" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "RegisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "ResetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "SetAppIcon" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetDisplayLayout" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               },
-               "SetGlobalProperties" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED" ]
-               },
-               "UnregisterAppInterface" : {
-                  "hmi_levels" : [ "BACKGROUND", "FULL", "LIMITED", "NONE" ]
-               }
-            }
-         }
-      },
-      "module_config" : {
-         "device_certificates" : {
-            "HUU40DAS7F970UEI17A73JH32L41K32JH4L1K234H3K4" : "aldhfkahfgkafrblgjr"
-         },
-         "endpoints" : {
-            "0x07" : {
-               "default" : [ "http://x.x.x.x:3000/api/1/policies" ]
-            }
-         },
-         "exchange_after_x_days" : 30,
-         "exchange_after_x_ignition_cycles" : 100,
-         "exchange_after_x_kilometers" : 1800,
-         "notifications_per_minute_by_priority" : {
-            "COMMUNICATION" : 6,
-            "EMERGENCY" : 60,
-            "NAVIGATION" : 15,
-            "NONE" : 0,
-            "NORMAL" : 4,
-            "VOICECOMM" : 10
-         },
-         "seconds_between_retries" : [ 1, 5, 25, 125, 625 ],
-         "timeout_after_x_seconds" : 60,
-         "vehicle_make" : "Stark Industries",
-         "vehicle_model" : "E-Tron",
-         "vehicle_year" : "1992"
-      }
-   }
-}
diff --git a/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc b/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc
new file mode 100644
index 0000000000..ec728a69ae
--- /dev/null
+++ b/src/components/policy/policy_regular/test/vehicle_data_item_type_test.cc
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE. */
+
+#include "gtest/gtest.h"
+#include "policy/policy_table/types.h"
+#include "utils/jsoncpp_reader_wrapper.h"
+
+#include <type_traits>
+
+namespace test {
+namespace vehicle_info_plugin_test {
+
+using namespace rpc::policy_table_interface_base;
+
+namespace {
+/*
+ * class TestString should be used for compact string creation with json value
+ */
+class TestString {
+  /**
+   * @brief Field contains json structure
+   */
+  std::string text_;
+  /**
+   * @brief Need for validate should not be returned closed json or empty string
+   */
+  bool is_initialized_;
+
+ public:
+  TestString() : is_initialized_(false) {}
+
+  /**
+   * @brief This method handling all types except string
+   * the name:value will be added to json string
+   * @param std::string& name - name of json filed
+   * @param const T& value - value of json filed
+   */
+  template <class T>
+  void AddField(const std::string& name, const T& value) {
+    const bool is_bool = std::is_same<T, bool>::value;
+    // Should be writed to json true/false not 1/0
+    const std::string text_value =
+        (is_bool ? (value ? "true" : "false") : std::to_string(value));
+    if (text_.empty()) {
+      is_initialized_ = true;
+      text_ = "{\"" + name + "\":" + text_value;
+      return;
+    }
+    text_ += ",\"" + name + "\":" + text_value;
+  }
+
+  /**
+   * @brief This method handling only string values
+   * the name:"value" will be added to json string
+   * this method is coverring value in quotes
+   * @param std::string& name - name of json filed
+   * @param const T& value - value of json filed
+   */
+  void AddField(const std::string& name, const char* value) {
+    if (text_.empty()) {
+      is_initialized_ = true;
+      text_ = "{\"" + name + "\":";
+    } else {
+      text_ += ",\"" + name + "\":";
+    }
+
+    text_ += value[0] == '{' || value[0] == '['
+                 ? std::string(value)
+                 : "\"" + std::string(value) + "\"";
+  }
+
+  /**
+   * @brief This method close json string before return
+   * @return all string and close json form by right bracket "}"
+   * or empty string if json structure is empty
+   */
+  std::string GetValue() {
+    return is_initialized_ ? text_ + "}" : "";
+  }
+};
+
+}  // namespace
+
+class VehicleDataItemTypeTest : public ::testing::Test {
+ public:
+  std::string GetFullJsonString(const std::string& params_array = "") {
+    TestString str;
+    str.AddField("name", "VehicleDataItem");
+    str.AddField("type", "String");
+    str.AddField("key", "OEMDataRef");
+    str.AddField("array", true);
+    str.AddField("mandatory", true);
+    str.AddField("params", ("[" + params_array + "]").c_str());
+    str.AddField("since", "4.0");
+    str.AddField("until", "5.0");
+    str.AddField("removed", true);
+    str.AddField("deprecated", true);
+    str.AddField("minvalue", 1);
+    str.AddField("maxvalue", 2);
+    str.AddField("minsize", 10);
+    str.AddField("maxsize", 20);
+    str.AddField("minlength", 100);
+    str.AddField("maxlength", 200);
+
+    return str.GetValue();
+  }
+
+ protected:
+  virtual void TearDown() {
+    json_.clear();
+  }
+
+  Json::Value json_;
+  utils::JsonReader reader_;
+};
+
+TEST_F(VehicleDataItemTypeTest, Initialize_Success) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+  VehicleDataItem vdi(&json_);
+
+  EXPECT_TRUE(vdi.is_initialized());
+}
+
+TEST_F(VehicleDataItemTypeTest, Initialize_Failed) {
+  VehicleDataItem vdi;
+
+  EXPECT_FALSE(vdi.is_initialized());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckConvertFromJsonToVehicleDataItem_Success) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+  VehicleDataItem vdi(&json_);
+
+  EXPECT_TRUE((std::string)vdi.name == "VehicleDataItem");
+  EXPECT_TRUE((std::string)vdi.type == "String");
+  EXPECT_TRUE((std::string)vdi.key == "OEMDataRef");
+  EXPECT_TRUE(*vdi.array == true);
+  EXPECT_TRUE(vdi.mandatory == true);
+  EXPECT_TRUE(vdi.params->empty());
+  EXPECT_TRUE((std::string)*vdi.since == "4.0");
+  EXPECT_TRUE((std::string)*vdi.until == "5.0");
+  EXPECT_TRUE(*vdi.removed == true);
+  EXPECT_TRUE(*vdi.deprecated == true);
+  EXPECT_TRUE(*vdi.minvalue == 1);
+  EXPECT_TRUE(*vdi.maxvalue == 2);
+  EXPECT_TRUE(*vdi.minsize == 10);
+  EXPECT_TRUE(*vdi.maxsize == 20);
+  EXPECT_TRUE(*vdi.minlength == 100);
+  EXPECT_TRUE(*vdi.maxlength == 200);
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckConvertFromVehicleDataItemToJson_Success) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+  VehicleDataItem vdi(&json_);
+
+  auto jsonFrom = vdi.ToJsonValue();
+  VehicleDataItem vdi2(&jsonFrom);
+  EXPECT_TRUE(vdi == vdi2);
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckIsValid_Failed) {
+  VehicleDataItem vdi;
+
+  EXPECT_FALSE(vdi.is_valid());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckIsValid_Struct_Success) {
+  std::string str = GetFullJsonString(GetFullJsonString());
+  reader_.parse(str, &json_);
+  VehicleDataItem vdi(&json_);
+
+  vdi.type = "Struct";
+  EXPECT_TRUE(vdi.is_valid());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckIsValid_Struct_EmptyParams_Failed) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+
+  VehicleDataItem vdi(&json_);
+
+  vdi.type = "Struct";
+  EXPECT_FALSE(vdi.is_valid());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckIsValid_PODTypes_Success) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+
+  VehicleDataItem vdi(&json_);
+
+  vdi.type = "Integer";
+  EXPECT_TRUE(vdi.is_valid());
+
+  vdi.type = "Float";
+  EXPECT_TRUE(vdi.is_valid());
+
+  vdi.type = "String";
+  EXPECT_TRUE(vdi.is_valid());
+
+  vdi.type = "Boolean";
+  EXPECT_TRUE(vdi.is_valid());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckEmptiness_True) {
+  VehicleDataItem vdi;
+  EXPECT_FALSE(vdi.struct_not_empty());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckEmptiness_False) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+
+  VehicleDataItem vdi(&json_);
+  EXPECT_TRUE(vdi.struct_not_empty());
+}
+
+TEST_F(VehicleDataItemTypeTest, CheckCopyConstructor) {
+  const std::string str = GetFullJsonString();
+  reader_.parse(str, &json_);
+
+  VehicleDataItem vdi1(&json_);
+  VehicleDataItem vdi2(vdi1);
+
+  EXPECT_TRUE(vdi1 == vdi2);
+}
+
+}  // namespace vehicle_info_plugin_test
+}  // namespace test
\ No newline at end of file
diff --git a/src/components/protocol/src/raw_message.cc b/src/components/protocol/src/raw_message.cc
index daffd0f2bd..72eb82394b 100644
--- a/src/components/protocol/src/raw_message.cc
+++ b/src/components/protocol/src/raw_message.cc
@@ -40,12 +40,14 @@ RawMessage::RawMessage(uint32_t connection_key,
                        uint32_t protocol_version,
                        const uint8_t* const data_param,
                        uint32_t data_sz,
+                       bool protection,
                        uint8_t type,
                        uint32_t payload_size)
     : connection_key_(connection_key)
     , data_(NULL)
     , data_size_(data_sz)
     , protocol_version_(protocol_version)
+    , protection_(protection)
     , service_type_(ServiceTypeFromByte(type))
     , payload_size_(payload_size)
     , waiting_(false) {
@@ -87,6 +89,10 @@ bool RawMessage::IsWaiting() const {
   return waiting_;
 }
 
+bool RawMessage::protection_flag() const {
+  return protection_;
+}
+
 void RawMessage::set_waiting(bool v) {
   waiting_ = v;
 }
diff --git a/src/components/protocol_handler/CMakeLists.txt b/src/components/protocol_handler/CMakeLists.txt
index ed3aaaf24c..53ccd3c5c9 100644
--- a/src/components/protocol_handler/CMakeLists.txt
+++ b/src/components/protocol_handler/CMakeLists.txt
@@ -34,8 +34,12 @@ include_directories(
   ${COMPONENTS_DIR}/utils/include/
   ${COMPONENTS_DIR}/protocol_handler/include/
   ${COMPONENTS_DIR}/connection_handler/include/
+  ${COMPONENTS_DIR}/application_manager/include
+  ${CMAKE_BINARY_DIR}/src/components/
+  ${JSONCPP_INCLUDE_DIRECTORY}
   ${LOG4CXX_INCLUDE_DIRECTORY}
   ${BSON_INCLUDE_DIRECTORY}
+  ${BOOST_INCLUDE_DIR}
 )
 
 set(PATHS
diff --git a/src/components/protocol_handler/docs/SDL.SDD.ServiceStatusUpdate.dox b/src/components/protocol_handler/docs/SDL.SDD.ServiceStatusUpdate.dox
new file mode 100644
index 0000000000..dea9ae5d0b
--- /dev/null
+++ b/src/components/protocol_handler/docs/SDL.SDD.ServiceStatusUpdate.dox
@@ -0,0 +1,116 @@
+/**
+\page service_status_update Service Status Update Detailed Design
+## Table of contents
+- \subpage service_status_update_intoduction
+  + \ref service_status_update_rationale                "1.1 Rationale"
+  + \ref service_status_update_scope                    "1.2 Scope"
+- \subpage service_status_update_detail_design
+  + \ref service_status_update_design_solutions         "2.1 Design solutions"
+  + \ref service_status_update_class_structure          "2.2 Class Structure"
+  + \ref service_status_update_sequence_diagram         "2.3 Sequence diagram"
+- \subpage service_status_update_data_structures
+  + \ref service_status_update_data_structure        "3.1 Data structures"
+- \subpage service_status_update_references_and_history
+  + \ref service_status_update_history                  "4.1 References"
+*/
+//-----------------------------------------------------------
+/**
+\page service_status_update_intoduction 1 Introduction
+The document is intended to support software developers, 
+maintenance and integration engineers with sufficient,
+detailed information concerning the design, development and
+deployment concepts, to accomplish their respective tasks without reliance on the authors.
+
+\anchor service_status_update_rationale
+## 1.1 Rationale
+ServiceStatusUpdateHandler and ServiceStatusUpdateHandlerListener classes are 
+implemented to provide adequate levels of abstraction when passing data between ProtocolHandler, 
+SecurityManager, ApplicationManager and PolicyHandler
+
+\anchor service_status_update_scope
+## 1.2 Scope
+ServiceStatusUpdateHandler is a part of protocol_handler namespace
+
+*/
+//-----------------------------------------------------------
+/**
+\page service_status_update_detail_design 2 Component detail design
+\anchor service_status_update_design_solutions
+### 2.1 Design solutions
+The following design approaches and patterns was used for ServiceStatusUpdateHandler:
+- Introducing extra layer to process data relevant only for ProtocolHandler or ApplicationManager
+  + ServiceStatusUpdateHandler converts ServiceStatus value relevant only for ProtocolHandler to 
+    HMI API values relevant only for ApplicationManager
+- [Builder design pattern](https://sourcemaking.com/design_patterns/builder)
+ used for construction of OnServiceUpdate notification object
+- [Observer design pattern]
+ used for notifying ApplicationManager of service update occured
+
+
+#### Design description
+protocol_handler::ServiceStatusUpdateHandler is an entity to establish data transfer between 
+ProtocolHandler and ApplicationManager about occuring service updates
+protocol_handler::ServiceStatusUpdateHandlerListener is an interface used
+to provide adequate level of abstraction between broadcasting and listening entity
+MessageHelper::ServiceStatusUpdateNotificationBuilder is an entity used 
+for flexible construction of OnServiceUpdate notification object
+
+\anchor service_status_update_class_structure
+### 2.2 Class Structure
+The following UML class diagram shows the component structure.
+![Service Status Update class diagram](ServiceStatusUpdate_classes.png)
+For more information about class diagram follow:
+- http://www.uml-diagrams.org/class-diagrams-overview.htqml
+- https://sourcemaking.com/uml/modeling-it-systems/structural-view/class-diagram
+
+\anchor service_status_update_sequence_diagram
+### 2.3 Sequence diagram
+The following UML sequence diagram shows the component dynamic behavior.
+For more information about sequence diagram follow:
+- http://www.uml-diagrams.org/sequence-diagrams.html
+- https://sourcemaking.com/uml/modeling-it-systems/external-view/use-case-sequence-diagram
+
+Service Status Update basic flow:
+![Basic flow](ServiceStatusUpdate_sequence.png)
+
+Service Status Update invalid certificate:
+![Invalid Cert](invalid_cert.png)
+
+Service Status Update PTU failed:
+![PTU Failed](ptu_failed.png)
+
+Service Status Update PTU failed (EXTERNAL_PROPRIETARY):
+![PTU Failed EXTERNAL_PROPRIETARY](PTU_for_EXTERNAL_PROPRIETARY.png)
+
+Service Status Update GetSystemTime failed:
+![GetSystemTime failed](invalid_time.png)
+*/
+
+//-----------------------------------------------------------
+/**
+\page service_status_update_data_structures 3 Component data and resources
+\anchor service_status_update_data_structure
+### 3.1 Element Data Structure
+The following data types are used by the ServiceStatusUpdateHandler:
+  - protocol_handler::ServiceStatus
+
+//-----------------------------------------------------------
+/**
+\page service_status_update_references_and_history 4 References and history
+\anchor service_status_update_history
+### 4.1 Document history
+Document change history
+
+| Version     | Date       | Author/Editor                          | Change description  |
+|-------------|------------|----------------------------------------|---------------------|
+| 0.1         | 02/21/2019 | [MKed](https://github.com/mked-luxoft) | Initial version from the previous [SDL SDD](https://adc.luxoft.com/confluence/pages/viewpage.action?pageId=279677125) |
+
+Document approve history
+
+| Version     | Date       | Author/Editor               | Change description  |
+|-------------|------------|-----------------------------|---------------------|
+| | | | |
+
+For more precise document change history follow github history -
+- https://github.com/smartdevicelink/sdl_core/commits/develop/src/components/protocol_handler/docs/SDL.SDD.ServiceStatusUpdate.dox
+*/
\ No newline at end of file
diff --git a/src/components/protocol_handler/docs/assets/PTU_for_EXTERNAL_PROPRIETARY.png b/src/components/protocol_handler/docs/assets/PTU_for_EXTERNAL_PROPRIETARY.png
new file mode 100644
index 0000000000..5962a1f08b
--- /dev/null
+++ b/src/components/protocol_handler/docs/assets/PTU_for_EXTERNAL_PROPRIETARY.png
diff --git a/src/components/protocol_handler/docs/assets/ServiceStatusUpdate_classes.png b/src/components/protocol_handler/docs/assets/ServiceStatusUpdate_classes.png
new file mode 100644
index 0000000000..f604a80aa9
--- /dev/null
+++ b/src/components/protocol_handler/docs/assets/ServiceStatusUpdate_classes.png
diff --git a/src/components/protocol_handler/docs/assets/ServiceStatusUpdate_sequence.png b/src/components/protocol_handler/docs/assets/ServiceStatusUpdate_sequence.png
new file mode 100644
index 0000000000..ac58aa9c48
--- /dev/null
+++ b/src/components/protocol_handler/docs/assets/ServiceStatusUpdate_sequence.png
diff --git a/src/components/protocol_handler/docs/assets/invalid_cert.png b/src/components/protocol_handler/docs/assets/invalid_cert.png
new file mode 100644
index 0000000000..e208e27a52
--- /dev/null
+++ b/src/components/protocol_handler/docs/assets/invalid_cert.png
diff --git a/src/components/protocol_handler/docs/assets/invalid_time.png b/src/components/protocol_handler/docs/assets/invalid_time.png
new file mode 100644
index 0000000000..c9c88a5ed3
--- /dev/null
+++ b/src/components/protocol_handler/docs/assets/invalid_time.png
diff --git a/src/components/protocol_handler/docs/assets/ptu_failed.png b/src/components/protocol_handler/docs/assets/ptu_failed.png
new file mode 100644
index 0000000000..f9f5a6d144
--- /dev/null
+++ b/src/components/protocol_handler/docs/assets/ptu_failed.png
diff --git a/src/components/protocol_handler/include/protocol_handler/handshake_handler.h b/src/components/protocol_handler/include/protocol_handler/handshake_handler.h
index cb52c9d375..9552d4c420 100644
--- a/src/components/protocol_handler/include/protocol_handler/handshake_handler.h
+++ b/src/components/protocol_handler/include/protocol_handler/handshake_handler.h
@@ -57,7 +57,8 @@ class HandshakeHandler : public security_manager::SecurityManagerListener {
                    utils::SemanticVersion& full_version,
                    const SessionContext& context,
                    const uint8_t protocol_version,
-                   std::shared_ptr<BsonObject> payload);
+                   std::shared_ptr<BsonObject> payload,
+                   ServiceStatusUpdateHandler& service_status_update_handler);
 
   ~HandshakeHandler();
 
@@ -82,19 +83,40 @@ class HandshakeHandler : public security_manager::SecurityManagerListener {
    * @brief Notification about handshake failure
    * @return true on success notification handling or false otherwise
    */
-  bool OnHandshakeFailed() OVERRIDE;
+  bool OnGetSystemTimeFailed() OVERRIDE;
 
   /**
    * @brief Notification that certificate update is required.
    */
   void OnCertificateUpdateRequired() OVERRIDE;
 
+  bool OnPTUFailed() OVERRIDE;
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief OnCertDecryptFailed is called when certificate decryption fails in
+   * external flow
+   * @return since this callback is a part of SecurityManagerListener, bool
+   * return value is used to indicate whether listener instance can be deleted
+   * by calling entity. if true - listener can be deleted and removed from
+   * listeners by SecurityManager, false - listener retains its place within
+   * SecurityManager.
+   */
+  bool OnCertDecryptFailed() OVERRIDE;
+#endif
+
   /**
    * @brief Get connection key of this handler
    * @return connection key
    */
   uint32_t connection_key() const;
 
+  /**
+   * @brief Get primary connection key of this handler
+   * @return primary connection key
+   */
+  uint32_t primary_connection_key() const;
+
  private:
   /**
    * @brief Performs related actions if handshake was successfully finished
@@ -107,8 +129,21 @@ class HandshakeHandler : public security_manager::SecurityManagerListener {
   /**
    * @brief Performs related actions if handshake was failed
    * @param params set of params used in bson part of message
+   * @param service_status - service status to be sent to HMI
+   */
+  void ProcessFailedHandshake(BsonObject& params, ServiceStatus service_status);
+
+  /**
+   * @brief Determines whether service can be protected
+   * @return true is service can be protected, otherwise - false
+   */
+  bool CanBeProtected() const;
+
+  /**
+   * @brief Determines whether service is already protected
+   * @return true is service is already protected, otherwise - false
    */
-  void ProcessFailedHandshake(BsonObject& params);
+  bool IsAlreadyProtected() const;
 
   ProtocolHandlerImpl& protocol_handler_;
   SessionObserver& session_observer_;
@@ -116,6 +151,7 @@ class HandshakeHandler : public security_manager::SecurityManagerListener {
   utils::SemanticVersion full_version_;
   const uint8_t protocol_version_;
   std::shared_ptr<BsonObject> payload_;
+  ServiceStatusUpdateHandler& service_status_update_handler_;
 };
 
 }  // namespace protocol_handler
diff --git a/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h b/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h
index 82bf563bc5..dc640c4707 100644
--- a/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h
+++ b/src/components/protocol_handler/include/protocol_handler/incoming_data_handler.h
@@ -67,7 +67,7 @@ class IncomingDataHandler {
    * \return list of complete, correct packets
    */
   ProtocolFramePtrList ProcessData(const RawMessage& tm_message,
-                                   RESULT_CODE* result,
+                                   RESULT_CODE& out_result,
                                    size_t* malformed_occurrence);
   /**
    * @brief Add connection for data handling and verification
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
index 15996bb4e2..8dbfc4ed4d 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h
@@ -55,6 +55,7 @@
 #include "protocol_handler/protocol_handler_settings.h"
 #include "protocol_handler/protocol_observer.h"
 #include "protocol_handler/protocol_packet.h"
+#include "protocol_handler/service_status_update_handler.h"
 #include "protocol_handler/session_observer.h"
 #include "transport_manager/common.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
@@ -210,6 +211,16 @@ class ProtocolHandlerImpl
 
   void RemoveProtocolObserver(ProtocolObserver* observer) OVERRIDE;
 
+  void ProcessFailedPTU() OVERRIDE;
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief ProcessFailedCertDecrypt is called to notify security manager that
+   * certificate decryption failed in the external flow
+   */
+  void ProcessFailedCertDecrypt() OVERRIDE;
+#endif
+
 #ifdef ENABLE_SECURITY
   /**
    * \brief Sets pointer for SecurityManager layer for managing protection
@@ -220,6 +231,9 @@ class ProtocolHandlerImpl
       security_manager::SecurityManager* security_manager);
 #endif  // ENABLE_SECURITY
 
+  void set_service_status_update_handler(
+      std::unique_ptr<ServiceStatusUpdateHandler> handler);
+
   /**
    * \brief Stop all handling activity
    */
@@ -230,8 +244,11 @@ class ProtocolHandlerImpl
    * \param message Message with params to be sent to Mobile App
    */
   void SendMessageToMobileApp(const RawMessagePtr message,
+                              bool needs_encryption,
                               bool final_message) OVERRIDE;
 
+  bool IsRPCServiceSecure(const uint32_t connection_key) const OVERRIDE;
+
   /**
    * \brief Sends number of processed frames in case of binary nav streaming
    * \param connection_key Unique key used by other components as session
@@ -275,7 +292,7 @@ class ProtocolHandlerImpl
                       uint8_t session_id,
                       uint8_t service_type);
 
-  void NotifyOnFailedHandshake() OVERRIDE;
+  void NotifyOnGetSystemTimeFailed() OVERRIDE;
 
   // TODO(Ezamakhov): move Ack/Nack as interface for StartSessionHandler
   /**
@@ -433,9 +450,6 @@ class ProtocolHandlerImpl
   void NotifySessionStarted(const SessionContext& context,
                             std::vector<std::string>& rejected_params) OVERRIDE;
 
-  void OnAuthTokenUpdated(const std::string& policy_app_id,
-                          const std::string& auth_token) OVERRIDE;
-
 #ifdef BUILD_TESTS
   const impl::FromMobileQueue& get_from_mobile_queue() const {
     return raw_ford_messages_from_mobile_;
@@ -454,6 +468,8 @@ class ProtocolHandlerImpl
   }
 #endif
 
+  void OnAuthTokenUpdated(const std::string&, const std::string&) OVERRIDE;
+
  private:
   void SendEndServicePrivate(int32_t primary_connection_id,
                              int32_t connection_id,
@@ -520,10 +536,6 @@ class ProtocolHandlerImpl
   void OnTMMessageSendFailed(const transport_manager::DataSendError& error,
                              const RawMessagePtr message) OVERRIDE;
 
-  void OnConnectionPending(
-      const transport_manager::DeviceInfo& device_info,
-      const transport_manager::ConnectionUID connection_id) OVERRIDE;
-
   void OnConnectionEstablished(
       const transport_manager::DeviceInfo& device_info,
       const transport_manager::ConnectionUID connection_id) OVERRIDE;
@@ -535,6 +547,10 @@ class ProtocolHandlerImpl
       const transport_manager::ConnectionUID connection_id,
       const transport_manager::CommunicationError& error) OVERRIDE;
 
+  void OnConnectionPending(
+      const transport_manager::DeviceInfo& device_info,
+      const transport_manager::ConnectionUID connection_id) OVERRIDE;
+
   /**
    * @brief Notifies that configuration of a transport has been updated.
    *
@@ -569,6 +585,7 @@ class ProtocolHandlerImpl
                                      const uint8_t service_type,
                                      const size_t data_size,
                                      const uint8_t* data,
+                                     const bool needs_encryption,
                                      const bool is_final_message);
 
   /**
@@ -591,6 +608,7 @@ class ProtocolHandlerImpl
                                     const size_t data_size,
                                     const uint8_t* data,
                                     const size_t max_frame_size,
+                                    const bool needs_encryption,
                                     const bool is_final_message);
 
   /**
@@ -699,6 +717,12 @@ class ProtocolHandlerImpl
   const std::string TransportTypeFromTransport(
       const utils::custom_string::CustomString& transport) const;
 
+  const ServiceStatus ServiceDisallowedBySettings(
+      const ServiceType service_type,
+      const ConnectionID connection_id,
+      const uint8_t session_id,
+      const bool protection) const;
+
   const ProtocolHandlerSettings& settings_;
 
   /**
@@ -785,6 +809,8 @@ class ProtocolHandlerImpl
   sync_primitives::Lock start_session_frame_map_lock_;
   StartSessionFrameMap start_session_frame_map_;
 
+  std::unique_ptr<ServiceStatusUpdateHandler> service_status_update_handler_;
+
   // Map policy app id -> auth token
   sync_primitives::Lock auth_token_map_lock_;
   std::map<std::string, std::string> auth_token_map_;
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
index 215c63c685..ef189b062f 100644
--- a/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
+++ b/src/components/protocol_handler/include/protocol_handler/protocol_packet.h
@@ -103,12 +103,15 @@ class ProtocolPacket {
     void set_max_rpc_payload_size(const size_t max_payload_size);
     void set_max_audio_payload_size(const size_t max_payload_size);
     void set_max_video_payload_size(const size_t max_payload_size);
+    void set_max_protocol_version_supported(
+        const uint16_t max_protocol_version_supported);
 
     size_t max_payload_size() const;
     size_t max_control_payload_size() const;
     size_t max_rpc_payload_size() const;
     size_t max_audio_payload_size() const;
     size_t max_video_payload_size() const;
+    uint16_t max_protocol_version_supported() const;
 
     size_t max_payload_size_by_service_type(const ServiceType type) const;
 
@@ -123,6 +126,7 @@ class ProtocolPacket {
     size_t max_rpc_payload_size_;
     size_t max_audio_payload_size_;
     size_t max_video_payload_size_;
+    uint16_t max_protocol_version_supported_;
   };
 
   /**
diff --git a/src/components/protocol_handler/include/protocol_handler/service_status_update_handler.h b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler.h
new file mode 100644
index 0000000000..c94ddb91e4
--- /dev/null
+++ b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler.h
@@ -0,0 +1,89 @@
+/*
+ Copyright (c) 2019, Ford Motor Company
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided with the
+ distribution.
+
+ Neither the name of the Ford Motor Company nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_SERVICE_STATUS_UPDATE_HANDLER_H_
+#define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_SERVICE_STATUS_UPDATE_HANDLER_H_
+
+#include "protocol_handler/service_status_update_handler_listener.h"
+
+namespace protocol_handler {
+
+/**
+ * @brief  ServiceStatus helper enum containing reasons for
+ * service
+ * status to be updated
+ */
+enum class ServiceStatus {
+  INVALID_ENUM = -1,
+  SERVICE_RECEIVED,
+  SERVICE_ACCEPTED,
+  SERVICE_START_FAILED,
+  PTU_FAILED,
+  CERT_INVALID,
+  INVALID_TIME,
+  PROTECTION_ENFORCED,
+  PROTECTION_DISABLED,
+  UNSECURE_START_FAILED
+};
+
+/**
+ * @brief ServiceStatusUpdateHandler class is used to notify listeners about
+ * occured events during service start
+ */
+class ServiceStatusUpdateHandler {
+ public:
+  /**
+   * @brief ServiceStatusUpdateHandler class constructor
+   * @param listener pointer to ServiceStatusUpdateHandlerListener instance
+   */
+  ServiceStatusUpdateHandler(ServiceStatusUpdateHandlerListener* listener)
+      : listener_(listener) {}
+
+  /**
+   * @brief OnServiceUpdate callback that is invoked in case of
+   * service status update needed
+   * @param connection_key - connection key
+   * @param service_type enum value containing type of service.
+   * @param service_status enum value containing status of service.
+   * received
+   */
+  void OnServiceUpdate(const uint32_t connection_key,
+                       const protocol_handler::ServiceType service_type,
+                       const ServiceStatus service_status);
+
+ private:
+  ServiceStatusUpdateHandlerListener* listener_;
+};
+
+}  // namespace protocol_handler
+
+#endif  // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_SERVICE_STATUS_UPDATE_HANDLER_H_
diff --git a/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h
new file mode 100644
index 0000000000..3c782f72f8
--- /dev/null
+++ b/src/components/protocol_handler/include/protocol_handler/service_status_update_handler_listener.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_SERVICE_STATUS_UPDATE_HANDLER_LISTENER_H_
+#define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_SERVICE_STATUS_UPDATE_HANDLER_LISTENER_H_
+
+#include "interfaces/HMI_API.h"
+#include "protocol_handler/protocol_handler.h"
+#include "transport_manager/transport_manager.h"
+#include "utils/optional.h"
+
+namespace protocol_handler {
+/**
+ * @brief Converts service type enum value from protocol_handler to hmi_apis.
+ * @param service_type protocol_handler enum value.
+ */
+hmi_apis::Common_ServiceType::eType GetHMIServiceType(
+    protocol_handler::ServiceType service_type);
+
+/**
+ * @brief ServiceStatusUpdateHandlerListener provides callbacks interface with
+ * a purpose to notify HMI on successful or failed state updates of different
+ * services
+ */
+class ServiceStatusUpdateHandlerListener {
+ public:
+  /**
+   * @brief ProcessServiceStatusUpdate callback that is invoked in case of
+   * service
+   * status update
+   * @param connection_key - connection key
+   * @param service_type enum value containing type of service.
+   * @param service_event enum value containing event that occured during
+   * service start.
+   * @param service_update_reason enum value containing reason why service_event
+   * occured.
+   */
+  virtual void ProcessServiceStatusUpdate(
+      const uint32_t connection_key,
+      hmi_apis::Common_ServiceType::eType service_type,
+      hmi_apis::Common_ServiceEvent::eType service_event,
+      utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>
+          service_update_reason) = 0;
+};
+
+}  // namespace protocol_handler
+
+#endif
diff --git a/src/components/protocol_handler/src/handshake_handler.cc b/src/components/protocol_handler/src/handshake_handler.cc
index fa0b375018..3b4ae6ef1f 100644
--- a/src/components/protocol_handler/src/handshake_handler.cc
+++ b/src/components/protocol_handler/src/handshake_handler.cc
@@ -38,23 +38,27 @@
 #include "protocol_handler/protocol_packet.h"
 #include "protocol_handler/session_observer.h"
 #include "security_manager/security_manager.h"
+#include "utils/helpers.h"
 
 namespace protocol_handler {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "ProtocolHandler")
 
-HandshakeHandler::HandshakeHandler(ProtocolHandlerImpl& protocol_handler,
-                                   SessionObserver& session_observer,
-                                   utils::SemanticVersion& full_version,
-                                   const SessionContext& context,
-                                   const uint8_t protocol_version,
-                                   std::shared_ptr<BsonObject> payload)
+HandshakeHandler::HandshakeHandler(
+    ProtocolHandlerImpl& protocol_handler,
+    SessionObserver& session_observer,
+    utils::SemanticVersion& full_version,
+    const SessionContext& context,
+    const uint8_t protocol_version,
+    std::shared_ptr<BsonObject> payload,
+    ServiceStatusUpdateHandler& service_status_update_handler)
     : protocol_handler_(protocol_handler)
     , session_observer_(session_observer)
     , context_(context)
     , full_version_(full_version)
     , protocol_version_(protocol_version)
-    , payload_(payload) {}
+    , payload_(payload)
+    , service_status_update_handler_(service_status_update_handler) {}
 
 HandshakeHandler::~HandshakeHandler() {
   LOG4CXX_DEBUG(logger_, "Destroying of HandshakeHandler: " << this);
@@ -65,35 +69,67 @@ uint32_t HandshakeHandler::connection_key() const {
                                        context_.new_session_id_);
 }
 
+uint32_t HandshakeHandler::primary_connection_key() const {
+  return session_observer_.KeyFromPair(context_.primary_connection_id_,
+                                       context_.new_session_id_);
+}
+
 bool HandshakeHandler::GetPolicyCertificateData(std::string& data) const {
   return false;
 }
 
-void HandshakeHandler::OnCertificateUpdateRequired() {}
+void HandshakeHandler::OnCertificateUpdateRequired() {
+  LOG4CXX_AUTO_TRACE(logger_);
+}
 
-bool HandshakeHandler::OnHandshakeFailed() {
+#if defined(EXTERNAL_PROPRIETARY_MODE) && defined(ENABLE_SECURITY)
+bool HandshakeHandler::OnCertDecryptFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (payload_) {
-    ProcessFailedHandshake(*payload_);
+    ProcessFailedHandshake(*payload_, ServiceStatus::CERT_INVALID);
+  }
+
+  return true;
+}
+#endif
+
+bool HandshakeHandler::OnGetSystemTimeFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  if (payload_) {
+    ProcessFailedHandshake(*payload_, ServiceStatus::INVALID_TIME);
   } else {
     BsonObject params;
     bson_object_initialize_default(&params);
-    ProcessFailedHandshake(params);
+    ProcessFailedHandshake(params, ServiceStatus::INVALID_TIME);
     bson_object_deinitialize(&params);
   }
 
   return true;
 }
 
+bool HandshakeHandler::OnPTUFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (payload_) {
+    ProcessFailedHandshake(*payload_, ServiceStatus::PTU_FAILED);
+  }
+
+  return true;
+}
+
 bool HandshakeHandler::OnHandshakeDone(
     uint32_t connection_key,
     security_manager::SSLContext::HandshakeResult result) {
   LOG4CXX_AUTO_TRACE(logger_);
 
-  if (connection_key != this->connection_key()) {
+  LOG4CXX_DEBUG(logger_,
+                "OnHandshakeDone for service : " << context_.service_type_);
+
+  if (connection_key != this->primary_connection_key()) {
     LOG4CXX_DEBUG(logger_,
                   "Listener " << this
                               << " expects notification for connection id: "
-                              << this->connection_key()
+                              << this->primary_connection_key()
                               << ". Received notification for connection id "
                               << connection_key << " will be ignored");
     return false;
@@ -106,7 +142,7 @@ bool HandshakeHandler::OnHandshakeDone(
     if (success) {
       ProcessSuccessfulHandshake(connection_key, *payload_);
     } else {
-      ProcessFailedHandshake(*payload_);
+      ProcessFailedHandshake(*payload_, ServiceStatus::CERT_INVALID);
     }
   } else {
     BsonObject params;
@@ -114,7 +150,7 @@ bool HandshakeHandler::OnHandshakeDone(
     if (success) {
       ProcessSuccessfulHandshake(connection_key, params);
     } else {
-      ProcessFailedHandshake(params);
+      ProcessFailedHandshake(params, ServiceStatus::CERT_INVALID);
     }
     bson_object_deinitialize(&params);
   }
@@ -122,20 +158,25 @@ bool HandshakeHandler::OnHandshakeDone(
   return true;
 }
 
+bool HandshakeHandler::CanBeProtected() const {
+  const auto& force_unprotected =
+      protocol_handler_.get_settings().force_unprotected_service();
+
+  return !(helpers::in_range(force_unprotected, context_.service_type_));
+}
+
+bool HandshakeHandler::IsAlreadyProtected() const {
+  return (session_observer_.GetSSLContext(this->primary_connection_key(),
+                                          context_.service_type_) != NULL);
+}
+
 void HandshakeHandler::ProcessSuccessfulHandshake(const uint32_t connection_key,
                                                   BsonObject& params) {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::vector<int>& force_unprotected =
-      protocol_handler_.get_settings().force_unprotected_service();
 
-  const bool can_be_protected =
-      std::find(force_unprotected.begin(),
-                force_unprotected.end(),
-                context_.service_type_) == force_unprotected.end();
+  const bool is_service_already_protected = IsAlreadyProtected();
 
-  const bool is_service_already_protected =
-      session_observer_.GetSSLContext(connection_key, context_.service_type_) !=
-      NULL;
+  const bool can_be_protected = CanBeProtected();
 
   LOG4CXX_DEBUG(logger_,
                 "Service can be protected: " << can_be_protected
@@ -144,6 +185,10 @@ void HandshakeHandler::ProcessSuccessfulHandshake(const uint32_t connection_key,
 
   if (can_be_protected && !is_service_already_protected) {
     session_observer_.SetProtectionFlag(connection_key, context_.service_type_);
+    service_status_update_handler_.OnServiceUpdate(
+        this->connection_key(),
+        context_.service_type_,
+        ServiceStatus::SERVICE_ACCEPTED);
     protocol_handler_.SendStartSessionAck(context_.connection_id_,
                                           context_.new_session_id_,
                                           protocol_version_,
@@ -153,6 +198,10 @@ void HandshakeHandler::ProcessSuccessfulHandshake(const uint32_t connection_key,
                                           full_version_,
                                           params);
   } else {
+    service_status_update_handler_.OnServiceUpdate(
+        this->connection_key(),
+        context_.service_type_,
+        ServiceStatus::SERVICE_START_FAILED);
     protocol_handler_.SendStartSessionNAck(context_.connection_id_,
                                            context_.new_session_id_,
                                            protocol_version_,
@@ -160,7 +209,8 @@ void HandshakeHandler::ProcessSuccessfulHandshake(const uint32_t connection_key,
   }
 }
 
-void HandshakeHandler::ProcessFailedHandshake(BsonObject& params) {
+void HandshakeHandler::ProcessFailedHandshake(BsonObject& params,
+                                              ServiceStatus service_status) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_, "Handshake failed");
   const std::vector<int>& force_protected =
@@ -177,6 +227,10 @@ void HandshakeHandler::ProcessFailedHandshake(BsonObject& params) {
                                                << context_.is_new_service_);
 
   if (can_be_unprotected && context_.is_new_service_) {
+    service_status_update_handler_.OnServiceUpdate(
+        this->connection_key(),
+        context_.service_type_,
+        ServiceStatus::PROTECTION_DISABLED);
     protocol_handler_.SendStartSessionAck(context_.connection_id_,
                                           context_.new_session_id_,
                                           protocol_version_,
@@ -186,6 +240,8 @@ void HandshakeHandler::ProcessFailedHandshake(BsonObject& params) {
                                           full_version_,
                                           params);
   } else {
+    service_status_update_handler_.OnServiceUpdate(
+        this->connection_key(), context_.service_type_, service_status);
     protocol_handler_.SendStartSessionNAck(context_.connection_id_,
                                            context_.new_session_id_,
                                            protocol_version_,
diff --git a/src/components/protocol_handler/src/incoming_data_handler.cc b/src/components/protocol_handler/src/incoming_data_handler.cc
index 566b36f46d..498618d6de 100644
--- a/src/components/protocol_handler/src/incoming_data_handler.cc
+++ b/src/components/protocol_handler/src/incoming_data_handler.cc
@@ -50,10 +50,9 @@ static const size_t MIN_HEADER_SIZE =
 
 ProtocolFramePtrList IncomingDataHandler::ProcessData(
     const RawMessage& tm_message,
-    RESULT_CODE* result,
+    RESULT_CODE& out_result,
     size_t* malformed_occurrence) {
   LOG4CXX_AUTO_TRACE(logger_);
-  DCHECK(result);
   DCHECK(malformed_occurrence);
   const transport_manager::ConnectionUID connection_id =
       tm_message.connection_key();
@@ -61,7 +60,7 @@ ProtocolFramePtrList IncomingDataHandler::ProcessData(
   const size_t tm_message_size = tm_message.data_size();
   if (tm_message_size == 0 || data == NULL) {
     LOG4CXX_WARN(logger_, "Wrong raw message " << tm_message_size << " bytes");
-    *result = RESULT_FAIL;
+    out_result = RESULT_FAIL;
     return ProtocolFramePtrList();
   }
   LOG4CXX_INFO(logger_,
@@ -70,7 +69,7 @@ ProtocolFramePtrList IncomingDataHandler::ProcessData(
   ConnectionsDataMap::iterator it = connections_data_.find(connection_id);
   if (connections_data_.end() == it) {
     LOG4CXX_WARN(logger_, "ProcessData requested for unknown connection");
-    *result = RESULT_FAIL;
+    out_result = RESULT_FAIL;
     return ProtocolFramePtrList();
   }
   std::vector<uint8_t>& connection_data = it->second;
@@ -80,7 +79,7 @@ ProtocolFramePtrList IncomingDataHandler::ProcessData(
                                                   << connection_data.size());
   ProtocolFramePtrList out_frames;
   *malformed_occurrence = 0;
-  *result = CreateFrame(
+  out_result = CreateFrame(
       connection_data, out_frames, *malformed_occurrence, connection_id);
   LOG4CXX_DEBUG(logger_,
                 "New data size for connection " << connection_id << " is "
@@ -89,7 +88,7 @@ ProtocolFramePtrList IncomingDataHandler::ProcessData(
     LOG4CXX_INFO(logger_,
                  "Created and passed " << out_frames.size() << " packets");
   } else {
-    if (RESULT_DEFERRED == *result) {
+    if (RESULT_DEFERRED == out_result) {
       LOG4CXX_DEBUG(
           logger_,
           "No packets have been created. Waiting next portion of data.");
@@ -98,9 +97,9 @@ ProtocolFramePtrList IncomingDataHandler::ProcessData(
     }
   }
   if (*malformed_occurrence > 0u || last_portion_of_data_was_malformed_) {
-    *result = RESULT_MALFORMED_OCCURS;
+    out_result = RESULT_MALFORMED_OCCURS;
   } else {
-    *result = RESULT_OK;
+    out_result = RESULT_OK;
   }
   return out_frames;
 }
diff --git a/src/components/protocol_handler/src/multiframe_builder.cc b/src/components/protocol_handler/src/multiframe_builder.cc
index d7cfc6f90e..fbfc061490 100644
--- a/src/components/protocol_handler/src/multiframe_builder.cc
+++ b/src/components/protocol_handler/src/multiframe_builder.cc
@@ -261,6 +261,11 @@ RESULT_CODE MultiFrameBuilder::HandleConsecutiveFrame(
     }
   }
 
+  const bool packet_protection_flag = packet->protection_flag();
+  if (!assembling_frame->protection_flag() && packet_protection_flag) {
+    assembling_frame->set_protection_flag(packet_protection_flag);
+  }
+
   assembling_frame->set_frame_data(new_frame_data);
 
   LOG4CXX_DEBUG(logger_,
diff --git a/src/components/protocol_handler/src/protocol_handler_impl.cc b/src/components/protocol_handler/src/protocol_handler_impl.cc
index 222ca635d0..7769696a76 100644
--- a/src/components/protocol_handler/src/protocol_handler_impl.cc
+++ b/src/components/protocol_handler/src/protocol_handler_impl.cc
@@ -104,6 +104,8 @@ ProtocolHandlerImpl::ProtocolHandlerImpl(
       get_settings().maximum_audio_payload_size());
   protocol_header_validator_.set_max_video_payload_size(
       get_settings().maximum_video_payload_size());
+  protocol_header_validator_.set_max_protocol_version_supported(
+      get_settings().max_supported_protocol_version());
   incoming_data_handler_.set_validator(&protocol_header_validator_);
 
   const size_t& message_frequency_count =
@@ -493,8 +495,9 @@ void ProtocolHandlerImpl::SendStartSessionNAck(
     BsonArray rejectedParamsArr;
     bson_array_initialize(&rejectedParamsArr, rejectedParams.size());
     for (std::string param : rejectedParams) {
-      char paramPtr[255];
-      strncpy(paramPtr, param.c_str(), 255);
+      char paramPtr[256];
+      strncpy(paramPtr, param.c_str(), sizeof(paramPtr));
+      paramPtr[sizeof(paramPtr) - 1] = '\0';
       bson_array_add_string(&rejectedParamsArr, paramPtr);
     }
     bson_object_put_array(
@@ -555,8 +558,9 @@ void ProtocolHandlerImpl::SendEndSessionNAck(
     BsonArray rejectedParamsArr;
     bson_array_initialize(&rejectedParamsArr, rejectedParams.size());
     for (std::string param : rejectedParams) {
-      char paramPtr[255];
-      strncpy(paramPtr, param.c_str(), 255);
+      char paramPtr[256];
+      strncpy(paramPtr, param.c_str(), sizeof(paramPtr));
+      paramPtr[sizeof(paramPtr) - 1] = '\0';
       bson_array_add_string(&rejectedParamsArr, paramPtr);
     }
     bson_object_put_array(
@@ -850,6 +854,7 @@ void ProtocolHandlerImpl::SendHeartBeat(int32_t connection_id,
 }
 
 void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
+                                                 bool needs_encryption,
                                                  bool final_message) {
 #ifdef TELEMETRY_MONITOR
   const date_time::TimeDuration start_time = date_time::getCurrentTime();
@@ -917,6 +922,7 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
                                                 message->service_type(),
                                                 message->data_size(),
                                                 message->data(),
+                                                needs_encryption,
                                                 final_message);
     if (result != RESULT_OK) {
       LOG4CXX_ERROR(logger_,
@@ -934,6 +940,7 @@ void ProtocolHandlerImpl::SendMessageToMobileApp(const RawMessagePtr message,
                                                message->data_size(),
                                                message->data(),
                                                frame_size,
+                                               needs_encryption,
                                                final_message);
     if (result != RESULT_OK) {
       LOG4CXX_ERROR(logger_,
@@ -971,17 +978,17 @@ void ProtocolHandlerImpl::OnTMMessageReceived(const RawMessagePtr tm_message) {
   size_t malformed_occurs = 0u;
   const ProtocolFramePtrList protocol_frames =
       incoming_data_handler_.ProcessData(
-          *tm_message, &result, &malformed_occurs);
-  LOG4CXX_DEBUG(logger_, "Proccessed " << protocol_frames.size() << " frames");
+          *tm_message, result, &malformed_occurs);
+  LOG4CXX_DEBUG(logger_, "Processed " << protocol_frames.size() << " frames");
   if (result != RESULT_OK) {
     if (result == RESULT_MALFORMED_OCCURS) {
       LOG4CXX_WARN(
           logger_,
           "Malformed message occurs, connection id " << connection_key);
       if (!get_settings().malformed_message_filtering()) {
-        LOG4CXX_DEBUG(logger_, "Malformed message filterign disabled");
+        LOG4CXX_DEBUG(logger_, "Malformed message filtering disabled");
         session_observer_.OnMalformedMessageCallback(connection_key);
-        // For tracking only malformed occurrence check outpute
+        // For tracking only malformed occurrence check output
       } else {
         if (malformed_occurs > 0) {
           TrackMalformedMessage(connection_key, malformed_occurs);
@@ -1126,13 +1133,27 @@ void ProtocolHandlerImpl::OnUnexpectedDisconnect(
   OnConnectionClosed(connection_id);
 }
 
-void ProtocolHandlerImpl::NotifyOnFailedHandshake() {
+void ProtocolHandlerImpl::NotifyOnGetSystemTimeFailed() {
   LOG4CXX_AUTO_TRACE(logger_);
 #ifdef ENABLE_SECURITY
-  security_manager_->NotifyListenersOnHandshakeFailed();
+  security_manager_->ResetPendingSystemTimeRequests();
+  security_manager_->NotifyListenersOnGetSystemTimeFailed();
 #endif  // ENABLE_SECURITY
 }
 
+void ProtocolHandlerImpl::ProcessFailedPTU() {
+#ifdef ENABLE_SECURITY
+  security_manager_->ProcessFailedPTU();
+#endif  // ENABLE_SECURITY
+}
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+void ProtocolHandlerImpl::ProcessFailedCertDecrypt() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  security_manager_->ProcessFailedCertDecrypt();
+}
+#endif
+
 void ProtocolHandlerImpl::OnTransportConfigUpdated(
     const transport_manager::transport_adapter::TransportConfig& configs) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1210,6 +1231,19 @@ void ProtocolHandlerImpl::OnAuthTokenUpdated(const std::string& policy_app_id,
   }
 }
 
+bool ProtocolHandlerImpl::IsRPCServiceSecure(
+    const uint32_t connection_key) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+#ifdef ENABLE_SECURITY
+
+  security_manager::SSLContext* context =
+      session_observer_.GetSSLContext(connection_key, ServiceType::kRpc);
+  return (context && context->IsInitCompleted());
+#else
+  return false;
+#endif  // ENABLE_SECURITY
+}
+
 RESULT_CODE ProtocolHandlerImpl::SendFrame(const ProtocolFramePtr packet) {
   LOG4CXX_AUTO_TRACE(logger_);
   if (!packet) {
@@ -1254,13 +1288,18 @@ RESULT_CODE ProtocolHandlerImpl::SendSingleFrameMessage(
     const uint8_t service_type,
     const size_t data_size,
     const uint8_t* data,
+    const bool needs_encryption,
     const bool is_final_message) {
   LOG4CXX_AUTO_TRACE(logger_);
 
+  LOG4CXX_DEBUG(
+      logger_,
+      "Packet needs encryption: " << std::boolalpha << needs_encryption);
+
   ProtocolFramePtr ptr(
       new protocol_handler::ProtocolPacket(connection_id,
                                            protocol_version,
-                                           PROTECTION_OFF,
+                                           needs_encryption,
                                            FRAME_TYPE_SINGLE,
                                            service_type,
                                            FRAME_DATA_SINGLE,
@@ -1282,6 +1321,7 @@ RESULT_CODE ProtocolHandlerImpl::SendMultiFrameMessage(
     const size_t data_size,
     const uint8_t* data,
     const size_t max_frame_size,
+    const bool needs_encryption,
     const bool is_final_message) {
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -1322,7 +1362,7 @@ RESULT_CODE ProtocolHandlerImpl::SendMultiFrameMessage(
   const ProtocolFramePtr firstPacket(
       new protocol_handler::ProtocolPacket(connection_id,
                                            protocol_version,
-                                           PROTECTION_OFF,
+                                           needs_encryption,
                                            FRAME_TYPE_FIRST,
                                            service_type,
                                            FRAME_DATA_FIRST,
@@ -1346,7 +1386,7 @@ RESULT_CODE ProtocolHandlerImpl::SendMultiFrameMessage(
     const ProtocolFramePtr ptr(
         new protocol_handler::ProtocolPacket(connection_id,
                                              protocol_version,
-                                             PROTECTION_OFF,
+                                             needs_encryption,
                                              FRAME_TYPE_CONSECUTIVE,
                                              service_type,
                                              data_type,
@@ -1408,6 +1448,7 @@ RESULT_CODE ProtocolHandlerImpl::HandleSingleFrameMessage(
                                                 packet->protocol_version(),
                                                 packet->data(),
                                                 packet->total_data_bytes(),
+                                                packet->protection_flag(),
                                                 packet->service_type(),
                                                 packet->payload_size()));
   if (!rawMessage) {
@@ -1547,7 +1588,8 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageEndSession(
                                            << " type.");
     if (packet.protocol_version() >= PROTOCOL_VERSION_5) {
       std::vector<std::string> rejectedParams;
-      if (hash_id == protocol_handler::HASH_ID_WRONG) {
+      if (hash_id == protocol_handler::HASH_ID_WRONG &&
+          packet.service_type() == kRpc) {
         rejectedParams.push_back(std::string(strings::hash_id));
       }
       SendEndSessionNAck(connection_id,
@@ -1565,6 +1607,59 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageEndSession(
   return RESULT_OK;
 }
 
+const ServiceStatus ProtocolHandlerImpl::ServiceDisallowedBySettings(
+    const ServiceType service_type,
+    const ConnectionID connection_id,
+    const uint8_t session_id,
+    const bool protection) const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const std::string& transport =
+      session_observer_.TransportTypeProfileStringFromConnHandle(connection_id);
+
+  const auto video_transports = settings_.video_service_transports();
+  const bool is_video_allowed =
+      video_transports.empty() ||
+      std::find(video_transports.begin(), video_transports.end(), transport) !=
+          video_transports.end();
+
+  const auto audio_transports = settings_.audio_service_transports();
+  const bool is_audio_allowed =
+      audio_transports.empty() ||
+      std::find(audio_transports.begin(), audio_transports.end(), transport) !=
+          audio_transports.end();
+
+#ifdef ENABLE_SECURITY
+  const auto& force_protected = get_settings().force_protected_service();
+
+  const auto& force_unprotected = get_settings().force_unprotected_service();
+
+  const bool is_force_protected =
+      (helpers::in_range(force_protected, service_type));
+
+  const bool is_force_unprotected =
+      (helpers::in_range(force_unprotected, service_type));
+
+  const bool can_start_protected = is_force_protected && protection;
+
+  const bool can_start_unprotected = is_force_unprotected && !protection;
+
+  if (is_force_protected && !can_start_protected) {
+    return ServiceStatus::PROTECTION_ENFORCED;
+  }
+
+  if (is_force_unprotected && !can_start_unprotected) {
+    return ServiceStatus::UNSECURE_START_FAILED;
+  }
+#endif  // ENABLE_SECURITY
+
+  if ((ServiceType::kMobileNav == service_type && !is_video_allowed) ||
+      (ServiceType::kAudio == service_type && !is_audio_allowed)) {
+    return ServiceStatus::SERVICE_START_FAILED;
+  }
+
+  return ServiceStatus::INVALID_ENUM;
+}
+
 RESULT_CODE ProtocolHandlerImpl::HandleControlMessageEndServiceACK(
     const ProtocolPacket& packet) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -1605,27 +1700,21 @@ RESULT_CODE ProtocolHandlerImpl::HandleControlMessageStartSession(
 
   const ConnectionID connection_id = packet->connection_id();
   const uint8_t session_id = packet->session_id();
-  const std::string& transport =
-      session_observer_.TransportTypeProfileStringFromConnHandle(connection_id);
+  const uint32_t connection_key =
+      session_observer_.KeyFromPair(connection_id, session_id);
 
-  const auto video_transports = settings_.video_service_transports();
-  const bool is_video_allowed =
-      video_transports.empty() ||
-      std::find(video_transports.begin(), video_transports.end(), transport) !=
-          video_transports.end();
+  service_status_update_handler_->OnServiceUpdate(
+      connection_key, service_type, ServiceStatus::SERVICE_RECEIVED);
 
-  const auto audio_transports = settings_.audio_service_transports();
-  const bool is_audio_allowed =
-      audio_transports.empty() ||
-      std::find(audio_transports.begin(), audio_transports.end(), transport) !=
-          audio_transports.end();
+  const auto settings_check = ServiceDisallowedBySettings(
+      service_type, connection_id, session_id, protection);
 
-  if ((ServiceType::kMobileNav == service_type && !is_video_allowed) ||
-      (ServiceType::kAudio == service_type && !is_audio_allowed)) {
+  if (ServiceStatus::INVALID_ENUM != settings_check) {
     LOG4CXX_DEBUG(logger_,
                   "Rejecting StartService for service:"
-                      << service_type << ", over transport: " << transport
-                      << ", disallowed by settings.");
+                      << service_type << ", disallowed by settings.");
+    service_status_update_handler_->OnServiceUpdate(
+        connection_key, service_type, settings_check);
     SendStartSessionNAck(
         connection_id, session_id, protocol_version, service_type);
     return RESULT_OK;
@@ -1723,14 +1812,22 @@ void ProtocolHandlerImpl::NotifySessionStarted(
     start_session_frame_map_.erase(it);
   }
 
+  const ServiceType service_type = ServiceTypeFromByte(packet->service_type());
   const uint8_t protocol_version = packet->protocol_version();
 
   if (0 == context.new_session_id_) {
     LOG4CXX_WARN(logger_,
                  "Refused by session_observer to create service "
-                     << packet->service_type() << " type.");
+                     << static_cast<int32_t>(service_type) << " type.");
+    const auto session_id = packet->session_id();
+    const auto connection_key =
+        session_observer_.KeyFromPair(context.connection_id_, session_id);
+    service_status_update_handler_->OnServiceUpdate(
+        connection_key,
+        context.service_type_,
+        ServiceStatus::SERVICE_START_FAILED);
     SendStartSessionNAck(context.connection_id_,
-                         packet->session_id(),
+                         session_id,
                          protocol_version,
                          packet->service_type(),
                          rejected_params);
@@ -1738,7 +1835,10 @@ void ProtocolHandlerImpl::NotifySessionStarted(
   }
 
   std::shared_ptr<BsonObject> start_session_ack_params(
-      new BsonObject(), [](BsonObject* obj) { bson_object_deinitialize(obj); });
+      new BsonObject(), [](BsonObject* obj) {
+        bson_object_deinitialize(obj);
+        delete obj;
+      });
   bson_object_initialize_default(start_session_ack_params.get());
   // when video service is successfully started, copy input parameters
   // ("width", "height", "videoProtocol", "videoCodec") to the ACK packet
@@ -1810,19 +1910,20 @@ void ProtocolHandlerImpl::NotifySessionStarted(
   }
 
 #ifdef ENABLE_SECURITY
-  const ServiceType service_type = ServiceTypeFromByte(packet->service_type());
   // for packet is encrypted and security plugin is enable
   if (context.is_protected_ && security_manager_) {
     const uint32_t connection_key = session_observer_.KeyFromPair(
         context.connection_id_, context.new_session_id_);
 
     std::shared_ptr<HandshakeHandler> handler =
-        std::make_shared<HandshakeHandler>(*this,
-                                           session_observer_,
-                                           *fullVersion,
-                                           context,
-                                           packet->protocol_version(),
-                                           start_session_ack_params);
+        std::make_shared<HandshakeHandler>(
+            *this,
+            session_observer_,
+            *fullVersion,
+            context,
+            packet->protocol_version(),
+            start_session_ack_params,
+            *(service_status_update_handler_.get()));
 
     security_manager::SSLContext* ssl_context =
         security_manager_->CreateSSLContext(
@@ -1853,6 +1954,10 @@ void ProtocolHandlerImpl::NotifySessionStarted(
       // mark service as protected
       session_observer_.SetProtectionFlag(connection_key, service_type);
       // Start service as protected with current SSLContext
+      service_status_update_handler_->OnServiceUpdate(
+          connection_key,
+          context.service_type_,
+          ServiceStatus::SERVICE_ACCEPTED);
       SendStartSessionAck(context.connection_id_,
                           context.new_session_id_,
                           packet->protocol_version(),
@@ -1889,7 +1994,11 @@ void ProtocolHandlerImpl::NotifySessionStarted(
     return;
   }
 #endif  // ENABLE_SECURITY
+  const uint32_t connection_key = session_observer_.KeyFromPair(
+      context.connection_id_, context.new_session_id_);
   if (rejected_params.empty()) {
+    service_status_update_handler_->OnServiceUpdate(
+        connection_key, context.service_type_, ServiceStatus::SERVICE_ACCEPTED);
     SendStartSessionAck(context.connection_id_,
                         context.new_session_id_,
                         packet->protocol_version(),
@@ -1899,6 +2008,10 @@ void ProtocolHandlerImpl::NotifySessionStarted(
                         *fullVersion,
                         *start_session_ack_params);
   } else {
+    service_status_update_handler_->OnServiceUpdate(
+        connection_key,
+        context.service_type_,
+        ServiceStatus::SERVICE_START_FAILED);
     SendStartSessionNAck(context.connection_id_,
                          packet->session_id(),
                          protocol_version,
@@ -1955,6 +2068,7 @@ void ProtocolHandlerImpl::PopValideAndExpirateMultiframes() {
                                                   frame->protocol_version(),
                                                   frame->data(),
                                                   frame->total_data_bytes(),
+                                                  frame->protection_flag(),
                                                   frame->service_type(),
                                                   frame->payload_size()));
     DCHECK(rawMessage);
@@ -2079,6 +2193,11 @@ void ProtocolHandlerImpl::Stop() {
   start_session_frame_map_.clear();
 }
 
+void ProtocolHandlerImpl::set_service_status_update_handler(
+    std::unique_ptr<ServiceStatusUpdateHandler> handler) {
+  service_status_update_handler_ = std::move(handler);
+}
+
 #ifdef ENABLE_SECURITY
 void ProtocolHandlerImpl::set_security_manager(
     security_manager::SecurityManager* security_manager) {
@@ -2106,7 +2225,12 @@ RESULT_CODE ProtocolHandlerImpl::EncryptFrame(ProtocolFramePtr packet) {
       packet->connection_id(), packet->session_id());
   security_manager::SSLContext* context = session_observer_.GetSSLContext(
       connection_key, ServiceTypeFromByte(packet->service_type()));
-  if (!context || !context->IsInitCompleted()) {
+
+  LOG4CXX_DEBUG(
+      logger_,
+      "Protection flag is: " << packet->protection_flag() << std::boolalpha);
+  if ((!context || !context->IsInitCompleted()) || !packet->protection_flag()) {
+    LOG4CXX_DEBUG(logger_, "Ecryption is skipped!");
     return RESULT_OK;
   }
   const uint8_t* out_data;
diff --git a/src/components/protocol_handler/src/protocol_packet.cc b/src/components/protocol_handler/src/protocol_packet.cc
index 3473b8e5c5..5bee1c16b2 100644
--- a/src/components/protocol_handler/src/protocol_packet.cc
+++ b/src/components/protocol_handler/src/protocol_packet.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Ford Motor Company
+ * Copyright (c) 2019, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
 
 #include <memory.h>
 #include <stdint.h>
+#include <algorithm>
 #include <cstring>
 #include <limits>
 #include <memory>
@@ -47,6 +48,30 @@ namespace protocol_handler {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "ProtocolHandler")
 
+namespace {
+std::string StringifyFrameType(uint8_t type) {
+  switch (type) {
+    case FRAME_TYPE_SINGLE:
+      return "FRAME_TYPE_SINGLE";
+
+    case FRAME_TYPE_CONSECUTIVE:
+      return "FRAME_TYPE_CONSECUTIVE";
+
+    case FRAME_TYPE_CONTROL:
+      return "FRAME_TYPE_CONTROL";
+
+    case FRAME_TYPE_FIRST:
+      return "FRAME_TYPE_FIRST";
+
+    default:
+      LOG4CXX_ERROR(logger_, "Unknown frame type:" << static_cast<int>(type));
+      break;
+  }
+
+  return "";
+}
+}  // namespace
+
 ProtocolPacket::ProtocolData::ProtocolData() : data(NULL), totalDataBytes(0u) {}
 
 ProtocolPacket::ProtocolData::~ProtocolData() {
@@ -137,7 +162,8 @@ ProtocolPacket::ProtocolHeaderValidator::ProtocolHeaderValidator()
     , max_control_payload_size_(0)
     , max_rpc_payload_size_(0)
     , max_audio_payload_size_(0)
-    , max_video_payload_size_(0) {}
+    , max_video_payload_size_(0)
+    , max_protocol_version_supported_(PROTOCOL_VERSION_MAX) {}
 
 void ProtocolPacket::ProtocolHeaderValidator::set_max_payload_size(
     const size_t max_payload_size) {
@@ -173,6 +199,15 @@ void ProtocolPacket::ProtocolHeaderValidator::set_max_video_payload_size(
   max_video_payload_size_ = max_payload_size;
 }
 
+void ProtocolPacket::ProtocolHeaderValidator::
+    set_max_protocol_version_supported(
+        const uint16_t max_protocol_version_supported) {
+  LOG4CXX_DEBUG(logger_,
+                "New maximum protocol version supported is "
+                    << max_protocol_version_supported);
+  max_protocol_version_supported_ = max_protocol_version_supported;
+}
+
 size_t ProtocolPacket::ProtocolHeaderValidator::max_payload_size() const {
   return max_payload_size_;
 }
@@ -194,6 +229,12 @@ size_t ProtocolPacket::ProtocolHeaderValidator::max_video_payload_size() const {
   return max_video_payload_size_;
 }
 
+uint16_t
+ProtocolPacket::ProtocolHeaderValidator::max_protocol_version_supported()
+    const {
+  return max_protocol_version_supported_;
+}
+
 size_t
 ProtocolPacket::ProtocolHeaderValidator::max_payload_size_by_service_type(
     const ServiceType type) const {
@@ -233,15 +274,16 @@ RESULT_CODE ProtocolPacket::ProtocolHeaderValidator::validate(
   // on used protocol version and service type
   size_t payload_size = MAXIMUM_FRAME_DATA_V2_SIZE;
   // Protocol version shall be from 1 to 4
+  if (max_protocol_version_supported_ < header.version) {
+    return RESULT_FAIL;
+  }
   switch (header.version) {
     case PROTOCOL_VERSION_1:
     case PROTOCOL_VERSION_2:
       break;
     case PROTOCOL_VERSION_3:
     case PROTOCOL_VERSION_4:
-      payload_size = max_payload_size_ > MAXIMUM_FRAME_DATA_V2_SIZE
-                         ? max_payload_size_
-                         : MAXIMUM_FRAME_DATA_V2_SIZE;
+      payload_size = std::max(max_payload_size_, MAXIMUM_FRAME_DATA_V2_SIZE);
       break;
     case PROTOCOL_VERSION_5:
       payload_size = max_payload_size_by_service_type(
@@ -252,6 +294,7 @@ RESULT_CODE ProtocolPacket::ProtocolHeaderValidator::validate(
                    "Unknown version:" << static_cast<int>(header.version));
       return RESULT_FAIL;
   }
+
   // ServiceType shall be equal 0x0 (Control), 0x07 (RPC), 0x0A (PCM), 0x0B
   // (Video), 0x0F (Bulk)
   if (ServiceTypeFromByte(header.serviceType) == kInvalidServiceType) {
@@ -319,26 +362,40 @@ RESULT_CODE ProtocolPacket::ProtocolHeaderValidator::validate(
   // For Control frames Data Size value shall be less than MTU header
   // For Single and Consecutive Data Size value shall be greater than 0x00
   // and shall be less than payload size
-  if (header.dataSize > payload_size) {
-    LOG4CXX_WARN(logger_,
-                 "Packet data size is "
-                     << header.dataSize
-                     << " and bigger than allowed payload size " << payload_size
-                     << " bytes");
-    return RESULT_FAIL;
-  }
+  // For First Frame Data Size shall be equal 0x08 (payload of this packet will
+  // be 8 bytes).
+
   switch (header.frameType) {
     case FRAME_TYPE_SINGLE:
     case FRAME_TYPE_CONSECUTIVE:
-      if (header.dataSize <= 0u) {
+    case FRAME_TYPE_CONTROL: {
+      if (header.dataSize > payload_size ||
+          (FRAME_TYPE_CONTROL != header.frameType && header.dataSize == 0u)) {
+        UNUSED(StringifyFrameType);
+        LOG4CXX_WARN(
+            logger_,
+            "Packet data size of "
+                << StringifyFrameType(header.frameType)
+                << " frame must be in range (0, payload_size=" << payload_size
+                << "], but actual value is " << header.dataSize);
+        return RESULT_FAIL;
+      }
+    } break;
+
+    case FRAME_TYPE_FIRST:
+      if (FIRST_FRAME_DATA_SIZE != header.dataSize) {
         LOG4CXX_WARN(logger_,
-                     "Data size of Single and Consecutive frame shall be not "
-                     "equal 0 byte ");
+                     "Packet data size of FRAME_TYPE_FIRST frame must equal "
+                         << static_cast<int>(FIRST_FRAME_DATA_SIZE)
+                         << ", but actual value is " << header.dataSize);
         return RESULT_FAIL;
       }
       break;
+
     default:
-      break;
+      LOG4CXX_WARN(logger_,
+                   "Unknown frame type " << static_cast<int>(header.frameType));
+      return RESULT_FAIL;
   }
   // Message ID be equal or greater than 0x01 (not actual for 1 protocol version
   // and Control frames)
@@ -346,7 +403,6 @@ RESULT_CODE ProtocolPacket::ProtocolHeaderValidator::validate(
     if (FRAME_TYPE_CONTROL != header.frameType &&
         PROTOCOL_VERSION_1 != header.version) {
       LOG4CXX_WARN(logger_, "Message ID shall be greater than 0x00");
-      // Message ID shall be greater than 0x00, but not implemented in SPT
       return RESULT_FAIL;
     }
   }
@@ -433,6 +489,7 @@ RawMessagePtr ProtocolPacket::serializePacket() const {
                                                  packet_header_.version,
                                                  packet,
                                                  total_packet_size,
+                                                 false,
                                                  packet_header_.serviceType));
 
   delete[] packet;
diff --git a/src/components/protocol_handler/src/service_status_update_handler.cc b/src/components/protocol_handler/src/service_status_update_handler.cc
new file mode 100644
index 0000000000..7b2c67ea23
--- /dev/null
+++ b/src/components/protocol_handler/src/service_status_update_handler.cc
@@ -0,0 +1,117 @@
+#include "protocol_handler/service_status_update_handler.h"
+#include "interfaces/HMI_API.h"
+
+namespace protocol_handler {
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "ServiceStatusUpdateHandler")
+
+hmi_apis::Common_ServiceType::eType GetHMIServiceType(
+    protocol_handler::ServiceType service_type) {
+  using namespace hmi_apis;
+  using namespace protocol_handler;
+  switch (service_type) {
+    case SERVICE_TYPE_RPC: {
+      return Common_ServiceType::RPC;
+    }
+    case SERVICE_TYPE_AUDIO: {
+      return Common_ServiceType::AUDIO;
+    }
+    case SERVICE_TYPE_NAVI: {
+      return Common_ServiceType::VIDEO;
+    }
+    default: { return Common_ServiceType::INVALID_ENUM; }
+  }
+}
+
+void ServiceStatusUpdateHandler::OnServiceUpdate(
+    const uint32_t connection_key,
+    const protocol_handler::ServiceType service_type,
+    ServiceStatus service_status) {
+  using namespace hmi_apis;
+  typedef utils::Optional<Common_ServiceStatusUpdateReason::eType>
+      UpdateReasonOptional;
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto hmi_service_type = GetHMIServiceType(service_type);
+
+  switch (service_status) {
+    case ServiceStatus::SERVICE_RECEIVED: {
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_RECEIVED,
+          UpdateReasonOptional(UpdateReasonOptional::EMPTY));
+    }
+    case ServiceStatus::SERVICE_ACCEPTED: {
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_ACCEPTED,
+          UpdateReasonOptional(UpdateReasonOptional::EMPTY));
+    }
+    case ServiceStatus::SERVICE_START_FAILED: {
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_REJECTED,
+          UpdateReasonOptional(UpdateReasonOptional::EMPTY));
+    }
+    case ServiceStatus::PTU_FAILED: {
+      auto update_reason = Common_ServiceStatusUpdateReason::PTU_FAILED;
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_REJECTED,
+          update_reason);
+    }
+    case ServiceStatus::CERT_INVALID: {
+      auto update_reason = Common_ServiceStatusUpdateReason::INVALID_CERT;
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_REJECTED,
+          update_reason);
+    }
+    case ServiceStatus::INVALID_TIME: {
+      auto update_reason = Common_ServiceStatusUpdateReason::INVALID_TIME;
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_REJECTED,
+          update_reason);
+    }
+    case ServiceStatus::PROTECTION_ENFORCED: {
+      auto update_reason =
+          Common_ServiceStatusUpdateReason::PROTECTION_ENFORCED;
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_REJECTED,
+          update_reason);
+    }
+    case ServiceStatus::PROTECTION_DISABLED: {
+      auto update_reason =
+          Common_ServiceStatusUpdateReason::PROTECTION_DISABLED;
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_ACCEPTED,
+          update_reason);
+    }
+    case ServiceStatus::UNSECURE_START_FAILED: {
+      auto update_reason =
+          Common_ServiceStatusUpdateReason::PROTECTION_DISABLED;
+      return listener_->ProcessServiceStatusUpdate(
+          connection_key,
+          hmi_service_type,
+          Common_ServiceEvent::REQUEST_REJECTED,
+          update_reason);
+    }
+    default: {
+      LOG4CXX_WARN(logger_,
+                   "Received unknown ServiceStatus: "
+                       << static_cast<int32_t>(service_status));
+      return;
+    }
+  }
+}
+}  // namespace protocol_handler
diff --git a/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h b/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h
new file mode 100644
index 0000000000..ccbfeb8438
--- /dev/null
+++ b/src/components/protocol_handler/test/include/protocol_handler/mock_service_status_update_handler_listener.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_TEST_INCLUDE_MOCK_SERVICE_STATUS_UPDATE_HANDLER_LISTENER_H
+#define SRC_COMPONENTS_PROTOCOL_HANDLER_TEST_INCLUDE_MOCK_SERVICE_STATUS_UPDATE_HANDLER_LISTENER_H
+
+#include "gmock/gmock.h"
+#include "protocol_handler/service_status_update_handler_listener.h"
+
+namespace test {
+namespace components {
+namespace protocol_handler_test {
+
+class MockServiceStatusUpdateHandlerListener
+    : public protocol_handler::ServiceStatusUpdateHandlerListener {
+ public:
+  MOCK_METHOD4(
+      ProcessServiceStatusUpdate,
+      void(const uint32_t,
+           hmi_apis::Common_ServiceType::eType,
+           hmi_apis::Common_ServiceEvent::eType,
+           utils::Optional<hmi_apis::Common_ServiceStatusUpdateReason::eType>));
+};
+}  // namespace protocol_handler_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_PROTOCOL_HANDLER_TEST_INCLUDE_MOCK_SERVICE_STATUS_UPDATE_HANDLER_LISTENER_H
diff --git a/src/components/protocol_handler/test/incoming_data_handler_test.cc b/src/components/protocol_handler/test/incoming_data_handler_test.cc
index fff102dde9..1476db0dd9 100644
--- a/src/components/protocol_handler/test/incoming_data_handler_test.cc
+++ b/src/components/protocol_handler/test/incoming_data_handler_test.cc
@@ -55,7 +55,14 @@ class IncomingDataHandlerTest : public ::testing::Test {
     some_data_size = 4;
     some_data2_size = 512;
     some_data = new uint8_t[some_data_size];
+    for (size_t i = 0; i < some_data_size; i++) {
+      // put some data in the buffer
+      some_data[i] = i % 256;
+    }
     some_data2 = new uint8_t[some_data2_size];
+    for (size_t i = 0; i < some_data2_size; i++) {
+      some_data2[i] = i % 256;
+    }
     protov1_message_id = 0x0;
     some_message_id = 0xABCDEF0;
     some_session_id = 0xFEDCBA0;
@@ -68,8 +75,10 @@ class IncomingDataHandlerTest : public ::testing::Test {
   void ProcessData(transport_manager::ConnectionUID uid,
                    const uint8_t* const data,
                    const uint32_t data_size) {
-    actual_frames = data_handler.ProcessData(
-        RawMessage(uid, 0, data, data_size), &result_code, &malformed_occurs);
+    actual_frames =
+        data_handler.ProcessData(RawMessage(uid, 0, data, data_size, false),
+                                 result_code,
+                                 &malformed_occurs);
   }
 
   void AppendPacketToTMData(const ProtocolPacket& packet) {
@@ -117,16 +126,18 @@ TEST_F(IncomingDataHandlerTest, NullData) {
 
 TEST_F(IncomingDataHandlerTest, DataForUnknownConnection) {
   size_t malformed_count = 0;
-  actual_frames = data_handler.ProcessData(
-      RawMessage(uid_unknown, 0, NULL, 0), &result_code, &malformed_count);
+  actual_frames =
+      data_handler.ProcessData(RawMessage(uid_unknown, 0, NULL, 0, false),
+                               result_code,
+                               &malformed_count);
   EXPECT_EQ(RESULT_FAIL, result_code);
   EXPECT_EQ(malformed_count, 0u);
   EXPECT_TRUE(actual_frames.empty());
 
   AppendPacketToTMData(ProtocolPacket());
   actual_frames = data_handler.ProcessData(
-      RawMessage(uid_unknown, 0, tm_data.data(), tm_data.size()),
-      &result_code,
+      RawMessage(uid_unknown, 0, tm_data.data(), tm_data.size(), false),
+      result_code,
       &malformed_count);
   EXPECT_EQ(RESULT_FAIL, result_code);
   EXPECT_EQ(malformed_count, 0u);
@@ -250,7 +261,6 @@ TEST_F(IncomingDataHandlerTest, MixedPayloadData_TwoConnections) {
   for (FrameList::const_iterator it = actual_frames.begin();
        it != actual_frames.end();
        ++it, ++it_exp) {
-    // TODO(EZamakhov): investigate valgrind warning (unitialized value)
     EXPECT_EQ(**it, **it_exp)
         << "Element number " << std::distance(mobile_packets.begin(), it_exp);
   }
@@ -1036,6 +1046,24 @@ TEST_F(
   EXPECT_EQ(1u, actual_frames.size());
 }
 
+TEST_F(IncomingDataHandlerTest,
+       ProcessData_ProtocolVersionBiggerThanSupported_MalformedOccurs) {
+  header_validator.set_max_protocol_version_supported(PROTOCOL_VERSION_2);
+  const ProtocolPacket packet(uid1,
+                              PROTOCOL_VERSION_3,
+                              PROTECTION_OFF,
+                              FRAME_TYPE_CONTROL,
+                              kControl,
+                              FRAME_DATA_SINGLE,
+                              some_session_id,
+                              0u,
+                              some_message_id,
+                              NULL);
+  const auto raw_message_ptr = packet.serializePacket();
+  data_handler.ProcessData(*raw_message_ptr, result_code, &malformed_occurs);
+  EXPECT_EQ(RESULT_CODE::RESULT_MALFORMED_OCCURS, result_code);
+}
+
 // TODO(EZamakhov): add tests for handling 2+ connection data
 
 }  // namespace protocol_handler_test
diff --git a/src/components/protocol_handler/test/protocol_handler_tm_test.cc b/src/components/protocol_handler/test/protocol_handler_tm_test.cc
index e23223c2c8..312ec88930 100644
--- a/src/components/protocol_handler/test/protocol_handler_tm_test.cc
+++ b/src/components/protocol_handler/test/protocol_handler_tm_test.cc
@@ -39,6 +39,7 @@
 #include "protocol_handler/mock_protocol_handler.h"
 #include "protocol_handler/mock_protocol_handler_settings.h"
 #include "protocol_handler/mock_protocol_observer.h"
+#include "protocol_handler/mock_service_status_update_handler_listener.h"
 #include "protocol_handler/mock_session_observer.h"
 #include "protocol_handler/protocol_handler.h"
 #include "protocol_handler/protocol_handler_impl.h"
@@ -108,6 +109,7 @@ using protocol_handler::PROTOCOL_VERSION_MAX;
 using protocol_handler::ProtocolHandlerImpl;
 using protocol_handler::RawMessage;
 using protocol_handler::RawMessagePtr;
+using protocol_handler::ServiceStatusUpdateHandler;
 using protocol_handler::ServiceType;
 // For TM states
 using test::components::security_manager_test::MockSystemTimeHandler;
@@ -139,6 +141,9 @@ using ::testing::SetArgPointee;
 using ::testing::SetArgReferee;
 
 typedef std::vector<uint8_t> UCharDataVector;
+typedef std::shared_ptr<
+    testing::NiceMock<MockServiceStatusUpdateHandlerListener> >
+    MockServiceStatusUpdateHandlerListenerPtr;
 
 // custom action to call a member function with 6 arguments
 ACTION_P4(InvokeMemberFuncWithArg2, ptr, memberFunc, a, b) {
@@ -174,6 +179,8 @@ class ProtocolHandlerImplTest : public ::testing::Test {
         .WillByDefault(Return(malformd_max_messages));
     ON_CALL(protocol_handler_settings_mock, multiframe_waiting_timeout())
         .WillByDefault(Return(multiframe_waiting_timeout));
+    ON_CALL(protocol_handler_settings_mock, max_supported_protocol_version())
+        .WillByDefault(Return(PROTOCOL_VERSION_MAX));
 #ifdef ENABLE_SECURITY
     ON_CALL(protocol_handler_settings_mock, force_protected_service())
         .WillByDefault(ReturnRefOfCopy(force_protected_services));
@@ -186,10 +193,17 @@ class ProtocolHandlerImplTest : public ::testing::Test {
                                 session_observer_mock,
                                 connection_handler_mock,
                                 transport_manager_mock));
+    std::unique_ptr<ServiceStatusUpdateHandler> service_status_update_handler_(
+        new ServiceStatusUpdateHandler(
+            &(*mock_service_status_update_handler_listener_)));
+    protocol_handler_impl->set_service_status_update_handler(
+        std::move(service_status_update_handler_));
     tm_listener = protocol_handler_impl.get();
   }
 
   void SetUp() OVERRIDE {
+    mock_service_status_update_handler_listener_ = std::make_shared<
+        testing::NiceMock<MockServiceStatusUpdateHandlerListener> >();
     InitProtocolHandlerImpl(0u, 0u);
     connection_id = 0xAu;
     session_id = 0xFFu;
@@ -390,6 +404,8 @@ class ProtocolHandlerImplTest : public ::testing::Test {
 
   testing::NiceMock<MockProtocolHandlerSettings> protocol_handler_settings_mock;
   std::shared_ptr<ProtocolHandlerImpl> protocol_handler_impl;
+  MockServiceStatusUpdateHandlerListenerPtr
+      mock_service_status_update_handler_listener_;
   TransportManagerListener* tm_listener;
   // Uniq connection
   ::transport_manager::ConnectionUID connection_id;
@@ -732,13 +748,12 @@ TEST_F(ProtocolHandlerImplTest,
   const uint8_t session_id1 = 1u;
   const ::transport_manager::ConnectionUID connection_id2 = 0xBu;
   const uint8_t session_id2 = 2u;
+  EXPECT_CALL(session_observer_mock, KeyFromPair(connection_id2, session_id2))
+      .WillRepeatedly(Return(connection_key));
 
 #ifdef ENABLE_SECURITY
   AddSecurityManager();
 
-  EXPECT_CALL(session_observer_mock, KeyFromPair(connection_id2, session_id2))
-      .WillOnce(Return(connection_key));
-
   EXPECT_CALL(session_observer_mock,
               GetSSLContext(connection_key, start_service))
       .Times(2)
@@ -1416,7 +1431,7 @@ TEST_F(ProtocolHandlerImplTest,
   services.push_back(0x0A);
   services.push_back(0x0B);
   EXPECT_CALL(protocol_handler_settings_mock, force_protected_service())
-      .WillOnce(ReturnRefOfCopy(services));
+      .WillRepeatedly(ReturnRefOfCopy(services));
 
   // call new SSLContext creation
   EXPECT_CALL(security_manager_mock, CreateSSLContext(connection_key, _))
@@ -3539,7 +3554,7 @@ TEST_F(ProtocolHandlerImplTest,
   // Expect check connection with ProtocolVersionUsed
   EXPECT_CALL(session_observer_mock,
               ProtocolVersionUsed(connection_id, session_id, _))
-      .WillOnce(Return(true));
+      .WillOnce(DoAll(SetArgReferee<2>(PROTOCOL_VERSION_1), Return(true)));
   // Expect send End Service
   EXPECT_CALL(transport_manager_mock,
               SendMessageToDevice(ExpectedMessage(FRAME_TYPE_CONTROL,
@@ -3578,7 +3593,7 @@ TEST_F(ProtocolHandlerImplTest, SendHeartBeat_Successful) {
   // Expect check connection with ProtocolVersionUsed
   EXPECT_CALL(session_observer_mock,
               ProtocolVersionUsed(connection_id, session_id, _))
-      .WillOnce(Return(true));
+      .WillOnce(DoAll(SetArgReferee<2>(PROTOCOL_VERSION_3), Return(true)));
   // Expect send HeartBeat
   EXPECT_CALL(
       transport_manager_mock,
@@ -3662,8 +3677,12 @@ TEST_F(ProtocolHandlerImplTest,
   const bool is_final = true;
   const uint32_t total_data_size = 1;
   UCharDataVector data(total_data_size);
-  RawMessagePtr message = std::make_shared<RawMessage>(
-      connection_key, PROTOCOL_VERSION_3, &data[0], total_data_size, kControl);
+  RawMessagePtr message = std::make_shared<RawMessage>(connection_key,
+                                                       PROTOCOL_VERSION_3,
+                                                       &data[0],
+                                                       total_data_size,
+                                                       false,
+                                                       kControl);
   // Expect getting pair from key from session observer
   EXPECT_CALL(session_observer_mock,
               PairFromKey(message->connection_key(), _, _))
@@ -3684,7 +3703,7 @@ TEST_F(ProtocolHandlerImplTest,
   times++;
 
   // Act
-  protocol_handler_impl->SendMessageToMobileApp(message, is_final);
+  protocol_handler_impl->SendMessageToMobileApp(message, false, is_final);
 
   EXPECT_TRUE(waiter->WaitFor(times, kAsyncExpectationsTimeout));
 }
@@ -3700,8 +3719,12 @@ TEST_F(ProtocolHandlerImplTest,
   const bool is_final = true;
   const uint32_t total_data_size = 1;
   UCharDataVector data(total_data_size);
-  RawMessagePtr message = std::make_shared<RawMessage>(
-      connection_key, PROTOCOL_VERSION_3, &data[0], total_data_size, kRpc);
+  RawMessagePtr message = std::make_shared<RawMessage>(connection_key,
+                                                       PROTOCOL_VERSION_3,
+                                                       &data[0],
+                                                       total_data_size,
+                                                       false,
+                                                       kRpc);
   // Expect getting pair from key from session observer
   EXPECT_CALL(session_observer_mock,
               PairFromKey(message->connection_key(), _, _))
@@ -3727,7 +3750,7 @@ TEST_F(ProtocolHandlerImplTest,
   times++;
 
   // Act
-  protocol_handler_impl->SendMessageToMobileApp(message, is_final);
+  protocol_handler_impl->SendMessageToMobileApp(message, false, is_final);
 
   EXPECT_TRUE(waiter->WaitFor(times, kAsyncExpectationsTimeout));
 }
@@ -3743,8 +3766,12 @@ TEST_F(ProtocolHandlerImplTest, SendMessageToMobileApp_SendMultiframeMessage) {
   const uint32_t total_data_size = MAXIMUM_FRAME_DATA_V2_SIZE * 2;
   UCharDataVector data(total_data_size);
   const uint8_t first_consecutive_frame = 0x01;
-  RawMessagePtr message = std::make_shared<RawMessage>(
-      connection_key, PROTOCOL_VERSION_3, &data[0], total_data_size, kBulk);
+  RawMessagePtr message = std::make_shared<RawMessage>(connection_key,
+                                                       PROTOCOL_VERSION_3,
+                                                       &data[0],
+                                                       total_data_size,
+                                                       false,
+                                                       kBulk);
   // Expect getting pair from key from session observer
   EXPECT_CALL(session_observer_mock,
               PairFromKey(message->connection_key(), _, _))
@@ -3782,7 +3809,7 @@ TEST_F(ProtocolHandlerImplTest, SendMessageToMobileApp_SendMultiframeMessage) {
   times++;
 
   // Act
-  protocol_handler_impl->SendMessageToMobileApp(message, is_final);
+  protocol_handler_impl->SendMessageToMobileApp(message, false, is_final);
 
   EXPECT_TRUE(waiter->WaitFor(times, kAsyncExpectationsTimeout));
 }
diff --git a/src/components/protocol_handler/test/protocol_header_validator_test.cc b/src/components/protocol_handler/test/protocol_header_validator_test.cc
index e69e44dbac..ee48d2eb3d 100644
--- a/src/components/protocol_handler/test/protocol_header_validator_test.cc
+++ b/src/components/protocol_handler/test/protocol_header_validator_test.cc
@@ -491,8 +491,10 @@ TEST_F(ProtocolHeaderValidatorTest, Malformed_MessageID) {
 
   message_header.frameType = FRAME_TYPE_FIRST;
   message_header.version = PROTOCOL_VERSION_1;
+  message_header.dataSize = FIRST_FRAME_DATA_SIZE;
   EXPECT_EQ(RESULT_OK, header_validator.validate(message_header));
 
+  message_header.dataSize = 0u;
   message_header.version = PROTOCOL_VERSION_2;
   EXPECT_EQ(RESULT_FAIL, header_validator.validate(message_header));
   message_header.version = PROTOCOL_VERSION_3;
diff --git a/src/components/protocol_handler/test/protocol_payload_test.cc b/src/components/protocol_handler/test/protocol_payload_test.cc
index e89e6c7395..84f6e2b2c5 100644
--- a/src/components/protocol_handler/test/protocol_payload_test.cc
+++ b/src/components/protocol_handler/test/protocol_payload_test.cc
@@ -242,8 +242,9 @@ TEST(ProtocolPayloadTest, ExtractProtocolWithJSONWithDataWithWrongPayloadSize) {
   prot_payload_test.json = expect_output_json_string;
   prot_payload_test.header.json_size = prot_payload_test.json.length();
 
-  const size_t data_for_sending_size =
-      PROTOCOL_HEADER_V2_SIZE + prot_payload_test.json.length();
+  const size_t data_for_sending_size = PROTOCOL_HEADER_V2_SIZE +
+                                       prot_payload_test.json.length() +
+                                       prot_payload_test.data.size();
   uint8_t* data_for_sending = new uint8_t[data_for_sending_size];
   prepare_data(data_for_sending, prot_payload_test);
 
diff --git a/src/components/protocol_handler/test/service_status_update_handler_test.cc b/src/components/protocol_handler/test/service_status_update_handler_test.cc
new file mode 100644
index 0000000000..7d4516a7ff
--- /dev/null
+++ b/src/components/protocol_handler/test/service_status_update_handler_test.cc
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "protocol_handler/service_status_update_handler.h"
+#include "gtest/gtest.h"
+#include "protocol_handler/mock_service_status_update_handler_listener.h"
+
+namespace test {
+namespace components {
+namespace protocol_handler_test {
+
+namespace {
+const uint32_t kConnectionKey = 123u;
+}
+
+using namespace protocol_handler;
+using ::testing::_;
+using ::testing::Return;
+using namespace hmi_apis;
+typedef utils::Optional<Common_ServiceStatusUpdateReason::eType>
+    UpdateReasonOptional;
+typedef std::shared_ptr<ServiceStatusUpdateHandler>
+    ServiceStatusUpdateHandlerPtr;
+typedef std::shared_ptr<MockServiceStatusUpdateHandlerListener>
+    MockServiceStatusUpdateHandlerListenerPtr;
+
+struct ServiceUpdate {
+  ServiceType service_type_;
+  ServiceStatus service_status_;
+  ServiceUpdate(ServiceType type, ServiceStatus status)
+      : service_type_(type), service_status_(status) {}
+};
+
+class ServiceStatusUpdateHandlerTest
+    : public ::testing::TestWithParam<ServiceUpdate> {
+ public:
+  ServiceStatusUpdateHandlerTest() {
+    mock_service_status_update_handler_listener_.reset(
+        new MockServiceStatusUpdateHandlerListener);
+    service_status_update_handler_ =
+        std::make_shared<ServiceStatusUpdateHandler>(
+            &(*mock_service_status_update_handler_listener_));
+  }
+
+  Common_ServiceEvent::eType GetServiceEvent(ServiceStatus status) {
+    switch (status) {
+      case ServiceStatus::SERVICE_ACCEPTED:
+      case ServiceStatus::PROTECTION_DISABLED: {
+        return Common_ServiceEvent::REQUEST_ACCEPTED;
+      }
+      case ServiceStatus::SERVICE_RECEIVED: {
+        return Common_ServiceEvent::REQUEST_RECEIVED;
+      }
+      case ServiceStatus::SERVICE_START_FAILED:
+      case ServiceStatus::PTU_FAILED:
+      case ServiceStatus::CERT_INVALID:
+      case ServiceStatus::INVALID_TIME:
+      case ServiceStatus::PROTECTION_ENFORCED: {
+        return Common_ServiceEvent::REQUEST_REJECTED;
+      }
+      default: { return Common_ServiceEvent::INVALID_ENUM; }
+    }
+  }
+
+  UpdateReasonOptional GetUpdateReason(ServiceStatus status) {
+    switch (status) {
+      case ServiceStatus::SERVICE_START_FAILED:
+      case ServiceStatus::SERVICE_ACCEPTED:
+      case ServiceStatus::SERVICE_RECEIVED: {
+        return UpdateReasonOptional::EMPTY;
+      }
+      case ServiceStatus::PTU_FAILED: {
+        auto reason = Common_ServiceStatusUpdateReason::PTU_FAILED;
+        return reason;
+      }
+      case ServiceStatus::CERT_INVALID: {
+        auto reason = Common_ServiceStatusUpdateReason::INVALID_CERT;
+        return reason;
+      }
+      case ServiceStatus::INVALID_TIME: {
+        auto reason = Common_ServiceStatusUpdateReason::INVALID_TIME;
+        return reason;
+      }
+      case ServiceStatus::PROTECTION_ENFORCED: {
+        auto reason = Common_ServiceStatusUpdateReason::PROTECTION_ENFORCED;
+        return reason;
+      }
+      case ServiceStatus::PROTECTION_DISABLED: {
+        auto reason = Common_ServiceStatusUpdateReason::PROTECTION_DISABLED;
+        return reason;
+      }
+      default: {
+        auto reason = Common_ServiceStatusUpdateReason::INVALID_ENUM;
+        return reason;
+      }
+    }
+  }
+
+ public:
+  MockServiceStatusUpdateHandlerListenerPtr
+      mock_service_status_update_handler_listener_;
+  ServiceStatusUpdateHandlerPtr service_status_update_handler_;
+};
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_SERVICE_ACCEPTED,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::SERVICE_ACCEPTED),
+        ServiceUpdate(ServiceType::kMobileNav, ServiceStatus::SERVICE_ACCEPTED),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::SERVICE_ACCEPTED)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_SERVICE_RECEIVED,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::SERVICE_RECEIVED),
+        ServiceUpdate(ServiceType::kMobileNav, ServiceStatus::SERVICE_RECEIVED),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::SERVICE_RECEIVED)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_SERVICE_START_FAILED,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::SERVICE_START_FAILED),
+        ServiceUpdate(ServiceType::kMobileNav,
+                      ServiceStatus::SERVICE_START_FAILED),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::SERVICE_START_FAILED)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_CERT_INVALID,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::CERT_INVALID),
+        ServiceUpdate(ServiceType::kMobileNav, ServiceStatus::CERT_INVALID),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::CERT_INVALID)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_INVALID_TIME,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::INVALID_TIME),
+        ServiceUpdate(ServiceType::kMobileNav, ServiceStatus::INVALID_TIME),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::INVALID_TIME)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_PTU_FAILED,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::PTU_FAILED),
+        ServiceUpdate(ServiceType::kMobileNav, ServiceStatus::PTU_FAILED),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::PTU_FAILED)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_PROTECTION_ENFRORCED,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::PROTECTION_ENFORCED),
+        ServiceUpdate(ServiceType::kMobileNav,
+                      ServiceStatus::PROTECTION_ENFORCED),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::PROTECTION_ENFORCED)));
+
+INSTANTIATE_TEST_CASE_P(
+    OnServiceUpdate_PROTECTION_DISABLED,
+    ServiceStatusUpdateHandlerTest,
+    ::testing::Values(
+        ServiceUpdate(ServiceType::kAudio, ServiceStatus::PROTECTION_DISABLED),
+        ServiceUpdate(ServiceType::kMobileNav,
+                      ServiceStatus::PROTECTION_DISABLED),
+        ServiceUpdate(ServiceType::kRpc, ServiceStatus::PROTECTION_DISABLED)));
+
+TEST_P(ServiceStatusUpdateHandlerTest, OnServiceUpdate) {
+  auto service_event_ = GetServiceEvent(GetParam().service_status_);
+  auto reason_ = GetUpdateReason(GetParam().service_status_);
+
+  EXPECT_CALL(
+      *mock_service_status_update_handler_listener_,
+      ProcessServiceStatusUpdate(kConnectionKey, _, service_event_, reason_))
+      .Times(1);
+
+  service_status_update_handler_->OnServiceUpdate(
+      kConnectionKey, GetParam().service_type_, GetParam().service_status_);
+}
+
+TEST_F(ServiceStatusUpdateHandlerTest, GetHMIServiceType) {
+  EXPECT_EQ(Common_ServiceType::RPC, GetHMIServiceType(ServiceType::kRpc));
+  EXPECT_EQ(Common_ServiceType::AUDIO, GetHMIServiceType(ServiceType::kAudio));
+  EXPECT_EQ(Common_ServiceType::VIDEO,
+            GetHMIServiceType(ServiceType::kMobileNav));
+  EXPECT_EQ(Common_ServiceType::INVALID_ENUM,
+            GetHMIServiceType(ServiceType::kInvalidServiceType));
+}
+
+}  // namespace protocol_handler_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/resumption/CMakeLists.txt b/src/components/resumption/CMakeLists.txt
index a2c93b0689..73e7b88a74 100644
--- a/src/components/resumption/CMakeLists.txt
+++ b/src/components/resumption/CMakeLists.txt
@@ -36,6 +36,7 @@ include_directories (
   ${COMPONENTS_DIR}/config_profile/include/
   ${JSONCPP_INCLUDE_DIRECTORY}
   ${LOG4CXX_INCLUDE_DIRECTORY}
+  ${BOOST_INCLUDE_DIR}
 )
 
 set(PATHS
diff --git a/src/components/resumption/include/resumption/last_state_impl.h b/src/components/resumption/include/resumption/last_state_impl.h
index 2da3147930..5eb4050d2d 100644
--- a/src/components/resumption/include/resumption/last_state_impl.h
+++ b/src/components/resumption/include/resumption/last_state_impl.h
@@ -33,7 +33,10 @@
 #ifndef SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_IMPL_H_
 #define SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_IMPL_H_
 
+#include <string>
+
 #include "resumption/last_state.h"
+#include "utils/lock.h"
 #include "utils/macro.h"
 
 namespace resumption {
@@ -49,31 +52,53 @@ class LastStateImpl : public LastState {
    */
   LastStateImpl(const std::string& app_storage_folder,
                 const std::string& app_info_storage);
-
   /**
    * @brief Destructor
    */
   ~LastStateImpl();
 
+  DEPRECATED
+  void SaveStateToFileSystem();
+
   /**
    * @brief Saving dictionary to filesystem
    */
-  void SaveStateToFileSystem() OVERRIDE;
+  void SaveToFileSystem() OVERRIDE;
 
   /**
-   * @brief Get reference to dictionary
+   * @brief Remove dictionary from filesystem
    */
-  Json::Value& get_dictionary() OVERRIDE;
+  void RemoveFromFileSystem() OVERRIDE;
 
- private:
-  const std::string app_storage_folder_;
-  const std::string app_info_storage_;
-  Json::Value dictionary_;
+  /**
+   * @brief Get the dictionary
+   * @return A copy of the dictionary instance
+   */
+  Json::Value dictionary() const OVERRIDE;
 
   /**
+   * @brief Get the dictionary
+   * @return Reference to the dictionary
+   */
+  DEPRECATED Json::Value& get_dictionary();
+
+  /**
+   * @brief Resets internal dictionary
+   * @param dictionary New dictionary json value to be set
+   */
+  void set_dictionary(const Json::Value& dictionary) OVERRIDE;
+
+ private:
+  /**
    * @brief Load dictionary from filesystem
    */
-  void LoadStateFromFileSystem();
+  void LoadFromFileSystem();
+
+  Json::Value dictionary_;
+  mutable sync_primitives::Lock dictionary_lock_;
+
+  std::string app_storage_folder_;
+  std::string app_info_storage_;
 
   DISALLOW_COPY_AND_ASSIGN(LastStateImpl);
 };
diff --git a/src/components/resumption/include/resumption/last_state.h b/src/components/resumption/include/resumption/last_state_wrapper_impl.h
index 3481fc9327..52ba8a4d2b 100644
--- a/src/components/resumption/include/resumption/last_state.h
+++ b/src/components/resumption/include/resumption/last_state_wrapper_impl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Ford Motor Company
+ * Copyright (c) 2019, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,33 +30,32 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_H_
-#define SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_H_
+#ifndef SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_WRAPPER_IMPL_H_
+#define SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_WRAPPER_IMPL_H_
 
-#include <string>
+#include <memory>
 
-#include "json/json.h"
+#include "resumption/last_state_wrapper.h"
+#include "utils/lock.h"
+#include "utils/macro.h"
+#include "utils/mutable_data_accessor.h"
 
 namespace resumption {
 
-class LastState {
+class LastStateWrapperImpl : public LastStateWrapper {
  public:
   /**
-   * @brief Destructor
+   * @brief Constructor
    */
-  virtual ~LastState() {}
+  explicit LastStateWrapperImpl(std::shared_ptr<LastState> last_state);
 
-  /**
-   * @brief Saving dictionary to filesystem
-   */
-  virtual void SaveStateToFileSystem() = 0;
+  LastStateAccessor get_accessor() const OVERRIDE;
 
-  /**
-   * @brief Get reference to dictionary
-   */
-  virtual Json::Value& get_dictionary() = 0;
+ private:
+  std::shared_ptr<LastState> last_state_;
+  mutable std::shared_ptr<sync_primitives::Lock> lock_;
 };
 
 }  // namespace resumption
 
-#endif  // SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_H_
+#endif  // SRC_COMPONENTS_RESUMPTION_INCLUDE_RESUMPTION_LAST_STATE_WRAPPER_IMPL_H_
diff --git a/src/components/resumption/src/last_state_impl.cc b/src/components/resumption/src/last_state_impl.cc
index 564266e19c..05c801d762 100644
--- a/src/components/resumption/src/last_state_impl.cc
+++ b/src/components/resumption/src/last_state_impl.cc
@@ -32,6 +32,7 @@
 
 #include "resumption/last_state_impl.h"
 #include "utils/file_system.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/logger.h"
 
 namespace resumption {
@@ -42,35 +43,57 @@ LastStateImpl::LastStateImpl(const std::string& app_storage_folder,
                              const std::string& app_info_storage)
     : app_storage_folder_(app_storage_folder)
     , app_info_storage_(app_info_storage) {
-  LoadStateFromFileSystem();
+  LoadFromFileSystem();
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
 LastStateImpl::~LastStateImpl() {
   LOG4CXX_AUTO_TRACE(logger_);
-  SaveStateToFileSystem();
+  SaveToFileSystem();
 }
 
 void LastStateImpl::SaveStateToFileSystem() {
   LOG4CXX_AUTO_TRACE(logger_);
-  const std::string& str = dictionary_.toStyledString();
-  const std::vector<uint8_t> char_vector_pdata(str.begin(), str.end());
 
+  std::string styled_string;
+  {
+    sync_primitives::AutoLock lock(dictionary_lock_);
+    styled_string = dictionary_.toStyledString();
+  }
+
+  const std::vector<uint8_t> char_vector_pdata(styled_string.begin(),
+                                               styled_string.end());
   DCHECK(file_system::CreateDirectoryRecursively(app_storage_folder_));
   LOG4CXX_INFO(logger_,
-               "LastState::SaveStateToFileSystem " << app_info_storage_ << str);
+               "LastState::SaveStateToFileSystem[DEPRECATED] "
+                   << app_info_storage_ << styled_string);
   DCHECK(file_system::Write(app_info_storage_, char_vector_pdata));
 }
 
-Json::Value& LastStateImpl::get_dictionary() {
-  return dictionary_;
+void LastStateImpl::SaveToFileSystem() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  std::string styled_string;
+  {
+    sync_primitives::AutoLock lock(dictionary_lock_);
+    styled_string = dictionary_.toStyledString();
+  }
+
+  const std::vector<uint8_t> char_vector_pdata(styled_string.begin(),
+                                               styled_string.end());
+  DCHECK(file_system::CreateDirectoryRecursively(app_storage_folder_));
+  LOG4CXX_INFO(
+      logger_,
+      "LastState::SaveToFileSystem " << app_info_storage_ << styled_string);
+  DCHECK(file_system::Write(app_info_storage_, char_vector_pdata));
 }
 
-void LastStateImpl::LoadStateFromFileSystem() {
+void LastStateImpl::LoadFromFileSystem() {
   std::string buffer;
-  bool result = file_system::ReadFile(app_info_storage_, buffer);
-  Json::Reader m_reader;
-  if (result && m_reader.parse(buffer, dictionary_)) {
+  const bool result = file_system::ReadFile(app_info_storage_, buffer);
+  utils::JsonReader reader;
+
+  if (result && reader.parse(buffer, &dictionary_)) {
     LOG4CXX_INFO(logger_,
                  "Valid last state was found." << dictionary_.toStyledString());
     return;
@@ -78,4 +101,28 @@ void LastStateImpl::LoadStateFromFileSystem() {
   LOG4CXX_WARN(logger_, "No valid last state was found.");
 }
 
+void LastStateImpl::RemoveFromFileSystem() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!file_system::DeleteFile(app_info_storage_)) {
+    LOG4CXX_WARN(logger_, "Failed attempt to delete " << app_info_storage_);
+  }
+}
+
+Json::Value LastStateImpl::dictionary() const {
+  sync_primitives::AutoLock lock(dictionary_lock_);
+  return dictionary_;
+}
+
+Json::Value& LastStateImpl::get_dictionary() {
+  sync_primitives::AutoLock lock(dictionary_lock_);
+  return dictionary_;
+}
+
+void LastStateImpl::set_dictionary(const Json::Value& dictionary) {
+  DCHECK(dictionary.type() == Json::objectValue ||
+         dictionary.type() == Json::nullValue);
+  sync_primitives::AutoLock lock(dictionary_lock_);
+  dictionary_ = dictionary;
+}
+
 }  // namespace resumption
diff --git a/src/components/resumption/src/last_state_wrapper_impl.cc b/src/components/resumption/src/last_state_wrapper_impl.cc
new file mode 100644
index 0000000000..61b325f53b
--- /dev/null
+++ b/src/components/resumption/src/last_state_wrapper_impl.cc
@@ -0,0 +1,49 @@
+/* Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "resumption/last_state_wrapper_impl.h"
+#include "utils/logger.h"
+
+namespace resumption {
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "Resumption")
+
+LastStateWrapperImpl::LastStateWrapperImpl(
+    std::shared_ptr<LastState> last_state)
+    : last_state_(last_state)
+    , lock_(std::make_shared<sync_primitives::Lock>()) {}
+
+LastStateAccessor LastStateWrapperImpl::get_accessor() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return MutableDataAccessor<LastState>(*last_state_, lock_);
+}
+
+}  // namespace resumption
diff --git a/src/components/resumption/test/last_state_test.cc b/src/components/resumption/test/last_state_test.cc
index 15180fa12c..61c227bbf3 100644
--- a/src/components/resumption/test/last_state_test.cc
+++ b/src/components/resumption/test/last_state_test.cc
@@ -73,13 +73,13 @@ class LastStateTest : public ::testing::Test {
 };
 
 TEST_F(LastStateTest, Basic) {
-  const Value& dictionary = last_state_.get_dictionary();
+  const Value& dictionary = last_state_.dictionary();
   EXPECT_EQ(empty_dictionary_, dictionary.toStyledString());
 }
 
 TEST_F(LastStateTest, SetGetData) {
   {
-    Value& dictionary = last_state_.get_dictionary();
+    Value dictionary = last_state_.dictionary();
     const Value& bluetooth_info =
         dictionary["TransportManager"]["BluetoothAdapter"];
     EXPECT_EQ(empty_dictionary_, bluetooth_info.toStyledString());
@@ -102,18 +102,19 @@ TEST_F(LastStateTest, SetGetData) {
 
     dictionary["TransportManager"]["BluetoothAdapter"]["devices"] =
         "bluetooth_device";
-    last_state_.SaveStateToFileSystem();
+    last_state_.set_dictionary(dictionary);
+    last_state_.SaveToFileSystem();
   }
 
-  const Value& dictionary = last_state_.get_dictionary();
+  const Value dictionary = last_state_.dictionary();
 
   const Value& bluetooth_info =
       dictionary["TransportManager"]["BluetoothAdapter"];
   const Value& tcp_adapter_info = dictionary["TransportManager"]["TcpAdapter"];
-  EXPECT_EQ("{\n   \"devices\" : \"bluetooth_device\"\n}\n",
+  EXPECT_EQ("{\n\t\"devices\" : \"bluetooth_device\"\n}\n",
             bluetooth_info.toStyledString());
   EXPECT_EQ(
-      "{\n   \"devices\" : {\n      \"name\" : \"test_device\"\n   }\n}\n",
+      "{\n\t\"devices\" : \n\t{\n\t\t\"name\" : \"test_device\"\n\t}\n}\n",
       tcp_adapter_info.toStyledString());
 }
 
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base.h b/src/components/rpc_base/include/rpc_base/rpc_base.h
index 611c333e4d..6e06d61a7c 100644
--- a/src/components/rpc_base/include/rpc_base/rpc_base.h
+++ b/src/components/rpc_base/include/rpc_base/rpc_base.h
@@ -172,6 +172,7 @@ class Boolean : public PrimitiveType {
   Boolean& operator=(bool new_val);
   operator bool() const;
   Json::Value ToJsonValue() const;
+  bool operator==(const Boolean& that);
 
  private:
   // Fields
@@ -233,6 +234,9 @@ class String : public PrimitiveType {
   String& operator=(const std::string& new_val);
   String& operator=(const String& new_val);
   bool operator==(const String& rhs) const;
+  bool operator==(const std::string& rhs) const;
+  bool operator!=(const String& rhs) const;
+  bool operator!=(const std::string& rhs) const;
   operator const std::string&() const;
   Json::Value ToJsonValue() const;
 
@@ -282,6 +286,7 @@ class Array : public std::vector<T>, public CompositeType {
   template <typename U>
   void push_back(const U& value);
   Json::Value ToJsonValue() const;
+  bool operator==(const Array& that);
 
   virtual bool is_valid() const;
   bool is_initialized() const;
@@ -395,6 +400,8 @@ class Optional {
   // casted to integral types
   operator const void*() const;
 
+  bool operator==(const Optional<T>& that);
+
   bool is_valid() const;
   bool is_initialized() const;
   void ReportErrors(ValidationReport* report) const;
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h
index 07a85eaa22..a7b477c009 100644
--- a/src/components/rpc_base/include/rpc_base/rpc_base_inl.h
+++ b/src/components/rpc_base/include/rpc_base/rpc_base_inl.h
@@ -138,6 +138,10 @@ inline Boolean::Boolean() : PrimitiveType(kUninitialized), value_(false) {}
 
 inline Boolean::Boolean(bool value) : PrimitiveType(kValid), value_(value) {}
 
+inline bool Boolean::operator==(const Boolean& that) {
+  return value_ == that.value_;
+}
+
 inline Boolean& Boolean::operator=(bool new_val) {
   value_ = new_val;
   value_state_ = kValid;
@@ -185,12 +189,14 @@ Integer<T, minval, maxval>& Integer<T, minval, maxval>::operator=(
 template <typename T, T minval, T maxval>
 Integer<T, minval, maxval>& Integer<T, minval, maxval>::operator++() {
   ++value_;
+  value_state_ = range_.Includes(value_) ? kValid : kInvalid;
   return *this;
 }
 
 template <typename T, T minval, T maxval>
 Integer<T, minval, maxval>& Integer<T, minval, maxval>::operator+=(int value) {
   value_ += value;
+  value_state_ = range_.Includes(value_) ? kValid : kInvalid;
   return *this;
 }
 
@@ -278,6 +284,21 @@ bool String<minlen, maxlen>::operator==(const String& rhs) const {
 }
 
 template <size_t minlen, size_t maxlen>
+bool String<minlen, maxlen>::operator==(const std::string& rhs) const {
+  return value_ == rhs;
+}
+
+template <size_t minlen, size_t maxlen>
+bool String<minlen, maxlen>::operator!=(const String& rhs) const {
+  return value_ != rhs.value_;
+}
+
+template <size_t minlen, size_t maxlen>
+bool String<minlen, maxlen>::operator!=(const std::string& rhs) const {
+  return value_ != rhs;
+}
+
+template <size_t minlen, size_t maxlen>
 String<minlen, maxlen>::operator const std::string&() const {
   return value_;
 }
@@ -363,6 +384,20 @@ bool Array<T, minsize, maxsize>::is_initialized() const {
 }
 
 template <typename T, size_t minsize, size_t maxsize>
+bool Array<T, minsize, maxsize>::operator==(const Array& that) {
+  if (this->size() != that.size())
+    return false;
+
+  for (auto i = std::begin(*this), j = std::begin(that); i != std::end(*this);
+       ++i, ++j) {
+    if (!(*i == *j)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+template <typename T, size_t minsize, size_t maxsize>
 void Array<T, minsize, maxsize>::ReportErrors(ValidationReport* report) const {
   if (this->empty()) {
     CompositeType::ReportErrors(report);
@@ -569,6 +604,11 @@ const T* Optional<T>::operator->() const {
 }
 
 template <typename T>
+bool Optional<T>::operator==(const Optional<T>& that) {
+  return value_ == that.value_;
+}
+
+template <typename T>
 void Optional<T>::assign_if_valid(const Optional<T>& value) {
   if (value.is_initialized()) {
     value_ = value.value_;
diff --git a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h
index 871778b29a..80e11994f1 100644
--- a/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h
+++ b/src/components/rpc_base/include/rpc_base/rpc_base_json_inl.h
@@ -164,7 +164,7 @@ Json::Value Integer<T, minval, maxval>::ToJsonValue() const {
 
 template <int64_t minnum, int64_t maxnum, int64_t minden, int64_t maxden>
 Float<minnum, maxnum, minden, maxden>::Float(const Json::Value* value)
-    : PrimitiveType(InitHelper(value, &Json::Value::isDouble)), value_() {
+    : PrimitiveType(InitHelper(value, &Json::Value::isNumeric)), value_() {
   if (is_valid()) {
     value_ = value->asDouble();
     value_state_ = range_.Includes(value_) ? kValid : kInvalid;
@@ -174,7 +174,7 @@ Float<minnum, maxnum, minden, maxden>::Float(const Json::Value* value)
 template <int64_t minnum, int64_t maxnum, int64_t minden, int64_t maxden>
 Float<minnum, maxnum, minden, maxden>::Float(const Json::Value* value,
                                              double def_value)
-    : PrimitiveType(InitHelper(value, &Json::Value::isDouble))
+    : PrimitiveType(InitHelper(value, &Json::Value::isNumeric))
     , value_(def_value) {
   if (!is_initialized()) {
     value_state_ = kValid;
diff --git a/src/components/rpc_base/test/rpc_base_json_test.cc b/src/components/rpc_base/test/rpc_base_json_test.cc
index cad9dd3a65..8db1c5549b 100644
--- a/src/components/rpc_base/test/rpc_base_json_test.cc
+++ b/src/components/rpc_base/test/rpc_base_json_test.cc
@@ -124,7 +124,7 @@ TEST(ValidatedTypesJson, IntegerAbsentValueTest) {
 }
 
 TEST(ValidatedTypesJson, IntegerFromOverflowingJsonTest) {
-  Value int_val(0xFFFFFFFFFFll);
+  Value int_val(0xFFFFFFFFFFl);
   Integer<int32_t, -5, 192> integer(&int_val);
   ASSERT_TRUE(integer.is_initialized());
   ASSERT_FALSE(integer.is_valid());
diff --git a/src/components/rpc_base/test/rpc_base_test.cc b/src/components/rpc_base/test/rpc_base_test.cc
index dc0a1df128..7c62fa3fb4 100644
--- a/src/components/rpc_base/test/rpc_base_test.cc
+++ b/src/components/rpc_base/test/rpc_base_test.cc
@@ -191,18 +191,20 @@ TEST(ValidatedTypes, TestOptionalEmptyArray) {
   Optional<Array<Integer<int8_t, 0, 10>, 0, 5> > ai;
   ASSERT_RPCTYPE_VALID(ai);
   ASSERT_FALSE(ai.is_initialized());
-  Json::FastWriter fw;
-  std::string serialized = fw.write(ai.ToJsonValue());
-  ASSERT_EQ(serialized, "[]\n");
+  Json::StreamWriterBuilder writer_builder;
+  const std::string serialized =
+      Json::writeString(writer_builder, ai.ToJsonValue());
+  ASSERT_EQ("[]", serialized);
 }
 
 TEST(ValidatedTypes, TestMandatoryEmptyArray) {
   Array<Integer<int8_t, 0, 10>, 0, 5> ai;
   ASSERT_FALSE(ai.is_valid());
   ASSERT_FALSE(ai.is_initialized());
-  Json::FastWriter fw;
-  std::string serialized = fw.write(ai.ToJsonValue());
-  ASSERT_EQ(serialized, "[]\n");
+  Json::StreamWriterBuilder writer_builder;
+  const std::string serialized =
+      Json::writeString(writer_builder, ai.ToJsonValue());
+  ASSERT_EQ("[]", serialized);
 }
 
 TEST(ValidatedTypes, TestMap) {
@@ -230,9 +232,10 @@ TEST(ValidatedTypes, TestEmptyMandatoryMap) {
   Map<Integer<int8_t, 0, 10>, 0, 5> im;
   ASSERT_FALSE(im.is_valid());
   ASSERT_FALSE(im.is_initialized());
-  Json::FastWriter fw;
-  std::string serialized = fw.write(im.ToJsonValue());
-  ASSERT_EQ(serialized, "{}\n");
+  Json::StreamWriterBuilder writer_builder;
+  const std::string serialized =
+      Json::writeString(writer_builder, im.ToJsonValue());
+  ASSERT_EQ("{}", serialized);
 }
 
 TEST(ValidatedTypes, TestEnumConstructor) {
diff --git a/src/components/security_manager/include/security_manager/crypto_manager_impl.h b/src/components/security_manager/include/security_manager/crypto_manager_impl.h
index 46fd1a5995..42abe6e3b6 100644
--- a/src/components/security_manager/include/security_manager/crypto_manager_impl.h
+++ b/src/components/security_manager/include/security_manager/crypto_manager_impl.h
@@ -206,6 +206,7 @@ class CryptoManagerImpl : public CryptoManager {
   SSL_CTX* context_;
   static uint32_t instance_count_;
   static sync_primitives::Lock instance_lock_;
+  sync_primitives::Lock crypto_manager_lock_;
   DISALLOW_COPY_AND_ASSIGN(CryptoManagerImpl);
 };
 }  // namespace security_manager
diff --git a/src/components/security_manager/include/security_manager/security_manager_impl.h b/src/components/security_manager/include/security_manager/security_manager_impl.h
index f2a417a43d..ee00e0774a 100644
--- a/src/components/security_manager/include/security_manager/security_manager_impl.h
+++ b/src/components/security_manager/include/security_manager/security_manager_impl.h
@@ -200,7 +200,7 @@ class SecurityManagerImpl : public SecurityManager,
   /**
    * @brief Notify all listeners that handshake was failed
    */
-  void NotifyListenersOnHandshakeFailed() OVERRIDE;
+  void NotifyListenersOnGetSystemTimeFailed() OVERRIDE;
 
   /**
    * @brief Check is policy certificate data is empty
@@ -214,6 +214,16 @@ class SecurityManagerImpl : public SecurityManager,
    */
   static const char* ConfigSection();
 
+  void ProcessFailedPTU() OVERRIDE;
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+  /**
+   * @brief ProcessFailedCertDecrypt is called to notify listeners that
+   * certificate decryption failed in the external flow
+   */
+  void ProcessFailedCertDecrypt() OVERRIDE;
+#endif
+
  private:
   /**
    * \brief Sends Handshake binary data to mobile application
@@ -280,6 +290,17 @@ class SecurityManagerImpl : public SecurityManager,
    */
   void OnSystemTimeArrived(const time_t utc_time) OVERRIDE;
 
+  /**
+   * @brief OnSystemTimeFailed Notify about system request failure
+   */
+  void OnSystemTimeFailed() OVERRIDE;
+
+  /**
+   * @brief ResetPendingSystemTimeRequests resets waiting for system time
+   * requests flag
+   */
+  void ResetPendingSystemTimeRequests();
+
   // Thread that pumps handshake data
   SecurityMessageLoop security_messages_;
 
diff --git a/src/components/security_manager/src/crypto_manager_impl.cc b/src/components/security_manager/src/crypto_manager_impl.cc
index cb42d5b46c..48b3119bec 100644
--- a/src/components/security_manager/src/crypto_manager_impl.cc
+++ b/src/components/security_manager/src/crypto_manager_impl.cc
@@ -283,6 +283,7 @@ bool CryptoManagerImpl::Init() {
 
 bool CryptoManagerImpl::OnCertificateUpdated(const std::string& data) {
   LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(crypto_manager_lock_);
   if (!context_) {
     LOG4CXX_WARN(logger_, "Not initialized");
     return false;
@@ -307,6 +308,8 @@ bool CryptoManagerImpl::OnCertificateUpdated(const std::string& data) {
 }
 
 SSLContext* CryptoManagerImpl::CreateSSLContext() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock lock(crypto_manager_lock_);
   if (NULL == context_) {
     return NULL;
   }
diff --git a/src/components/security_manager/src/security_manager_impl.cc b/src/components/security_manager/src/security_manager_impl.cc
index dd71828d73..a24e48289d 100644
--- a/src/components/security_manager/src/security_manager_impl.cc
+++ b/src/components/security_manager/src/security_manager_impl.cc
@@ -37,6 +37,7 @@
 #include "security_manager/crypto_manager_impl.h"
 #include "utils/byte_order.h"
 #include "utils/helpers.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/logger.h"
 
 namespace security_manager {
@@ -213,6 +214,13 @@ void SecurityManagerImpl::ResumeHandshake(uint32_t connection_key) {
     return;
   }
 
+  LOG4CXX_DEBUG(logger_,
+                "Connection key : "
+                    << connection_key
+                    << " is waiting for certificate: " << std::boolalpha
+                    << waiting_for_certificate_ << " and has certificate: "
+                    << ssl_context->HasCertificate());
+
   ssl_context->ResetConnection();
   if (!waiting_for_certificate_ && !ssl_context->HasCertificate()) {
     NotifyListenersOnHandshakeDone(connection_key,
@@ -228,6 +236,7 @@ void SecurityManagerImpl::StartHandshake(uint32_t connection_key) {
   LOG4CXX_INFO(logger_, "StartHandshake: connection_key " << connection_key);
   security_manager::SSLContext* ssl_context = session_observer_->GetSSLContext(
       connection_key, protocol_handler::kControl);
+
   if (!ssl_context) {
     const std::string error_text(
         "StartHandshake failed, "
@@ -277,6 +286,7 @@ void SecurityManagerImpl::ProceedHandshake(
   time_t cert_due_date;
   if (!ssl_context->GetCertificateDueDate(cert_due_date)) {
     LOG4CXX_ERROR(logger_, "Failed to get certificate due date!");
+    PostponeHandshake(connection_key);
     return;
   }
 
@@ -388,6 +398,68 @@ void SecurityManagerImpl::OnSystemTimeArrived(const time_t utc_time) {
   awaiting_time_connections_.clear();
 }
 
+void SecurityManagerImpl::OnSystemTimeFailed() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  {
+    sync_primitives::AutoLock lock(waiters_lock_);
+    waiting_for_time_ = false;
+  }
+
+  NotifyListenersOnGetSystemTimeFailed();
+
+  awaiting_time_connections_.clear();
+}
+
+void SecurityManagerImpl::ProcessFailedPTU() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (listeners_.empty()) {
+    LOG4CXX_DEBUG(logger_, "listeners arrays IS EMPTY!");
+    return;
+  }
+
+  std::list<SecurityManagerListener*> listeners_to_remove;
+  for (auto listener : listeners_) {
+    if (listener->OnPTUFailed()) {
+      listeners_to_remove.push_back(listener);
+    }
+  }
+
+  for (auto& listener : listeners_to_remove) {
+    auto it = std::find(listeners_.begin(), listeners_.end(), listener);
+    DCHECK(it != listeners_.end());
+    LOG4CXX_DEBUG(logger_, "Destroying listener: " << *it);
+    delete (*it);
+    listeners_.erase(it);
+  }
+}
+
+#ifdef EXTERNAL_PROPRIETARY_MODE
+void SecurityManagerImpl::ProcessFailedCertDecrypt() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  {
+    sync_primitives::AutoLock lock(waiters_lock_);
+    waiting_for_certificate_ = false;
+  }
+
+  std::list<SecurityManagerListener*> listeners_to_remove;
+  for (auto listener : listeners_) {
+    if (listener->OnCertDecryptFailed()) {
+      listeners_to_remove.push_back(listener);
+    }
+  }
+
+  for (auto& listener : listeners_to_remove) {
+    auto it = std::find(listeners_.begin(), listeners_.end(), listener);
+    DCHECK(it != listeners_.end());
+    LOG4CXX_DEBUG(logger_, "Destroying listener: " << *it);
+    delete (*it);
+    listeners_.erase(it);
+  }
+
+  awaiting_certificate_connections_.clear();
+}
+#endif
+
 void SecurityManagerImpl::NotifyListenersOnHandshakeDone(
     const uint32_t& connection_key, SSLContext::HandshakeResult error) {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -412,11 +484,15 @@ void SecurityManagerImpl::NotifyOnCertificateUpdateRequired() {
   }
 }
 
-void SecurityManagerImpl::NotifyListenersOnHandshakeFailed() {
+void SecurityManagerImpl::ResetPendingSystemTimeRequests() {
+  system_time_handler_->ResetPendingSystemTimeRequests();
+}
+
+void SecurityManagerImpl::NotifyListenersOnGetSystemTimeFailed() {
   LOG4CXX_AUTO_TRACE(logger_);
   std::list<SecurityManagerListener*>::iterator it = listeners_.begin();
   while (it != listeners_.end()) {
-    if ((*it)->OnHandshakeFailed()) {
+    if ((*it)->OnGetSystemTimeFailed()) {
       LOG4CXX_DEBUG(logger_, "Destroying listener: " << *it);
       delete (*it);
       it = listeners_.erase(it);
@@ -514,11 +590,13 @@ bool SecurityManagerImpl::ProccessInternalError(
                "Received InternalError with Json message"
                    << inMessage->get_json_message());
   Json::Value root;
-  Json::Reader reader;
-  const bool parsingSuccessful =
-      reader.parse(inMessage->get_json_message(), root);
-  if (!parsingSuccessful)
+  std::string str = inMessage->get_json_message();
+  utils::JsonReader reader;
+
+  if (!reader.parse(str, &root)) {
+    LOG4CXX_DEBUG(logger_, "Json parsing fails.");
     return false;
+  }
   LOG4CXX_DEBUG(logger_,
                 "Received InternalError id "
                     << root[kErrId].asString()
@@ -582,10 +660,11 @@ void SecurityManagerImpl::SendQuery(const SecurityQuery& query,
                                          protocol_version,
                                          &data_sending[0],
                                          data_sending.size(),
+                                         false,
                                          protocol_handler::kControl));
     DCHECK(protocol_handler_);
     // Add RawMessage to ProtocolHandler message query
-    protocol_handler_->SendMessageToMobileApp(rawMessagePtr, false);
+    protocol_handler_->SendMessageToMobileApp(rawMessagePtr, false, false);
   }
 }
 
diff --git a/src/components/security_manager/src/ssl_context_impl.cc b/src/components/security_manager/src/ssl_context_impl.cc
index 357d9556fb..d5c892c07a 100644
--- a/src/components/security_manager/src/ssl_context_impl.cc
+++ b/src/components/security_manager/src/ssl_context_impl.cc
@@ -529,13 +529,18 @@ bool CryptoManagerImpl::SSLContextImpl::Decrypt(const uint8_t* const in_data,
 }
 
 size_t CryptoManagerImpl::SSLContextImpl::get_max_block_size(size_t mtu) const {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!max_block_size_) {
     // FIXME(EZamakhov): add correct logics for TLS1/1.2/SSL3
     // For SSL3.0 set temporary value 90, old TLS1.2 value is 29
     assert(mtu > 90);
     return mtu - 90;
   }
-  return max_block_size_(mtu);
+
+  const auto max_allowed_block_size =
+      mtu > SSL3_RT_MAX_PLAIN_LENGTH ? SSL3_RT_MAX_PLAIN_LENGTH : mtu;
+
+  return max_block_size_(max_allowed_block_size);
 }
 
 bool CryptoManagerImpl::SSLContextImpl::IsHandshakePending() const {
diff --git a/src/components/security_manager/test/security_manager_test.cc b/src/components/security_manager/test/security_manager_test.cc
index 21af54f67b..7906ae7006 100644
--- a/src/components/security_manager/test/security_manager_test.cc
+++ b/src/components/security_manager/test/security_manager_test.cc
@@ -122,7 +122,7 @@ class SecurityManagerTest : public ::testing::Test {
                               uint32_t dataSize,
                               const ServiceType serviceType) {
     const RawMessagePtr rawMessagePtr(std::make_shared<RawMessage>(
-        kKey, kProtocolVersion, data, dataSize, serviceType));
+        kKey, kProtocolVersion, data, dataSize, false, serviceType));
     security_manager_->OnMessageReceived(rawMessagePtr);
   }
   /*
@@ -292,6 +292,7 @@ TEST_F(SecurityManagerTest, SecurityManager_NULLCryptoManager) {
   EXPECT_CALL(mock_protocol_handler,
               SendMessageToMobileApp(
                   InternalErrorWithErrId(SecurityManager::ERROR_NOT_SUPPORTED),
+                  false,
                   kIsFinal))
       .WillOnce(NotifyTestAsyncWaiter(&waiter));
   const SecurityQuery::QueryHeader header(SecurityQuery::REQUEST,
@@ -307,8 +308,8 @@ TEST_F(SecurityManagerTest, SecurityManager_NULLCryptoManager) {
  */
 TEST_F(SecurityManagerTest, OnMobileMessageSent) {
   const uint8_t* data_param = NULL;
-  const RawMessagePtr rawMessagePtr(
-      std::make_shared<RawMessage>(kKey, kProtocolVersion, data_param, 0));
+  const RawMessagePtr rawMessagePtr(std::make_shared<RawMessage>(
+      kKey, kProtocolVersion, data_param, 0, false));
   security_manager_->OnMobileMessageSent(rawMessagePtr);
 }
 /*
@@ -338,6 +339,7 @@ TEST_F(SecurityManagerTest, GetEmptyQuery) {
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_INVALID_QUERY_SIZE),
+          false,
           kIsFinal));
   // Call with NULL data
   call_OnMessageReceived(NULL, 0, kSecureServiceType);
@@ -359,6 +361,7 @@ TEST_F(SecurityManagerTest, GetWrongJSONSize) {
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_INVALID_QUERY_SIZE),
+          false,
           kIsFinal));
   SecurityQuery::QueryHeader header(SecurityQuery::REQUEST,
                                     SecurityQuery::INVALID_QUERY_ID);
@@ -388,6 +391,7 @@ TEST_F(SecurityManagerTest, GetInvalidQueryId) {
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_INVALID_QUERY_ID),
+          false,
           kIsFinal))
       .WillOnce(NotifyTestAsyncWaiter(&waiter));
   times++;
@@ -427,10 +431,11 @@ TEST_F(SecurityManagerTest, CreateSSLContext_ErrorCreateSSL) {
   EXPECT_CALL(mock_session_observer,
               ProtocolVersionUsed(connection_id, session_id, _))
       .WillOnce(Return(true));
-  EXPECT_CALL(
-      mock_protocol_handler,
-      SendMessageToMobileApp(
-          InternalErrorWithErrId(SecurityManager::ERROR_INTERNAL), kIsFinal));
+  EXPECT_CALL(mock_protocol_handler,
+              SendMessageToMobileApp(
+                  InternalErrorWithErrId(SecurityManager::ERROR_INTERNAL),
+                  false,
+                  kIsFinal));
 
   // Emulate SessionObserver and CryptoManager result
   EXPECT_CALL(mock_session_observer, GetSSLContext(kKey, kControl))
@@ -461,6 +466,7 @@ TEST_F(SecurityManagerTest, CreateSSLContext_SetSSLContextError) {
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_UNKNOWN_INTERNAL_ERROR),
+          false,
           kIsFinal));
 
   // Emulate SessionObserver and CryptoManager result
@@ -512,10 +518,11 @@ TEST_F(SecurityManagerTest, StartHandshake_ServiceStillUnprotected) {
               ProtocolVersionUsed(connection_id, session_id, _))
       .WillOnce(Return(true));
   // Expect InternalError with ERROR_INTERNAL
-  EXPECT_CALL(
-      mock_protocol_handler,
-      SendMessageToMobileApp(
-          InternalErrorWithErrId(SecurityManager::ERROR_INTERNAL), kIsFinal));
+  EXPECT_CALL(mock_protocol_handler,
+              SendMessageToMobileApp(
+                  InternalErrorWithErrId(SecurityManager::ERROR_INTERNAL),
+                  false,
+                  kIsFinal));
   // Expect notifying listeners (unsuccess)
   EXPECT_CALL(*mock_sm_listener,
               OnHandshakeDone(kKey, SSLContext::Handshake_Result_Fail))
@@ -550,10 +557,11 @@ TEST_F(SecurityManagerTest, StartHandshake_SSLInternalError) {
   EXPECT_CALL(mock_session_observer, GetSSLContext(kKey, kControl))
       .WillOnce(ReturnNull());
   // Expect InternalError with ERROR_ID
-  EXPECT_CALL(
-      mock_protocol_handler,
-      SendMessageToMobileApp(
-          InternalErrorWithErrId(SecurityManager::ERROR_INTERNAL), kIsFinal));
+  EXPECT_CALL(mock_protocol_handler,
+              SendMessageToMobileApp(
+                  InternalErrorWithErrId(SecurityManager::ERROR_INTERNAL),
+                  false,
+                  kIsFinal));
 
   security_manager_->StartHandshake(kKey);
   mock_sm_listener.release();
@@ -579,6 +587,7 @@ TEST_F(SecurityManagerTest, ProccessHandshakeData_WrongDataSize) {
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_INVALID_QUERY_SIZE),
+          false,
           kIsFinal))
       .WillOnce(NotifyTestAsyncWaiter(&waiter));
 
@@ -611,6 +620,7 @@ TEST_F(SecurityManagerTest,
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_SERVICE_NOT_PROTECTED),
+          false,
           kIsFinal))
       .WillOnce(NotifyTestAsyncWaiter(&waiter));
   times++;
@@ -665,6 +675,7 @@ TEST_F(SecurityManagerTest, ProccessHandshakeData_InvalidData) {
       mock_protocol_handler,
       SendMessageToMobileApp(
           InternalErrorWithErrId(SecurityManager::ERROR_SSL_INVALID_DATA),
+          false,
           kIsFinal))
       .Times(handshake_emulates)
       .WillRepeatedly(NotifyTestAsyncWaiter(&waiter));
@@ -743,9 +754,9 @@ TEST_F(SecurityManagerTest, ProccessHandshakeData_Answer) {
 
   // Get size of raw message after
   const size_t raw_message_size = 15;
-  EXPECT_CALL(
-      mock_protocol_handler,
-      SendMessageToMobileApp(RawMessageEqSize(raw_message_size), kIsFinal))
+  EXPECT_CALL(mock_protocol_handler,
+              SendMessageToMobileApp(
+                  RawMessageEqSize(raw_message_size), false, kIsFinal))
       .Times(handshake_emulates)
       .WillRepeatedly(NotifyTestAsyncWaiter(&waiter));
   times += handshake_emulates;
@@ -872,7 +883,7 @@ TEST_F(SecurityManagerTest, ProccessHandshakeData_HandshakeFinished) {
       .WillRepeatedly(DoAll(NotifyTestAsyncWaiter(&waiter), Return(true)));
   times += 2;  // matches to the number above
 
-  EXPECT_CALL(mock_protocol_handler, SendMessageToMobileApp(_, kIsFinal))
+  EXPECT_CALL(mock_protocol_handler, SendMessageToMobileApp(_, false, kIsFinal))
       .Times(2)
       .WillRepeatedly(NotifyTestAsyncWaiter(&waiter));
   times += 2;  // matches to the number above
diff --git a/src/components/smart_objects/CMakeLists.txt b/src/components/smart_objects/CMakeLists.txt
index ef84c52ab9..6bc70f8226 100644
--- a/src/components/smart_objects/CMakeLists.txt
+++ b/src/components/smart_objects/CMakeLists.txt
@@ -34,6 +34,7 @@ include_directories(
   ${COMPONENTS_DIR}/include
   ${COMPONENTS_DIR}/smart_objects/include
   ${COMPONENTS_DIR}/utils/include
+  ${CMAKE_BINARY_DIR}/src/components/interfaces
   ${BOOST_INCLUDE_DIR}
 )
 
@@ -45,6 +46,7 @@ collect_sources(SOURCES "${PATHS}")
 
 add_library("SmartObjects" ${SOURCES})
 target_link_libraries("SmartObjects" Utils)
+add_dependencies("SmartObjects" MOBILE_API)
 
 if(ENABLE_LOG)
   target_link_libraries("SmartObjects" log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
diff --git a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
index 05c53ec582..7b92bc9748 100644
--- a/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/always_false_schema_item.h
@@ -51,7 +51,7 @@ class CAlwaysFalseSchemaItem : public ISchemaItem {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -61,7 +61,7 @@ class CAlwaysFalseSchemaItem : public ISchemaItem {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
 
diff --git a/src/components/smart_objects/include/smart_objects/always_true_schema_item.h b/src/components/smart_objects/include/smart_objects/always_true_schema_item.h
index a2d305d0f9..b0bb3f2fa6 100644
--- a/src/components/smart_objects/include/smart_objects/always_true_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/always_true_schema_item.h
@@ -51,7 +51,7 @@ class CAlwaysTrueSchemaItem : public ISchemaItem {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -61,7 +61,7 @@ class CAlwaysTrueSchemaItem : public ISchemaItem {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
 
diff --git a/src/components/smart_objects/include/smart_objects/array_schema_item.h b/src/components/smart_objects/include/smart_objects/array_schema_item.h
index 0e19d2237e..8f9a179fff 100644
--- a/src/components/smart_objects/include/smart_objects/array_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/array_schema_item.h
@@ -66,7 +66,7 @@ class CArraySchemaItem : public ISchemaItem {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -76,17 +76,21 @@ class CArraySchemaItem : public ISchemaItem {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
 
+  bool filterInvalidEnums(SmartObject& Object,
+                          const utils::SemanticVersion& MessageVersion,
+                          rpc::ValidationReport* report) OVERRIDE;
+
   /**
    * @brief Apply schema.
    *
    * @param Object Object to apply schema.
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
-   * from smart object otherwise contains false.
+   * parameters from smart object, otherwise contains false.
+   * @param MessageVersion the version of the schema to be applied
    **/
   void applySchema(SmartObject& Object,
                    const bool remove_unknown_parameters,
@@ -113,6 +117,8 @@ class CArraySchemaItem : public ISchemaItem {
   void BuildObjectBySchema(const SmartObject& pattern_object,
                            SmartObject& result_object) OVERRIDE;
 
+  TypeID GetType() OVERRIDE;
+
  private:
   /**
    * @brief Constructor.
@@ -124,6 +130,7 @@ class CArraySchemaItem : public ISchemaItem {
   CArraySchemaItem(const ISchemaItemPtr ElementSchemaItem,
                    const TSchemaItemParameter<size_t>& MinSize,
                    const TSchemaItemParameter<size_t>& MaxSize);
+
   /**
    * @brief SchemaItem for array elements.
    **/
diff --git a/src/components/smart_objects/include/smart_objects/bool_schema_item.h b/src/components/smart_objects/include/smart_objects/bool_schema_item.h
index 3a9f6c929d..b652799a27 100644
--- a/src/components/smart_objects/include/smart_objects/bool_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/bool_schema_item.h
@@ -51,6 +51,8 @@ class CBoolSchemaItem : public CDefaultSchemaItem<bool> {
       const TSchemaItemParameter<bool>& DefaultValue =
           TSchemaItemParameter<bool>());
 
+  TypeID GetType() OVERRIDE;
+
  private:
   explicit CBoolSchemaItem(const TSchemaItemParameter<bool>& DefaultValue);
   SmartType getSmartType() const OVERRIDE;
diff --git a/src/components/smart_objects/include/smart_objects/default_shema_item.h b/src/components/smart_objects/include/smart_objects/default_shema_item.h
index 16dbad4426..bcb610cb33 100644
--- a/src/components/smart_objects/include/smart_objects/default_shema_item.h
+++ b/src/components/smart_objects/include/smart_objects/default_shema_item.h
@@ -51,7 +51,7 @@ class CDefaultSchemaItem : public ISchemaItem {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -61,7 +61,7 @@ class CDefaultSchemaItem : public ISchemaItem {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
 
@@ -109,7 +109,7 @@ CDefaultSchemaItem<Type>::CDefaultSchemaItem(const ParameterType& DefaultValue)
 template <typename Type>
 errors::eType CDefaultSchemaItem<Type>::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   if (getSmartType() != Object.getType()) {
@@ -117,7 +117,7 @@ errors::eType CDefaultSchemaItem<Type>::validate(
         "Incorrect type, expected: " +
         SmartObject::typeToString(getSmartType()) +
         ", got: " + SmartObject::typeToString(Object.getType());
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::INVALID_VALUE;
   } else {
     return errors::OK;
diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
index 053ad98395..de4c3adcc8 100644
--- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h
@@ -106,7 +106,7 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -116,7 +116,7 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
   /**
@@ -128,15 +128,17 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> {
       const std::vector<ElementSignature>& signatures,
       const utils::SemanticVersion& MessageVersion);
 
+  bool filterInvalidEnums(SmartObject& Object,
+                          const utils::SemanticVersion& MessageVersion,
+                          rpc::ValidationReport* report) OVERRIDE;
+
   /**
    * @brief Apply schema.
-   * This implementation checks if enumeration is represented as string
-   * and tries to convert it to integer according to element-to-string
-   * map.
+   *
    * @param Object Object to apply schema.
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
-   * from smart object otherwise contains false.
+   * parameters from smart object, otherwise contains false.
+   * @param MessageVersion the version of the schema to be applied
    **/
   void applySchema(SmartObject& Object,
                    const bool remove_unknown_parameters,
@@ -166,6 +168,7 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> {
                       ElementSignatures);
   SmartType getSmartType() const OVERRIDE;
   EnumType getDefaultValue() const OVERRIDE;
+  TypeID GetType() OVERRIDE;
   /**
    * @brief Set of allowed enumeration elements.
    **/
@@ -203,6 +206,9 @@ class EnumConversionHelper {
     typename CStringToEnumMap::const_iterator it =
         cstring_to_enum_map().find(str);
     if (it == cstring_to_enum_map().end()) {
+      if (value) {
+        *value = EnumType::INVALID_ENUM;
+      }
       return false;
     }
     if (value) {
@@ -312,25 +318,39 @@ const ElementSignature TEnumSchemaItem<EnumType>::getSignature(
 }
 
 template <typename EnumType>
+bool TEnumSchemaItem<EnumType>::filterInvalidEnums(
+    SmartObject& Object,
+    const utils::SemanticVersion& MessageVersion,
+    rpc::ValidationReport* report) {
+  rpc::ValidationReport dummy_report("");
+  if (validate(Object, &dummy_report, MessageVersion) == errors::OUT_OF_RANGE) {
+    std::string validation_info =
+        "Ignored invalid value - " + Object.asString();
+    report->set_validation_info(validation_info);
+    return true;
+  }
+  return false;
+}
+
+template <typename EnumType>
 errors::eType TEnumSchemaItem<EnumType>::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
-  if (SmartType_Integer != Object.getType()) {
-    std::string validation_info;
-    if (SmartType_String == Object.getType()) {
-      if (allow_unknown_enums) {
-        return errors::OK;
-      }
-      validation_info = "Invalid enum value: " + Object.asString();
-    } else {
-      validation_info =
-          "Incorrect type, expected: " +
-          SmartObject::typeToString(SmartType_Integer) +
-          " (enum), got: " + SmartObject::typeToString(Object.getType());
+  if (SmartType_String == Object.getType()) {
+    if (allow_unknown_enums) {
+      return errors::OK;
     }
-    report__->set_validation_info(validation_info);
+    std::string validation_info = "Invalid enum value: " + Object.asString();
+    report->set_validation_info(validation_info);
+    return errors::OUT_OF_RANGE;
+  } else if (SmartType_Integer != Object.getType()) {
+    std::string validation_info =
+        "Incorrect type, expected: " +
+        SmartObject::typeToString(SmartType_Integer) +
+        " (enum), got: " + SmartObject::typeToString(Object.getType());
+    report->set_validation_info(validation_info);
     return errors::INVALID_VALUE;
   }
 
@@ -338,10 +358,9 @@ errors::eType TEnumSchemaItem<EnumType>::validate(
       mAllowedElements.find(static_cast<EnumType>(Object.asInt()));
 
   if (elements_it == mAllowedElements.end()) {
-    std::stringstream stream;
-    stream << "Invalid enum value: " << Object.asInt();
-    std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    std::string validation_info =
+        "Invalid enum value: " + std::to_string(Object.asInt());
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
 
@@ -358,16 +377,16 @@ errors::eType TEnumSchemaItem<EnumType>::validate(
           std::string validation_info = "Enum value : " + Object.asString() +
                                         " removed for SyncMsgVersion " +
                                         MessageVersion.toString();
-          report__->set_validation_info(validation_info);
-          return errors::INVALID_VALUE;
+          report->set_validation_info(validation_info);
+          return errors::OUT_OF_RANGE;
         } else if (signature.mSince == boost::none &&
                    signature.mUntil == boost::none) {
           // Element does not exist for this version
           std::string validation_info = "Enum value : " + Object.asString() +
                                         " does not exist for SyncMsgVersion " +
                                         MessageVersion.toString();
-          report__->set_validation_info(validation_info);
-          return errors::INVALID_VALUE;
+          report->set_validation_info(validation_info);
+          return errors::OUT_OF_RANGE;
         }
       }
     }
@@ -410,6 +429,11 @@ EnumType TEnumSchemaItem<EnumType>::getDefaultValue() const {
 }
 
 template <typename EnumType>
+TypeID TEnumSchemaItem<EnumType>::GetType() {
+  return TYPE_ENUM;
+}
+
+template <typename EnumType>
 TEnumSchemaItem<EnumType>::TEnumSchemaItem(
     const std::set<EnumType>& AllowedElements,
     const TSchemaItemParameter<EnumType>& DefaultValue)
diff --git a/src/components/smart_objects/include/smart_objects/number_schema_item.h b/src/components/smart_objects/include/smart_objects/number_schema_item.h
index c3767e8e48..25b7684829 100644
--- a/src/components/smart_objects/include/smart_objects/number_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/number_schema_item.h
@@ -68,7 +68,7 @@ class TNumberSchemaItem : public CDefaultSchemaItem<NumberType> {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -78,10 +78,12 @@ class TNumberSchemaItem : public CDefaultSchemaItem<NumberType> {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
 
+  TypeID GetType() OVERRIDE;
+
  private:
   /**
    * @brief Get smart type for this NumberType.
@@ -142,7 +144,7 @@ bool TNumberSchemaItem<NumberType>::isValidNumberType(SmartType type) {
 template <typename NumberType>
 errors::eType TNumberSchemaItem<NumberType>::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   if (!isValidNumberType(Object.getType())) {
@@ -152,7 +154,7 @@ errors::eType TNumberSchemaItem<NumberType>::validate(
     std::string validation_info =
         "Incorrect type, expected: " + SmartObject::typeToString(expectedType) +
         ", got: " + SmartObject::typeToString(Object.getType());
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::INVALID_VALUE;
   }
   NumberType value(0);
@@ -176,7 +178,7 @@ errors::eType TNumberSchemaItem<NumberType>::validate(
     stream << "Value too small, got: " << value
            << ", minimum allowed: " << rangeLimit;
     std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
 
@@ -185,13 +187,18 @@ errors::eType TNumberSchemaItem<NumberType>::validate(
     stream << "Value too large, got: " << value
            << ", maximum allowed: " << rangeLimit;
     std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
   return errors::OK;
 }
 
 template <typename NumberType>
+TypeID TNumberSchemaItem<NumberType>::GetType() {
+  return TYPE_NUMBER;
+}
+
+template <typename NumberType>
 TNumberSchemaItem<NumberType>::TNumberSchemaItem(
     const TSchemaItemParameter<NumberType>& MinValue,
     const TSchemaItemParameter<NumberType>& MaxValue,
diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h
index 7f51ae5678..d5c8a7f3e9 100644
--- a/src/components/smart_objects/include/smart_objects/object_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h
@@ -45,56 +45,59 @@
 
 namespace ns_smart_device_link {
 namespace ns_smart_objects {
+
+/**
+ * @brief Object member.
+ **/
+struct SMember {
+  /**
+   * @brief Default constructor.
+   **/
+  SMember();
+  /**
+   * @brief Constructor.
+   * @param SchemaItem Member schema item.
+   * @param IsMandatory true if member is mandatory, false
+   *                    otherwise. Defaults to true.
+   **/
+
+  SMember(const ISchemaItemPtr SchemaItem,
+          const bool IsMandatory = true,
+          const std::string& Since = "",
+          const std::string& Until = "",
+          const bool IsDeprecated = false,
+          const bool IsRemoved = false,
+          const std::vector<SMember>& history_vector = {});
+
+  /**
+   * @brief Checks the version a parameter was removed (until)
+   * If the mobile's msg version is greater than or
+   **/
+  bool CheckHistoryFieldVersion(
+      const utils::SemanticVersion& MessageVersion) const;
+
+  /**
+   * @brief Member schema item.
+   **/
+  ISchemaItemPtr mSchemaItem;
+  /**
+   * @brief true if member is mandatory, false otherwise.
+   **/
+  bool mIsMandatory;
+  boost::optional<utils::SemanticVersion> mSince;
+  boost::optional<utils::SemanticVersion> mUntil;
+  bool mIsDeprecated;
+  bool mIsRemoved;
+  std::vector<SMember> mHistoryVector;
+};
+typedef std::map<std::string, SMember> Members;
+
 /**
  * @brief Object schema item.
  **/
 class CObjectSchemaItem : public ISchemaItem {
  public:
   /**
-   * @brief Object member.
-   **/
-  struct SMember {
-    /**
-     * @brief Default constructor.
-     **/
-    SMember();
-    /**
-     * @brief Constructor.
-     * @param SchemaItem Member schema item.
-     * @param IsMandatory true if member is mandatory, false
-     *                    otherwise. Defaults to true.
-     **/
-
-    SMember(const ISchemaItemPtr SchemaItem,
-            const bool IsMandatory = true,
-            const std::string& Since = "",
-            const std::string& Until = "",
-            const bool IsDeprecated = false,
-            const bool IsRemoved = false,
-            const std::vector<CObjectSchemaItem::SMember>& history_vector = {});
-    /**
-     * @brief Checks the version a parameter was removed (until)
-     * If the mobile's msg version is greater than or
-     **/
-    bool CheckHistoryFieldVersion(
-        const utils::SemanticVersion& MessageVersion) const;
-
-    /**
-     * @brief Member schema item.
-     **/
-    ISchemaItemPtr mSchemaItem;
-    /**
-     * @brief true if member is mandatory, false otherwise.
-     **/
-    bool mIsMandatory;
-    boost::optional<utils::SemanticVersion> mSince;
-    boost::optional<utils::SemanticVersion> mUntil;
-    bool mIsDeprecated;
-    bool mIsRemoved;
-    std::vector<CObjectSchemaItem::SMember> mHistoryVector;
-  };
-  typedef std::map<std::string, SMember> Members;
-  /**
    * @brief Create a new schema item.
    *
    * @param Members Map of member name to SMember structure
@@ -107,7 +110,7 @@ class CObjectSchemaItem : public ISchemaItem {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -117,15 +120,21 @@ class CObjectSchemaItem : public ISchemaItem {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
+
+  bool filterInvalidEnums(SmartObject& Object,
+                          const utils::SemanticVersion& MessageVersion,
+                          rpc::ValidationReport* report) OVERRIDE;
+
   /**
    * @brief Apply schema.
+   *
    * @param Object Object to apply schema.
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
-   * from smart object otherwise contains false.
+   * parameters from smart object, otherwise contains false.
+   * @param MessageVersion the version of the schema to be applied
    **/
   void applySchema(SmartObject& Object,
                    const bool remove_unknown_parameters,
@@ -135,7 +144,7 @@ class CObjectSchemaItem : public ISchemaItem {
    * @brief Unapply schema.
    * @param Object Object to unapply schema.
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
+   *                                  parameters
    **/
   void unapplySchema(SmartObject& Object,
                      const bool remove_unknown_parameters) OVERRIDE;
@@ -153,6 +162,14 @@ class CObjectSchemaItem : public ISchemaItem {
    */
   size_t GetMemberSize() OVERRIDE;
 
+  TypeID GetType() OVERRIDE;
+
+  boost::optional<SMember&> GetMemberSchemaItem(
+      const std::string& member_key) OVERRIDE;
+
+  void AddMemberSchemaItem(const std::string& member_key,
+                           SMember& member) OVERRIDE;
+
  protected:
   /**
    * @brief Constructor.
@@ -162,25 +179,29 @@ class CObjectSchemaItem : public ISchemaItem {
   CObjectSchemaItem(const Members& Members);
 
   /**
-   * @brief Removes fake parameters from object.
-   * @param Object Object to remove fake parameters.
+   * @brief Removes unknown parameters from object.
+   * @param Object Object to remove unknown parameters.
+   * @param MessageVersion The version to check against for which parameters are
+   *                       unknown.
    **/
-  void RemoveFakeParams(SmartObject& Object,
-                        const utils::SemanticVersion& MessageVersion);
+  void RemoveUnknownParams(SmartObject& Object,
+                           const utils::SemanticVersion& MessageVersion);
 
   /**
    * @brief Returns the correct schema item based on message version.
    * @param member Schema member
-   * @param MmessageVersion Semantic Version of mobile message.
+   * @param MessageVersion Semantic Version of mobile message.
+   * @return Pointer to correct schema item if item found or nullptr, if item
+   *         was not found.
    **/
-  const CObjectSchemaItem::SMember& GetCorrectMember(
-      const SMember& member, const utils::SemanticVersion& messageVersion);
+  const SMember* GetCorrectMember(const SMember& member,
+                                  const utils::SemanticVersion& messageVersion);
 
   /**
    * @brief Map of member name to SMember structure describing the object
-   *member.
+   *        member.
    **/
-  const Members mMembers;
+  Members mMembers;
   DISALLOW_COPY_AND_ASSIGN(CObjectSchemaItem);
 };
 }  // namespace ns_smart_objects
diff --git a/src/components/smart_objects/include/smart_objects/schema_item.h b/src/components/smart_objects/include/smart_objects/schema_item.h
index fa5f6d3adc..1b1395739b 100644
--- a/src/components/smart_objects/include/smart_objects/schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/schema_item.h
@@ -40,12 +40,24 @@
 
 #include <memory>
 #include <vector>
+#include "boost/optional/optional.hpp"
 #include "utils/macro.h"
 #include "utils/semantic_version.h"
 
 namespace ns_smart_device_link {
 namespace ns_smart_objects {
 class SmartObject;
+class SMember;
+
+enum TypeID {
+  TYPE_NONE,
+  TYPE_OBJECT,
+  TYPE_ARRAY,
+  TYPE_STRING,
+  TYPE_NUMBER,
+  TYPE_ENUM,
+  TYPE_BOOLEAN
+};
 
 /**
  * @brief Base schema item.
@@ -56,7 +68,7 @@ class ISchemaItem {
    * @brief Validate smart object.
    *
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * message if an error occurs
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
@@ -67,7 +79,7 @@ class ISchemaItem {
    **/
   virtual errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false);
 
@@ -90,12 +102,26 @@ class ISchemaItem {
   virtual bool hasDefaultValue(SmartObject& Object);
 
   /**
+   * @brief Filter invalid enum values
+   *
+   * @param Object Object to check for invalid enum values
+   * @param MessageVersion the version of the schema to use for validation
+   * @param report object for reporting enums which were removed during the
+   * process
+   *
+   * @return true if the value being checked should be filtered, false otherwise
+   **/
+  virtual bool filterInvalidEnums(SmartObject& Object,
+                                  const utils::SemanticVersion& MessageVersion,
+                                  rpc::ValidationReport* report);
+
+  /**
    * @brief Apply schema.
    *
    * @param Object Object to apply schema.
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
-   * from smart object otherwise contains false.
+   * parameters from smart object, otherwise contains false.
+   * @param MessageVersion the version of the schema to be applied
    **/
   virtual void applySchema(
       ns_smart_device_link::ns_smart_objects::SmartObject& Object,
@@ -123,6 +149,17 @@ class ISchemaItem {
   virtual void BuildObjectBySchema(const SmartObject& pattern_object,
                                    SmartObject& result_object);
 
+  virtual boost::optional<SMember&> GetMemberSchemaItem(
+      const std::string& member_key) {
+    UNUSED(member_key);
+    return boost::optional<SMember&>();
+  }
+
+  virtual void AddMemberSchemaItem(const std::string& member_key,
+                                   SMember& member) {
+    UNUSED(member_key);
+    UNUSED(member);
+  }
   /**
    * @brief Get value param, depends of children
    *
@@ -130,6 +167,13 @@ class ISchemaItem {
    */
   virtual size_t GetMemberSize();
 
+  /**
+   * @brief Get type ID of schema
+   *
+   * @return The type ID of this schema
+   */
+  virtual TypeID GetType();
+
   virtual ~ISchemaItem() {}
 };
 typedef std::shared_ptr<ISchemaItem> ISchemaItemPtr;
diff --git a/src/components/smart_objects/include/smart_objects/smart_object.h b/src/components/smart_objects/include/smart_objects/smart_object.h
index f3aab0fc1e..6ce9f96d8b 100644
--- a/src/components/smart_objects/include/smart_objects/smart_object.h
+++ b/src/components/smart_objects/include/smart_objects/smart_object.h
@@ -674,7 +674,7 @@ class SmartObject FINAL {
   /**
    * @brief Validates object according to attached schema.
    *
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param messageVersion of the mobile app to check against RPC Spec Schema
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -683,7 +683,7 @@ class SmartObject FINAL {
    * @return Result of validation.
    */
   errors::eType validate(
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false);
 
diff --git a/src/components/smart_objects/include/smart_objects/smart_schema.h b/src/components/smart_objects/include/smart_objects/smart_schema.h
index 936f49c11e..b44ac98afd 100644
--- a/src/components/smart_objects/include/smart_objects/smart_schema.h
+++ b/src/components/smart_objects/include/smart_objects/smart_schema.h
@@ -64,7 +64,7 @@ class CSmartSchema FINAL {
    * @brief Validate smart object.
    *
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -74,7 +74,7 @@ class CSmartSchema FINAL {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& messageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) const;
 
@@ -86,25 +86,33 @@ class CSmartSchema FINAL {
   void setSchemaItem(const ISchemaItemPtr SchemaItem);
 
   /**
+   * @brief Set new root schema item.
+   *
+   * @param SchemaItem Root schema item.
+   */
+  ISchemaItemPtr getSchemaItem();
+
+  /**
    * @brief Apply schema.
    *
    * @param Object Object to apply schema.
-   *
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
-   * from smart object otherwise contains false.
+   * parameters from smart object, otherwise contains false.
+   * @param MessageVersion the version of the schema to be applied
+   * @param report object for reporting warnings during schema application
    **/
   void applySchema(
       SmartObject& Object,
       const bool remove_unknown_parameters,
-      const utils::SemanticVersion& MessageVersion = utils::SemanticVersion());
+      const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
+      rpc::ValidationReport* report = nullptr);
 
   /**
    * @brief The reverse SmartObject conversion using schema.
    *
    * @param object Object to convert.
    * @param remove_unknown_parameters contains true if need to remove unknown
-   *parameters
+   * parameters
    */
   // TODO(cpplint): Is this a non-const reference?
   // If so, make const or use a pointer.
diff --git a/src/components/smart_objects/include/smart_objects/string_schema_item.h b/src/components/smart_objects/include/smart_objects/string_schema_item.h
index 7104ff47a9..8f8f516e38 100644
--- a/src/components/smart_objects/include/smart_objects/string_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/string_schema_item.h
@@ -63,7 +63,7 @@ class CStringSchemaItem : public CDefaultSchemaItem<std::string> {
   /**
    * @brief Validate smart object.
    * @param Object Object to validate.
-   * @param report__ object for reporting errors during validation
+   * @param report object for reporting errors during validation
    * @param MessageVersion to check mobile RPC version against RPC Spec History
    * @param allow_unknown_enums
    *   false - unknown enum values (left as string values after applySchema)
@@ -73,10 +73,12 @@ class CStringSchemaItem : public CDefaultSchemaItem<std::string> {
    **/
   errors::eType validate(
       const SmartObject& Object,
-      rpc::ValidationReport* report__,
+      rpc::ValidationReport* report,
       const utils::SemanticVersion& MessageVersion = utils::SemanticVersion(),
       const bool allow_unknown_enums = false) OVERRIDE;
 
+  TypeID GetType() OVERRIDE;
+
  private:
   /**
    * @brief Constructor.
diff --git a/src/components/smart_objects/src/always_false_schema_item.cc b/src/components/smart_objects/src/always_false_schema_item.cc
index 4f8f4584af..45955c79da 100644
--- a/src/components/smart_objects/src/always_false_schema_item.cc
+++ b/src/components/smart_objects/src/always_false_schema_item.cc
@@ -43,10 +43,10 @@ std::shared_ptr<CAlwaysFalseSchemaItem> CAlwaysFalseSchemaItem::create() {
 
 errors::eType CAlwaysFalseSchemaItem::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
-  report__->set_validation_info("Generic error");
+  report->set_validation_info("Generic error");
   return errors::ERROR;
 }
 
diff --git a/src/components/smart_objects/src/always_true_schema_item.cc b/src/components/smart_objects/src/always_true_schema_item.cc
index 855bfef2a0..6df8b3a63d 100644
--- a/src/components/smart_objects/src/always_true_schema_item.cc
+++ b/src/components/smart_objects/src/always_true_schema_item.cc
@@ -41,7 +41,7 @@ std::shared_ptr<CAlwaysTrueSchemaItem> CAlwaysTrueSchemaItem::create() {
 
 errors::eType CAlwaysTrueSchemaItem::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   return errors::OK;
diff --git a/src/components/smart_objects/src/array_schema_item.cc b/src/components/smart_objects/src/array_schema_item.cc
index 9420fe020f..3c28396213 100644
--- a/src/components/smart_objects/src/array_schema_item.cc
+++ b/src/components/smart_objects/src/array_schema_item.cc
@@ -29,6 +29,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 #include "smart_objects/array_schema_item.h"
+
+#include "smart_objects/enum_schema_item.h"
 #include "smart_objects/smart_object.h"
 
 namespace ns_smart_device_link {
@@ -44,7 +46,7 @@ std::shared_ptr<CArraySchemaItem> CArraySchemaItem::create(
 
 errors::eType CArraySchemaItem::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   if (SmartType_Array != Object.getType()) {
@@ -52,7 +54,7 @@ errors::eType CArraySchemaItem::validate(
         "Incorrect type, expected: " +
         SmartObject::typeToString(SmartType_Array) +
         ", got: " + SmartObject::typeToString(Object.getType());
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::INVALID_VALUE;
   }
   size_t sizeLimit;
@@ -63,7 +65,7 @@ errors::eType CArraySchemaItem::validate(
     stream << "Got array of size: " << array_len
            << ", minimum allowed: " << sizeLimit;
     std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
   if (mMaxSize.getValue(sizeLimit) && (array_len > sizeLimit)) {
@@ -71,18 +73,16 @@ errors::eType CArraySchemaItem::validate(
     stream << "Got array of size: " << array_len
            << ", maximum allowed: " << sizeLimit;
     std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
 
   for (size_t i = 0u; i < array_len; ++i) {
-    std::stringstream strVal;
-    strVal << i;
-    const errors::eType result =
-        mElementSchemaItem->validate(Object.getElement(i),
-                                     &report__->ReportSubobject(strVal.str()),
-                                     MessageVersion,
-                                     allow_unknown_enums);
+    const errors::eType result = mElementSchemaItem->validate(
+        Object.getElement(i),
+        &report->ReportSubobject(std::to_string(i)),
+        MessageVersion,
+        allow_unknown_enums);
     if (errors::OK != result) {
       return result;
     }
@@ -90,6 +90,36 @@ errors::eType CArraySchemaItem::validate(
   return errors::OK;
 }
 
+bool CArraySchemaItem::filterInvalidEnums(
+    SmartObject& Object,
+    const utils::SemanticVersion& MessageVersion,
+    rpc::ValidationReport* report) {
+  if (SmartType_Array != Object.getType()) {
+    return false;
+  }
+
+  int index = 0;
+  auto array = Object.asArray();
+  size_t initial_size = array->size();
+  auto should_erase =
+      [this, MessageVersion, report, &index](SmartObject& element) {
+        // If filterInvalidEnums returns true, the checked element
+        // is now invalid and should be filtered
+        return mElementSchemaItem->filterInvalidEnums(
+            element,
+            MessageVersion,
+            &report->ReportSubobject(std::to_string(index++)));
+      };
+  array->erase(std::remove_if(array->begin(), array->end(), should_erase),
+               array->end());
+
+  // Mark this container as invalid if it is below the minimum size after
+  // filtering one or more elements
+  size_t min_size;
+  return array->size() < initial_size && mMinSize.getValue(min_size) &&
+         array->size() < min_size;
+}
+
 void CArraySchemaItem::applySchema(
     SmartObject& Object,
     const bool remove_unknown_parameters,
@@ -127,6 +157,10 @@ void CArraySchemaItem::BuildObjectBySchema(const SmartObject& pattern_object,
   result_object = SmartObject(SmartType_Array);
 }
 
+TypeID CArraySchemaItem::GetType() {
+  return TYPE_ARRAY;
+}
+
 CArraySchemaItem::CArraySchemaItem(const ISchemaItemPtr ElementSchemaItem,
                                    const TSchemaItemParameter<size_t>& MinSize,
                                    const TSchemaItemParameter<size_t>& MaxSize)
diff --git a/src/components/smart_objects/src/bool_schema_item.cc b/src/components/smart_objects/src/bool_schema_item.cc
index a4875a1b24..f24d14acc3 100644
--- a/src/components/smart_objects/src/bool_schema_item.cc
+++ b/src/components/smart_objects/src/bool_schema_item.cc
@@ -51,5 +51,9 @@ bool CBoolSchemaItem::getDefaultValue() const {
   return false;
 }
 
+TypeID CBoolSchemaItem::GetType() {
+  return TYPE_BOOLEAN;
+}
+
 }  // namespace ns_smart_objects
 }  // namespace ns_smart_device_link
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index be1c73fb85..c8eab82e8a 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -33,31 +33,35 @@
 
 #include <algorithm>
 
+#include "generated_msg_version.h"
 #include "smart_objects/always_false_schema_item.h"
+#include "smart_objects/enum_schema_item.h"
 #include "smart_objects/smart_object.h"
 
 namespace {
 const char connection_key[] = "connection_key";
 const char binary_data[] = "binary_data";
 const char app_id[] = "appID";
+const utils::SemanticVersion kModuleVersion(application_manager::major_version,
+                                            application_manager::minor_version,
+                                            application_manager::patch_version);
 }  // namespace
 namespace ns_smart_device_link {
 namespace ns_smart_objects {
 
-CObjectSchemaItem::SMember::SMember()
+SMember::SMember()
     : mSchemaItem(CAlwaysFalseSchemaItem::create())
     , mIsMandatory(true)
     , mIsDeprecated(false)
     , mIsRemoved(false) {}
 
-CObjectSchemaItem::SMember::SMember(
-    const ISchemaItemPtr SchemaItem,
-    const bool IsMandatory,
-    const std::string& Since,
-    const std::string& Until,
-    const bool IsDeprecated,
-    const bool IsRemoved,
-    const std::vector<CObjectSchemaItem::SMember>& history_vector)
+SMember::SMember(const ISchemaItemPtr SchemaItem,
+                 const bool IsMandatory,
+                 const std::string& Since,
+                 const std::string& Until,
+                 const bool IsDeprecated,
+                 const bool IsRemoved,
+                 const std::vector<SMember>& history_vector)
     : mSchemaItem(SchemaItem), mIsMandatory(IsMandatory) {
   if (Since.size() > 0) {
     utils::SemanticVersion since_struct(Since);
@@ -76,30 +80,22 @@ CObjectSchemaItem::SMember::SMember(
   mHistoryVector = history_vector;
 }
 
-bool CObjectSchemaItem::SMember::CheckHistoryFieldVersion(
+bool SMember::CheckHistoryFieldVersion(
     const utils::SemanticVersion& MessageVersion) const {
   if (MessageVersion.isValid()) {
     if (mSince != boost::none) {
       if (MessageVersion < mSince.get()) {
-        return false;  // Msg version predates `since` field
-      } else {
-        if (mUntil != boost::none && (MessageVersion >= mUntil.get())) {
-          return false;  // Msg version newer than `until` field
-        } else {
-          return true;  // Mobile msg version falls within specified version
-                        // range
-        }
+        return false;
       }
     }
-
-    if (mUntil != boost::none && (MessageVersion >= mUntil.get())) {
-      return false;  // Msg version newer than `until` field
-    } else {
-      return true;  // Mobile msg version falls within specified version range
+    if (mUntil != boost::none) {
+      if (MessageVersion >= mUntil.get()) {
+        return false;  // Msg version newer than `until` field
+      }
     }
   }
 
-  return true;  // Not enough version information. Default true.
+  return true;  // All checks passed. Return true.
 }
 
 std::shared_ptr<CObjectSchemaItem> CObjectSchemaItem::create(
@@ -109,7 +105,7 @@ std::shared_ptr<CObjectSchemaItem> CObjectSchemaItem::create(
 
 errors::eType CObjectSchemaItem::validate(
     const SmartObject& object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   if (SmartType_Map != object.getType()) {
@@ -117,7 +113,7 @@ errors::eType CObjectSchemaItem::validate(
         "Incorrect type, expected: " +
         SmartObject::typeToString(SmartType_Map) +
         ", got: " + SmartObject::typeToString(object.getType());
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::INVALID_VALUE;
   }
 
@@ -127,14 +123,14 @@ errors::eType CObjectSchemaItem::validate(
        ++it) {
     const std::string& key = it->first;
     const SMember& member = it->second;
-    const SMember& correct_member = GetCorrectMember(member, MessageVersion);
+    const SMember* correct_member = GetCorrectMember(member, MessageVersion);
 
     std::set<std::string>::const_iterator key_it = object_keys.find(key);
     if (object_keys.end() == key_it) {
-      if (correct_member.mIsMandatory == true &&
-          correct_member.mIsRemoved == false) {
+      if (correct_member && correct_member->mIsMandatory == true &&
+          correct_member->mIsRemoved == false) {
         std::string validation_info = "Missing mandatory parameter: " + key;
-        report__->set_validation_info(validation_info);
+        report->set_validation_info(validation_info);
         return errors::MISSING_MANDATORY_PARAMETER;
       }
       continue;
@@ -143,19 +139,59 @@ errors::eType CObjectSchemaItem::validate(
 
     errors::eType result = errors::OK;
     // Check if MessageVersion matches schema version
-    result =
-        correct_member.mSchemaItem->validate(field,
-                                             &report__->ReportSubobject(key),
-                                             MessageVersion,
-                                             allow_unknown_enums);
+    if (correct_member) {
+      result =
+          correct_member->mSchemaItem->validate(field,
+                                                &report->ReportSubobject(key),
+                                                MessageVersion,
+                                                allow_unknown_enums);
+    } else {
+      result = errors::ERROR;
+    }
+
     if (errors::OK != result) {
       return result;
     }
     object_keys.erase(key_it);
   }
+
   return errors::OK;
 }
 
+bool CObjectSchemaItem::filterInvalidEnums(
+    SmartObject& Object,
+    const utils::SemanticVersion& MessageVersion,
+    rpc::ValidationReport* report) {
+  bool valid = true;
+  for (const auto& key : Object.enumerate()) {
+    auto members_it = mMembers.find(key);
+    if (mMembers.end() == members_it) {
+      // No members found for this key, skipping over
+      continue;
+    }
+
+    const SMember* member =
+        GetCorrectMember(members_it->second, MessageVersion);
+    // Perform filtering recursively on this field
+    if (member->mSchemaItem->filterInvalidEnums(
+            Object[key], MessageVersion, &report->ReportSubobject(key))) {
+      // Object is no longer valid if the member is mandatory.
+      if (member->mIsMandatory) {
+        valid = false;
+      }
+
+      // The member is safe to filter if it is non-mandatory, only leaf nodes
+      // (individual enum values) should be filtered otherwise.
+      bool should_erase = (member->mSchemaItem->GetType() == TYPE_ENUM ||
+                           !member->mIsMandatory);
+      if (should_erase) {
+        Object.erase(key);
+      }
+    }
+  }
+  return !valid;
+}
+
 void CObjectSchemaItem::applySchema(
     SmartObject& Object,
     const bool remove_unknown_parameters,
@@ -164,15 +200,11 @@ void CObjectSchemaItem::applySchema(
     return;
   }
 
-  if (remove_unknown_parameters) {
-    RemoveFakeParams(Object, MessageVersion);
-  }
-
   SmartObject default_value;
-  for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
-       ++it) {
-    const std::string& key = it->first;
-    const SMember& member = it->second;
+
+  for (const auto& item : mMembers) {
+    const std::string& key = item.first;
+    const SMember& member = item.second;
     if (!Object.keyExists(key)) {
       if (member.mSchemaItem->setDefaultValue(default_value)) {
         Object[key] = default_value;
@@ -184,6 +216,10 @@ void CObjectSchemaItem::applySchema(
           Object[key], remove_unknown_parameters, MessageVersion);
     }
   }
+
+  if (remove_unknown_parameters) {
+    RemoveUnknownParams(Object, MessageVersion);
+  }
 }
 
 void CObjectSchemaItem::unapplySchema(SmartObject& Object,
@@ -201,7 +237,6 @@ void CObjectSchemaItem::unapplySchema(SmartObject& Object,
       Object.erase(key);
     }
   }
-
   for (Members::const_iterator it = mMembers.begin(); it != mMembers.end();
        ++it) {
     const std::string& key = it->first;
@@ -232,50 +267,67 @@ size_t CObjectSchemaItem::GetMemberSize() {
   return mMembers.size();
 }
 
+TypeID CObjectSchemaItem::GetType() {
+  return TYPE_OBJECT;
+}
+
+boost::optional<SMember&> CObjectSchemaItem::GetMemberSchemaItem(
+    const std::string& member_key) {
+  auto it = mMembers.find(member_key);
+
+  if (it != mMembers.end()) {
+    return boost::optional<SMember&>(it->second);
+  }
+  return boost::optional<SMember&>();
+}
+
+void CObjectSchemaItem::AddMemberSchemaItem(const std::string& member_key,
+                                            SMember& member) {
+  mMembers[member_key] = member;
+}
+
 CObjectSchemaItem::CObjectSchemaItem(const Members& members)
     : mMembers(members) {}
 
-void CObjectSchemaItem::RemoveFakeParams(
+void CObjectSchemaItem::RemoveUnknownParams(
     SmartObject& Object, const utils::SemanticVersion& MessageVersion) {
-  for (SmartMap::const_iterator it = Object.map_begin();
-       it != Object.map_end();) {
-    const std::string& key = it->first;
+  for (const auto& key : Object.enumerate()) {
     std::map<std::string, SMember>::const_iterator members_it =
         mMembers.find(key);
-    if (mMembers.end() == members_it
-        // FIXME(EZamakhov): Remove illegal usage of filed in AM
-        && key.compare(connection_key) != 0 && key.compare(binary_data) != 0 &&
-        key.compare(app_id) != 0) {
-      ++it;
-      Object.erase(key);
 
-    } else if (mMembers.end() != members_it &&
-               GetCorrectMember(members_it->second, MessageVersion)
-                   .mIsRemoved) {
-      ++it;
+    if (mMembers.end() != members_it) {
+      const SMember* member =
+          GetCorrectMember(members_it->second, MessageVersion);
+      if (!member || member->mIsRemoved) {
+        Object.erase(key);
+      }
+      continue;
+    } else if (key.compare(connection_key) != 0 &&
+               key.compare(binary_data) != 0 && key.compare(app_id) != 0) {
       Object.erase(key);
-    } else {
-      ++it;
     }
   }
 }
 
-const CObjectSchemaItem::SMember& CObjectSchemaItem::GetCorrectMember(
+const SMember* CObjectSchemaItem::GetCorrectMember(
     const SMember& member, const utils::SemanticVersion& messageVersion) {
   // Check if member is the correct version
   if (member.CheckHistoryFieldVersion(messageVersion)) {
-    return member;
+    return &member;
   }
   // Check for history tag items
   if (!member.mHistoryVector.empty()) {
     for (uint i = 0; i < member.mHistoryVector.size(); i++) {
       if (member.mHistoryVector[i].CheckHistoryFieldVersion(messageVersion)) {
-        return member.mHistoryVector[i];
+        return &member.mHistoryVector[i];
       }
     }
   }
+
   // Return member as default
-  return member;
+  return (member.mSince != boost::none && member.mSince.get() > kModuleVersion)
+             ? &member
+             : nullptr;
 }
 
 }  // namespace ns_smart_objects
diff --git a/src/components/smart_objects/src/schema_item.cc b/src/components/smart_objects/src/schema_item.cc
index 8c40e2c7bd..c05b99f19e 100644
--- a/src/components/smart_objects/src/schema_item.cc
+++ b/src/components/smart_objects/src/schema_item.cc
@@ -37,7 +37,7 @@ namespace ns_smart_objects {
 
 errors::eType ISchemaItem::validate(
     const SmartObject& object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   return errors::ERROR;
@@ -51,6 +51,13 @@ bool ISchemaItem::hasDefaultValue(SmartObject& Object) {
   return false;
 }
 
+bool ISchemaItem::filterInvalidEnums(
+    SmartObject& Object,
+    const utils::SemanticVersion& MessageVersion,
+    rpc::ValidationReport* report) {
+  return false;
+}
+
 void ISchemaItem::applySchema(SmartObject& Object,
                               const bool remove_unknown_parameters,
                               const utils::SemanticVersion& MessageVersion) {}
@@ -65,5 +72,9 @@ size_t ISchemaItem::GetMemberSize() {
   return 0;
 }
 
+TypeID ISchemaItem::GetType() {
+  return TYPE_NONE;
+}
+
 }  // namespace ns_smart_objects
 }  // namespace ns_smart_device_link
diff --git a/src/components/smart_objects/src/smart_object.cc b/src/components/smart_objects/src/smart_object.cc
index eb1c737aff..a8fc267615 100644
--- a/src/components/smart_objects/src/smart_object.cc
+++ b/src/components/smart_objects/src/smart_object.cc
@@ -734,16 +734,32 @@ void SmartObject::duplicate(const SmartObject& OtherObject) {
 void SmartObject::cleanup_data() {
   switch (m_type) {
     case SmartType_String:
-      delete m_data.str_value;
+      if (m_data.str_value) {
+        delete m_data.str_value;
+        m_data.str_value = nullptr;
+        m_type = SmartType_Null;
+      }
       break;
     case SmartType_Map:
-      delete m_data.map_value;
+      if (m_data.map_value) {
+        delete m_data.map_value;
+        m_data.map_value = nullptr;
+        m_type = SmartType_Null;
+      }
       break;
     case SmartType_Array:
-      delete m_data.array_value;
+      if (m_data.array_value) {
+        delete m_data.array_value;
+        m_data.array_value = nullptr;
+        m_type = SmartType_Null;
+      }
       break;
     case SmartType_Binary:
-      delete m_data.binary_value;
+      if (m_data.binary_value) {
+        delete m_data.binary_value;
+        m_data.binary_value = nullptr;
+        m_type = SmartType_Null;
+      }
       break;
     default:
       break;
@@ -876,11 +892,10 @@ bool SmartObject::isValid() const {
 }
 
 errors::eType SmartObject::validate(
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
-  return m_schema.validate(
-      *this, report__, MessageVersion, allow_unknown_enums);
+  return m_schema.validate(*this, report, MessageVersion, allow_unknown_enums);
 }
 
 void SmartObject::setSchema(const CSmartSchema& schema) {
diff --git a/src/components/smart_objects/src/smart_schema.cc b/src/components/smart_objects/src/smart_schema.cc
index 4ab5e5ff23..6deb08da3b 100644
--- a/src/components/smart_objects/src/smart_schema.cc
+++ b/src/components/smart_objects/src/smart_schema.cc
@@ -42,21 +42,33 @@ CSmartSchema::CSmartSchema(const ISchemaItemPtr SchemaItem)
 
 errors::eType CSmartSchema::validate(
     const SmartObject& object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) const {
   return mSchemaItem->validate(
-      object, report__, MessageVersion, allow_unknown_enums);
+      object, report, MessageVersion, allow_unknown_enums);
 }
 
 void CSmartSchema::setSchemaItem(const ISchemaItemPtr schemaItem) {
   mSchemaItem = schemaItem;
 }
 
+ISchemaItemPtr CSmartSchema::getSchemaItem() {
+  return mSchemaItem;
+}
+
 void CSmartSchema::applySchema(SmartObject& Object,
                                const bool remove_unknown_parameters,
-                               const utils::SemanticVersion& MessageVersion) {
+                               const utils::SemanticVersion& MessageVersion,
+                               rpc::ValidationReport* report) {
   mSchemaItem->applySchema(Object, remove_unknown_parameters, MessageVersion);
+  if (remove_unknown_parameters) {
+    rpc::ValidationReport dummy_report("");
+    if (!report) {
+      report = &dummy_report;
+    }
+    mSchemaItem->filterInvalidEnums(Object, MessageVersion, report);
+  }
 }
 
 void CSmartSchema::unapplySchema(SmartObject& Object,
diff --git a/src/components/smart_objects/src/string_schema_item.cc b/src/components/smart_objects/src/string_schema_item.cc
index c4382174d0..907f698545 100644
--- a/src/components/smart_objects/src/string_schema_item.cc
+++ b/src/components/smart_objects/src/string_schema_item.cc
@@ -48,7 +48,7 @@ std::shared_ptr<CStringSchemaItem> CStringSchemaItem::create(
 
 errors::eType CStringSchemaItem::validate(
     const SmartObject& Object,
-    rpc::ValidationReport* report__,
+    rpc::ValidationReport* report,
     const utils::SemanticVersion& MessageVersion,
     const bool allow_unknown_enums) {
   if (SmartType_String != Object.getType()) {
@@ -56,7 +56,7 @@ errors::eType CStringSchemaItem::validate(
         "Incorrect type, expected: " +
         SmartObject::typeToString(SmartType_String) +
         ", got: " + SmartObject::typeToString(Object.getType());
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::INVALID_VALUE;
   }
 
@@ -68,7 +68,7 @@ errors::eType CStringSchemaItem::validate(
     stream << "Got string of size: " << value.size()
            << ", minimum allowed: " << length;
     std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
   if (mMaxLength.getValue(length) && (value.size() > length)) {
@@ -76,7 +76,7 @@ errors::eType CStringSchemaItem::validate(
     stream << "Got string of size: " << value.size()
            << ", maximum allowed: " << length;
     std::string validation_info = stream.str();
-    report__->set_validation_info(validation_info);
+    report->set_validation_info(validation_info);
     return errors::OUT_OF_RANGE;
   }
   return errors::OK;
@@ -90,6 +90,10 @@ std::string CStringSchemaItem::getDefaultValue() const {
   return std::string("");
 }
 
+TypeID CStringSchemaItem::GetType() {
+  return TYPE_STRING;
+}
+
 CStringSchemaItem::CStringSchemaItem(
     const TSchemaItemParameter<size_t>& MinLength,
     const TSchemaItemParameter<size_t>& MaxLength,
diff --git a/src/components/smart_objects/test/ArraySchemaItem_test.cc b/src/components/smart_objects/test/ArraySchemaItem_test.cc
index a22a27399d..b5ba73ea91 100644
--- a/src/components/smart_objects/test/ArraySchemaItem_test.cc
+++ b/src/components/smart_objects/test/ArraySchemaItem_test.cc
@@ -33,8 +33,9 @@
 #include <string>
 
 #include "gmock/gmock.h"
-
 #include "smart_objects/array_schema_item.h"
+#include "smart_objects/enum_schema_item.h"
+#include "smart_objects/object_schema_item.h"
 #include "smart_objects/smart_object.h"
 #include "smart_objects/string_schema_item.h"
 
@@ -42,6 +43,15 @@ namespace test {
 namespace components {
 namespace smart_object_test {
 
+namespace ExampleEnum {
+enum eType { INVALID_ENUM = -1, Value0 = 0, Value1, Value2 };
+}  // namespace ExampleEnum
+
+namespace Keys {
+const char OPTIONAL_PARAM[] = "optionalParam";
+const char MANDATORY_PARAM[] = "mandatoryParam";
+}  // namespace Keys
+
 /**
  * Test ArraySchemaItem no schema item, no min and max size
  **/
@@ -345,6 +355,189 @@ TEST(test_map_validate, test_ArraySchemaItemTest) {
   EXPECT_EQ(std::string("Out of array"), obj["array"][4].asString());
 }
 
+TEST(test_array_with_unknown_enum, test_ArraySchemaItemTest) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+  SmartObject obj;
+  std::set<ExampleEnum::eType> enum_values;
+  enum_values.insert(ExampleEnum::Value0);
+  enum_values.insert(ExampleEnum::Value1);
+  enum_values.insert(ExampleEnum::Value2);
+
+  ISchemaItemPtr item = CArraySchemaItem::create(
+      TEnumSchemaItem<ExampleEnum::eType>::create(enum_values),
+      TSchemaItemParameter<size_t>(1));
+
+  obj[0] = "Value0";
+  obj[1] = "Value10";
+  obj[2] = "Value1";
+
+  item->applySchema(obj, true);
+
+  rpc::ValidationReport report("RPC");
+  EXPECT_FALSE(
+      item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  EXPECT_EQ((size_t)2, obj.length());
+  EXPECT_EQ(0, obj[0].asInt());
+  EXPECT_EQ(1, obj[1].asInt());
+
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OK, item->validate(obj, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST(test_array_with_unknown_enums, test_ArraySchemaItemTest) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+  SmartObject obj;
+  std::set<ExampleEnum::eType> enum_values;
+  enum_values.insert(ExampleEnum::Value0);
+  enum_values.insert(ExampleEnum::Value1);
+  enum_values.insert(ExampleEnum::Value2);
+
+  ISchemaItemPtr item = CArraySchemaItem::create(
+      TEnumSchemaItem<ExampleEnum::eType>::create(enum_values),
+      TSchemaItemParameter<size_t>(1));
+
+  obj[0] = "Value10";
+  obj[1] = "Value11";
+  obj[2] = "Value12";
+
+  item->applySchema(obj, true);
+
+  rpc::ValidationReport report("RPC");
+  EXPECT_TRUE(item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  EXPECT_EQ((size_t)0, obj.length());
+
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OUT_OF_RANGE, item->validate(obj, &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST(test_array_of_objects_with_unknown_enum, test_ArraySchemaItemTest) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+  SmartObject obj;
+  std::set<ExampleEnum::eType> enum_values;
+  enum_values.insert(ExampleEnum::Value0);
+  enum_values.insert(ExampleEnum::Value1);
+  enum_values.insert(ExampleEnum::Value2);
+
+  Members structMembersMap;
+  structMembersMap[Keys::OPTIONAL_PARAM] =
+      SMember(TEnumSchemaItem<ExampleEnum::eType>::create(enum_values), false);
+  structMembersMap[Keys::MANDATORY_PARAM] =
+      SMember(TEnumSchemaItem<ExampleEnum::eType>::create(enum_values), true);
+
+  ISchemaItemPtr item =
+      CArraySchemaItem::create(CObjectSchemaItem::create(structMembersMap),
+                               TSchemaItemParameter<size_t>(1));
+
+  SmartObject struct1;
+  struct1[Keys::MANDATORY_PARAM] = "Value0";
+  SmartObject struct2;
+  struct2[Keys::MANDATORY_PARAM] = "Value11";
+  SmartObject struct3;
+  struct3[Keys::MANDATORY_PARAM] = "Value2";
+  obj[0] = struct1;
+  obj[1] = struct2;
+  obj[2] = struct3;
+
+  item->applySchema(obj, true);
+
+  rpc::ValidationReport report("RPC");
+  EXPECT_FALSE(
+      item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  EXPECT_EQ((size_t)2, obj.length());
+  EXPECT_EQ(0, obj[0][Keys::MANDATORY_PARAM].asInt());
+  EXPECT_EQ(2, obj[1][Keys::MANDATORY_PARAM].asInt());
+
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OK, item->validate(obj, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST(test_array_of_objects_with_unknown_optional_enums,
+     test_ArraySchemaItemTest) {
+  using namespace ns_smart_device_link::ns_smart_objects;
+  SmartObject obj;
+  std::set<ExampleEnum::eType> enum_values;
+  enum_values.insert(ExampleEnum::Value0);
+  enum_values.insert(ExampleEnum::Value1);
+  enum_values.insert(ExampleEnum::Value2);
+
+  Members structMembersMap;
+  structMembersMap[Keys::OPTIONAL_PARAM] =
+      SMember(TEnumSchemaItem<ExampleEnum::eType>::create(enum_values), false);
+  structMembersMap[Keys::MANDATORY_PARAM] =
+      SMember(TEnumSchemaItem<ExampleEnum::eType>::create(enum_values), true);
+
+  ISchemaItemPtr item =
+      CArraySchemaItem::create(CObjectSchemaItem::create(structMembersMap),
+                               TSchemaItemParameter<size_t>(1));
+
+  SmartObject struct1;
+  struct1[Keys::OPTIONAL_PARAM] = "Value10";
+  struct1[Keys::MANDATORY_PARAM] = "Value0";
+  SmartObject struct2;
+  struct2[Keys::OPTIONAL_PARAM] = "Value0";
+  struct2[Keys::MANDATORY_PARAM] = "Value1";
+  SmartObject struct3;
+  struct3[Keys::OPTIONAL_PARAM] = "Value12";
+  struct3[Keys::MANDATORY_PARAM] = "Value2";
+  obj[0] = struct1;
+  obj[1] = struct2;
+  obj[2] = struct3;
+
+  item->applySchema(obj, true);
+
+  rpc::ValidationReport report("RPC");
+  EXPECT_FALSE(
+      item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  // Unknown sub-parameter values should be filtered, but not array elements
+  EXPECT_EQ((size_t)3, obj.length());
+  EXPECT_EQ(0, obj[0][Keys::MANDATORY_PARAM].asInt());
+  EXPECT_FALSE(obj[0].keyExists(Keys::OPTIONAL_PARAM));
+  EXPECT_EQ(1, obj[1][Keys::MANDATORY_PARAM].asInt());
+  EXPECT_EQ(0, obj[1][Keys::OPTIONAL_PARAM].asInt());
+  EXPECT_EQ(2, obj[2][Keys::MANDATORY_PARAM].asInt());
+  EXPECT_FALSE(obj[2].keyExists(Keys::OPTIONAL_PARAM));
+
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OK, item->validate(obj, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
 }  // namespace smart_object_test
 }  // namespace components
 }  // namespace test
+
+namespace ns_smart_device_link {
+namespace ns_smart_objects {
+
+namespace ExampleEnum = test::components::smart_object_test::ExampleEnum;
+typedef EnumConversionHelper<ExampleEnum::eType> EnumConverter;
+
+template <>
+const EnumConverter::EnumToCStringMap EnumConverter::enum_to_cstring_map_ =
+    EnumConverter::InitEnumToCStringMap();
+
+template <>
+const EnumConverter::CStringToEnumMap EnumConverter::cstring_to_enum_map_ =
+    EnumConverter::InitCStringToEnumMap();
+
+template <>
+const char* const EnumConverter::cstring_values_[] = {
+    "Value0", "Value1", "Value2"};
+
+template <>
+const ExampleEnum::eType EnumConverter::enum_values_[] = {
+    ExampleEnum::Value0, ExampleEnum::Value1, ExampleEnum::Value2};
+
+}  // namespace ns_smart_objects
+}  // namespace ns_smart_device_link
diff --git a/src/components/smart_objects/test/CMakeLists.txt b/src/components/smart_objects/test/CMakeLists.txt
index e0cc37e104..9c89079d94 100644
--- a/src/components/smart_objects/test/CMakeLists.txt
+++ b/src/components/smart_objects/test/CMakeLists.txt
@@ -53,5 +53,11 @@ set(EXCLUDE_PATHS
   SmartObjectConvertionTime_test.cc
 )
 
+# Enable detect Double-free, invalid free
+# AddressSanitizer is a fast memory error detector. 
+# It consists of a compiler instrumentation module and a run-time library.
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
+
 collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}")
 create_test(smart_object_test "${SOURCES}" "${LIBRARIES}")
diff --git a/src/components/smart_objects/test/CObjectSchemaItem_test.cc b/src/components/smart_objects/test/CObjectSchemaItem_test.cc
index 51085040c5..0eee0d1f0d 100644
--- a/src/components/smart_objects/test/CObjectSchemaItem_test.cc
+++ b/src/components/smart_objects/test/CObjectSchemaItem_test.cc
@@ -89,6 +89,9 @@ namespace Keys {
 const char RESULT_CODE[] = "resultCode";
 const char INFO[] = "info";
 const char SUCCESS[] = "success";
+const char STRUCT[] = "struct";
+const char OPTIONAL_PARAM[] = "optionalParam";
+const char MANDATORY_PARAM[] = "mandatoryParam";
 }  // namespace Keys
 
 class ObjectSchemaItemTest : public ::testing::Test {
@@ -117,28 +120,35 @@ class ObjectSchemaItemTest : public ::testing::Test {
     resultCode_values.insert(ResultType::GENERIC_ERROR);
     resultCode_values.insert(ResultType::DISALLOWED);
 
-    CObjectSchemaItem::Members paramsMembersMap;
-    paramsMembersMap[S_FUNCTION_ID] = CObjectSchemaItem::SMember(
+    Members paramsMembersMap;
+    paramsMembersMap[S_FUNCTION_ID] = SMember(
         TEnumSchemaItem<FunctionID::eType>::create(function_values), true);
     paramsMembersMap[S_CORRELATION_ID] =
-        CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-    paramsMembersMap[S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(
-        TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
-                                       TSchemaItemParameter<int>(2)),
-        true);
-
-    CObjectSchemaItem::Members schemaMembersMap;
-    schemaMembersMap[Keys::RESULT_CODE] = CObjectSchemaItem::SMember(
+        SMember(TNumberSchemaItem<int>::create(), true);
+    paramsMembersMap[S_PROTOCOL_VERSION] =
+        SMember(TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
+                                               TSchemaItemParameter<int>(2)),
+                true);
+
+    Members structMembersMap;
+    structMembersMap[Keys::OPTIONAL_PARAM] = SMember(
+        TEnumSchemaItem<FunctionID::eType>::create(function_values), false);
+    structMembersMap[Keys::MANDATORY_PARAM] = SMember(
+        TEnumSchemaItem<FunctionID::eType>::create(function_values), true);
+
+    Members schemaMembersMap;
+    schemaMembersMap[Keys::RESULT_CODE] = SMember(
         TEnumSchemaItem<ResultType::eType>::create(resultCode_values), false);
-    schemaMembersMap[Keys::INFO] = CObjectSchemaItem::SMember(
-        CStringSchemaItem::create(TSchemaItemParameter<size_t>(0),
-                                  TSchemaItemParameter<size_t>(10)),
-        false);
-    schemaMembersMap[Keys::SUCCESS] =
-        CObjectSchemaItem::SMember(CBoolSchemaItem::create(), false);
+    schemaMembersMap[Keys::INFO] =
+        SMember(CStringSchemaItem::create(TSchemaItemParameter<size_t>(0),
+                                          TSchemaItemParameter<size_t>(10)),
+                false);
+    schemaMembersMap[Keys::SUCCESS] = SMember(CBoolSchemaItem::create(), false);
+    schemaMembersMap[Keys::STRUCT] =
+        SMember(CObjectSchemaItem::create(structMembersMap), false);
 
     // Create fake param that has breaking history changes
-    std::vector<CObjectSchemaItem::SMember> fake_param_history_vector;
+    std::vector<SMember> fake_param_history_vector;
 
     std::shared_ptr<ISchemaItem> fake_param_SchemaItem =
         CArraySchemaItem::create(
@@ -156,22 +166,21 @@ class ObjectSchemaItemTest : public ::testing::Test {
             TSchemaItemParameter<size_t>(1),
             TSchemaItemParameter<size_t>(100));
 
-    fake_param_history_vector.push_back(CObjectSchemaItem::SMember(
+    fake_param_history_vector.push_back(SMember(
         fake_param_history_v1_SchemaItem, true, "", "4.5.0", false, false));
-    schemaMembersMap["fakeParam"] =
-        CObjectSchemaItem::SMember(fake_param_SchemaItem,
-                                   false,
-                                   "4.5.0",
-                                   "",
-                                   false,
-                                   false,
-                                   fake_param_history_vector);
-
-    CObjectSchemaItem::Members rootMembersMap;
-    rootMembersMap[S_PARAMS] = CObjectSchemaItem::SMember(
-        CObjectSchemaItem::create(paramsMembersMap), true);
-    rootMembersMap[S_MSG_PARAMS] = CObjectSchemaItem::SMember(
-        CObjectSchemaItem::create(schemaMembersMap), true);
+    schemaMembersMap["fakeParam"] = SMember(fake_param_SchemaItem,
+                                            false,
+                                            "4.5.0",
+                                            "",
+                                            false,
+                                            false,
+                                            fake_param_history_vector);
+
+    Members rootMembersMap;
+    rootMembersMap[S_PARAMS] =
+        SMember(CObjectSchemaItem::create(paramsMembersMap), true);
+    rootMembersMap[S_MSG_PARAMS] =
+        SMember(CObjectSchemaItem::create(schemaMembersMap), true);
 
     schema_item = CObjectSchemaItem::create(rootMembersMap);
   }
@@ -251,22 +260,22 @@ TEST_F(ObjectSchemaItemTest, validation_invalid_param) {
   obj[S_MSG_PARAMS][Keys::SUCCESS] = 0xABC;
 
   report = rpc::ValidationReport("RPC");
-  EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report));
+  EXPECT_EQ(errors::OUT_OF_RANGE, schema_item->validate(obj, &report));
   EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
 
   obj[S_PARAMS][S_FUNCTION_ID] = 1;
   report = rpc::ValidationReport("RPC");
-  EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report));
+  EXPECT_EQ(errors::OUT_OF_RANGE, schema_item->validate(obj, &report));
   EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
 
   obj[S_PARAMS][S_CORRELATION_ID] = -0xFF1;
   report = rpc::ValidationReport("RPC");
-  EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report));
+  EXPECT_EQ(errors::OUT_OF_RANGE, schema_item->validate(obj, &report));
   EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
 
   obj[S_PARAMS][S_PROTOCOL_VERSION] = 2;
   report = rpc::ValidationReport("RPC");
-  EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report));
+  EXPECT_EQ(errors::OUT_OF_RANGE, schema_item->validate(obj, &report));
   EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
 
   obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 1;
@@ -433,7 +442,7 @@ TEST_F(ObjectSchemaItemTest, validation_unexpected_param_remove) {
   EXPECT_FALSE(obj[S_MSG_PARAMS].keyExists(fake3));
   // Invalide state after enum convertion
   report = rpc::ValidationReport("RPC");
-  EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report));
+  EXPECT_EQ(errors::OUT_OF_RANGE, schema_item->validate(obj, &report));
   EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
 }
 
@@ -460,7 +469,7 @@ TEST_F(ObjectSchemaItemTest, validation_empty_params) {
   schema_item->unapplySchema(obj);
   // Invalide state after enum convertion
   report = rpc::ValidationReport("RPC");
-  EXPECT_EQ(errors::INVALID_VALUE, schema_item->validate(obj, &report));
+  EXPECT_EQ(errors::OUT_OF_RANGE, schema_item->validate(obj, &report));
   EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
 }
 
@@ -523,6 +532,97 @@ TEST_F(ObjectSchemaItemTest, test_strings_to_enum_conversion) {
   }
 }
 
+TEST_F(ObjectSchemaItemTest, filter_unknown_enums_non_mandatory_param) {
+  SmartObject obj;
+  obj[S_PARAMS][S_FUNCTION_ID] = 1;
+  obj[S_PARAMS][S_CORRELATION_ID] = 0xFF;
+  obj[S_PARAMS][S_PROTOCOL_VERSION] = 2;
+  obj[S_MSG_PARAMS][Keys::RESULT_CODE] = "FUTURE";
+  obj[S_MSG_PARAMS][Keys::INFO] = "0123456789";
+
+  schema_item->applySchema(obj, false);
+  rpc::ValidationReport report("RPC");
+  EXPECT_FALSE(
+      schema_item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  // The unknown enum value was filtered. Validation should pass in this case.
+  EXPECT_FALSE(obj[S_MSG_PARAMS].keyExists(Keys::RESULT_CODE));
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OK, schema_item->validate(obj, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(ObjectSchemaItemTest, filter_unknown_enums_mandatory) {
+  SmartObject obj;
+  obj[S_PARAMS][S_FUNCTION_ID] = "FUTURE";
+  obj[S_PARAMS][S_CORRELATION_ID] = 0xFF;
+  obj[S_PARAMS][S_PROTOCOL_VERSION] = 2;
+  obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 2;
+  obj[S_MSG_PARAMS][Keys::INFO] = "0123456789";
+
+  schema_item->applySchema(obj, false);
+  rpc::ValidationReport report("RPC");
+  EXPECT_TRUE(
+      schema_item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  EXPECT_FALSE(obj[S_PARAMS].keyExists(S_FUNCTION_ID));
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::MISSING_MANDATORY_PARAMETER,
+            schema_item->validate(obj, &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(ObjectSchemaItemTest, filter_unknown_enums_non_mandatory_subparam) {
+  SmartObject obj;
+  obj[S_PARAMS][S_FUNCTION_ID] = 1;
+  obj[S_PARAMS][S_CORRELATION_ID] = 0xFF;
+  obj[S_PARAMS][S_PROTOCOL_VERSION] = 2;
+  obj[S_MSG_PARAMS][Keys::STRUCT][Keys::OPTIONAL_PARAM] = "FUTURE";
+  obj[S_MSG_PARAMS][Keys::STRUCT][Keys::MANDATORY_PARAM] = 1;
+  obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 2;
+  obj[S_MSG_PARAMS][Keys::INFO] = "0123456789";
+
+  schema_item->applySchema(obj, false);
+  rpc::ValidationReport report("RPC");
+  EXPECT_FALSE(
+      schema_item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  // The unknown enum value was filtered.
+  // Validation should pass in this case.
+  ASSERT_TRUE(obj[S_MSG_PARAMS].keyExists(Keys::STRUCT));
+  EXPECT_FALSE(obj[S_MSG_PARAMS][Keys::STRUCT].keyExists(Keys::OPTIONAL_PARAM));
+  EXPECT_TRUE(obj[S_MSG_PARAMS][Keys::STRUCT].keyExists(Keys::MANDATORY_PARAM));
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OK, schema_item->validate(obj, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
+TEST_F(ObjectSchemaItemTest, filter_unknown_enums_mandatory_subparam) {
+  SmartObject obj;
+  obj[S_PARAMS][S_FUNCTION_ID] = 1;
+  obj[S_PARAMS][S_CORRELATION_ID] = 0xFF;
+  obj[S_PARAMS][S_PROTOCOL_VERSION] = 2;
+  obj[S_MSG_PARAMS][Keys::STRUCT][Keys::MANDATORY_PARAM] = "FUTURE";
+  obj[S_MSG_PARAMS][Keys::RESULT_CODE] = 2;
+  obj[S_MSG_PARAMS][Keys::INFO] = "0123456789";
+
+  schema_item->applySchema(obj, false);
+  rpc::ValidationReport report("RPC");
+  EXPECT_FALSE(
+      schema_item->filterInvalidEnums(obj, utils::SemanticVersion(), &report));
+  EXPECT_NE(std::string(""), rpc::PrettyFormat(report));
+
+  // The struct containing the unknown enum value was filtered.
+  // Validation should pass in this case.
+  EXPECT_FALSE(obj[S_MSG_PARAMS].keyExists(Keys::STRUCT));
+  report = rpc::ValidationReport("RPC");
+  EXPECT_EQ(errors::OK, schema_item->validate(obj, &report));
+  EXPECT_EQ(std::string(""), rpc::PrettyFormat(report));
+}
+
 }  // namespace smart_object_test
 }  // namespace components
 }  // namespace test
@@ -531,20 +631,20 @@ namespace ns_smart_device_link {
 namespace ns_smart_objects {
 
 namespace FunctionID = test::components::smart_object_test::FunctionID;
-typedef EnumConversionHelper<FunctionID::eType> FunctionConvertor;
+typedef EnumConversionHelper<FunctionID::eType> FunctionConverter;
 
 template <>
-const FunctionConvertor::EnumToCStringMap
-    FunctionConvertor::enum_to_cstring_map_ =
-        FunctionConvertor::InitEnumToCStringMap();
+const FunctionConverter::EnumToCStringMap
+    FunctionConverter::enum_to_cstring_map_ =
+        FunctionConverter::InitEnumToCStringMap();
 
 template <>
-const FunctionConvertor::CStringToEnumMap
-    FunctionConvertor::cstring_to_enum_map_ =
-        FunctionConvertor::InitCStringToEnumMap();
+const FunctionConverter::CStringToEnumMap
+    FunctionConverter::cstring_to_enum_map_ =
+        FunctionConverter::InitCStringToEnumMap();
 
 template <>
-const char* const FunctionConvertor::cstring_values_[] = {"Function0",
+const char* const FunctionConverter::cstring_values_[] = {"Function0",
                                                           "Function1",
                                                           "Function2",
                                                           "Function3",
@@ -553,7 +653,7 @@ const char* const FunctionConvertor::cstring_values_[] = {"Function0",
                                                           "Function6"};
 
 template <>
-const FunctionID::eType FunctionConvertor::enum_values_[] = {
+const FunctionID::eType FunctionConverter::enum_values_[] = {
     FunctionID::Function0,
     FunctionID::Function1,
     FunctionID::Function2,
@@ -565,20 +665,20 @@ const FunctionID::eType FunctionConvertor::enum_values_[] = {
 // ----------------------------------------------------------------------------
 
 namespace ResultType = test::components::smart_object_test::ResultType;
-typedef EnumConversionHelper<ResultType::eType> ResultTypeConvertor;
+typedef EnumConversionHelper<ResultType::eType> ResultTypeConverter;
 
 template <>
-const ResultTypeConvertor::EnumToCStringMap
-    ResultTypeConvertor::enum_to_cstring_map_ =
-        ResultTypeConvertor::InitEnumToCStringMap();
+const ResultTypeConverter::EnumToCStringMap
+    ResultTypeConverter::enum_to_cstring_map_ =
+        ResultTypeConverter::InitEnumToCStringMap();
 
 template <>
-const ResultTypeConvertor::CStringToEnumMap
-    ResultTypeConvertor::cstring_to_enum_map_ =
-        ResultTypeConvertor::InitCStringToEnumMap();
+const ResultTypeConverter::CStringToEnumMap
+    ResultTypeConverter::cstring_to_enum_map_ =
+        ResultTypeConverter::InitCStringToEnumMap();
 
 template <>
-const char* const ResultTypeConvertor::cstring_values_[] = {
+const char* const ResultTypeConverter::cstring_values_[] = {
     "APPLICATION_NOT_REGISTERED",
     "SUCCESS",
     "TOO_MANY_PENDING_REQUESTS",
@@ -591,7 +691,7 @@ const char* const ResultTypeConvertor::cstring_values_[] = {
     "DISALLOWED"};
 
 template <>
-const ResultType::eType ResultTypeConvertor::enum_values_[] = {
+const ResultType::eType ResultTypeConverter::enum_values_[] = {
     ResultType::APPLICATION_NOT_REGISTERED,
     ResultType::SUCCESS,
     ResultType::TOO_MANY_PENDING_REQUESTS,
diff --git a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc
index edcb09c604..555239c489 100644
--- a/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc
+++ b/src/components/smart_objects/test/SmartObjectConvertionTime_test.cc
@@ -252,21 +252,20 @@ class SmartObjectConvertionTimeTest : public ::testing::Test {
         TEnumSchemaItem<MessageTypeTest::eType>::create(
             messageType_allowedEnumSubsetValues);
 
-    CObjectSchemaItem::Members paramsMembersMap;
+    Members paramsMembersMap;
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] =
-            CObjectSchemaItem::SMember(functionId_SchemaItem, true);
+            SMember(functionId_SchemaItem, true);
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] =
-            CObjectSchemaItem::SMember(messageType_SchemaItem, true);
+            SMember(messageType_SchemaItem, true);
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] =
-            CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+            SMember(TNumberSchemaItem<int>::create(), true);
 
-    std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap;
+    std::map<std::string, SMember> rootMembersMap;
     rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] =
-        CObjectSchemaItem::SMember(CObjectSchemaItem::create(paramsMembersMap),
-                                   true);
+        SMember(CObjectSchemaItem::create(paramsMembersMap), true);
 
     return CSmartSchema(CObjectSchemaItem::create(rootMembersMap));
   }
@@ -318,51 +317,43 @@ class SmartObjectConvertionTimeTest : public ::testing::Test {
                                        TSchemaItemParameter<int>(2000000000),
                                        TSchemaItemParameter<int>());
 
-    std::map<std::string, CObjectSchemaItem::SMember> schemaMembersMap;
+    std::map<std::string, SMember> schemaMembersMap;
 
-    schemaMembersMap["success"] =
-        CObjectSchemaItem::SMember(success_SchemaItem, true);
-    schemaMembersMap["resultCode"] =
-        CObjectSchemaItem::SMember(resultCode_SchemaItem, true);
-    schemaMembersMap["info"] =
-        CObjectSchemaItem::SMember(info_SchemaItem, false);
-    schemaMembersMap["tryAgainTime"] =
-        CObjectSchemaItem::SMember(tryAgainTime_SchemaItem, true);
+    schemaMembersMap["success"] = SMember(success_SchemaItem, true);
+    schemaMembersMap["resultCode"] = SMember(resultCode_SchemaItem, true);
+    schemaMembersMap["info"] = SMember(info_SchemaItem, false);
+    schemaMembersMap["tryAgainTime"] = SMember(tryAgainTime_SchemaItem, true);
 
-    std::map<std::string, CObjectSchemaItem::SMember> paramsMembersMap;
+    std::map<std::string, SMember> paramsMembersMap;
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] =
-            CObjectSchemaItem::SMember(
-                TEnumSchemaItem<FunctionIdTest::eType>::create(
-                    functionId_allowedEnumSubsetValues),
-                true);
+            SMember(TEnumSchemaItem<FunctionIdTest::eType>::create(
+                        functionId_allowedEnumSubsetValues),
+                    true);
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] =
-            CObjectSchemaItem::SMember(
-                TEnumSchemaItem<MessageTypeTest::eType>::create(
-                    messageType_allowedEnumSubsetValues),
-                true);
+            SMember(TEnumSchemaItem<MessageTypeTest::eType>::create(
+                        messageType_allowedEnumSubsetValues),
+                    true);
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] =
-            CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+            SMember(TNumberSchemaItem<int>::create(), true);
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] =
-            CObjectSchemaItem::SMember(
+            SMember(
                 TNumberSchemaItem<int>::create(TSchemaItemParameter<int>(1),
                                                TSchemaItemParameter<int>(2)),
                 true);
     paramsMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] =
-            CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+            SMember(TNumberSchemaItem<int>::create(), true);
 
-    std::map<std::string, CObjectSchemaItem::SMember> rootMembersMap;
+    std::map<std::string, SMember> rootMembersMap;
     rootMembersMap
         [ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] =
-            CObjectSchemaItem::SMember(
-                CObjectSchemaItem::create(schemaMembersMap), true);
+            SMember(CObjectSchemaItem::create(schemaMembersMap), true);
     rootMembersMap[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] =
-        CObjectSchemaItem::SMember(CObjectSchemaItem::create(paramsMembersMap),
-                                   true);
+        SMember(CObjectSchemaItem::create(paramsMembersMap), true);
     return CSmartSchema(CObjectSchemaItem::create(rootMembersMap));
   }
 };
diff --git a/src/components/smart_objects/test/SmartObjectUnit_test.cc b/src/components/smart_objects/test/SmartObjectUnit_test.cc
index 2c03d8a329..4a2fadfbe9 100644
--- a/src/components/smart_objects/test/SmartObjectUnit_test.cc
+++ b/src/components/smart_objects/test/SmartObjectUnit_test.cc
@@ -31,6 +31,7 @@
  */
 
 #include "gmock/gmock.h"
+#define final  // Disable error: cannot derive from ‘final’ base
 #include "smart_objects/smart_object.h"
 
 namespace test {
@@ -42,7 +43,7 @@ using namespace ns_smart_device_link::ns_smart_objects;
 class TestHelper : public ::testing::Test {
  protected:
   void makeMapObject(SmartObject& obj, const int size) const {
-    char i_key[8], j_key[8], k_key[8], value[8];
+    char i_key[32], j_key[32], k_key[32], value[32];
 
     for (int i = 0; i < size; i++)
       for (int j = 0; j < size; j++)
@@ -56,7 +57,7 @@ class TestHelper : public ::testing::Test {
   }
 
   void checkMapObject(SmartObject& obj, const int size) const {
-    char i_key[8], j_key[8], k_key[8], value[8];
+    char i_key[32], j_key[32], k_key[32], value[32];
 
     for (int i = 0; i < size; i++)
       for (int j = 0; j < size; j++)
@@ -585,6 +586,29 @@ TEST(MapEraseTest, SmartObjectTest) {
 }
 // TODO: Add a test to check accessing an array at strange indexes.
 
+TEST(DoubleCleanupDataTest, SmartObjectTest) {
+  class DerivedSmartObject : public SmartObject {
+   public:
+    DerivedSmartObject(SmartType Type) : SmartObject(Type) {}
+    using SmartObject::operator=;
+    void cleanup_data() {
+      SmartObject::cleanup_data();
+    }
+  };
+
+  DerivedSmartObject obj(SmartType_String);
+  ASSERT_EQ(SmartType_String, obj.getType());
+
+  obj = "test string_value";
+  ASSERT_EQ(std::string("test string_value"), obj.asString());
+
+  obj.cleanup_data();
+  ASSERT_EQ(std::string(""), obj.asCharArray());
+
+  obj.cleanup_data();
+  ASSERT_EQ(std::string(""), obj.asCharArray());
+}
+
 }  // namespace smart_object_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt
index 093413ef3b..3e8b2a9741 100644
--- a/src/components/telemetry_monitor/CMakeLists.txt
+++ b/src/components/telemetry_monitor/CMakeLists.txt
@@ -47,6 +47,7 @@ include_directories (
   ${COMPONENTS_DIR}/media_manager/include/
   ${COMPONENTS_DIR}/smart_objects/include/
   ${COMPONENTS_DIR}/config_profile/include/
+  ${COMPONENTS_DIR}/resumption/include
   ${JSONCPP_INCLUDE_DIRECTORY}
   ${CMAKE_BINARY_DIR}/src/components/
   ${LOG4CXX_INCLUDE_DIRECTORY}
@@ -63,7 +64,7 @@ set(LIBRARIES
   HMI_API
   MOBILE_API
   Utils
-  Policy
+  PolicyStatic
 )
 
 add_library("TelemetryMonitor" ${SOURCES})
diff --git a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc
index 90c5ffb87e..9bf4ec494b 100644
--- a/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc
+++ b/src/components/telemetry_monitor/src/application_manager_metric_wrapper.cc
@@ -45,10 +45,10 @@ Json::Value ApplicationManagerMetricWrapper::GetJsonMetric() {
   result[strings::end] = Json::Int64(date_time::getuSecs(message_metric->end));
   const ns_smart_device_link::ns_smart_objects::SmartObject& params =
       message_metric->message->getElement(application_manager::strings::params);
-  result[strings::correlation_id] = utils::ConvertInt64ToLongLongInt(
-      params[application_manager::strings::correlation_id].asInt());
-  result[strings::connection_key] = utils::ConvertInt64ToLongLongInt(
-      params[application_manager::strings::connection_key].asInt());
+  result[strings::correlation_id] =
+      params[application_manager::strings::correlation_id].asInt();
+  result[strings::connection_key] =
+      params[application_manager::strings::connection_key].asInt();
   return result;
 }
 }  // namespace telemetry_monitor
diff --git a/src/components/telemetry_monitor/src/metric_wrapper.cc b/src/components/telemetry_monitor/src/metric_wrapper.cc
index 8b2ba6f220..fdcd8f6a9c 100644
--- a/src/components/telemetry_monitor/src/metric_wrapper.cc
+++ b/src/components/telemetry_monitor/src/metric_wrapper.cc
@@ -54,9 +54,9 @@ std::string MetricWrapper::GetStyledString() {
 Json::Value MetricWrapper::GetJsonMetric() {
   Json::Value result;
   if (resources) {
-    result[strings::stime] = resources->stime;
-    result[strings::utime] = resources->utime;
-    result[strings::memory] = resources->memory;
+    result[strings::stime] = static_cast<Json::Int64>(resources->stime);
+    result[strings::utime] = static_cast<Json::Int64>(resources->utime);
+    result[strings::memory] = static_cast<Json::Int64>(resources->memory);
   }
   return result;
 }
diff --git a/src/components/telemetry_monitor/src/telemetry_monitor.cc b/src/components/telemetry_monitor/src/telemetry_monitor.cc
index e2f45b7576..f6cac49f59 100644
--- a/src/components/telemetry_monitor/src/telemetry_monitor.cc
+++ b/src/components/telemetry_monitor/src/telemetry_monitor.cc
@@ -107,6 +107,9 @@ void TelemetryMonitor::Stop() {
   if (thread_) {
     thread_->stop();
     thread_->join();
+    if (thread_->delegate()) {
+      streamer_.reset();
+    }
     threads::DeleteThread(thread_);
   }
   thread_ = NULL;
diff --git a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
index 57834339d6..c0501ac45e 100644
--- a/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
+++ b/src/components/telemetry_monitor/test/transport_manager_observer_test.cc
@@ -47,7 +47,7 @@ TEST(TransportManagerObserverTest, MessageProcess) {
   MockTelemetryMonitor mock_telemetry_monitor;
   TransportManagerObserver tr_observer(&mock_telemetry_monitor);
   protocol_handler::RawMessage* ptr =
-      new ::protocol_handler::RawMessage(0, 0, NULL, 0);
+      new ::protocol_handler::RawMessage(0, 0, NULL, 0, false);
   tr_observer.StartRawMsg(ptr);
   EXPECT_CALL(mock_telemetry_monitor, SendMetric(_));
   tr_observer.StopRawMsg(ptr);
diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt
index 11986ee9fa..82cc00baf2 100644
--- a/src/components/transport_manager/CMakeLists.txt
+++ b/src/components/transport_manager/CMakeLists.txt
@@ -106,8 +106,20 @@ else()
   )
 endif()
 
-if(NOT BUILD_TESTS)
-  list (APPEND EXCLUDE_PATH
+if(NOT BUILD_WEBSOCKET_SERVER_SUPPORT)
+  list(APPEND EXCLUDE_PATHS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/websocket_server
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/websocket_server
+  )
+elseif(NOT ENABLE_SECURITY)
+  list(APPEND EXCLUDE_PATHS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/transport_manager/websocket_server/websocket_secure_session.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/websocket_server/websocket_secure_session.cc
+  )
+endif()
+
+if(NOT ENABLE_IAP2EMULATION)
+  list (APPEND EXCLUDE_PATHS
     ${CMAKE_CURRENT_SOURCE_DIR}/include/iap2_emulation/iap2_transport_adapter.h
     ${CMAKE_CURRENT_SOURCE_DIR}/src/iap2_emulation/iap2_transport_adapter.cc
   )
diff --git a/src/components/transport_manager/docs/SDL.SDD.WebEngineSupport.dox b/src/components/transport_manager/docs/SDL.SDD.WebEngineSupport.dox
new file mode 100644
index 0000000000..77ab46e247
--- /dev/null
+++ b/src/components/transport_manager/docs/SDL.SDD.WebEngineSupport.dox
@@ -0,0 +1,127 @@
+/**
+\page web_engine_support Web Engine Support Detailed Design
+## Table of contents
+- \subpage wes_intoduction
+  + \ref wes_rationale                "1.1 Rationale"
+  + \ref wes_scope                    "1.2 Scope"
+- \subpage wes_detail_design
+  + \ref wes_design_solutions         "2.1 Design solutions"
+  + \ref wes_class_structure          "2.2 Class Structure"
+  + \ref wes_sequence_diagram         "2.3 Sequence diagram"
+- \subpage wes_data_structures
+  + \ref wes_data_structure        "3.1 Data structures"
+- \subpage wes_references_and_history
+  + \ref wes_history                  "4.1 References"
+*/
+//-----------------------------------------------------------
+/**
+\page wes_intoduction 1 Introduction
+The document is intended to support software developers, 
+maintenance and integration engineers with sufficient,
+detailed information concerning the design, development and
+deployment concepts, to accomplish their respective tasks without reliance on the authors.
+
+\anchor wes_rationale
+## 1.1 Rationale
+Boost asio libraries were utilized to enable websocket server connection for web engine.
+To split responsibilities, the following entities were introduces to enable server connections:
+- WebSocketListener
+- WebSocketConnection
+- WebSocketSession
+- WebSocketSecureSession
+
+
+\anchor wes_scope
+## 1.2 Scope
+All aforementioned entities are part of transport_manager namespace
+
+*/
+//-----------------------------------------------------------
+/**
+\page wes_detail_design 2 Component detail design
+\anchor wes_design_solutions
+### 2.1 Design solutions
+
+- WebSocket server was implemented using several layers (e.g. WebSocketConnection, WebSocketSession, WebSocketSecureSession).
+- Utilizing boost::asio library to host a websocket server and establish websocket connections
+- Utilizing asynchronous programming to make all server calls nonblocking 
+- CRTP and template specialization to facilitate code reuse.
+
+
+
+#### Design description
+transport_manager::WebSocketListener is an entity that is responsible for creating and listening for connections.
+It includes creating boost library objects to establish a connection, deducing security parameters during its initialization,
+opening a port and accepting new connections.
+The following parameters are used to configure security connection: 
+- WSServerCertificatePath (path to websocket server certificate)
+- WSServerKeyPath (path to websocket server private key path)
+- WSServerCACertificatePath (path to CA certificate)
+
+SDL will run in WSS mode only if ALL these parameters are present and have valid values.
+To run SDL as a WS server, one should remove ALL these parameters from smartDeviceLink.ini file (including parameter KEY and VALUE).
+All other cases of parameter configuration (e.g. two of three params are set) are considered to be misconfiguration,
+and SDL will launch with no websocket server transport. 
+
+transport_manager::WebSocketConnection is a class that is used as an additional layer between WebSocketListener and WebSocketSession,
+with ability to hadle input/output errors.
+
+transport_manager::WebSocketSession is a class that represents the lowest layer of abstraction in regards of WS server connection. It is used to read
+data from socket to buffer and notifying its observers about connection events.
+
+transport_manager::WebSocketSecureSession is a class that inherits WebSocketSession with an additional role of supporting TLS handshake.
+
+\anchor wes_class_structure
+### 2.2 Class Structure
+The following UML class diagram shows the component structure:
+![Web Engine Support class diagram](WES_classes.png)
+For more information about class diagram follow:
+- http://www.uml-diagrams.org/class-diagrams-overview.htqml
+- https://sourcemaking.com/uml/modeling-it-systems/structural-view/class-diagram
+
+\anchor wes_sequence_diagram
+### 2.3 Sequence diagram
+The following UML sequence diagram shows the component dynamic behavior.
+For more information about sequence diagram follow:
+- http://www.uml-diagrams.org/sequence-diagrams.html
+- https://sourcemaking.com/uml/modeling-it-systems/external-view/use-case-sequence-diagram
+
+Establishing WebSocket connection:
+![WES Basic flow](WES_sequence.png)
+*/
+
+//-----------------------------------------------------------
+/**
+\page wes_data_structures 3 Component data and resources
+\anchor wes_data_structure
+### 3.1 Element Data Structure
+The following data types are used by WebSocketListener:
+ - transport_manager::TransportAdapterController
+ - boost::asio::io_context
+ - boost::ssl::context 
+ - boost::asio::tcp::acceptor
+ - boost::asio::tcp::socket
+ - boost::asio::thread_pool
+ - WebSocketConnection
+ - transport_manager::TransportManagerSettings
+
+//-----------------------------------------------------------
+/**
+\page wes_references_and_history 4 References and history
+\anchor wes_history
+### 4.1 Document history
+Document change history
+
+| Version     | Date       | Author/Editor                          | Change description  |
+|-------------|------------|----------------------------------------|---------------------|
+| 0.1         | 02/03/2020 | [MKed](https://github.com/mked-luxoft) | Initial version from the previous [SDL SDD](https://adc.luxoft.com/confluence/pages/viewpage.action?pageId=279677125) |
+
+Document approve history
+
+| Version     | Date       | Author/Editor               | Change description  |
+|-------------|------------|-----------------------------|---------------------|
+| | | | |
+
+For more precise document change history follow github history -
+- https://github.com/smartdevicelink/sdl_core/commits/develop/src/components/transport_manager/docs/SDL.SDD.WebEngineSupport.dox
+*/
\ No newline at end of file
diff --git a/src/components/transport_manager/docs/assets/WES_classes.png b/src/components/transport_manager/docs/assets/WES_classes.png
new file mode 100644
index 0000000000..bbb19b8f02
--- /dev/null
+++ b/src/components/transport_manager/docs/assets/WES_classes.png
diff --git a/src/components/transport_manager/docs/assets/WES_sequence.png b/src/components/transport_manager/docs/assets/WES_sequence.png
new file mode 100644
index 0000000000..61aa5e35fb
--- /dev/null
+++ b/src/components/transport_manager/docs/assets/WES_sequence.png
diff --git a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h
index c4bd02d64b..14f954286f 100644
--- a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_transport_adapter.h
@@ -49,7 +49,11 @@ class BluetoothTransportAdapter : public TransportAdapterImpl {
   /**
    * @brief Constructor.
    */
-  BluetoothTransportAdapter(resumption::LastState& last_state,
+  BluetoothTransportAdapter(resumption::LastStateWrapperPtr last_state_wrapper,
+                            const TransportManagerSettings& settings);
+
+  DEPRECATED
+  BluetoothTransportAdapter(resumption::LastState&,
                             const TransportManagerSettings& settings);
 
   /**
diff --git a/src/components/transport_manager/include/transport_manager/cloud/cloud_device.h b/src/components/transport_manager/include/transport_manager/cloud/cloud_device.h
index 9c25be2a3e..15d23bba7f 100644
--- a/src/components/transport_manager/include/transport_manager/cloud/cloud_device.h
+++ b/src/components/transport_manager/include/transport_manager/cloud/cloud_device.h
@@ -55,7 +55,7 @@ class CloudDevice : public Device {
  public:
   CloudDevice(std::string& host, std::string& port, std::string& name);
 
-  CloudDevice(CloudAppEndpoint endpoint, std::string& name);
+  CloudDevice(CloudAppEndpoint& endpoint, std::string& name);
 
   virtual const std::string& GetHost() const;
 
diff --git a/src/components/transport_manager/include/transport_manager/cloud/cloud_websocket_transport_adapter.h b/src/components/transport_manager/include/transport_manager/cloud/cloud_websocket_transport_adapter.h
index 138f9ca895..c8b2cc9508 100644
--- a/src/components/transport_manager/include/transport_manager/cloud/cloud_websocket_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/cloud/cloud_websocket_transport_adapter.h
@@ -50,7 +50,7 @@ class CloudWebsocketTransportAdapter : public TransportAdapterImpl {
    * @brief Constructor.
    */
   explicit CloudWebsocketTransportAdapter(
-      resumption::LastState& last_state,
+      resumption::LastStateWrapperPtr last_state_wrapper,
       const TransportManagerSettings& settings);
 
   /**
diff --git a/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h b/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h
index a802a64afa..3dabfb39ca 100644
--- a/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/iap2_emulation/iap2_transport_adapter.h
@@ -33,7 +33,7 @@
 #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_IAP2_EMULATION_IAP2_TRANSPORT_ADAPTER_H_
 #define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_IAP2_EMULATION_IAP2_TRANSPORT_ADAPTER_H_
 
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 #include "transport_manager/tcp/tcp_transport_adapter.h"
 #include "transport_manager/transport_manager_settings.h"
 #include "utils/macro.h"
@@ -60,9 +60,14 @@ class IAP2BluetoothEmulationTransportAdapter : public TcpTransportAdapter {
    */
   IAP2BluetoothEmulationTransportAdapter(
       const uint16_t port,
-      resumption::LastState& last_state,
+      resumption::LastStateWrapperPtr last_state_wrapper,
       const TransportManagerSettings& settings);
 
+  DEPRECATED
+  IAP2BluetoothEmulationTransportAdapter(
+      const uint16_t port,
+      resumption::LastState& last_state_wrapper,
+      const TransportManagerSettings& settings);
   /**
    * @brief DeviceSwitched is called during switching from iAP2 Bluetooth to
    * iAP2 USB transport.
@@ -103,9 +108,16 @@ class IAP2USBEmulationTransportAdapter : public TcpTransportAdapter {
    * @param last_state LastState instance reference
    * @param settings Settings reference
    */
+  IAP2USBEmulationTransportAdapter(
+      const uint16_t port,
+      resumption::LastStateWrapperPtr last_state_wrapper,
+      const TransportManagerSettings& settings);
+
+  DEPRECATED
   IAP2USBEmulationTransportAdapter(const uint16_t port,
-                                   resumption::LastState& last_state,
-                                   const TransportManagerSettings& settings);
+                                   resumption::LastState&,
+                                   const TransportManagerSettings& settings) =
+      delete;
 
   /**
    * Destructor
diff --git a/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h b/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h
index bb60b09a9d..4a78af4eb1 100644
--- a/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h
+++ b/src/components/transport_manager/include/transport_manager/tcp/platform_specific/linux/platform_specific_network_interface_listener_impl.h
@@ -32,24 +32,32 @@ class InterfaceStatus {
 
   bool IsAvailable() const;
   bool IsLoopback() const;
+  const std::string& GetName() const {
+    return name_;
+  }
   // only for debugging output
   unsigned int GetFlags() const {
     return flags_;
   }
 
   bool HasIPAddress() const;
-  std::string GetIPv4Address() const;
-  std::string GetIPv6Address() const;
+  const std::string GetIPv4Address() const;
+  const std::string GetIPv6Address() const;
+
+  void SetName(const std::string& name) {
+    name_ = name;
+  }
 
   void SetFlags(unsigned int flags) {
     flags_ = flags;
   }
 
   // specify NULL to remove existing address
-  void SetIPv4Address(struct in_addr* addr);
-  void SetIPv6Address(struct in6_addr* addr);
+  void SetIPv4Address(const struct in_addr* addr);
+  void SetIPv6Address(const struct in6_addr* addr);
 
  private:
+  std::string name_;
   unsigned int flags_;
   bool has_ipv4_;
   bool has_ipv6_;
@@ -57,7 +65,11 @@ class InterfaceStatus {
   struct in6_addr ipv6_address_;
 };
 
-typedef std::map<std::string, InterfaceStatus> InterfaceStatusTable;
+/**
+ * @brief A map to store various status (IP addresses, status flags, etc.) of
+ *        network interfaces. Keys of the map are index numbers of interfaces.
+ */
+typedef std::map<unsigned int, InterfaceStatus> InterfaceStatusTable;
 
 /**
  * @brief Listener to detect various events on network interfaces
@@ -126,6 +138,12 @@ class PlatformSpecificNetworkInterfaceListener
   const std::string& GetSelectedInterfaceName() const {
     return selected_interface_;
   }
+
+  // for testing only: overwrites if_indextoname() by registering a dummy
+  // index-to-name mapping table
+  void SetDummyNameMap(const std::map<unsigned int, std::string>& m) {
+    dummy_name_map_ = m;
+  }
 #endif  // BUILD_TESTS
 
  private:
@@ -140,6 +158,17 @@ class PlatformSpecificNetworkInterfaceListener
         : if_index(interface_index), flags(interface_flags), address() {}
   };
 
+  // use with std::find_if() to search for an entry containing specified
+  // interface name
+  struct NamePredicate {
+    NamePredicate(const std::string& name) : name_(name) {}
+    bool operator()(
+        const std::pair<unsigned int, InterfaceStatus>& entry) const {
+      return entry.second.GetName() == name_;
+    }
+    const std::string& name_;
+  };
+
   // parent class which we will notify the events to
   TcpClientListener* tcp_client_listener_;
   // if configured, NetworkInterfaceListener will always look into the IP
@@ -160,6 +189,7 @@ class PlatformSpecificNetworkInterfaceListener
 
 #ifdef BUILD_TESTS
   bool testing_;
+  std::map<unsigned int, std::string> dummy_name_map_;
 #endif
 
   void Loop();
@@ -178,6 +208,8 @@ class PlatformSpecificNetworkInterfaceListener
   // convert ifaddrmsg to a list of EventParam structs
   std::vector<EventParam> ParseIFAddrMessage(struct ifaddrmsg* message,
                                              unsigned int size);
+  // return network interface name of the specified index
+  const std::string GetInterfaceName(unsigned int if_index) const;
   // for debugging
   void DumpTable() const;
 
diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h
index 28784fe3c7..9eea8389e6 100644
--- a/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h
+++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_client_listener.h
@@ -108,6 +108,10 @@ class TcpClientListener : public ClientConnectionListener {
    */
   virtual TransportAdapter::Error StopListening();
 
+  TransportAdapter::Error SuspendListening() OVERRIDE;
+
+  TransportAdapter::Error ResumeListening() OVERRIDE;
+
   /**
    * @brief Called from NetworkInterfaceListener when IP address of the network
    *        interface is changed.
@@ -146,6 +150,7 @@ class TcpClientListener : public ClientConnectionListener {
   threads::Thread* thread_;
   int socket_;
   bool thread_stop_requested_;
+  bool remove_devices_on_terminate_;
   int pipe_fds_[2];
   NetworkInterfaceListener* interface_listener_;
   const std::string designated_interface_;
diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h
index 6e7a306879..5b746662f1 100644
--- a/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h
+++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_device.h
@@ -66,7 +66,7 @@ class TcpDevice : public Device {
    **/
   TcpDevice(const in_addr_t& in_addr, const std::string& name);
 
-#if defined(BUILD_TESTS)
+#if defined(ENABLE_IAP2EMULATION)
   /**
    * @brief TcpDevice
    * @param in_addr IP address of device
diff --git a/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h b/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h
index 37f5a7fe49..c5948062c9 100644
--- a/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/tcp/tcp_transport_adapter.h
@@ -49,9 +49,14 @@ class TcpTransportAdapter : public TransportAdapterImpl {
   /**
    * @brief Constructor.
    */
-  explicit TcpTransportAdapter(uint16_t port,
-                               resumption::LastState& last_state,
-                               const TransportManagerSettings& settings);
+  TcpTransportAdapter(uint16_t port,
+                      resumption::LastStateWrapperPtr last_state_wrapper,
+                      const TransportManagerSettings& settings);
+
+  DEPRECATED
+  TcpTransportAdapter(uint16_t port,
+                      resumption::LastState&,
+                      const TransportManagerSettings& settings) = delete;
 
   /**
    * @brief Destructor.
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h b/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h
index f905e11c43..e49a355e53 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/client_connection_listener.h
@@ -76,6 +76,18 @@ class ClientConnectionListener {
   virtual TransportAdapter::Error StopListening() = 0;
 
   /**
+   * @brief Suspends current listening thread
+   * @return Error information about possible reason of failure.
+   */
+  virtual TransportAdapter::Error SuspendListening() = 0;
+
+  /**
+   * @brief Resumes current listening thread
+   * @return Error information about possible reason of failure.
+   */
+  virtual TransportAdapter::Error ResumeListening() = 0;
+
+  /**
    * @brief Destructor.
    */
   virtual ~ClientConnectionListener() {}
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
index 2374d8a126..4d9910b9f3 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/connection.h
@@ -64,6 +64,13 @@ class Connection {
    * @brief Disconnect the current connection.
    */
   virtual TransportAdapter::Error Disconnect() = 0;
+
+  /**
+   * @brief Terminate method may implement the logic of correct thread
+   * termination, if necessary for specific connection. Unlike the disconnect
+   * method, which manipulates physical descriptors
+   */
+  virtual void Terminate() {}
 };
 
 typedef std::shared_ptr<Connection> ConnectionSPtr;
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
index 11123ceb1c..7c4e07fa59 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/threaded_socket_connection.h
@@ -74,6 +74,8 @@ class ThreadedSocketConnection : public Connection {
    */
   TransportAdapter::Error Disconnect();
 
+  void Terminate() OVERRIDE;
+
   /**
    * @brief Start thread creation.
    *
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
index 72a67a3087..92a3a2c2f4 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_controller.h
@@ -225,6 +225,8 @@ class TransportAdapterController {
    * @param new_config The new configuration of the transport
    */
   virtual void TransportConfigUpdated(const TransportConfig& new_config) = 0;
+
+  virtual DeviceSptr GetWebEngineDevice() const = 0;
 };
 
 }  // namespace transport_adapter
diff --git a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
index 84b80e956f..cfc886cb15 100644
--- a/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_adapter/transport_adapter_impl.h
@@ -43,7 +43,7 @@
 #include "utils/rwlock.h"
 #include "utils/timer.h"
 
-#include "resumption/last_state.h"
+#include "resumption/last_state_wrapper.h"
 #include "transport_manager/transport_adapter/connection.h"
 #include "transport_manager/transport_adapter/transport_adapter.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
@@ -82,9 +82,16 @@ class TransportAdapterImpl : public TransportAdapter,
   TransportAdapterImpl(DeviceScanner* device_scanner,
                        ServerConnectionFactory* server_connection_factory,
                        ClientConnectionListener* client_connection_listener,
-                       resumption::LastState& last_state,
+                       resumption::LastStateWrapperPtr last_state_wrapper,
                        const TransportManagerSettings& settings);
 
+  DEPRECATED
+  TransportAdapterImpl(DeviceScanner* device_scanner,
+                       ServerConnectionFactory* server_connection_factory,
+                       ClientConnectionListener* client_connection_listener,
+                       resumption::LastState& last_state,
+                       const TransportManagerSettings& settings) = delete;
+
   /**
    * @brief Destructor.
    **/
@@ -202,19 +209,8 @@ class TransportAdapterImpl : public TransportAdapter,
       const ApplicationHandle& app_handle,
       const ::protocol_handler::RawMessagePtr data) OVERRIDE;
 
-  /**
-   * @brief Start client listener.
-   *
-   * @return Error information about possible reason of failure.
-   */
-  TransportAdapter::Error StartClientListening() OVERRIDE;
-
-  /**
-   * @brief Stop client listener.
-   *
-   * @return Error information about possible reason of failure.
-   */
-  TransportAdapter::Error StopClientListening() OVERRIDE;
+  TransportAdapter::Error ChangeClientListening(
+      TransportAction required_change) OVERRIDE;
 
   /**
    * @brief Notify that device scanner is available.
@@ -287,13 +283,6 @@ class TransportAdapterImpl : public TransportAdapter,
    */
   void SearchDeviceFailed(const SearchDeviceError& error) OVERRIDE;
 
-  /**
-   * @brief Add device to the container(map), if container doesn't hold it yet.
-   *
-   * @param device Smart pointer to the device.
-   *
-   * @return Smart pointer to the device.
-   */
   DeviceSptr AddDevice(DeviceSptr device) OVERRIDE;
 
   /**
@@ -511,7 +500,7 @@ class TransportAdapterImpl : public TransportAdapter,
    *
    * @param observer - pointer to observer
    */
-  void SetTelemetryObserver(TMTelemetryObserver* observer);
+  void SetTelemetryObserver(TMTelemetryObserver* observer) OVERRIDE;
 
   /**
    * @brief Return Time metric observer
@@ -521,6 +510,12 @@ class TransportAdapterImpl : public TransportAdapter,
   TMTelemetryObserver* GetTelemetryObserver() OVERRIDE;
 #endif  // TELEMETRY_MONITOR
 
+  /**
+   * @brief GetWebEngineDevice
+   * @return shared pointer to WebEngine device
+   */
+  DeviceSptr GetWebEngineDevice() const OVERRIDE;
+
  protected:
   /**
    * @brief Store adapter state where applicable
@@ -587,6 +582,16 @@ class TransportAdapterImpl : public TransportAdapter,
   DeviceUID GetNextRetryDevice();
 
   /**
+   * @brief Remove a connection from the list without triggering
+   *the connection's destructor inside of a list lock
+   *
+   * @param device_handle Device unique identifier.
+   * @param app_handle Handle of application.
+   */
+  void RemoveConnection(const DeviceUID& device_id,
+                        const ApplicationHandle& app_handle);
+
+  /**
    * @brief Remove specified device
    * @param device_handle Device unique identifier.
    */
@@ -673,7 +678,7 @@ class TransportAdapterImpl : public TransportAdapter,
 #endif  // TELEMETRY_MONITOR
 
   resumption::LastState& last_state() const {
-    return last_state_;
+    return last_state_wrapper_->get_accessor().GetMutableData();
   }
 
   /**
@@ -691,7 +696,7 @@ class TransportAdapterImpl : public TransportAdapter,
    */
   ClientConnectionListener* client_connection_listener_;
 
-  resumption::LastState& last_state_;
+  resumption::LastStateWrapperPtr last_state_wrapper_;
   const TransportManagerSettings& settings_;
 };
 
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_default.h b/src/components/transport_manager/include/transport_manager/transport_manager_default.h
index 7fb0904fdf..81fc92dc38 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_default.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_default.h
@@ -38,24 +38,51 @@
 
 #include "transport_manager/transport_manager_impl.h"
 
-namespace resumption {
-class LastState;
-}
-
 namespace transport_manager {
 
+struct TransportAdapterFactory {
+  TransportAdapterFactory();
+  template <typename... Args>
+  using CreatorTA =
+      std::function<transport_adapter::TransportAdapter*(Args&&... args)>;
+#ifdef BLUETOOTH_SUPPORT
+  CreatorTA<resumption::LastStateWrapperPtr&, const TransportManagerSettings&>
+      ta_bluetooth_creator_;
+#endif
+  CreatorTA<const uint16_t,
+            resumption::LastStateWrapperPtr&,
+            const TransportManagerSettings&>
+      ta_tcp_creator_;
+#if defined(USB_SUPPORT)
+  CreatorTA<resumption::LastStateWrapperPtr&, const TransportManagerSettings&>
+      ta_usb_creator_;
+#endif
+#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
+  CreatorTA<resumption::LastStateWrapperPtr&, const TransportManagerSettings&>
+      ta_cloud_creator_;
+#endif
+#if defined(WEBSOCKET_SERVER_TRANSPORT_SUPPORT)
+  CreatorTA<resumption::LastStateWrapperPtr&, const TransportManagerSettings&>
+      ta_websocket_server_creator_;
+#endif
+};
+
 /**
  * @brief Default realization of transport_manager_impl class.
  */
 class TransportManagerDefault : public TransportManagerImpl {
  public:
-  explicit TransportManagerDefault(const TransportManagerSettings& settings);
+  explicit TransportManagerDefault(const TransportManagerSettings& settings,
+                                   const TransportAdapterFactory& ta_factory_);
 
   /**
    * @brief Initialize transport manager.
    *
    * @return Code error.
    */
+  int Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE;
+
+  DEPRECATED
   int Init(resumption::LastState& last_state) OVERRIDE;
 
   /**
@@ -63,6 +90,8 @@ class TransportManagerDefault : public TransportManagerImpl {
    */
   virtual ~TransportManagerDefault();
 
+ private:
+  TransportAdapterFactory ta_factory_;
   DISALLOW_COPY_AND_ASSIGN(TransportManagerDefault);
 };
 }  // namespace transport_manager
diff --git a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
index d576db7500..85d96bac55 100644
--- a/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
+++ b/src/components/transport_manager/include/transport_manager/transport_manager_impl.h
@@ -124,6 +124,9 @@ class TransportManagerImpl
    *
    * @return Code error.
    */
+  int Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE;
+
+  DEPRECATED
   int Init(resumption::LastState& last_state) OVERRIDE;
 
   /**
@@ -132,6 +135,12 @@ class TransportManagerImpl
    */
   virtual int Reinit() OVERRIDE;
 
+  virtual void Deinit() OVERRIDE;
+
+  void StopEventsProcessing() OVERRIDE;
+
+  void StartEventsProcessing() OVERRIDE;
+
   /**
    * @brief Start scanning for new devices.
    *
@@ -250,14 +259,12 @@ class TransportManagerImpl
    **/
   int RemoveDevice(const DeviceHandle device) OVERRIDE;
 
-  /**
-   * @brief Turns on or off visibility of SDL to mobile devices
-   * when visibility is ON (on_off = true) mobile devices are able to connect
-   * otherwise ((on_off = false)) SDL is not visible from outside
-   *
-   * @return Code error.
-   */
-  int Visibility(const bool& on_off) const OVERRIDE;
+  int PerformActionOnClients(
+      const TransportAction required_action) const OVERRIDE;
+
+  void CreateWebEngineDevice() OVERRIDE;
+
+  const DeviceInfo& GetWebEngineDeviceInfo() const OVERRIDE;
 
   /**
    * @brief OnDeviceListUpdated updates device list and sends appropriate
@@ -414,6 +421,12 @@ class TransportManagerImpl
   sync_primitives::Lock device_lock_;
   DeviceUID device_to_reconnect_;
 
+  std::atomic_bool events_processing_is_active_;
+  sync_primitives::Lock events_processing_lock_;
+  sync_primitives::ConditionalVariable events_processing_cond_var_;
+
+  DeviceInfo web_engine_device_info_;
+
   /**
    * @brief Adds new incoming connection to connections list
    * @param c New connection
@@ -512,8 +525,9 @@ class TransportManagerImpl
   /**
    * @brief Updates total device list with info from specific transport adapter.
    * @param ta Transport adapter
+   * @return True if device list has been changed, otherwise - false
    */
-  void UpdateDeviceList(TransportAdapter* ta);
+  bool UpdateDeviceList(TransportAdapter* ta);
 };  // class TransportManagerImpl
 }  // namespace transport_manager
 #endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_IMPL_H_
diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h
index 2b7f6e4189..0fb9c599c7 100644
--- a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h
+++ b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_connection.h
@@ -60,9 +60,9 @@ class UsbConnection : public Connection {
   virtual TransportAdapter::Error Disconnect();
 
  private:
-  void PopOutMessage();
+  TransportAdapter::Error PopOutMessage();
   bool PostInTransfer();
-  bool PostOutTransfer();
+  TransportAdapter::Error PostOutTransfer();
   void OnInTransfer(struct libusb_transfer*);
   void OnOutTransfer(struct libusb_transfer*);
   void Finalise();
diff --git a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h
index 6b15229522..9c16b49df6 100644
--- a/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h
+++ b/src/components/transport_manager/include/transport_manager/usb/libusb/usb_handler.h
@@ -76,6 +76,7 @@ class UsbHandler {
    public:
     explicit UsbHandlerDelegate(UsbHandler* handler);
     void threadMain() OVERRIDE;
+    void exitThreadMain() OVERRIDE;
 
    private:
     UsbHandler* handler_;
diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h b/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h
index ee7039efde..45c6d4c0e4 100644
--- a/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h
+++ b/src/components/transport_manager/include/transport_manager/usb/usb_aoa_adapter.h
@@ -44,8 +44,13 @@ namespace transport_adapter {
 
 class UsbAoaAdapter : public TransportAdapterImpl {
  public:
-  UsbAoaAdapter(resumption::LastState& last_state,
+  UsbAoaAdapter(resumption::LastStateWrapperPtr last_state_wrapper,
                 const TransportManagerSettings& settings);
+
+  DEPRECATED
+  UsbAoaAdapter(resumption::LastState&,
+                const TransportManagerSettings& settings) = delete;
+
   virtual ~UsbAoaAdapter();
 
  protected:
diff --git a/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h b/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h
index 2cc482297b..9d99b1b548 100644
--- a/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h
+++ b/src/components/transport_manager/include/transport_manager/usb/usb_device_scanner.h
@@ -48,7 +48,8 @@ namespace transport_adapter {
 
 class UsbDeviceScanner : public DeviceScanner, public UsbDeviceListener {
  public:
-  UsbDeviceScanner(class TransportAdapterController* controller);
+  UsbDeviceScanner(class TransportAdapterController* controller,
+                   const TransportManagerSettings& settings);
   virtual ~UsbDeviceScanner();
 
  protected:
@@ -65,6 +66,7 @@ class UsbDeviceScanner : public DeviceScanner, public UsbDeviceListener {
   void SupportedDeviceFound(PlatformUsbDevice* device);
 
   TransportAdapterController* controller_;
+  const TransportManagerSettings& settings_;
 
   typedef std::list<PlatformUsbDevice*> Devices;
   Devices devices_;
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_connection.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_connection.h
new file mode 100644
index 0000000000..fb904d645e
--- /dev/null
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_connection.h
@@ -0,0 +1,126 @@
+/*
+Copyright (c) 2020 Livio, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of SmartDeviceLink Consortium, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_CONNECTION_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_CONNECTION_H_
+
+#include <memory>
+#include <queue>
+#include "transport_manager/transport_adapter/connection.h"
+#include "utils/message_queue.h"
+#include "utils/threads/thread.h"
+
+#ifdef ENABLE_SECURITY
+#include "transport_manager/websocket_server/websocket_secure_session.h"
+#else
+#include "transport_manager/websocket_server/websocket_session.h"
+#endif  // ENABLE_SECURITY
+
+namespace transport_manager {
+namespace transport_adapter {
+
+using ::utils::MessageQueue;
+
+typedef ::protocol_handler::RawMessagePtr Message;
+typedef std::queue<Message> AsyncQueue;
+
+class TransportAdapterController;
+
+template <typename Session = WebSocketSession<> >
+class WebSocketConnection
+    : public std::enable_shared_from_this<WebSocketConnection<Session> >,
+      public Connection {
+ public:
+  WebSocketConnection(const DeviceUID& device_uid,
+                      const ApplicationHandle& app_handle,
+                      boost::asio::ip::tcp::socket socket,
+                      TransportAdapterController* controller);
+
+#ifdef ENABLE_SECURITY
+  WebSocketConnection(const DeviceUID& device_uid,
+                      const ApplicationHandle& app_handle,
+                      boost::asio::ip::tcp::socket socket,
+                      ssl::context& ctx,
+                      TransportAdapterController* controller);
+#endif  // ENABLE_SECURITY
+
+  ~WebSocketConnection();
+
+  TransportAdapter::Error Disconnect() OVERRIDE;
+
+  TransportAdapter::Error SendData(
+      protocol_handler::RawMessagePtr message) OVERRIDE;
+
+  void DataReceive(protocol_handler::RawMessagePtr frame);
+  void Run();
+  bool IsShuttingDown();
+
+ protected:
+  void Shutdown();
+  void OnError();
+
+ private:
+  const DeviceUID device_uid_;
+  const ApplicationHandle app_handle_;
+  std::shared_ptr<Session> session_;
+  TransportAdapterController* controller_;
+
+  std::atomic_bool shutdown_;
+
+  MessageQueue<Message, AsyncQueue> message_queue_;
+
+  class LoopThreadDelegate : public threads::ThreadDelegate {
+   public:
+    LoopThreadDelegate(MessageQueue<Message, AsyncQueue>* message_queue,
+                       DataWriteCallback data_write,
+                       OnIOErrorCallback on_io_error);
+
+    virtual void threadMain() OVERRIDE;
+    virtual void exitThreadMain() OVERRIDE;
+
+    void OnWrite();
+
+    void SetShutdown();
+
+   private:
+    void DrainQueue();
+    MessageQueue<Message, AsyncQueue>& message_queue_;
+    DataWriteCallback data_write_;
+    OnIOErrorCallback on_io_error_;
+  };
+
+  LoopThreadDelegate* thread_delegate_;
+  threads::Thread* thread_;
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_CONNECTION_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_device.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_device.h
new file mode 100644
index 0000000000..10c6e54424
--- /dev/null
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_device.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020, Livio
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file websocket_device.h
+ * \brief WebSocketDevice class header file.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_DEVICE_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_DEVICE_H_
+
+#include <boost/beast/websocket.hpp>
+#include <string>
+#include "transport_manager/transport_adapter/device.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+using tcp = boost::asio::ip::tcp;  // from <boost/asio/ip/tcp.hpp>
+using protocol_type = boost::asio::basic_stream_socket<tcp>::protocol_type;
+
+class WebSocketDevice : public Device {
+ public:
+  WebSocketDevice(const std::string& name, const DeviceUID& unique_device_id);
+
+  virtual const std::string& GetHost() const;
+  virtual const std::string& GetPort() const;
+  virtual const std::string GetTarget() const;
+  virtual void AddApplication(const ApplicationHandle& app_handle);
+
+ protected:
+  bool IsSameAs(const Device* other_device) const OVERRIDE;
+  ApplicationList GetApplicationList() const OVERRIDE;
+
+ private:
+  std::string host_;
+  std::string port_;
+  bool is_secure_connect_;
+  protocol_type protocol_;
+  ApplicationList app_list_;
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_DEVICE_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_listener.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_listener.h
new file mode 100644
index 0000000000..3a0131f087
--- /dev/null
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_listener.h
@@ -0,0 +1,120 @@
+/*
+ * \file websocket_listener.h
+ * \brief WebSocketListener class header file.
+ *
+ * Copyright (c) 2020
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_LISTENER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_LISTENER_H_
+
+#include <boost/asio/thread_pool.hpp>
+#include <memory>
+#include <vector>
+#include "transport_manager/transport_adapter/client_connection_listener.h"
+#include "transport_manager/transport_manager_settings.h"
+#include "transport_manager/websocket_server/websocket_connection.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+class TransportAdapterController;
+
+/**
+ * @brief Class responsible for communication over websockets.
+ */
+class WebSocketListener : public ClientConnectionListener {
+ public:
+  /**
+   * @brief Constructor.
+   * @param controller Pointer to the device adapter controller.
+   * @param number of threads for listen incoming connections
+   */
+  WebSocketListener(TransportAdapterController* controller,
+                    const TransportManagerSettings& settings,
+                    const int num_threads = 1);
+
+  /**
+   * @brief Destructor.
+   */
+  ~WebSocketListener();
+
+  TransportAdapter::Error Init() OVERRIDE;
+  void Terminate() OVERRIDE;
+  bool IsInitialised() const OVERRIDE {
+    return true;
+  }
+  TransportAdapter::Error StartListening() OVERRIDE;
+  TransportAdapter::Error StopListening() OVERRIDE {
+    return TransportAdapter::OK;
+  }
+  TransportAdapter::Error SuspendListening() OVERRIDE {
+    return TransportAdapter::OK;
+  }
+  TransportAdapter::Error ResumeListening() OVERRIDE {
+    return TransportAdapter::OK;
+  }
+
+ protected:
+#ifdef ENABLE_SECURITY
+  TransportAdapter::Error AddCertificateAuthority();
+#endif
+  bool Run();
+  bool WaitForConnection();
+  void StartSession(boost::system::error_code ec);
+  void Shutdown();
+
+  template <typename Connection>
+  void ProcessConnection(std::shared_ptr<Connection> connection,
+                         const DeviceSptr,
+                         const ApplicationHandle);
+
+ private:
+  TransportAdapterController* controller_;
+  boost::asio::io_context ioc_;
+#ifdef ENABLE_SECURITY
+  ssl::context ctx_;
+  bool start_secure_;
+#endif  // ENABLE_SECURITY
+  tcp::acceptor acceptor_;
+  tcp::socket socket_;
+  std::unique_ptr<boost::asio::thread_pool> io_pool_;
+  const int num_threads_;
+  std::atomic_bool shutdown_;
+  std::vector<std::shared_ptr<Connection> > connection_list_;
+  sync_primitives::Lock connection_list_lock;
+  const TransportManagerSettings& settings_;
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_LISTENER_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_secure_session.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_secure_session.h
new file mode 100644
index 0000000000..a3ead8e5a5
--- /dev/null
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_secure_session.h
@@ -0,0 +1,64 @@
+/*
+Copyright (c) 2020 Livio, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of SmartDeviceLink Consortium, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SECURE_SESSION_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SECURE_SESSION_H_
+
+#include <memory>
+#include "transport_manager/websocket_server/websocket_session.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+CREATE_LOGGERPTR_GLOBAL(wss_logger_, "WebSocketSecureSession")
+
+template <typename ExecutorType = ssl::stream<tcp::socket&> >
+class WebSocketSecureSession : public WebSocketSession<ExecutorType> {
+ public:
+  WebSocketSecureSession(tcp::socket,
+                         ssl::context& ctx,
+                         DataReceiveCallback data_receive,
+                         OnIOErrorCallback on_errror);
+
+  void AsyncAccept() OVERRIDE;
+  virtual void AsyncHandshake(boost::system::error_code ec);
+
+  std::shared_ptr<WebSocketSecureSession<ExecutorType> > shared_from_this() {
+    auto base_ptr =
+        static_cast<WebSocketSession<ExecutorType>*>(this)->shared_from_this();
+    return std::static_pointer_cast<WebSocketSecureSession<ExecutorType> >(
+        base_ptr);
+  }
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SECURE_SESSION_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h
new file mode 100644
index 0000000000..23122b2e98
--- /dev/null
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_server_transport_adapter.h
@@ -0,0 +1,136 @@
+/*
+ * \file websocket_transport_adapter.h
+ * \brief WebSocketTransportAdapter class header file.
+ *
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SERVER_TRANSPORT_ADAPTER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SERVER_TRANSPORT_ADAPTER_H_
+
+#include <string>
+#include "transport_manager/transport_adapter/transport_adapter_impl.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+/**
+ * @brief Transport adapter that uses WebSocket transport.
+ */
+class WebSocketServerTransportAdapter : public TransportAdapterImpl {
+ public:
+  /**
+   * @brief Constructor.
+   */
+  WebSocketServerTransportAdapter(
+      resumption::LastStateWrapperPtr last_state_wrapper,
+      const TransportManagerSettings& settings);
+
+  /**
+   * @brief Destructor.
+   */
+  virtual ~WebSocketServerTransportAdapter();
+
+  /**
+   * @brief Websocket server transport adapter
+   * specific Init() method
+   * @note Perform additional actions required by WS transport adapter
+   * then calls basic class Init()
+   */
+  TransportAdapter::Error Init() OVERRIDE;
+
+  /**
+   * @brief Adds webengine device to internal storage
+   * of related WebSocket transport adapter
+   * @param device webengine device to add
+   * @note webengine device storage required
+   * to be used in Low Voltage conditions
+   */
+  DeviceSptr AddDevice(DeviceSptr device) OVERRIDE;
+
+  /**
+   * @brief Notification that transport's configuration is updated
+   *
+   * @param new_config The new configuration of the transport
+   */
+  void TransportConfigUpdated(const TransportConfig& new_config) OVERRIDE;
+
+  /**
+   * @brief Returns the transport's configuration information
+   */
+  virtual TransportConfig GetTransportConfiguration() const OVERRIDE;
+
+  /**
+   * @brief Store adapter state in last state
+   */
+  void Store() const OVERRIDE;
+
+  /**
+   * @brief Restore adapter state from last state
+   * @return True on success false otherwise
+   */
+  bool Restore() OVERRIDE;
+
+  /**
+   * @brief Get stored device ID
+   * @return stored unique device id, or empty string if no stored device id
+   * present in last saved state
+   */
+  std::string GetStoredDeviceID() const;
+
+ protected:
+  /**
+   * @brief Return type of device.
+   *
+   * @return String with device type.
+   */
+  DeviceType GetDeviceType() const OVERRIDE;
+
+ private:
+  /**
+   * @brief Keeps transport specific configuration
+   *
+   * TCP transport uses following information:
+   * - "enabled": whether the transport is currently enabled or not. Value can
+   *              be "true" or "false".
+   * - "tcp_ip_address": string representation of IP address (either IPv4 or
+   *                     IPv6)
+   * - "tcp_port": string representation of TCP port number (e.g. "12345")
+   */
+  TransportConfig transport_config_;
+  DeviceSptr webengine_device_;
+  std::string webengine_device_id_;
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SERVER_TRANSPORT_ADAPTER_H_
diff --git a/src/components/transport_manager/include/transport_manager/websocket_server/websocket_session.h b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_session.h
new file mode 100644
index 0000000000..a8dadc9831
--- /dev/null
+++ b/src/components/transport_manager/include/transport_manager/websocket_server/websocket_session.h
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2020 Livio, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of SmartDeviceLink Consortium, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SESSION_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SESSION_H_
+
+#include <boost/asio/bind_executor.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
+#include "protocol/raw_message.h"
+#include "transport_manager/transport_adapter/transport_adapter.h"
+#include "utils/logger.h"
+
+#ifdef ENABLE_SECURITY
+#include <boost/beast/websocket/ssl.hpp>
+#endif  // ENABLE_SECURITY
+
+namespace transport_manager {
+namespace transport_adapter {
+
+using DataReceiveCallback =
+    std::function<void(protocol_handler::RawMessagePtr)>;
+using DataWriteCallback = std::function<TransportAdapter::Error(
+    protocol_handler::RawMessagePtr message)>;
+using OnIOErrorCallback = std::function<void()>;
+
+using tcp = boost::asio::ip::tcp;  // from <boost/asio/ip/tcp.hpp>
+namespace websocket =
+    boost::beast::websocket;  // from <boost/beast/websocket.hpp>
+#ifdef ENABLE_SECURITY
+namespace ssl = boost::asio::ssl;  // from <boost/asio/ssl.hpp>
+#endif                             // ENABLE_SECURITY
+
+CREATE_LOGGERPTR_GLOBAL(ws_logger_, "WebSocketSession")
+
+class TransportAdapterController;
+
+template <typename ExecutorType = tcp::socket&>
+class WebSocketSession
+    : public std::enable_shared_from_this<WebSocketSession<ExecutorType> > {
+ public:
+  WebSocketSession(boost::asio::ip::tcp::socket socket,
+                   DataReceiveCallback data_receive,
+                   OnIOErrorCallback on_error);
+
+#ifdef ENABLE_SECURITY
+  WebSocketSession(boost::asio::ip::tcp::socket socket,
+                   ssl::context& ctx,
+                   DataReceiveCallback data_receive,
+                   OnIOErrorCallback on_error);
+#endif  // ENABLE_SECURITY
+
+  virtual ~WebSocketSession();
+
+  virtual void AsyncAccept();
+
+  virtual void AsyncRead(boost::system::error_code ec);
+
+  virtual TransportAdapter::Error WriteDown(
+      ::protocol_handler::RawMessagePtr message);
+
+  virtual void Read(boost::system::error_code ec,
+                    std::size_t bytes_transferred);
+
+  virtual bool Shutdown();
+
+ protected:
+  tcp::socket socket_;
+  websocket::stream<ExecutorType> ws_;
+  boost::asio::strand<boost::asio::io_context::executor_type> strand_;
+  boost::beast::flat_buffer buffer_;
+  DataReceiveCallback data_receive_;
+  OnIOErrorCallback on_io_error_;
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SESSION_H_
diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc
index 911658bc56..066751c474 100644
--- a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc
+++ b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc
@@ -57,12 +57,13 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 BluetoothTransportAdapter::~BluetoothTransportAdapter() {}
 
 BluetoothTransportAdapter::BluetoothTransportAdapter(
-    resumption::LastState& last_state, const TransportManagerSettings& settings)
+    resumption::LastStateWrapperPtr last_state_wrapper,
+    const TransportManagerSettings& settings)
     : TransportAdapterImpl(
           new BluetoothDeviceScanner(this, true, 0, settings.bluetooth_uuid()),
           new BluetoothConnectionFactory(this),
           NULL,
-          last_state,
+          last_state_wrapper,
           settings) {}
 
 DeviceType BluetoothTransportAdapter::GetDeviceType() const {
@@ -112,23 +113,25 @@ void BluetoothTransportAdapter::Store() const {
     }
   }
   bluetooth_adapter_dictionary["devices"] = devices_dictionary;
-  Json::Value& dictionary = last_state().get_dictionary();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   dictionary["TransportManager"]["BluetoothAdapter"] =
       bluetooth_adapter_dictionary;
+  accessor.GetMutableData().set_dictionary(dictionary);
   LOG4CXX_TRACE(logger_, "exit");
 }
 
 bool BluetoothTransportAdapter::Restore() {
   LOG4CXX_TRACE(logger_, "enter");
   bool errors_occured = false;
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   const Json::Value bluetooth_adapter_dictionary =
-      last_state().get_dictionary()["TransportManager"]["BluetoothAdapter"];
+      dictionary["TransportManager"]["BluetoothAdapter"];
   const Json::Value devices_dictionary =
       bluetooth_adapter_dictionary["devices"];
-  for (Json::Value::const_iterator i = devices_dictionary.begin();
-       i != devices_dictionary.end();
-       ++i) {
-    const Json::Value device_dictionary = *i;
+  for (const auto& bt_device : devices_dictionary) {
+    const Json::Value device_dictionary = bt_device;
     std::string name = device_dictionary["name"].asString();
     std::string address_record = device_dictionary["address"].asString();
     bdaddr_t address;
@@ -136,10 +139,8 @@ bool BluetoothTransportAdapter::Restore() {
     RfcommChannelVector rfcomm_channels;
     const Json::Value applications_dictionary =
         device_dictionary["applications"];
-    for (Json::Value::const_iterator j = applications_dictionary.begin();
-         j != applications_dictionary.end();
-         ++j) {
-      const Json::Value application_dictionary = *j;
+    for (const auto& application : applications_dictionary) {
+      const Json::Value application_dictionary = application;
       std::string rfcomm_channel_record =
           application_dictionary["rfcomm_channel"].asString();
       uint8_t rfcomm_channel =
@@ -150,11 +151,9 @@ bool BluetoothTransportAdapter::Restore() {
         new BluetoothDevice(address, name.c_str(), rfcomm_channels);
     DeviceSptr device(bluetooth_device);
     AddDevice(device);
-    for (RfcommChannelVector::const_iterator j = rfcomm_channels.begin();
-         j != rfcomm_channels.end();
-         ++j) {
+    for (const auto& channel : rfcomm_channels) {
       ApplicationHandle app_handle =
-          *j;  // for Bluetooth device app_handle is just RFCOMM channel
+          channel;  // for Bluetooth device app_handle is just RFCOMM channel
       if (Error::OK != Connect(device->unique_device_id(), app_handle)) {
         errors_occured = true;
       }
diff --git a/src/components/transport_manager/src/cloud/cloud_device.cc b/src/components/transport_manager/src/cloud/cloud_device.cc
index c1ad186ded..9225589d57 100644
--- a/src/components/transport_manager/src/cloud/cloud_device.cc
+++ b/src/components/transport_manager/src/cloud/cloud_device.cc
@@ -49,7 +49,7 @@ CloudDevice::CloudDevice(std::string& host,
                                  .query = "",
                                  .fragment = ""}) {}
 
-CloudDevice::CloudDevice(CloudAppEndpoint endpoint, std::string& name)
+CloudDevice::CloudDevice(CloudAppEndpoint& endpoint, std::string& name)
     : Device(name, std::string(name)), endpoint_(endpoint) {}
 
 bool CloudDevice::IsSameAs(const Device* other) const {
diff --git a/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc b/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc
index 622531b120..2d1de703b1 100644
--- a/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc
+++ b/src/components/transport_manager/src/cloud/cloud_websocket_transport_adapter.cc
@@ -44,11 +44,12 @@ namespace transport_adapter {
 CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 
 CloudWebsocketTransportAdapter::CloudWebsocketTransportAdapter(
-    resumption::LastState& last_state, const TransportManagerSettings& settings)
+    resumption::LastStateWrapperPtr last_state_wrapper,
+    const TransportManagerSettings& settings)
     : TransportAdapterImpl(NULL,
                            new CloudWebsocketConnectionFactory(this),
                            NULL,
-                           last_state,
+                           last_state_wrapper,
                            settings) {}
 
 CloudWebsocketTransportAdapter::~CloudWebsocketTransportAdapter() {}
diff --git a/src/components/transport_manager/src/cloud/websocket_client_connection.cc b/src/components/transport_manager/src/cloud/websocket_client_connection.cc
index ec2fb0bcfb..794cf57208 100644
--- a/src/components/transport_manager/src/cloud/websocket_client_connection.cc
+++ b/src/components/transport_manager/src/cloud/websocket_client_connection.cc
@@ -261,7 +261,7 @@ void WebsocketClientConnection::OnRead(boost::system::error_code ec,
       boost::beast::buffers_front(buffer_.data()));
 
   ::protocol_handler::RawMessagePtr frame(
-      new protocol_handler::RawMessage(0, 0, data, size));
+      new protocol_handler::RawMessage(0, 0, data, size, false));
 
   controller_->DataReceiveDone(device_uid_, app_handle_, frame);
 
diff --git a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
index 2e37f76bc9..6a43f66c64 100644
--- a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
+++ b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
@@ -54,9 +54,9 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "IAP2Emulation");
 
 IAP2BluetoothEmulationTransportAdapter::IAP2BluetoothEmulationTransportAdapter(
     const uint16_t port,
-    resumption::LastState& last_state,
+    resumption::LastStateWrapperPtr last_state_wrapper,
     const TransportManagerSettings& settings)
-    : TcpTransportAdapter(port, last_state, settings) {}
+    : TcpTransportAdapter(port, last_state_wrapper, settings) {}
 
 void IAP2BluetoothEmulationTransportAdapter::DeviceSwitched(
     const DeviceUID& device_handle) {
@@ -76,9 +76,9 @@ void IAP2BluetoothEmulationTransportAdapter::TransportConfigUpdated(
 
 IAP2USBEmulationTransportAdapter::IAP2USBEmulationTransportAdapter(
     const uint16_t port,
-    resumption::LastState& last_state,
+    resumption::LastStateWrapperPtr last_state_wrapper,
     const TransportManagerSettings& settings)
-    : TcpTransportAdapter(port, last_state, settings), out_(0) {
+    : TcpTransportAdapter(port, last_state_wrapper, settings), out_(0) {
   auto delegate = new IAPSignalHandlerDelegate(*this);
   signal_handler_ = threads::CreateThread("iAP signal handler", delegate);
   signal_handler_->start();
diff --git a/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc b/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc
index e0bda61e4d..b37e5dc962 100644
--- a/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc
+++ b/src/components/transport_manager/src/tcp/platform_specific/linux/platform_specific_network_interface_listener.cc
@@ -23,7 +23,6 @@ namespace transport_adapter {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 
-static std::string GetInterfaceName(unsigned int if_index);
 static bool SetNonblocking(int s);
 
 bool InterfaceStatus::IsAvailable() const {
@@ -39,7 +38,7 @@ bool InterfaceStatus::HasIPAddress() const {
   return has_ipv4_ || has_ipv6_;
 }
 
-std::string InterfaceStatus::GetIPv4Address() const {
+const std::string InterfaceStatus::GetIPv4Address() const {
   char buf[INET_ADDRSTRLEN] = "";
   if (has_ipv4_ && IsAvailable()) {
     inet_ntop(AF_INET, &ipv4_address_, buf, sizeof(buf));
@@ -47,7 +46,7 @@ std::string InterfaceStatus::GetIPv4Address() const {
   return std::string(buf);
 }
 
-std::string InterfaceStatus::GetIPv6Address() const {
+const std::string InterfaceStatus::GetIPv6Address() const {
   char buf[INET6_ADDRSTRLEN] = "";
   if (has_ipv6_ && IsAvailable()) {
     inet_ntop(AF_INET6, &ipv6_address_, buf, sizeof(buf));
@@ -55,7 +54,7 @@ std::string InterfaceStatus::GetIPv6Address() const {
   return std::string(buf);
 }
 
-void InterfaceStatus::SetIPv4Address(struct in_addr* addr) {
+void InterfaceStatus::SetIPv4Address(const struct in_addr* addr) {
   if (addr == NULL) {
     has_ipv4_ = false;
   } else {
@@ -64,7 +63,7 @@ void InterfaceStatus::SetIPv4Address(struct in_addr* addr) {
   }
 }
 
-void InterfaceStatus::SetIPv6Address(struct in6_addr* addr) {
+void InterfaceStatus::SetIPv6Address(const struct in6_addr* addr) {
   if (addr == NULL) {
     has_ipv6_ = false;
   } else {
@@ -105,7 +104,7 @@ PlatformSpecificNetworkInterfaceListener::
 
 bool PlatformSpecificNetworkInterfaceListener::Init() {
   LOG4CXX_AUTO_TRACE(logger_);
-
+  LOG4CXX_DEBUG(logger_, "Init socket: " << socket_);
   if (socket_ >= 0) {
     LOG4CXX_WARN(logger_, "Network interface listener is already initialized");
     return false;
@@ -151,7 +150,7 @@ bool PlatformSpecificNetworkInterfaceListener::Init() {
 
 void PlatformSpecificNetworkInterfaceListener::Deinit() {
   LOG4CXX_AUTO_TRACE(logger_);
-
+  LOG4CXX_DEBUG(logger_, "Deinit socket: " << socket_);
   if (socket_ >= 0) {
     close(socket_);
     socket_ = -1;
@@ -376,8 +375,13 @@ bool PlatformSpecificNetworkInterfaceListener::InitializeStatus() {
       continue;
     }
 
-    std::string ifname(interface->ifa_name);
-    InterfaceStatus& status = status_table_[ifname];
+    unsigned int index = if_nametoindex(interface->ifa_name);
+    if (index == 0) {
+      // network interface isn't found
+      continue;
+    }
+
+    InterfaceStatus& status = status_table_[index];
 
     switch (interface->ifa_addr->sa_family) {
       case AF_INET: {
@@ -395,6 +399,7 @@ bool PlatformSpecificNetworkInterfaceListener::InitializeStatus() {
       default:
         continue;
     }
+    status.SetName(std::string(interface->ifa_name));
     status.SetFlags(interface->ifa_flags);
   }
 
@@ -412,25 +417,22 @@ bool PlatformSpecificNetworkInterfaceListener::UpdateStatus(
   for (std::vector<EventParam>::iterator it = params.begin();
        it != params.end();
        ++it) {
-    std::string ifname = GetInterfaceName(it->if_index);
-    if (ifname.empty()) {
-      continue;
-    }
-
-    InterfaceStatus& status = status_table_[ifname];
-
+    InterfaceStatus& status = status_table_[it->if_index];
     switch (type) {
       case RTM_NEWLINK: {
+        const std::string& ifname = GetInterfaceName(it->if_index);
         LOG4CXX_DEBUG(
             logger_,
             "netlink event: interface " << ifname << " created or updated");
+        status.SetName(ifname);
         status.SetFlags(it->flags);
         break;
       }
       case RTM_DELLINK:
-        LOG4CXX_DEBUG(logger_,
-                      "netlink event: interface " << ifname << " removed");
-        status_table_.erase(ifname);
+        LOG4CXX_DEBUG(
+            logger_,
+            "netlink event: interface " << status.GetName() << " removed");
+        status_table_.erase(it->if_index);
         break;
       case RTM_NEWADDR: {
         sockaddr* addr = reinterpret_cast<sockaddr*>(&it->address);
@@ -439,14 +441,14 @@ bool PlatformSpecificNetworkInterfaceListener::UpdateStatus(
           status.SetIPv4Address(&addr_in->sin_addr);
           LOG4CXX_DEBUG(logger_,
                         "netlink event: IPv4 address of interface "
-                            << ifname << " updated to "
+                            << status.GetName() << " updated to "
                             << status.GetIPv4Address());
         } else if (addr->sa_family == AF_INET6) {
           sockaddr_in6* addr_in6 = reinterpret_cast<sockaddr_in6*>(addr);
           status.SetIPv6Address(&addr_in6->sin6_addr);
           LOG4CXX_DEBUG(logger_,
                         "netlink event: IPv6 address of interface "
-                            << ifname << " updated to "
+                            << status.GetName() << " updated to "
                             << status.GetIPv6Address());
         }
         break;
@@ -456,12 +458,12 @@ bool PlatformSpecificNetworkInterfaceListener::UpdateStatus(
         if (addr->sa_family == AF_INET) {
           LOG4CXX_DEBUG(logger_,
                         "netlink event: IPv4 address of interface "
-                            << ifname << " removed");
+                            << status.GetName() << " removed");
           status.SetIPv4Address(NULL);
         } else if (addr->sa_family == AF_INET6) {
           LOG4CXX_DEBUG(logger_,
                         "netlink event: IPv6 address of interface "
-                            << ifname << " removed");
+                            << status.GetName() << " removed");
           status.SetIPv6Address(NULL);
         }
         break;
@@ -484,9 +486,12 @@ void PlatformSpecificNetworkInterfaceListener::NotifyIPAddresses() {
   // note that if interface_name is empty (i.e. no interface is selected),
   // the IP addresses will be empty
   if (!interface_name.empty()) {
-    InterfaceStatusTable::iterator it = status_table_.find(interface_name);
+    InterfaceStatusTable::const_iterator it =
+        std::find_if(status_table_.begin(),
+                     status_table_.end(),
+                     NamePredicate(interface_name));
     if (status_table_.end() != it) {
-      InterfaceStatus& status = it->second;
+      const InterfaceStatus& status = it->second;
       ipv4_addr = status.GetIPv4Address();
       ipv6_addr = status.GetIPv6Address();
     }
@@ -514,14 +519,16 @@ const std::string PlatformSpecificNetworkInterfaceListener::SelectInterface() {
     return designated_interface_;
   }
 
-  InterfaceStatusTable::iterator it;
+  InterfaceStatusTable::const_iterator it;
 
   if (!selected_interface_.empty()) {
     // if current network interface is still available and has IP address, then
     // we use it
-    it = status_table_.find(selected_interface_);
+    it = std::find_if(status_table_.begin(),
+                      status_table_.end(),
+                      NamePredicate(selected_interface_));
     if (it != status_table_.end()) {
-      InterfaceStatus& status = it->second;
+      const InterfaceStatus& status = it->second;
       if (status.IsAvailable() && status.HasIPAddress()) {
         return selected_interface_;
       }
@@ -530,17 +537,17 @@ const std::string PlatformSpecificNetworkInterfaceListener::SelectInterface() {
 
   // pick a network interface that has IP address
   for (it = status_table_.begin(); it != status_table_.end(); ++it) {
-    InterfaceStatus& status = it->second;
+    const InterfaceStatus& status = it->second;
     // ignore loopback interfaces
     if (status.IsLoopback()) {
       continue;
     }
-    // if the interface has to be UP and RUNNING, and must have an IP address
+    // the interface has to be UP and RUNNING, and must have an IP address
     if (!(status.IsAvailable() && status.HasIPAddress())) {
       continue;
     }
 
-    selected_interface_ = it->first;
+    selected_interface_ = status.GetName();
     LOG4CXX_DEBUG(logger_,
                   "selecting network interface: " << selected_interface_);
     return selected_interface_;
@@ -618,13 +625,12 @@ void PlatformSpecificNetworkInterfaceListener::DumpTable() const {
                 "Number of network interfaces: " << status_table_.size());
 
   for (auto it = status_table_.begin(); it != status_table_.end(); ++it) {
-    const std::string ifname = it->first;
     const InterfaceStatus& status = it->second;
     UNUSED(status);
 
     LOG4CXX_DEBUG(
         logger_,
-        "  " << ifname << " : flags=" << status.GetFlags()
+        "  " << status.GetName() << " : flags=" << status.GetFlags()
              << " : available: " << (status.IsAvailable() ? "yes" : "no")
              << " IPv4: " << status.GetIPv4Address()
              << " IPv6: " << status.GetIPv6Address()
@@ -632,6 +638,28 @@ void PlatformSpecificNetworkInterfaceListener::DumpTable() const {
   }
 }
 
+const std::string PlatformSpecificNetworkInterfaceListener::GetInterfaceName(
+    unsigned int if_index) const {
+#ifdef BUILD_TESTS
+  if (testing_) {
+    std::map<unsigned int, std::string>::const_iterator it =
+        dummy_name_map_.find(if_index);
+    if (it == dummy_name_map_.end()) {
+      return std::string();
+    }
+    return it->second;
+  }
+#endif  // BUILD_TESTS
+
+  char buf[IFNAMSIZ + 1] = "";
+  char* ret = if_indextoname(if_index, buf);
+  if (ret != NULL) {
+    return std::string(buf);
+  } else {
+    return std::string();
+  }
+}
+
 PlatformSpecificNetworkInterfaceListener::ListenerThreadDelegate::
     ListenerThreadDelegate(PlatformSpecificNetworkInterfaceListener* parent)
     : parent_(parent) {}
@@ -646,12 +674,6 @@ void PlatformSpecificNetworkInterfaceListener::ListenerThreadDelegate::
   parent_->StopLoop();
 }
 
-static std::string GetInterfaceName(unsigned int if_index) {
-  char buf[IFNAMSIZ + 1] = "";
-  if_indextoname(if_index, buf);
-  return std::string(buf);
-}
-
 static bool SetNonblocking(int s) {
   int prev_flag = fcntl(s, F_GETFL, 0);
   if (prev_flag == -1) {
diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
index 66be810a9b..df4409b8f3 100644
--- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc
+++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc
@@ -86,6 +86,7 @@ TcpClientListener::TcpClientListener(TransportAdapterController* controller,
     , thread_(0)
     , socket_(-1)
     , thread_stop_requested_(false)
+    , remove_devices_on_terminate_(false)
     , designated_interface_(designated_interface) {
   pipe_fds_[0] = pipe_fds_[1] = -1;
   thread_ = threads::CreateThread("TcpClientListener",
@@ -107,7 +108,7 @@ TransportAdapter::Error TcpClientListener::Init() {
       return TransportAdapter::FAIL;
     }
   } else {
-    // Network interface is specified and we wiill listen only on the interface.
+    // Network interface is specified and we will listen only on the interface.
     // In this case, the server socket will be created once
     // NetworkInterfaceListener notifies the interface's IP address.
     LOG4CXX_INFO(logger_,
@@ -226,6 +227,7 @@ void TcpClientListener::Loop() {
   LOG4CXX_AUTO_TRACE(logger_);
   fd_set rfds;
   char dummy[16];
+  std::vector<DeviceUID> device_uid_list;
 
   while (!thread_stop_requested_) {
     FD_ZERO(&rfds);
@@ -300,13 +302,13 @@ void TcpClientListener::Loop() {
       const auto device_uid =
           device_name + std::string(":") + std::to_string(port_);
 
-#if defined(BUILD_TESTS)
+#if defined(ENABLE_IAP2EMULATION)
       auto tcp_device = std::make_shared<TcpDevice>(
           client_address.sin_addr.s_addr, device_uid, device_name);
 #else
       auto tcp_device = std::make_shared<TcpDevice>(
           client_address.sin_addr.s_addr, device_uid);
-#endif  // BUILD_TESTS
+#endif  // ENABLE_IAP2EMULATION
 
       DeviceSptr device = controller_->AddDevice(tcp_device);
       auto tcp_device_raw = static_cast<TcpDevice*>(device.get());
@@ -323,10 +325,19 @@ void TcpClientListener::Loop() {
       if (TransportAdapter::OK != error) {
         LOG4CXX_ERROR(logger_,
                       "TCP connection::Start() failed with error: " << error);
+      } else {
+        device_uid_list.push_back(device->unique_device_id());
       }
     }
   }
 
+  if (remove_devices_on_terminate_) {
+    for (std::vector<DeviceUID>::iterator it = device_uid_list.begin();
+         it != device_uid_list.end();
+         ++it) {
+      controller_->DeviceDisconnected(*it, DisconnectDeviceError());
+    }
+  }
   LOG4CXX_INFO(logger_, "TCP server socket loop is terminated.");
 }
 
@@ -374,17 +385,16 @@ TransportAdapter::Error TcpClientListener::StartListening() {
   return TransportAdapter::OK;
 }
 
-void TcpClientListener::ListeningThreadDelegate::exitThreadMain() {
-  parent_->StopLoop();
-}
+TransportAdapter::Error TcpClientListener::ResumeListening() {
+  LOG4CXX_AUTO_TRACE(logger_);
 
-void TcpClientListener::ListeningThreadDelegate::threadMain() {
-  parent_->Loop();
-}
+  interface_listener_->Init();
+  StartListeningThread();
+  started_ = true;
 
-TcpClientListener::ListeningThreadDelegate::ListeningThreadDelegate(
-    TcpClientListener* parent)
-    : parent_(parent) {}
+  LOG4CXX_INFO(logger_, "Tcp client listener was resumed successfully");
+  return TransportAdapter::OK;
+}
 
 TransportAdapter::Error TcpClientListener::StopListening() {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -398,10 +408,45 @@ TransportAdapter::Error TcpClientListener::StopListening() {
   StopListeningThread();
 
   started_ = false;
-  LOG4CXX_INFO(logger_, "Tcp client listener has stopped successfully");
+  LOG4CXX_INFO(logger_, "Tcp client listener was stopped successfully");
+  return TransportAdapter::OK;
+}
+
+TransportAdapter::Error TcpClientListener::SuspendListening() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!started_) {
+    LOG4CXX_DEBUG(logger_, "TcpClientListener is not running now");
+    return TransportAdapter::BAD_STATE;
+  }
+
+  if (shutdown(socket_, SHUT_RDWR) != 0) {
+    LOG4CXX_WARN(logger_, "Socket was unable to be shutdowned");
+  }
+
+  if (close(socket_) != 0) {
+    LOG4CXX_ERROR_WITH_ERRNO(logger_, "Failed to close socket");
+  }
+
+  interface_listener_->Deinit();
+  StopListeningThread();
+  started_ = false;
+
+  LOG4CXX_INFO(logger_, "Tcp client listener was suspended");
   return TransportAdapter::OK;
 }
 
+void TcpClientListener::ListeningThreadDelegate::exitThreadMain() {
+  parent_->StopLoop();
+}
+
+void TcpClientListener::ListeningThreadDelegate::threadMain() {
+  parent_->Loop();
+}
+
+TcpClientListener::ListeningThreadDelegate::ListeningThreadDelegate(
+    TcpClientListener* parent)
+    : parent_(parent) {}
+
 TransportAdapter::Error TcpClientListener::StartListeningThread() {
   LOG4CXX_AUTO_TRACE(logger_);
 
@@ -410,8 +455,7 @@ TransportAdapter::Error TcpClientListener::StartListeningThread() {
 
   if (pipe_fds_[0] < 0 || pipe_fds_[1] < 0) {
     // recreate the pipe every time, so that the thread loop will not get
-    // leftover
-    // data inside pipe after it is started
+    // leftover data inside pipe after it is started
     if (pipe(pipe_fds_) != 0) {
       LOG4CXX_ERROR_WITH_ERRNO(logger_, "Failed to create internal pipe");
       return TransportAdapter::FAIL;
@@ -500,6 +544,8 @@ bool TcpClientListener::StartOnNetworkInterface() {
       }
     }
 
+    remove_devices_on_terminate_ = true;
+
     if (TransportAdapter::OK != StartListeningThread()) {
       LOG4CXX_WARN(logger_, "Failed to start TCP client listener");
       return false;
@@ -525,6 +571,8 @@ bool TcpClientListener::StopOnNetworkInterface() {
       socket_ = -1;
     }
 
+    remove_devices_on_terminate_ = false;
+
     LOG4CXX_INFO(
         logger_,
         "TCP server socket on " << designated_interface_ << " stopped");
diff --git a/src/components/transport_manager/src/tcp/tcp_device.cc b/src/components/transport_manager/src/tcp/tcp_device.cc
index 4542f76c1d..d9bc8aec78 100644
--- a/src/components/transport_manager/src/tcp/tcp_device.cc
+++ b/src/components/transport_manager/src/tcp/tcp_device.cc
@@ -46,7 +46,7 @@ TcpDevice::TcpDevice(const in_addr_t& in_addr, const std::string& name)
   LOG4CXX_AUTO_TRACE(logger_);
 }
 
-#if defined(BUILD_TESTS)
+#if defined(ENABLE_IAP2EMULATION)
 TcpDevice::TcpDevice(const in_addr_t& in_addr,
                      const std::string& device_uid,
                      const std::string& transport_switch_id)
@@ -61,14 +61,14 @@ TcpDevice::TcpDevice(const in_addr_t& in_addr,
       logger_,
       "Device parameters: " << device_uid << " / " << transport_switch_id);
 }
-#endif  // BUILD_TESTS
+#endif  // ENABLE_IAP2EMULATION
 
 bool TcpDevice::IsSameAs(const Device* other) const {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_, "Device: " << other);
-  const TcpDevice* other_tcp_device = static_cast<const TcpDevice*>(other);
+  const TcpDevice* other_tcp_device = dynamic_cast<const TcpDevice*>(other);
 
-  if (other_tcp_device->in_addr_ == in_addr_) {
+  if (other_tcp_device && other_tcp_device->in_addr_ == in_addr_) {
     LOG4CXX_TRACE(
         logger_,
         "exit with TRUE. Condition: other_tcp_device->in_addr_ == in_addr_");
diff --git a/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc b/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc
index aeb50f3830..54eb3a7b6d 100644
--- a/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc
+++ b/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc
@@ -53,7 +53,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 
 TcpTransportAdapter::TcpTransportAdapter(
     const uint16_t port,
-    resumption::LastState& last_state,
+    resumption::LastStateWrapperPtr last_state_wrapper,
     const TransportManagerSettings& settings)
     : TransportAdapterImpl(
           NULL,
@@ -63,7 +63,7 @@ TcpTransportAdapter::TcpTransportAdapter(
               port,
               true,
               settings.transport_manager_tcp_adapter_network_interface()),
-          last_state,
+          last_state_wrapper,
           settings) {}
 
 TcpTransportAdapter::~TcpTransportAdapter() {}
@@ -131,20 +131,22 @@ void TcpTransportAdapter::Store() const {
     }
   }
   tcp_adapter_dictionary["devices"] = devices_dictionary;
-  Json::Value& dictionary = last_state().get_dictionary();
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   dictionary["TransportManager"]["TcpAdapter"] = tcp_adapter_dictionary;
+  accessor.GetMutableData().set_dictionary(dictionary);
 }
 
 bool TcpTransportAdapter::Restore() {
   LOG4CXX_AUTO_TRACE(logger_);
   bool errors_occurred = false;
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  Json::Value dictionary = accessor.GetData().dictionary();
   const Json::Value tcp_adapter_dictionary =
-      last_state().get_dictionary()["TransportManager"]["TcpAdapter"];
+      dictionary["TransportManager"]["TcpAdapter"];
   const Json::Value devices_dictionary = tcp_adapter_dictionary["devices"];
-  for (Json::Value::const_iterator i = devices_dictionary.begin();
-       i != devices_dictionary.end();
-       ++i) {
-    const Json::Value device_dictionary = *i;
+  for (const auto& tcp_adapter_device : devices_dictionary) {
+    const Json::Value device_dictionary = tcp_adapter_device;
     std::string name = device_dictionary["name"].asString();
     std::string address_record = device_dictionary["address"].asString();
     in_addr_t address = inet_addr(address_record.c_str());
@@ -153,10 +155,8 @@ bool TcpTransportAdapter::Restore() {
     AddDevice(device);
     const Json::Value applications_dictionary =
         device_dictionary["applications"];
-    for (Json::Value::const_iterator j = applications_dictionary.begin();
-         j != applications_dictionary.end();
-         ++j) {
-      const Json::Value application_dictionary = *j;
+    for (const auto& application : applications_dictionary) {
+      const Json::Value application_dictionary = application;
       std::string port_record = application_dictionary["port"].asString();
       int port = atoi(port_record.c_str());
       ApplicationHandle app_handle = tcp_device->AddDiscoveredApplication(port);
diff --git a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc
index 8f8c004594..7d96c685f1 100644
--- a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc
+++ b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc
@@ -62,7 +62,7 @@ ThreadedSocketConnection::ThreadedSocketConnection(
     , unexpected_disconnect_(false)
     , device_uid_(device_id)
     , app_handle_(app_handle)
-    , thread_(NULL) {
+    , thread_(nullptr) {
   const std::string thread_name = std::string("Socket ") + device_handle();
   thread_ = threads::CreateThread(thread_name.c_str(),
                                   new SocketConnectionDelegate(this));
@@ -70,7 +70,7 @@ ThreadedSocketConnection::ThreadedSocketConnection(
 
 ThreadedSocketConnection::~ThreadedSocketConnection() {
   LOG4CXX_AUTO_TRACE(logger_);
-  DCHECK(NULL == thread_);
+  DCHECK(nullptr == thread_);
 
   if (-1 != read_fd_) {
     close(read_fd_);
@@ -82,10 +82,12 @@ ThreadedSocketConnection::~ThreadedSocketConnection() {
 
 void ThreadedSocketConnection::StopAndJoinThread() {
   Disconnect();
-  thread_->join();
-  delete thread_->delegate();
-  threads::DeleteThread(thread_);
-  thread_ = NULL;
+  if (thread_) {
+    thread_->join();
+    delete thread_->delegate();
+    threads::DeleteThread(thread_);
+    thread_ = nullptr;
+  }
 }
 
 void ThreadedSocketConnection::Abort() {
@@ -167,16 +169,23 @@ TransportAdapter::Error ThreadedSocketConnection::Disconnect() {
   return Notify();
 }
 
+void ThreadedSocketConnection::Terminate() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  StopAndJoinThread();
+}
+
 void ThreadedSocketConnection::threadMain() {
   LOG4CXX_AUTO_TRACE(logger_);
-  ConnectError* connect_error = NULL;
+  ConnectError* connect_error = nullptr;
   if (!Establish(&connect_error)) {
     LOG4CXX_ERROR(logger_, "Connection Establish failed");
     delete connect_error;
     Abort();
+  } else {
+    LOG4CXX_DEBUG(logger_, "Connection established");
+    controller_->ConnectDone(device_handle(), application_handle());
   }
-  LOG4CXX_DEBUG(logger_, "Connection established");
-  controller_->ConnectDone(device_handle(), application_handle());
+
   while (!terminate_flag_) {
     Transmit();
   }
@@ -304,7 +313,7 @@ bool ThreadedSocketConnection::Receive() {
           logger_,
           "Received " << bytes_read << " bytes for connection " << this);
       ::protocol_handler::RawMessagePtr frame(
-          new protocol_handler::RawMessage(0, 0, buffer, bytes_read));
+          new protocol_handler::RawMessage(0, 0, buffer, bytes_read, false));
       controller_->DataReceiveDone(
           device_handle(), application_handle(), frame);
     } else if (bytes_read < 0) {
diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
index fc43cfc63e..36f6dd98d0 100644
--- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
+++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc
@@ -40,6 +40,9 @@
 #include "transport_manager/transport_adapter/server_connection_factory.h"
 #include "transport_manager/transport_adapter/transport_adapter_impl.h"
 #include "transport_manager/transport_adapter/transport_adapter_listener.h"
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+#include "transport_manager/websocket_server/websocket_device.h"
+#endif
 
 namespace transport_manager {
 namespace transport_adapter {
@@ -62,15 +65,16 @@ DeviceTypes devicesType = {
                    std::string("USB_IOS_DEVICE_MODE")),
     std::make_pair(DeviceType::IOS_CARPLAY_WIRELESS,
                    std::string("CARPLAY_WIRELESS_IOS")),
-    std::make_pair(DeviceType::CLOUD_WEBSOCKET,
-                   std::string("CLOUD_WEBSOCKET"))};
+    std::make_pair(DeviceType::CLOUD_WEBSOCKET, std::string("CLOUD_WEBSOCKET")),
+    std::make_pair(DeviceType::WEBENGINE_WEBSOCKET,
+                   std::string("WEBENGINE_WEBSOCKET"))};
 }
 
 TransportAdapterImpl::TransportAdapterImpl(
     DeviceScanner* device_scanner,
     ServerConnectionFactory* server_connection_factory,
     ClientConnectionListener* client_connection_listener,
-    resumption::LastState& last_state,
+    resumption::LastStateWrapperPtr last_state_wrapper,
     const TransportManagerSettings& settings)
     : listeners_()
     , initialised_(0)
@@ -86,7 +90,7 @@ TransportAdapterImpl::TransportAdapterImpl(
     device_scanner_(device_scanner)
     , server_connection_factory_(server_connection_factory)
     , client_connection_listener_(client_connection_listener)
-    , last_state_(last_state)
+    , last_state_wrapper_(last_state_wrapper)
     , settings_(settings) {
 }
 
@@ -138,6 +142,12 @@ void TransportAdapterImpl::Terminate() {
   connections_lock_.AcquireForWriting();
   std::swap(connections, connections_);
   connections_lock_.Release();
+  for (const auto& connection : connections) {
+    auto& info = connection.second;
+    if (info.connection) {
+      info.connection->Terminate();
+    }
+  }
   connections.clear();
 
   LOG4CXX_DEBUG(logger_, "Connections deleted");
@@ -232,11 +242,9 @@ TransportAdapter::Error TransportAdapterImpl::Connect(
   const TransportAdapter::Error err =
       server_connection_factory_->CreateConnection(device_id, app_handle);
   if (TransportAdapter::OK != err) {
-    connections_lock_.AcquireForWriting();
     if (!pending_app) {
-      connections_.erase(std::make_pair(device_id, app_handle));
+      RemoveConnection(device_id, app_handle);
     }
-    connections_lock_.Release();
   }
   LOG4CXX_TRACE(logger_, "exit with error: " << err);
   return err;
@@ -367,6 +375,10 @@ TransportAdapter::Error TransportAdapterImpl::DisconnectDevice(
 
   Error error = OK;
   DeviceSptr device = FindDevice(device_id);
+  if (!device) {
+    LOG4CXX_WARN(logger_, "Device with id: " << device_id << " Not found");
+    return BAD_PARAM;
+  }
   ConnectionStatusUpdated(device, ConnectionStatus::CLOSING);
 
   std::vector<ConnectionInfo> to_disconnect;
@@ -418,8 +430,9 @@ TransportAdapter::Error TransportAdapterImpl::SendData(
   }
 }
 
-TransportAdapter::Error TransportAdapterImpl::StartClientListening() {
-  LOG4CXX_TRACE(logger_, "enter");
+TransportAdapter::Error TransportAdapterImpl::ChangeClientListening(
+    TransportAction required_change) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (client_connection_listener_ == 0) {
     LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED");
     return NOT_SUPPORTED;
@@ -428,27 +441,43 @@ TransportAdapter::Error TransportAdapterImpl::StartClientListening() {
     LOG4CXX_TRACE(logger_, "exit with BAD_STATE");
     return BAD_STATE;
   }
-  TransportAdapter::Error err = client_connection_listener_->StartListening();
-  LOG4CXX_TRACE(logger_, "exit with error: " << err);
-  return err;
-}
 
-TransportAdapter::Error TransportAdapterImpl::StopClientListening() {
-  LOG4CXX_TRACE(logger_, "enter");
-  if (client_connection_listener_ == 0) {
-    LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED");
-    return NOT_SUPPORTED;
-  }
-  if (!client_connection_listener_->IsInitialised()) {
-    LOG4CXX_TRACE(logger_, "exit with BAD_STATE");
-    return BAD_STATE;
-  }
-  TransportAdapter::Error err = client_connection_listener_->StopListening();
-  sync_primitives::AutoLock locker(devices_mutex_);
-  for (DeviceMap::iterator it = devices_.begin(); it != devices_.end(); ++it) {
-    it->second->Stop();
+  TransportAdapter::Error err = TransportAdapter::Error::UNKNOWN;
+
+  switch (required_change) {
+    case transport_manager::TransportAction::kVisibilityOn:
+      err = client_connection_listener_->StartListening();
+      break;
+
+    case transport_manager::TransportAction::kListeningOn:
+      err = client_connection_listener_->ResumeListening();
+      break;
+
+    case transport_manager::TransportAction::kListeningOff:
+      err = client_connection_listener_->SuspendListening();
+      {
+        sync_primitives::AutoLock locker(devices_mutex_);
+        for (DeviceMap::iterator it = devices_.begin(); it != devices_.end();
+             ++it) {
+          it->second->Stop();
+        }
+      }
+      break;
+
+    case transport_manager::TransportAction::kVisibilityOff:
+      err = client_connection_listener_->StopListening();
+      {
+        sync_primitives::AutoLock locker(devices_mutex_);
+        for (DeviceMap::iterator it = devices_.begin(); it != devices_.end();
+             ++it) {
+          it->second->Stop();
+        }
+      }
+      break;
+    default:
+      NOTREACHED();
   }
-  LOG4CXX_TRACE(logger_, "exit with error: " << err);
+  LOG4CXX_TRACE(logger_, "Exit with error: " << err);
   return err;
 }
 
@@ -465,6 +494,32 @@ DeviceList TransportAdapterImpl::GetDeviceList() const {
   return devices;
 }
 
+DeviceSptr TransportAdapterImpl::GetWebEngineDevice() const {
+#ifndef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  LOG4CXX_TRACE(logger_,
+                "Web engine support is disabled. Device does not exist");
+  return DeviceSptr();
+#else
+  LOG4CXX_AUTO_TRACE(logger_);
+  sync_primitives::AutoLock locker(devices_mutex_);
+
+  auto web_engine_device =
+      std::find_if(devices_.begin(),
+                   devices_.end(),
+                   [](const std::pair<DeviceUID, DeviceSptr> device) {
+                     return webengine_constants::kWebEngineDeviceName ==
+                            device.second->name();
+                   });
+
+  if (devices_.end() != web_engine_device) {
+    return web_engine_device->second;
+  }
+
+  LOG4CXX_ERROR(logger_, "WebEngine device not found!");
+  return std::make_shared<transport_adapter::WebSocketDevice>("", "");
+#endif
+}
+
 DeviceSptr TransportAdapterImpl::AddDevice(DeviceSptr device) {
   LOG4CXX_TRACE(logger_, "enter. device: " << device);
   DeviceSptr existing_device;
@@ -662,14 +717,12 @@ void TransportAdapterImpl::DeviceDisconnected(
     listener->OnDisconnectDeviceDone(this, device_uid);
   }
 
-  connections_lock_.AcquireForWriting();
   for (ApplicationList::const_iterator i = app_list.begin();
        i != app_list.end();
        ++i) {
     ApplicationHandle app_handle = *i;
-    connections_.erase(std::make_pair(device_uid, app_handle));
+    RemoveConnection(device_uid, app_handle);
   }
-  connections_lock_.Release();
 
   RemoveDevice(device_uid);
   LOG4CXX_TRACE(logger_, "exit");
@@ -719,9 +772,7 @@ void TransportAdapterImpl::DisconnectDone(const DeviceUID& device_handle,
       listener->OnDisconnectDeviceDone(this, device_uid);
     }
   }
-  connections_lock_.AcquireForWriting();
-  connections_.erase(std::make_pair(device_uid, app_uid));
-  connections_lock_.Release();
+  RemoveConnection(device_uid, app_uid);
 
   if (device_disconnected) {
     RemoveDevice(device_uid);
@@ -916,9 +967,7 @@ void TransportAdapterImpl::ConnectFailed(const DeviceUID& device_handle,
   LOG4CXX_TRACE(logger_,
                 "enter. device_id: " << &device_uid << ", app_handle: "
                                      << &app_uid << ", error: " << &error);
-  connections_lock_.AcquireForWriting();
-  connections_.erase(std::make_pair(device_uid, app_uid));
-  connections_lock_.Release();
+  RemoveConnection(device_uid, app_uid);
   for (TransportAdapterListenerList::iterator it = listeners_.begin();
        it != listeners_.end();
        ++it) {
@@ -931,23 +980,70 @@ void TransportAdapterImpl::RemoveFinalizedConnection(
     const DeviceUID& device_handle, const ApplicationHandle& app_handle) {
   const DeviceUID device_uid = device_handle;
   LOG4CXX_AUTO_TRACE(logger_);
-  sync_primitives::AutoWriteLock lock(connections_lock_);
-  ConnectionMap::iterator it_conn =
-      connections_.find(std::make_pair(device_uid, app_handle));
-  if (it_conn == connections_.end()) {
-    LOG4CXX_WARN(logger_,
-                 "Device_id: " << &device_uid << ", app_handle: " << &app_handle
-                               << " connection not found");
-    return;
+  {
+    connections_lock_.AcquireForWriting();
+    auto it_conn = connections_.find(std::make_pair(device_uid, app_handle));
+    if (connections_.end() == it_conn) {
+      LOG4CXX_WARN(logger_,
+                   "Device_id: " << &device_uid << ", app_handle: "
+                                 << &app_handle << " connection not found");
+      connections_lock_.Release();
+      return;
+    }
+    const ConnectionInfo& info = it_conn->second;
+    if (ConnectionInfo::FINALISING != info.state) {
+      LOG4CXX_WARN(logger_,
+                   "Device_id: " << &device_uid << ", app_handle: "
+                                 << &app_handle << " connection not finalized");
+      connections_lock_.Release();
+      return;
+    }
+    // By copying the info.connection shared pointer into this local variable,
+    // we can delay the connection's destructor until after
+    // connections_lock_.Release.
+    LOG4CXX_DEBUG(
+        logger_,
+        "RemoveFinalizedConnection copying connection with Device_id: "
+            << &device_uid << ", app_handle: " << &app_handle);
+    ConnectionSPtr connection = info.connection;
+    connections_.erase(it_conn);
+    connections_lock_.Release();
+    LOG4CXX_DEBUG(logger_,
+                  "RemoveFinalizedConnection Connections Lock Released");
   }
-  const ConnectionInfo& info = it_conn->second;
-  if (info.state != ConnectionInfo::FINALISING) {
-    LOG4CXX_WARN(logger_,
-                 "Device_id: " << &device_uid << ", app_handle: " << &app_handle
-                               << " connection not finalized");
+
+  DeviceSptr device = FindDevice(device_handle);
+  if (!device) {
+    LOG4CXX_WARN(logger_, "Device: uid " << &device_uid << " not found");
     return;
   }
-  connections_.erase(it_conn);
+
+  if (ToBeAutoDisconnected(device) &&
+      IsSingleApplication(device_handle, app_handle)) {
+    RemoveDevice(device_uid);
+  }
+}
+
+void TransportAdapterImpl::RemoveConnection(
+    const DeviceUID& device_id, const ApplicationHandle& app_handle) {
+  ConnectionSPtr connection;
+  connections_lock_.AcquireForWriting();
+  ConnectionMap::const_iterator it =
+      connections_.find(std::make_pair(device_id, app_handle));
+  if (it != connections_.end()) {
+    // By copying the connection from the map to this shared pointer,
+    // we can erase the object from the map without triggering the destructor
+    LOG4CXX_DEBUG(logger_,
+                  "Copying connection with Device_id: "
+                      << &device_id << ", app_handle: " << &app_handle);
+    connection = it->second.connection;
+    connections_.erase(it);
+  }
+  connections_lock_.Release();
+  LOG4CXX_DEBUG(logger_, "Connections Lock Released");
+
+  // And now, "connection" goes out of scope, triggering the destructor outside
+  // of the "connections_lock_"
 }
 
 void TransportAdapterImpl::AddListener(TransportAdapterListener* listener) {
diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc
index 71fc41ada9..74c5b9ceee 100644
--- a/src/components/transport_manager/src/transport_manager_default.cc
+++ b/src/components/transport_manager/src/transport_manager_default.cc
@@ -48,97 +48,152 @@
 #include "transport_manager/cloud/cloud_websocket_transport_adapter.h"
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 
-#if defined(BUILD_TESTS)
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+#include "transport_manager/websocket_server/websocket_server_transport_adapter.h"
+#endif
+
+#if defined(ENABLE_IAP2EMULATION)
 #include "transport_manager/iap2_emulation/iap2_transport_adapter.h"
-#endif  // BUILD_TEST
+#endif  // ENABLE_IAP2EMULATION
 
 namespace transport_manager {
 CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 
+TransportAdapterFactory::TransportAdapterFactory() {
+#ifdef BLUETOOTH_SUPPORT
+  ta_bluetooth_creator_ = [](resumption::LastStateWrapperPtr last_state_wrapper,
+                             const TransportManagerSettings& settings) {
+    return new transport_adapter::BluetoothTransportAdapter(last_state_wrapper,
+                                                            settings);
+  };
+#endif
+  ta_tcp_creator_ = [](const uint16_t port,
+                       resumption::LastStateWrapperPtr last_state_wrapper,
+                       const TransportManagerSettings& settings) {
+    return new transport_adapter::TcpTransportAdapter(
+        port, last_state_wrapper, settings);
+  };
+#if defined(USB_SUPPORT)
+  ta_usb_creator_ = [](resumption::LastStateWrapperPtr last_state_wrapper,
+                       const TransportManagerSettings& settings) {
+    return new transport_adapter::UsbAoaAdapter(last_state_wrapper, settings);
+  };
+#endif
+#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
+  ta_cloud_creator_ = [](resumption::LastStateWrapperPtr last_state_wrapper,
+                         const TransportManagerSettings& settings) {
+    return new transport_adapter::CloudWebsocketTransportAdapter(
+        last_state_wrapper, settings);
+  };
+#endif
+
+#if defined(WEBSOCKET_SERVER_TRANSPORT_SUPPORT)
+  ta_websocket_server_creator_ =
+      [](resumption::LastStateWrapperPtr last_state_wrapper,
+         const TransportManagerSettings& settings) {
+        return new transport_adapter::WebSocketServerTransportAdapter(
+            last_state_wrapper, settings);
+      };
+#endif
+}
+
 TransportManagerDefault::TransportManagerDefault(
-    const TransportManagerSettings& settings)
-    : TransportManagerImpl(settings) {}
+    const TransportManagerSettings& settings,
+    const TransportAdapterFactory& ta_factory)
+    : TransportManagerImpl(settings), ta_factory_(ta_factory) {}
 
-int TransportManagerDefault::Init(resumption::LastState& last_state) {
+int TransportManagerDefault::Init(
+    resumption::LastStateWrapperPtr last_state_wrapper) {
   LOG4CXX_TRACE(logger_, "enter");
-  if (E_SUCCESS != TransportManagerImpl::Init(last_state)) {
+  if (E_SUCCESS != TransportManagerImpl::Init(last_state_wrapper)) {
     LOG4CXX_TRACE(logger_,
                   "exit with E_TM_IS_NOT_INITIALIZED. Condition: E_SUCCESS != "
                   "TransportManagerImpl::Init()");
     return E_TM_IS_NOT_INITIALIZED;
   }
 
-#ifdef BLUETOOTH_SUPPORT
-  transport_adapter::TransportAdapterImpl* ta_bluetooth =
-      new transport_adapter::BluetoothTransportAdapter(last_state,
-                                                       get_settings());
+  const auto& settings = get_settings();
+
+#if defined(BLUETOOTH_SUPPORT)
+  auto ta_bluetooth =
+      ta_factory_.ta_bluetooth_creator_(last_state_wrapper, settings);
 #ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     ta_bluetooth->SetTelemetryObserver(metric_observer_);
   }
 #endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta_bluetooth);
-  ta_bluetooth = NULL;
-#endif
+#endif  // BLUETOOTH_SUPPORT
 
-  const uint16_t port = get_settings().transport_manager_tcp_adapter_port();
-  transport_adapter::TransportAdapterImpl* ta_tcp =
-      new transport_adapter::TcpTransportAdapter(
-          port, last_state, get_settings());
+  auto ta_tcp =
+      ta_factory_.ta_tcp_creator_(settings.transport_manager_tcp_adapter_port(),
+                                  last_state_wrapper,
+                                  settings);
 #ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     ta_tcp->SetTelemetryObserver(metric_observer_);
   }
 #endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta_tcp);
-  ta_tcp = NULL;
 
 #if defined(USB_SUPPORT)
-  transport_adapter::TransportAdapterImpl* ta_usb =
-      new transport_adapter::UsbAoaAdapter(last_state, get_settings());
+  auto ta_usb = ta_factory_.ta_usb_creator_(last_state_wrapper, settings);
 #ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     ta_usb->SetTelemetryObserver(metric_observer_);
   }
 #endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta_usb);
-  ta_usb = NULL;
 #endif  // USB_SUPPORT
 
 #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
-  transport_adapter::TransportAdapterImpl* ta_cloud =
-      new transport_adapter::CloudWebsocketTransportAdapter(last_state,
-                                                            get_settings());
+  auto ta_cloud = ta_factory_.ta_cloud_creator_(last_state_wrapper, settings);
 #ifdef TELEMETRY_MONITOR
   if (metric_observer_) {
     ta_cloud->SetTelemetryObserver(metric_observer_);
   }
 #endif  // TELEMETRY_MONITOR
   AddTransportAdapter(ta_cloud);
-  ta_cloud = NULL;
 #endif  // CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT
 
-#if defined BUILD_TESTS
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  auto ta_websocket =
+      ta_factory_.ta_websocket_server_creator_(last_state_wrapper, settings);
+
+#ifdef TELEMETRY_MONITOR
+  if (metric_observer_) {
+    ta_websocket->SetTelemetryObserver(metric_observer_);
+  }
+#endif  // TELEMETRY_MONITOR
+  AddTransportAdapter(ta_websocket);
+  ta_websocket = NULL;
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+
+#if defined ENABLE_IAP2EMULATION
   const uint16_t iap2_bt_emu_port = 23456;
   transport_adapter::IAP2BluetoothEmulationTransportAdapter*
       iap2_bt_emu_adapter =
           new transport_adapter::IAP2BluetoothEmulationTransportAdapter(
-              iap2_bt_emu_port, last_state, get_settings());
+              iap2_bt_emu_port, last_state_wrapper, settings);
 
   AddTransportAdapter(iap2_bt_emu_adapter);
 
   const uint16_t iap2_usb_emu_port = 34567;
   transport_adapter::IAP2USBEmulationTransportAdapter* iap2_usb_emu_adapter =
       new transport_adapter::IAP2USBEmulationTransportAdapter(
-          iap2_usb_emu_port, last_state, get_settings());
+          iap2_usb_emu_port, last_state_wrapper, settings);
 
   AddTransportAdapter(iap2_usb_emu_adapter);
-#endif  // BUILD_TEST
+#endif  // ENABLE_IAP2EMULATION
 
   LOG4CXX_TRACE(logger_, "exit with E_SUCCESS");
   return E_SUCCESS;
 }
 
+int TransportManagerDefault::Init(resumption::LastState&) {
+  return 1;
+}
+
 TransportManagerDefault::~TransportManagerDefault() {}
 
 }  //  namespace transport_manager
diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc
index a2bc95bfdd..ddff4f3780 100644
--- a/src/components/transport_manager/src/transport_manager_impl.cc
+++ b/src/components/transport_manager/src/transport_manager_impl.cc
@@ -54,6 +54,10 @@
 #include "transport_manager/transport_adapter/transport_adapter_event.h"
 #include "transport_manager/transport_manager_listener.h"
 #include "transport_manager/transport_manager_listener_empty.h"
+#ifdef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+#include "transport_manager/websocket_server/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_server_transport_adapter.h"
+#endif
 #include "utils/timer_task_impl.h"
 
 using ::transport_manager::transport_adapter::TransportAdapter;
@@ -67,6 +71,7 @@ struct ConnectionFinder {
     return id_ == connection.id;
   }
 };
+
 }  // namespace
 
 namespace transport_manager {
@@ -100,7 +105,14 @@ TransportManagerImpl::TransportManagerImpl(
     , device_switch_timer_(
           "Device reconection timer",
           new timer::TimerTaskImpl<TransportManagerImpl>(
-              this, &TransportManagerImpl::ReconnectionTimeout)) {
+              this, &TransportManagerImpl::ReconnectionTimeout))
+    , events_processing_is_active_(true)
+    , events_processing_lock_()
+    , events_processing_cond_var_()
+    , web_engine_device_info_(0,
+                              "",
+                              webengine_constants::kWebEngineDeviceName,
+                              webengine_constants::kWebEngineConnectionType) {
   LOG4CXX_TRACE(logger_, "TransportManager has created");
 }
 
@@ -577,8 +589,18 @@ int TransportManagerImpl::SearchDevices() {
   return transport_adapter_search;
 }
 
+int TransportManagerImpl::Init(
+    resumption::LastStateWrapperPtr last_state_wrapper) {
+  // Last state wrapper required to initialize Transport adapters
+  UNUSED(last_state_wrapper);
+  LOG4CXX_TRACE(logger_, "enter");
+  is_initialized_ = true;
+  LOG4CXX_TRACE(logger_, "exit with E_SUCCESS");
+  return E_SUCCESS;
+}
+
 int TransportManagerImpl::Init(resumption::LastState& last_state) {
-  // Last state requred to initialize Transport adapters
+  // Last state required to initialize Transport adapters
   UNUSED(last_state);
   LOG4CXX_TRACE(logger_, "enter");
   is_initialized_ = true;
@@ -586,21 +608,36 @@ int TransportManagerImpl::Init(resumption::LastState& last_state) {
   return E_SUCCESS;
 }
 
-int TransportManagerImpl::Reinit() {
+void TransportManagerImpl::Deinit() {
   LOG4CXX_AUTO_TRACE(logger_);
   DisconnectAllDevices();
   TerminateAllAdapters();
   device_to_adapter_map_.clear();
   connection_id_counter_ = 0;
+}
+
+int TransportManagerImpl::Reinit() {
   int ret = InitAllAdapters();
   return ret;
 }
 
-int TransportManagerImpl::Visibility(const bool& on_off) const {
-  LOG4CXX_TRACE(logger_, "enter. On_off: " << &on_off);
-  TransportAdapter::Error ret;
+void TransportManagerImpl::StopEventsProcessing() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  events_processing_is_active_ = false;
+}
+
+void TransportManagerImpl::StartEventsProcessing() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  events_processing_is_active_ = true;
+  events_processing_cond_var_.Broadcast();
+}
 
-  LOG4CXX_DEBUG(logger_, "Visibility change requested to " << on_off);
+int TransportManagerImpl::PerformActionOnClients(
+    const TransportAction required_action) const {
+  LOG4CXX_TRACE(logger_,
+                "The following action requested: "
+                    << static_cast<int>(required_action)
+                    << " to be performed on connected clients");
   if (!is_initialized_) {
     LOG4CXX_ERROR(logger_, "TM is not initialized");
     LOG4CXX_TRACE(logger_,
@@ -609,26 +646,82 @@ int TransportManagerImpl::Visibility(const bool& on_off) const {
     return E_TM_IS_NOT_INITIALIZED;
   }
 
-  for (std::vector<TransportAdapter*>::const_iterator it =
-           transport_adapters_.begin();
-       it != transport_adapters_.end();
-       ++it) {
-    if (on_off) {
-      ret = (*it)->StartClientListening();
-    } else {
-      ret = (*it)->StopClientListening();
-    }
+  TransportAdapter::Error ret = TransportAdapter::Error::UNKNOWN;
+
+  for (auto adapter_ptr : transport_adapters_) {
+    ret = adapter_ptr->ChangeClientListening(required_action);
+
     if (TransportAdapter::Error::NOT_SUPPORTED == ret) {
       LOG4CXX_DEBUG(logger_,
-                    "Visibility change is not supported for adapter "
-                        << *it << "[" << (*it)->GetDeviceType() << "]");
+                    "Requested action on client is not supported for adapter "
+                        << adapter_ptr << "[" << adapter_ptr->GetDeviceType()
+                        << "]");
     }
   }
+
   LOG4CXX_TRACE(logger_, "exit with E_SUCCESS");
   return E_SUCCESS;
 }
 
-void TransportManagerImpl::UpdateDeviceList(TransportAdapter* ta) {
+void TransportManagerImpl::CreateWebEngineDevice() {
+#ifndef WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+  LOG4CXX_TRACE(logger_, "Web engine support is disabled. Exiting function");
+#else
+  LOG4CXX_AUTO_TRACE(logger_);
+  auto web_socket_ta_iterator = std::find_if(
+      transport_adapters_.begin(),
+      transport_adapters_.end(),
+      [](const TransportAdapter* ta) {
+        return transport_adapter::DeviceType::WEBENGINE_WEBSOCKET ==
+               ta->GetDeviceType();
+      });
+
+  if (transport_adapters_.end() == web_socket_ta_iterator) {
+    LOG4CXX_WARN(logger_,
+                 "WebSocketServerTransportAdapter not found."
+                 "Impossible to create WebEngineDevice");
+    return;
+  }
+
+  auto web_socket_ta =
+      dynamic_cast<transport_adapter::WebSocketServerTransportAdapter*>(
+          *web_socket_ta_iterator);
+
+  if (!web_socket_ta) {
+    LOG4CXX_ERROR(logger_,
+                  "Unable to cast from Transport Adapter to "
+                  "WebSocketServerTransportAdapter."
+                  "Impossible to create WebEngineDevice");
+    return;
+  }
+
+  std::string unique_device_id = web_socket_ta->GetStoredDeviceID();
+
+  DeviceHandle device_handle = converter_.UidToHandle(
+      unique_device_id, webengine_constants::kWebEngineConnectionType);
+
+  web_engine_device_info_ =
+      DeviceInfo(device_handle,
+                 unique_device_id,
+                 webengine_constants::kWebEngineDeviceName,
+                 webengine_constants::kWebEngineConnectionType);
+
+  auto ws_device = std::make_shared<transport_adapter::WebSocketDevice>(
+      web_engine_device_info_.name(), web_engine_device_info_.mac_address());
+
+  ws_device->set_keep_on_disconnect(true);
+
+  web_socket_ta->AddDevice(ws_device);
+  OnDeviceListUpdated(web_socket_ta);
+#endif  // WEBSOCKET_SERVER_TRANSPORT_SUPPORT
+}
+
+const DeviceInfo& TransportManagerImpl::GetWebEngineDeviceInfo() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return web_engine_device_info_;
+}
+
+bool TransportManagerImpl::UpdateDeviceList(TransportAdapter* ta) {
   LOG4CXX_TRACE(logger_, "enter. TransportAdapter: " << ta);
   std::set<DeviceInfo> old_devices;
   std::set<DeviceInfo> new_devices;
@@ -680,7 +773,9 @@ void TransportManagerImpl::UpdateDeviceList(TransportAdapter* ta) {
        ++it) {
     RaiseEvent(&TransportManagerListener::OnDeviceRemoved, *it);
   }
+
   LOG4CXX_TRACE(logger_, "exit");
+  return added_devices.size() + removed_devices.size() > 0;
 }
 
 void TransportManagerImpl::PostMessage(
@@ -829,9 +924,9 @@ void TransportManagerImpl::TryDeviceSwitch(
                                            IOSBTAdapterFinder());
 
   if (transport_adapters_.end() == ios_bt_adapter) {
-    LOG4CXX_WARN(
-        logger_,
-        "There is no iAP2 Bluetooth adapter found. Switching is not possible.");
+    LOG4CXX_WARN(logger_,
+                 "There is no iAP2 Bluetooth adapter found. Switching is not "
+                 "possible.");
     return;
   }
 
@@ -972,7 +1067,12 @@ void TransportManagerImpl::OnDeviceListUpdated(TransportAdapter* ta) {
     LOG4CXX_ERROR(logger_, "Device list update failed.");
     return;
   }
-  UpdateDeviceList(ta);
+
+  if (!UpdateDeviceList(ta)) {
+    LOG4CXX_DEBUG(logger_, "Device list was not changed");
+    return;
+  }
+
   std::vector<DeviceInfo> device_infos;
   device_list_lock_.AcquireForReading();
   for (DeviceInfoList::const_iterator it = device_list_.begin();
@@ -987,6 +1087,13 @@ void TransportManagerImpl::OnDeviceListUpdated(TransportAdapter* ta) {
 
 void TransportManagerImpl::Handle(TransportAdapterEvent event) {
   LOG4CXX_TRACE(logger_, "enter");
+
+  if (!events_processing_is_active_) {
+    LOG4CXX_DEBUG(logger_, "Waiting for events handling unlock");
+    sync_primitives::AutoLock auto_lock(events_processing_lock_);
+    events_processing_cond_var_.Wait(auto_lock);
+  }
+
   switch (event.event_type) {
     case EventTypeEnum::ON_SEARCH_DONE: {
       RaiseEvent(&TransportManagerListener::OnScanDevicesFinished);
@@ -1297,6 +1404,13 @@ void TransportManagerImpl::SetTelemetryObserver(TMTelemetryObserver* observer) {
 
 void TransportManagerImpl::Handle(::protocol_handler::RawMessagePtr msg) {
   LOG4CXX_TRACE(logger_, "enter");
+
+  if (!events_processing_is_active_) {
+    LOG4CXX_DEBUG(logger_, "Waiting for events handling unlock");
+    sync_primitives::AutoLock auto_lock(events_processing_lock_);
+    events_processing_cond_var_.Wait(auto_lock);
+  }
+
   sync_primitives::AutoReadLock lock(connections_lock_);
   ConnectionInternal* connection = GetConnection(msg->connection_key());
   if (connection == NULL) {
diff --git a/src/components/transport_manager/src/usb/libusb/usb_connection.cc b/src/components/transport_manager/src/usb/libusb/usb_connection.cc
index d60c409a96..4b7b22394d 100644
--- a/src/components/transport_manager/src/usb/libusb/usb_connection.cc
+++ b/src/components/transport_manager/src/usb/libusb/usb_connection.cc
@@ -137,7 +137,7 @@ void UsbConnection::OnInTransfer(libusb_transfer* transfer) {
                       << transfer->actual_length << ", data:"
                       << hex_data(transfer->buffer, transfer->actual_length));
     ::protocol_handler::RawMessagePtr data(new protocol_handler::RawMessage(
-        0, 0, in_buffer_, transfer->actual_length));
+        0, 0, in_buffer_, transfer->actual_length, false));
     controller_->DataReceiveDone(device_uid_, app_handle_, data);
   } else {
     LOG4CXX_ERROR(logger_,
@@ -159,26 +159,30 @@ void UsbConnection::OnInTransfer(libusb_transfer* transfer) {
   LOG4CXX_TRACE(logger_, "exit");
 }
 
-void UsbConnection::PopOutMessage() {
+TransportAdapter::Error UsbConnection::PopOutMessage() {
   LOG4CXX_TRACE(logger_, "enter");
   bytes_sent_ = 0;
+  auto error_code = TransportAdapter::OK;
   if (out_messages_.empty()) {
     current_out_message_.reset();
   } else {
     current_out_message_ = out_messages_.front();
     out_messages_.pop_front();
-    PostOutTransfer();
+    error_code = PostOutTransfer();
   }
   LOG4CXX_TRACE(logger_, "exit");
+  return error_code;
 }
 
-bool UsbConnection::PostOutTransfer() {
+TransportAdapter::Error UsbConnection::PostOutTransfer() {
   LOG4CXX_TRACE(logger_, "enter");
   out_transfer_ = libusb_alloc_transfer(0);
-  if (0 == out_transfer_) {
+  if (nullptr == out_transfer_) {
     LOG4CXX_ERROR(logger_, "libusb_alloc_transfer failed");
-    LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: 0 == out_transfer_");
-    return false;
+    LOG4CXX_TRACE(logger_,
+                  "exit with TransportAdapter::BAD_STATE. Condition: nullptr "
+                  "== out_transfer_");
+    return TransportAdapter::BAD_STATE;
   }
   libusb_fill_bulk_transfer(out_transfer_,
                             device_handle_,
@@ -192,43 +196,50 @@ bool UsbConnection::PostOutTransfer() {
   if (LIBUSB_SUCCESS != libusb_ret) {
     LOG4CXX_ERROR(
         logger_,
-        "libusb_submit_transfer failed: " << libusb_error_name(libusb_ret)
-                                          << ". Abort connection.");
-    AbortConnection();
+        "libusb_submit_transfer failed: " << libusb_error_name(libusb_ret));
     LOG4CXX_TRACE(logger_,
-                  "exit with FALSE. Condition: "
+                  "exit with TransportAdapter::FAIL. Condition: "
                       << "LIBUSB_SUCCESS != libusb_fill_bulk_transfer");
-    return false;
+    return TransportAdapter::FAIL;
   }
-  LOG4CXX_TRACE(logger_, "exit with TRUE");
-  return true;
+  LOG4CXX_TRACE(logger_, "exit with TransportAdapter::OK");
+  return TransportAdapter::OK;
 }
 
 void UsbConnection::OnOutTransfer(libusb_transfer* transfer) {
   LOG4CXX_TRACE(logger_, "enter with  Libusb_transfer*: " << transfer);
-  sync_primitives::AutoLock locker(out_messages_mutex_);
-  if (transfer->status == LIBUSB_TRANSFER_COMPLETED) {
-    bytes_sent_ += transfer->actual_length;
-    if (bytes_sent_ == current_out_message_->data_size()) {
-      LOG4CXX_DEBUG(
+  auto error_code = TransportAdapter::OK;
+  {
+    sync_primitives::AutoLock locker(out_messages_mutex_);
+    if (LIBUSB_TRANSFER_COMPLETED == transfer->status) {
+      bytes_sent_ += transfer->actual_length;
+      if (current_out_message_->data_size() == bytes_sent_) {
+        LOG4CXX_DEBUG(
+            logger_,
+            "USB out transfer, data sent: " << current_out_message_.get());
+        controller_->DataSendDone(
+            device_uid_, app_handle_, current_out_message_);
+        error_code = PopOutMessage();
+      }
+    } else {
+      LOG4CXX_ERROR(
           logger_,
-          "USB out transfer, data sent: " << current_out_message_.get());
-      controller_->DataSendDone(device_uid_, app_handle_, current_out_message_);
-      PopOutMessage();
+          "USB out transfer failed: " << libusb_error_name(transfer->status));
+      controller_->DataSendFailed(
+          device_uid_, app_handle_, current_out_message_, DataSendError());
+      error_code = PopOutMessage();
+    }
+    if (current_out_message_.use_count() == 0) {
+      libusb_free_transfer(transfer);
+      out_transfer_ = nullptr;
+      waiting_out_transfer_cancel_ = false;
     }
-  } else {
-    LOG4CXX_ERROR(
-        logger_,
-        "USB out transfer failed: " << libusb_error_name(transfer->status));
-    controller_->DataSendFailed(
-        device_uid_, app_handle_, current_out_message_, DataSendError());
-    PopOutMessage();
   }
-  if (current_out_message_.use_count() == 0) {
-    libusb_free_transfer(transfer);
-    out_transfer_ = NULL;
-    waiting_out_transfer_cancel_ = false;
+
+  if (TransportAdapter::FAIL == error_code) {
+    AbortConnection();
   }
+
   LOG4CXX_TRACE(logger_, "exit");
 }
 
@@ -241,22 +252,35 @@ TransportAdapter::Error UsbConnection::SendData(
                       << "disconnecting_");
     return TransportAdapter::BAD_STATE;
   }
-  sync_primitives::AutoLock locker(out_messages_mutex_);
-  if (current_out_message_.use_count() != 0) {
-    out_messages_.push_back(message);
-  } else {
-    current_out_message_ = message;
-    if (!PostOutTransfer()) {
-      controller_->DataSendFailed(
-          device_uid_, app_handle_, message, DataSendError());
-      LOG4CXX_TRACE(
-          logger_,
-          "exit with TransportAdapter::FAIL. Condition: !PostOutTransfer()");
-      return TransportAdapter::FAIL;
+
+  auto process_message = [this, &message]() {
+    sync_primitives::AutoLock locker(out_messages_mutex_);
+    if (current_out_message_.use_count() == 0) {
+      current_out_message_ = message;
+      return PostOutTransfer();
     }
+    out_messages_.push_back(message);
+    return TransportAdapter::OK;
+  };
+
+  auto error_code = process_message();
+
+  if (TransportAdapter::OK == error_code) {
+    LOG4CXX_TRACE(logger_, "exit with TransportAdapter::OK.");
+    return TransportAdapter::OK;
   }
-  LOG4CXX_TRACE(logger_, "exit with TransportAdapter::OK.");
-  return TransportAdapter::OK;
+
+  controller_->DataSendFailed(
+      device_uid_, app_handle_, message, DataSendError());
+
+  if (TransportAdapter::FAIL == error_code) {
+    AbortConnection();
+  }
+
+  LOG4CXX_TRACE(logger_,
+                "exit with TransportAdapter::FAIL. PostOutTransfer сondition: "
+                    << error_code);
+  return TransportAdapter::FAIL;
 }
 
 void UsbConnection::Finalise() {
@@ -293,9 +317,9 @@ void UsbConnection::Finalise() {
 
 void UsbConnection::AbortConnection() {
   LOG4CXX_TRACE(logger_, "enter");
+  Finalise();
   controller_->ConnectionAborted(
       device_uid_, app_handle_, CommunicationError());
-  Disconnect();
   LOG4CXX_TRACE(logger_, "exit");
 }
 
diff --git a/src/components/transport_manager/src/usb/libusb/usb_handler.cc b/src/components/transport_manager/src/usb/libusb/usb_handler.cc
index df3b7e128e..d1fc0af7f7 100644
--- a/src/components/transport_manager/src/usb/libusb/usb_handler.cc
+++ b/src/components/transport_manager/src/usb/libusb/usb_handler.cc
@@ -77,12 +77,12 @@ class UsbHandler::ControlTransferSequenceState {
 
 UsbHandler::UsbHandler()
     : shutdown_requested_(false)
-    , thread_(NULL)
+    , thread_(nullptr)
     , usb_device_listeners_()
     , devices_()
     , transfer_sequences_()
     , device_handles_to_close_()
-    , libusb_context_(NULL)
+    , libusb_context_(nullptr)
     , arrived_callback_handle_()
     , left_callback_handle_() {
   thread_ = threads::CreateThread("UsbHandler", new UsbHandlerDelegate(this));
@@ -90,20 +90,24 @@ UsbHandler::UsbHandler()
 
 UsbHandler::~UsbHandler() {
   shutdown_requested_ = true;
-  if (libusb_context_ != 0) {
+  LOG4CXX_INFO(logger_, "UsbHandler thread finished");
+
+  if (libusb_context_) {
+    // The libusb_hotplug_deregister_callback() wakes up blocking call of
+    // libusb_handle_events_completed() in the Thread() method of delegate
     libusb_hotplug_deregister_callback(libusb_context_,
                                        arrived_callback_handle_);
     libusb_hotplug_deregister_callback(libusb_context_, left_callback_handle_);
   }
-  thread_->stop();
-  LOG4CXX_INFO(logger_, "UsbHandler thread finished");
-  if (libusb_context_) {
-    libusb_exit(libusb_context_);
-    libusb_context_ = 0;
-  }
+
   thread_->join();
   delete thread_->delegate();
   threads::DeleteThread(thread_);
+
+  if (libusb_context_) {
+    libusb_exit(libusb_context_);
+    libusb_context_ = nullptr;
+  }
 }
 
 void UsbHandler::DeviceArrived(libusb_device* device_libusb) {
@@ -518,5 +522,11 @@ void UsbHandler::UsbHandlerDelegate::threadMain() {
   handler_->Thread();
 }
 
+void UsbHandler::UsbHandlerDelegate::exitThreadMain() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  // Empty method required in order to avoid force delegate thread
+  // finishing by exitThreadMain() of the base class
+}
+
 }  // namespace transport_adapter
 }  // namespace transport_manager
diff --git a/src/components/transport_manager/src/usb/qnx/usb_connection.cc b/src/components/transport_manager/src/usb/qnx/usb_connection.cc
index c514162eb0..2945639ce9 100644
--- a/src/components/transport_manager/src/usb/qnx/usb_connection.cc
+++ b/src/components/transport_manager/src/usb/qnx/usb_connection.cc
@@ -144,7 +144,7 @@ void UsbConnection::OnInTransfer(usbd_urb* urb) {
         device_uid_, app_handle_, DataReceiveError());
   } else {
     ::protocol_handler::RawMessagePtr msg(
-        new protocol_handler::RawMessage(0, 0, in_buffer_, len));
+        new protocol_handler::RawMessage(0, 0, in_buffer_, len, false));
     controller_->DataReceiveDone(device_uid_, app_handle_, msg);
   }
 
diff --git a/src/components/transport_manager/src/usb/usb_aoa_adapter.cc b/src/components/transport_manager/src/usb/usb_aoa_adapter.cc
index 3ecc1e22f3..9ce571eb6c 100644
--- a/src/components/transport_manager/src/usb/usb_aoa_adapter.cc
+++ b/src/components/transport_manager/src/usb/usb_aoa_adapter.cc
@@ -43,12 +43,12 @@ namespace transport_manager {
 namespace transport_adapter {
 
 CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
-UsbAoaAdapter::UsbAoaAdapter(resumption::LastState& last_state,
+UsbAoaAdapter::UsbAoaAdapter(resumption::LastStateWrapperPtr last_state_wrapper,
                              const TransportManagerSettings& settings)
-    : TransportAdapterImpl(new UsbDeviceScanner(this),
+    : TransportAdapterImpl(new UsbDeviceScanner(this, settings),
                            new UsbConnectionFactory(this),
                            NULL,
-                           last_state,
+                           last_state_wrapper,
                            settings)
     , is_initialised_(false)
     , usb_handler_(new UsbHandler()) {
diff --git a/src/components/transport_manager/src/usb/usb_device_scanner.cc b/src/components/transport_manager/src/usb/usb_device_scanner.cc
index 3a17203307..51d521c1bf 100644
--- a/src/components/transport_manager/src/usb/usb_device_scanner.cc
+++ b/src/components/transport_manager/src/usb/usb_device_scanner.cc
@@ -47,6 +47,7 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
 class AoaInitSequence : public UsbControlTransferSequence {
  public:
   AoaInitSequence();
+  AoaInitSequence(const TransportManagerSettings& settings);
   virtual ~AoaInitSequence() {}
 
  private:
@@ -86,8 +87,9 @@ void UsbDeviceScanner::OnDeviceLeft(PlatformUsbDevice* device) {
   }
 }
 
-UsbDeviceScanner::UsbDeviceScanner(TransportAdapterController* controller)
-    : controller_(controller) {}
+UsbDeviceScanner::UsbDeviceScanner(TransportAdapterController* controller,
+                                   const TransportManagerSettings& settings)
+    : controller_(controller), settings_(settings) {}
 
 UsbDeviceScanner::~UsbDeviceScanner() {}
 
@@ -171,28 +173,29 @@ class AoaInitSequence::AoaTurnIntoAccessoryMode : public UsbControlOutTransfer {
   }
 };
 
-static char manufacturer[] = "SDL";
-static char model_name[] = "Core";
-static char description[] = "SmartDeviceLink Core Component USB";
-static char version[] = "1.0";
-static char uri[] = "http://www.smartdevicelink.org";
-static char serial_num[] = "N000000";
-
-AoaInitSequence::AoaInitSequence() : UsbControlTransferSequence() {
+AoaInitSequence::AoaInitSequence(const TransportManagerSettings& settings)
+    : UsbControlTransferSequence() {
+  auto manufacturer = settings.aoa_filter_manufacturer().c_str();
+  auto model_name = settings.aoa_filter_model_name().c_str();
+  auto description = settings.aoa_filter_description().c_str();
+  auto version = settings.aoa_filter_version().c_str();
+  auto uri = settings.aoa_filter_uri().c_str();
+  auto serial_num = settings.aoa_filter_serial_number().c_str();
   AddTransfer(new AoaGetProtocolRequest);
-  AddTransfer(new AoaSendIdString(0, manufacturer, sizeof(manufacturer)));
-  AddTransfer(new AoaSendIdString(1, model_name, sizeof(model_name)));
-  AddTransfer(new AoaSendIdString(2, description, sizeof(description)));
-  AddTransfer(new AoaSendIdString(3, version, sizeof(version)));
-  AddTransfer(new AoaSendIdString(4, uri, sizeof(uri)));
-  AddTransfer(new AoaSendIdString(5, serial_num, sizeof(serial_num)));
+  AddTransfer(new AoaSendIdString(0, manufacturer, strlen(manufacturer)));
+  AddTransfer(new AoaSendIdString(1, model_name, strlen(model_name)));
+  AddTransfer(new AoaSendIdString(2, description, strlen(description)));
+  AddTransfer(new AoaSendIdString(3, version, strlen(version)));
+  AddTransfer(new AoaSendIdString(4, uri, strlen(uri)));
+  AddTransfer(new AoaSendIdString(5, serial_num, strlen(serial_num)));
   AddTransfer(new AoaTurnIntoAccessoryMode);
 }
 
 void UsbDeviceScanner::TurnIntoAccessoryMode(PlatformUsbDevice* device) {
   LOG4CXX_AUTO_TRACE(logger_);
   LOG4CXX_DEBUG(logger_, "PlatformUsbDevice: " << device);
-  GetUsbHandler()->StartControlTransferSequence(new AoaInitSequence, device);
+  GetUsbHandler()->StartControlTransferSequence(new AoaInitSequence(settings_),
+                                                device);
 }
 
 void UsbDeviceScanner::SupportedDeviceFound(PlatformUsbDevice* device) {
diff --git a/src/components/transport_manager/src/websocket_server/websocket_connection.cc b/src/components/transport_manager/src/websocket_server/websocket_connection.cc
new file mode 100644
index 0000000000..7bcc4baef2
--- /dev/null
+++ b/src/components/transport_manager/src/websocket_server/websocket_connection.cc
@@ -0,0 +1,218 @@
+/*
+Copyright (c) 2020 Livio, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of SmartDeviceLink Consortium, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "transport_manager/websocket_server/websocket_connection.h"
+#include <unistd.h>
+#include "transport_manager/transport_adapter/transport_adapter_controller.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+CREATE_LOGGERPTR_GLOBAL(wsc_logger_, "WebSocketConnection")
+
+using namespace boost::beast::websocket;
+
+template <>
+WebSocketConnection<WebSocketSession<> >::WebSocketConnection(
+    const DeviceUID& device_uid,
+    const ApplicationHandle& app_handle,
+    boost::asio::ip::tcp::socket socket,
+    TransportAdapterController* controller)
+    : device_uid_(device_uid)
+    , app_handle_(app_handle)
+    , session_(new WebSocketSession<>(
+          std::move(socket),
+          std::bind(
+              &WebSocketConnection::DataReceive, this, std::placeholders::_1),
+          std::bind(&WebSocketConnection::OnError, this)))
+    , controller_(controller)
+    , shutdown_(false)
+    , thread_delegate_(new LoopThreadDelegate(
+          &message_queue_,
+          std::bind(&WebSocketSession<>::WriteDown,
+                    session_.get(),
+                    std::placeholders::_1),
+          std::bind(&WebSocketConnection::OnError, this)))
+    , thread_(threads::CreateThread("WS Async Send", thread_delegate_)) {
+  thread_->start(threads::ThreadOptions());
+}
+
+#ifdef ENABLE_SECURITY
+template <>
+WebSocketConnection<WebSocketSecureSession<> >::WebSocketConnection(
+    const DeviceUID& device_uid,
+    const ApplicationHandle& app_handle,
+    boost::asio::ip::tcp::socket socket,
+    ssl::context& ctx,
+    TransportAdapterController* controller)
+    : device_uid_(device_uid)
+    , app_handle_(app_handle)
+    , session_(new WebSocketSecureSession<>(
+          std::move(socket),
+          ctx,
+          std::bind(
+              &WebSocketConnection::DataReceive, this, std::placeholders::_1),
+          std::bind(&WebSocketConnection::OnError, this)))
+    , controller_(controller)
+    , shutdown_(false)
+    , thread_delegate_(new LoopThreadDelegate(
+          &message_queue_,
+          std::bind(&WebSocketSecureSession<>::WriteDown,
+                    session_.get(),
+                    std::placeholders::_1),
+          std::bind(&WebSocketConnection::OnError, this)))
+    , thread_(threads::CreateThread("WS Async Send", thread_delegate_)) {
+  thread_->start(threads::ThreadOptions());
+}
+template class WebSocketConnection<WebSocketSecureSession<> >;
+#endif  // ENABLE_SECURITY
+
+template <typename Session>
+WebSocketConnection<Session>::~WebSocketConnection() {
+  if (!IsShuttingDown()) {
+    Shutdown();
+  }
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::OnError() {
+  LOG4CXX_AUTO_TRACE(wsc_logger_);
+
+  controller_->ConnectionAborted(
+      device_uid_, app_handle_, CommunicationError());
+
+  session_->Shutdown();
+}
+
+template <typename Session>
+TransportAdapter::Error WebSocketConnection<Session>::Disconnect() {
+  LOG4CXX_AUTO_TRACE(wsc_logger_);
+  if (!IsShuttingDown()) {
+    Shutdown();
+    controller_->DisconnectDone(device_uid_, app_handle_);
+    return TransportAdapter::OK;
+  }
+  return TransportAdapter::BAD_STATE;
+}
+
+template <typename Session>
+TransportAdapter::Error WebSocketConnection<Session>::SendData(
+    ::protocol_handler::RawMessagePtr message) {
+  if (IsShuttingDown()) {
+    return TransportAdapter::BAD_STATE;
+  }
+
+  message_queue_.push(message);
+
+  return TransportAdapter::OK;
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::DataReceive(
+    protocol_handler::RawMessagePtr frame) {
+  controller_->DataReceiveDone(device_uid_, app_handle_, frame);
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::Run() {
+  LOG4CXX_AUTO_TRACE(wsc_logger_);
+  session_->AsyncAccept();
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::Shutdown() {
+  LOG4CXX_AUTO_TRACE(wsc_logger_);
+  shutdown_ = true;
+  if (thread_delegate_) {
+    session_->Shutdown();
+    thread_delegate_->SetShutdown();
+    thread_->join();
+    delete thread_delegate_;
+    thread_delegate_ = nullptr;
+    threads::DeleteThread(thread_);
+    thread_ = nullptr;
+  }
+}
+
+template <typename Session>
+bool WebSocketConnection<Session>::IsShuttingDown() {
+  return shutdown_;
+}
+
+template <typename Session>
+WebSocketConnection<Session>::LoopThreadDelegate::LoopThreadDelegate(
+    MessageQueue<Message, AsyncQueue>* message_queue,
+    DataWriteCallback data_write,
+    OnIOErrorCallback on_io_error)
+    : message_queue_(*message_queue)
+    , data_write_(data_write)
+    , on_io_error_(on_io_error) {}
+
+template <typename Session>
+void WebSocketConnection<Session>::LoopThreadDelegate::threadMain() {
+  while (!message_queue_.IsShuttingDown()) {
+    DrainQueue();
+    message_queue_.wait();
+  }
+  DrainQueue();
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::LoopThreadDelegate::exitThreadMain() {
+  if (!message_queue_.IsShuttingDown()) {
+    message_queue_.Shutdown();
+  }
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::LoopThreadDelegate::DrainQueue() {
+  Message message_ptr;
+  while (!message_queue_.IsShuttingDown() && message_queue_.pop(message_ptr)) {
+    auto res = data_write_(message_ptr);
+    if (TransportAdapter::FAIL == res) {
+      LOG4CXX_WARN(wsc_logger_,
+                   "Writing to websocket stream failed. Will now close "
+                   "websocket connection.");
+      on_io_error_();
+    }
+  }
+}
+
+template <typename Session>
+void WebSocketConnection<Session>::LoopThreadDelegate::SetShutdown() {
+  if (!message_queue_.IsShuttingDown()) {
+    message_queue_.Shutdown();
+  }
+}
+
+template class WebSocketConnection<WebSocketSession<> >;
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/src/websocket_server/websocket_device.cc b/src/components/transport_manager/src/websocket_server/websocket_device.cc
new file mode 100644
index 0000000000..502daf349b
--- /dev/null
+++ b/src/components/transport_manager/src/websocket_server/websocket_device.cc
@@ -0,0 +1,94 @@
+/*
+ *
+ * Copyright (c) 2020, Livio
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "transport_manager/websocket_server/websocket_device.h"
+
+#include "utils/logger.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager")
+
+WebSocketDevice::WebSocketDevice(const std::string& name,
+                                 const DeviceUID& unique_device_id)
+    : Device(name, unique_device_id)
+    , is_secure_connect_(false)
+    , protocol_(boost::asio::ip::tcp::v4()) {}
+
+bool WebSocketDevice::IsSameAs(const Device* other) const {
+  LOG4CXX_TRACE(logger_, "enter. device: " << other);
+
+  const WebSocketDevice* other_websocket_device =
+      dynamic_cast<const WebSocketDevice*>(other);
+
+  if (!other_websocket_device) {
+    return false;
+  }
+
+  if (GetHost() != other_websocket_device->GetHost()) {
+    return false;
+  }
+
+  if (GetPort() != other_websocket_device->GetPort()) {
+    return false;
+  }
+
+  if (GetTarget() != other_websocket_device->GetTarget()) {
+    return false;
+  }
+
+  return true;
+}
+
+ApplicationList WebSocketDevice::GetApplicationList() const {
+  return app_list_;
+}
+
+const std::string& WebSocketDevice::GetHost() const {
+  return host_;
+}
+
+const std::string& WebSocketDevice::GetPort() const {
+  return port_;
+}
+
+const std::string WebSocketDevice::GetTarget() const {
+  return host_ + port_ + name();
+}
+
+void WebSocketDevice::AddApplication(const ApplicationHandle& app_handle) {
+  app_list_.push_back(app_handle);
+}
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/src/websocket_server/websocket_listener.cc b/src/components/transport_manager/src/websocket_server/websocket_listener.cc
new file mode 100644
index 0000000000..87fff3acbc
--- /dev/null
+++ b/src/components/transport_manager/src/websocket_server/websocket_listener.cc
@@ -0,0 +1,299 @@
+#include "transport_manager/websocket_server/websocket_listener.h"
+#include "transport_manager/transport_adapter/transport_adapter_controller.h"
+#include "transport_manager/websocket_server/websocket_device.h"
+#include "utils/file_system.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+CREATE_LOGGERPTR_GLOBAL(logger_, "WebSocketListener")
+
+WebSocketListener::WebSocketListener(TransportAdapterController* controller,
+                                     const TransportManagerSettings& settings,
+                                     const int num_threads)
+    : controller_(controller)
+    , ioc_(num_threads)
+#ifdef ENABLE_SECURITY
+    , ctx_(ssl::context::sslv23)
+    , start_secure_(false)
+#endif  // ENABLE_SECURITY
+    , acceptor_(ioc_)
+    , socket_(ioc_)
+    , io_pool_(new boost::asio::thread_pool(num_threads))
+    , num_threads_(num_threads)
+    , shutdown_(false)
+    , settings_(settings) {
+}
+
+WebSocketListener::~WebSocketListener() {
+  Terminate();
+}
+
+TransportAdapter::Error WebSocketListener::Init() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const auto old_shutdown_value = shutdown_.exchange(false);
+  if (old_shutdown_value) {
+    ioc_.restart();
+    io_pool_.reset(new boost::asio::thread_pool(num_threads_));
+  }
+  return StartListening();
+}
+
+void WebSocketListener::Terminate() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  Shutdown();
+}
+
+TransportAdapter::Error WebSocketListener::StartListening() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (acceptor_.is_open()) {
+    return TransportAdapter::OK;
+  }
+
+#ifdef ENABLE_SECURITY
+  auto const ta_error = AddCertificateAuthority();
+  if (TransportAdapter::OK != ta_error) {
+    return ta_error;
+  }
+#endif
+
+  auto const address =
+      boost::asio::ip::make_address(settings_.websocket_server_address());
+  tcp::endpoint endpoint = {address, settings_.websocket_server_port()};
+
+  // Open the acceptor
+  boost::system::error_code ec;
+  acceptor_.open(endpoint.protocol(), ec);
+  if (ec) {
+    auto str_err = "ErrorOpen: " + ec.message();
+    LOG4CXX_ERROR(logger_,
+                  str_err << " host/port: " << endpoint.address().to_string()
+                          << "/" << endpoint.port());
+    return TransportAdapter::FAIL;
+  }
+
+  acceptor_.set_option(boost::asio::socket_base::reuse_address(true), ec);
+  if (ec) {
+    std::string str_err = "ErrorSetOption: " + ec.message();
+    LOG4CXX_ERROR(logger_,
+                  str_err << " host/port: " << endpoint.address().to_string()
+                          << "/" << endpoint.port());
+    return TransportAdapter::FAIL;
+  }
+
+  // Bind to the server address
+  acceptor_.bind(endpoint, ec);
+  if (ec) {
+    std::string str_err = "ErrorBind: " + ec.message();
+    LOG4CXX_ERROR(logger_,
+                  str_err << " host/port: " << endpoint.address().to_string()
+                          << "/" << endpoint.port());
+    return TransportAdapter::FAIL;
+  }
+
+  // Start listening for connections
+  acceptor_.listen(boost::asio::socket_base::max_listen_connections, ec);
+  if (ec) {
+    std::string str_err = "ErrorListen: " + ec.message();
+    LOG4CXX_ERROR(logger_,
+                  str_err << " host/port: " << endpoint.address().to_string()
+                          << "/" << endpoint.port());
+    return TransportAdapter::FAIL;
+  }
+
+  if (false == Run()) {
+    return TransportAdapter::FAIL;
+  }
+
+  return TransportAdapter::OK;
+}
+
+#ifdef ENABLE_SECURITY
+TransportAdapter::Error WebSocketListener::AddCertificateAuthority() {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  const auto cert_path = settings_.ws_server_cert_path();
+  LOG4CXX_DEBUG(logger_, "Path to certificate : " << cert_path);
+  const auto key_path = settings_.ws_server_key_path();
+  LOG4CXX_DEBUG(logger_, "Path to key : " << key_path);
+  const auto ca_cert_path = settings_.ws_server_ca_cert_path();
+  LOG4CXX_DEBUG(logger_, "Path to ca cert : " << ca_cert_path);
+  start_secure_ = settings_.wss_server_supported();
+
+  if (start_secure_ && (!file_system::FileExists(cert_path) ||
+                        !file_system::FileExists(key_path) ||
+                        !file_system::FileExists(ca_cert_path))) {
+    LOG4CXX_ERROR(logger_, "Certificate or key file not found");
+    return TransportAdapter::FAIL;
+  }
+
+  if (!start_secure_) {
+    auto check_config = [](const std::string& config,
+                           const std::string config_name) {
+      bool start_unsecure = config.empty();
+      if (!start_unsecure) {
+        LOG4CXX_ERROR(logger_,
+                      "Configuration for secure WS is incomplete. "
+                          << config_name
+                          << " config is "
+                             "present, meanwhile others may be missing. Please "
+                             "check INI file");
+      }
+      return start_unsecure;
+    };
+    if (!check_config(cert_path, "Server cert") ||
+        !check_config(key_path, "Server key") ||
+        !check_config(ca_cert_path, "CA cert")) {
+      return TransportAdapter::FAIL;
+    }
+  } else {
+    LOG4CXX_INFO(logger_, "WebSocket server will start secure connection");
+    ctx_.add_verify_path(cert_path);
+    ctx_.set_options(boost::asio::ssl::context::default_workarounds);
+    using context = boost::asio::ssl::context_base;
+    ctx_.set_verify_mode(ssl::verify_peer | ssl::verify_fail_if_no_peer_cert);
+    boost::system::error_code sec_ec;
+    ctx_.use_certificate_chain_file(cert_path, sec_ec);
+    ctx_.load_verify_file(ca_cert_path);
+    if (sec_ec) {
+      LOG4CXX_ERROR(
+          logger_,
+          "Loading WS server certificate failed: " << sec_ec.message());
+      return TransportAdapter::FAIL;
+    }
+    sec_ec.clear();
+    ctx_.use_private_key_file(key_path, context::pem, sec_ec);
+    if (sec_ec) {
+      LOG4CXX_ERROR(logger_,
+                    "Loading WS server key failed: " << sec_ec.message());
+      return TransportAdapter::FAIL;
+    }
+  }
+
+  return TransportAdapter::OK;
+}
+#endif  // ENABLE_SECURITY
+
+bool WebSocketListener::Run() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const bool is_connection_open = WaitForConnection();
+  if (is_connection_open) {
+    boost::asio::post(*io_pool_.get(), [&]() { ioc_.run(); });
+  } else {
+    LOG4CXX_ERROR(logger_, "Connection is shutdown or acceptor isn't open");
+  }
+
+  return is_connection_open;
+}
+
+bool WebSocketListener::WaitForConnection() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (!shutdown_ && acceptor_.is_open()) {
+    acceptor_.async_accept(
+        socket_,
+        std::bind(
+            &WebSocketListener::StartSession, this, std::placeholders::_1));
+    return true;
+  }
+  return false;
+}
+
+template <>
+void WebSocketListener::ProcessConnection(
+    std::shared_ptr<WebSocketConnection<WebSocketSession<> > > connection,
+    const DeviceSptr device,
+    const ApplicationHandle app_handle) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  controller_->ConnectionCreated(
+      connection, device->unique_device_id(), app_handle);
+
+  controller_->ConnectDone(device->unique_device_id(), app_handle);
+
+  connection->Run();
+
+  connection_list_lock.Acquire();
+  connection_list_.push_back(connection);
+  connection_list_lock.Release();
+
+  WaitForConnection();
+}
+
+#ifdef ENABLE_SECURITY
+template <>
+void WebSocketListener::ProcessConnection(
+    std::shared_ptr<WebSocketConnection<WebSocketSecureSession<> > > connection,
+    const DeviceSptr device,
+    const ApplicationHandle app_handle) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  controller_->ConnectionCreated(
+      connection, device->unique_device_id(), app_handle);
+
+  controller_->ConnectDone(device->unique_device_id(), app_handle);
+
+  connection->Run();
+
+  connection_list_lock.Acquire();
+  connection_list_.push_back(connection);
+  connection_list_lock.Release();
+
+  WaitForConnection();
+}
+#endif  // ENABLE_SECURITY
+
+void WebSocketListener::StartSession(boost::system::error_code ec) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (ec) {
+    std::string str_err = "ErrorAccept: " + ec.message();
+    LOG4CXX_ERROR(logger_, str_err);
+    return;
+  }
+
+  if (shutdown_) {
+    return;
+  }
+
+  const ApplicationHandle app_handle = socket_.native_handle();
+
+  std::shared_ptr<WebSocketDevice> device =
+      std::static_pointer_cast<WebSocketDevice>(
+          controller_->GetWebEngineDevice());
+
+  LOG4CXX_INFO(logger_, "Connected client: " << app_handle);
+
+#ifdef ENABLE_SECURITY
+  if (start_secure_) {
+    auto connection =
+        std::make_shared<WebSocketConnection<WebSocketSecureSession<> > >(
+            device->unique_device_id(),
+            app_handle,
+            std::move(socket_),
+            ctx_,
+            controller_);
+    ProcessConnection(connection, device, app_handle);
+    return;
+  }
+#endif  // ENABLE_SECURITY
+
+  auto connection = std::make_shared<WebSocketConnection<WebSocketSession<> > >(
+      device->unique_device_id(), app_handle, std::move(socket_), controller_);
+  ProcessConnection(connection, device, app_handle);
+}
+
+void WebSocketListener::Shutdown() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (false == shutdown_.exchange(true)) {
+    ioc_.stop();
+    socket_.close();
+    boost::system::error_code ec;
+    acceptor_.close(ec);
+
+    if (ec) {
+      LOG4CXX_ERROR(logger_, "Acceptor closed with error: " << ec);
+    }
+
+    io_pool_->stop();
+    io_pool_->join();
+  }
+}
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/src/websocket_server/websocket_secure_session.cc b/src/components/transport_manager/src/websocket_server/websocket_secure_session.cc
new file mode 100644
index 0000000000..9be94119b6
--- /dev/null
+++ b/src/components/transport_manager/src/websocket_server/websocket_secure_session.cc
@@ -0,0 +1,79 @@
+/*
+Copyright (c) 2020 Livio, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of SmartDeviceLink Consortium, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "transport_manager/websocket_server/websocket_secure_session.h"
+#include <unistd.h>
+#include "transport_manager/transport_adapter/transport_adapter_controller.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+using namespace boost::beast::websocket;
+
+template <typename ExecutorType>
+WebSocketSecureSession<ExecutorType>::WebSocketSecureSession(
+    tcp::socket socket,
+    ssl::context& ctx,
+    DataReceiveCallback data_receive,
+    OnIOErrorCallback on_error)
+    : WebSocketSession<ExecutorType>(
+          std::move(socket), ctx, data_receive, on_error) {}
+
+template <typename ExecutorType>
+void WebSocketSecureSession<ExecutorType>::AsyncAccept() {
+  LOG4CXX_AUTO_TRACE(ws_logger_);
+  // Perform the SSL handshake
+  WebSocketSecureSession<ExecutorType>::ws_.next_layer().async_handshake(
+      ssl::stream_base::server,
+      boost::asio::bind_executor(
+          WebSocketSecureSession<ExecutorType>::strand_,
+          std::bind(&WebSocketSecureSession::AsyncHandshake,
+                    this->shared_from_this(),
+                    std::placeholders::_1)));
+}
+
+template <typename ExecutorType>
+void WebSocketSecureSession<ExecutorType>::AsyncHandshake(
+    boost::system::error_code ec) {
+  LOG4CXX_AUTO_TRACE(ws_logger_);
+  if (ec) {
+    auto str_err = "ErrorMessage: " + ec.message();
+    LOG4CXX_ERROR(ws_logger_, str_err);
+    WebSocketSession<ExecutorType>::on_io_error_();
+    return;
+  }
+
+  WebSocketSession<ExecutorType>::AsyncAccept();
+}
+
+template class WebSocketSecureSession<ssl::stream<tcp::socket&> >;
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
new file mode 100644
index 0000000000..ac8789eee8
--- /dev/null
+++ b/src/components/transport_manager/src/websocket_server/websocket_server_transport_adapter.cc
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "transport_manager/websocket_server/websocket_server_transport_adapter.h"
+
+#include <errno.h>
+#include <memory.h>
+#include <signal.h>
+#include <stdio.h>
+
+#include <cstdlib>
+#include <sstream>
+
+#include "transport_manager/websocket_server/websocket_listener.h"
+#include "utils/gen_hash.h"
+#include "utils/logger.h"
+#include "utils/threads/thread_delegate.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "WebSocketTransportAdapter")
+
+WebSocketServerTransportAdapter::WebSocketServerTransportAdapter(
+    resumption::LastStateWrapperPtr last_state_wrapper,
+    const TransportManagerSettings& settings)
+    : TransportAdapterImpl(nullptr,
+                           nullptr,
+                           new WebSocketListener(this, settings),
+                           last_state_wrapper,
+                           settings) {}
+
+WebSocketServerTransportAdapter::~WebSocketServerTransportAdapter() {}
+
+void WebSocketServerTransportAdapter::TransportConfigUpdated(
+    const TransportConfig& new_config) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
+  transport_config_ = new_config;
+
+  // call the method of parent class to trigger OnTransportConfigUpdated() for
+  // the listeners
+  TransportAdapterImpl::TransportConfigUpdated(new_config);
+}
+
+TransportConfig WebSocketServerTransportAdapter::GetTransportConfiguration()
+    const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return transport_config_;
+}
+
+DeviceType WebSocketServerTransportAdapter::GetDeviceType() const {
+  return WEBENGINE_WEBSOCKET;
+}
+
+DeviceSptr WebSocketServerTransportAdapter::AddDevice(DeviceSptr device) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  webengine_device_ = device;
+  Store();
+  return TransportAdapterImpl::AddDevice(webengine_device_);
+}
+
+TransportAdapter::Error WebSocketServerTransportAdapter::Init() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (webengine_device_) {
+    AddDevice(webengine_device_);
+  }
+  return TransportAdapterImpl::Init();
+}
+
+void WebSocketServerTransportAdapter::Store() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  if (webengine_device_) {
+    Json::Value& dictionary = last_state().get_dictionary();
+    if (dictionary["TransportManager"].isMember("WebsocketServerAdapter")) {
+      LOG4CXX_DEBUG(
+          logger_, "WebsocketServerAdapter already exists. Storing is skipped");
+      return;
+    }
+
+    Json::Value device_dictionary;
+    device_dictionary["unique_id"] = webengine_device_->unique_device_id();
+
+    Json::Value ws_adapter_dictionary;
+    ws_adapter_dictionary["device"] = device_dictionary;
+    dictionary["TransportManager"]["WebsocketServerAdapter"] =
+        ws_adapter_dictionary;
+  }
+}
+
+bool WebSocketServerTransportAdapter::Restore() {
+  LOG4CXX_AUTO_TRACE(logger_);
+  const Json::Value& dictionary = last_state().get_dictionary();
+  const Json::Value ws_adapter_dictionary =
+      dictionary["TransportManager"]["WebsocketServerAdapter"];
+  webengine_device_id_ =
+      ws_adapter_dictionary["device"]["unique_id"].asString();
+  if (webengine_device_id_.empty()) {
+    srand(time(0));
+    const size_t device_id_length = 64u;
+    webengine_device_id_ = utils::gen_hash(device_id_length);
+  }
+  return true;
+}
+
+std::string WebSocketServerTransportAdapter::GetStoredDeviceID() const {
+  LOG4CXX_AUTO_TRACE(logger_);
+  return webengine_device_id_;
+}
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/src/websocket_server/websocket_session.cc b/src/components/transport_manager/src/websocket_server/websocket_session.cc
new file mode 100644
index 0000000000..ab62530963
--- /dev/null
+++ b/src/components/transport_manager/src/websocket_server/websocket_session.cc
@@ -0,0 +1,162 @@
+/*
+Copyright (c) 2020 Livio, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of SmartDeviceLink Consortium, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "transport_manager/websocket_server/websocket_session.h"
+#include <unistd.h>
+#include "transport_manager/transport_adapter/transport_adapter_controller.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+using namespace boost::beast::websocket;
+
+template <>
+WebSocketSession<tcp::socket&>::WebSocketSession(
+    boost::asio::ip::tcp::socket socket,
+    DataReceiveCallback data_receive,
+    OnIOErrorCallback on_error)
+    : socket_(std::move(socket))
+    , ws_(socket_)
+    , strand_(ws_.get_executor())
+    , data_receive_(data_receive)
+    , on_io_error_(on_error) {
+  ws_.binary(true);
+}
+
+#ifdef ENABLE_SECURITY
+template <>
+WebSocketSession<ssl::stream<tcp::socket&> >::WebSocketSession(
+    boost::asio::ip::tcp::socket socket,
+    ssl::context& ctx,
+    DataReceiveCallback data_receive,
+    OnIOErrorCallback on_error)
+    : socket_(std::move(socket))
+    , ws_(socket_, ctx)
+    , strand_(ws_.get_executor())
+    , data_receive_(data_receive)
+    , on_io_error_(on_error) {
+  ws_.binary(true);
+}
+template class WebSocketSession<ssl::stream<tcp::socket&> >;
+#endif  // ENABLE_SECURITY
+
+template <typename ExecutorType>
+WebSocketSession<ExecutorType>::~WebSocketSession() {}
+
+template <typename ExecutorType>
+void WebSocketSession<ExecutorType>::AsyncAccept() {
+  LOG4CXX_AUTO_TRACE(ws_logger_);
+  ws_.async_accept(
+      boost::asio::bind_executor(strand_,
+                                 std::bind(&WebSocketSession::AsyncRead,
+                                           this->shared_from_this(),
+                                           std::placeholders::_1)));
+}
+
+template <typename ExecutorType>
+void WebSocketSession<ExecutorType>::AsyncRead(boost::system::error_code ec) {
+  LOG4CXX_AUTO_TRACE(ws_logger_);
+  if (ec) {
+    auto str_err = "ErrorMessage: " + ec.message();
+    LOG4CXX_ERROR(ws_logger_, str_err);
+    return;
+  }
+
+  ws_.async_read(buffer_,
+                 boost::asio::bind_executor(strand_,
+                                            std::bind(&WebSocketSession::Read,
+                                                      this->shared_from_this(),
+                                                      std::placeholders::_1,
+                                                      std::placeholders::_2)));
+}
+
+template <typename ExecutorType>
+TransportAdapter::Error WebSocketSession<ExecutorType>::WriteDown(
+    ::protocol_handler::RawMessagePtr message) {
+  boost::system::error_code ec;
+  ws_.write(boost::asio::buffer(message->data(), message->data_size()), ec);
+
+  if (ec) {
+    LOG4CXX_ERROR(ws_logger_, "A system error has occurred: " << ec.message());
+    return TransportAdapter::FAIL;
+  }
+
+  return TransportAdapter::OK;
+}
+
+template <typename ExecutorType>
+void WebSocketSession<ExecutorType>::Read(boost::system::error_code ec,
+                                          std::size_t bytes_transferred) {
+  LOG4CXX_AUTO_TRACE(ws_logger_);
+  boost::ignore_unused(bytes_transferred);
+  if (ec) {
+    LOG4CXX_ERROR(ws_logger_, ec.message());
+    buffer_.consume(buffer_.size());
+    on_io_error_();
+    return;
+  }
+
+  auto size = buffer_.size();
+  const auto data = boost::asio::buffer_cast<const uint8_t*>(
+      boost::beast::buffers_front(buffer_.data()));
+
+  LOG4CXX_DEBUG(ws_logger_,
+                "Msg: " << boost::beast::buffers_to_string(buffer_.data())
+                        << " Size: " << size;);
+
+  ::protocol_handler::RawMessagePtr frame(
+      new protocol_handler::RawMessage(0, 0, data, size, false));
+
+  data_receive_(frame);
+
+  buffer_.consume(buffer_.size());
+  AsyncRead(ec);
+}
+
+template <typename ExecutorType>
+bool WebSocketSession<ExecutorType>::Shutdown() {
+  LOG4CXX_AUTO_TRACE(ws_logger_);
+  boost::system::error_code ec;
+  if (socket_.is_open()) {
+    socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
+    socket_.close();
+  }
+  buffer_.consume(buffer_.size());
+  if (ec) {
+    LOG4CXX_ERROR(ws_logger_, ec.message());
+    return false;
+  }
+  return true;
+}
+
+template class WebSocketSession<tcp::socket&>;
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt
index f6e1212b36..76680b2fad 100644
--- a/src/components/transport_manager/test/CMakeLists.txt
+++ b/src/components/transport_manager/test/CMakeLists.txt
@@ -48,11 +48,18 @@ set(EXCLUDE_PATHS
 
 if (NOT BUILD_CLOUD_APP_SUPPORT)
   list(APPEND EXCLUDE_PATHS
-    ${CMAKE_CURRENT_SOURCE_DIR}/websocket_connection_test.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/sample_websocket_server.cc
   )
 endif()
 
+if (NOT BUILD_WEBSOCKET_SERVER_SUPPORT)
+  list(APPEND EXCLUDE_PATHS
+    ${CMAKE_CURRENT_SOURCE_DIR}/websocket_client_connection_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/websocket_connection_test.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/websocket_server_listener_test.cc
+  )
+endif()
+
 collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}")
 
 set(PLATFORM_DEPENDENT_SOURCES)
@@ -90,3 +97,4 @@ endif()
 create_test("transport_manager_test" "${SOURCES}" "${LIBRARIES}")
 
 file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY "test_certs/" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/test_certs)
diff --git a/src/components/transport_manager/test/include/transport_manager/bt/mock_bluetooth_transport_adapter.h b/src/components/transport_manager/test/include/transport_manager/bt/mock_bluetooth_transport_adapter.h
new file mode 100644
index 0000000000..ffd8cd9647
--- /dev/null
+++ b/src/components/transport_manager/test/include/transport_manager/bt/mock_bluetooth_transport_adapter.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_BT_MOCK_BLUETOOTH_TRANSPORT_ADAPTER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_BT_MOCK_BLUETOOTH_TRANSPORT_ADAPTER_H_
+
+#include "transport_manager/transport_adapter/mock_transport_adapter.h"
+
+namespace test {
+namespace components {
+namespace transport_manager_test {
+
+using namespace ::transport_manager::transport_adapter;
+
+class MockBluetoothTransportAdapter : public MockTransportAdapter {
+ public:
+  MOCK_CONST_METHOD0(GetDeviceType, DeviceType());
+  MOCK_CONST_METHOD0(Store, void());
+  MOCK_METHOD0(Restore, bool());
+};
+
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_BT_MOCK_BLUETOOTH_TRANSPORT_ADAPTER_H_
diff --git a/src/components/transport_manager/test/include/transport_manager/cloud/mock_cloud_websocket_transport_adapter.h b/src/components/transport_manager/test/include/transport_manager/cloud/mock_cloud_websocket_transport_adapter.h
new file mode 100644
index 0000000000..6e74ae759f
--- /dev/null
+++ b/src/components/transport_manager/test/include/transport_manager/cloud/mock_cloud_websocket_transport_adapter.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_CLOUD_MOCK_CLOUD_WEBSOCKET_TRANSPORT_ADAPTER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_CLOUD_MOCK_CLOUD_WEBSOCKET_TRANSPORT_ADAPTER_H_
+
+#include "transport_manager/cloud/cloud_websocket_transport_adapter.h"
+
+namespace test {
+namespace components {
+namespace transport_manager_test {
+
+using namespace ::transport_manager::transport_adapter;
+
+class MockCloudWebsocketTransportAdapter
+    : public CloudWebsocketTransportAdapter {
+ public:
+  MockCloudWebsocketTransportAdapter(
+      resumption::LastStateWrapperPtr last_state_wrapper,
+      const transport_manager::TransportManagerSettings& settings)
+      : CloudWebsocketTransportAdapter(last_state_wrapper, settings) {}
+  MOCK_CONST_METHOD0(GetDeviceType, DeviceType());
+  MOCK_CONST_METHOD0(Store, void());
+  MOCK_METHOD0(Restore, bool());
+  MOCK_CONST_METHOD0(IsInitialised, bool());
+  MOCK_METHOD1(AddListener, void(TransportAdapterListener* listener));
+  MOCK_METHOD0(Init, TransportAdapter::Error());
+  MOCK_METHOD0(Terminate, void());
+};
+
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_CLOUD_MOCK_CLOUD_WEBSOCKET_TRANSPORT_ADAPTER_H_
diff --git a/src/components/transport_manager/test/include/transport_manager/cloud/sample_websocket_server.h b/src/components/transport_manager/test/include/transport_manager/cloud/sample_websocket_server.h
index a8b801c1fe..e29f182059 100644
--- a/src/components/transport_manager/test/include/transport_manager/cloud/sample_websocket_server.h
+++ b/src/components/transport_manager/test/include/transport_manager/cloud/sample_websocket_server.h
@@ -39,6 +39,7 @@
 #include <boost/asio/placeholders.hpp>
 #include <boost/asio/ssl/stream.hpp>
 #include <boost/asio/strand.hpp>
+#include <boost/asio/thread_pool.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/ssl.hpp>
@@ -61,9 +62,9 @@ namespace ssl = boost::asio::ssl;        // from <boost/asio/ssl.hpp>
 using tcp = boost::asio::ip::tcp;        // from <boost/asio/ip/tcp.hpp>
 
 // Accepts incoming connections and launches the WSServer
-class WSSession {
+class WSSession : public std::enable_shared_from_this<WSSession> {
  private:
-  class WSServer {
+  class WSServer : public std::enable_shared_from_this<WSServer> {
    public:
     explicit WSServer(tcp::socket&& socket);
     void AddURLRoute(const std::string& route);
@@ -95,6 +96,7 @@ class WSSession {
  private:
   void on_accept(boost::system::error_code ec);
   boost::asio::io_context ioc_;
+  boost::asio::thread_pool io_pool_;
   const std::string& address_;
   uint16_t port_;
   tcp::acceptor acceptor_;
@@ -106,9 +108,9 @@ class WSSession {
 };
 
 // Accepts incoming connections and launches the sessions
-class WSSSession {
+class WSSSession : public std::enable_shared_from_this<WSSSession> {
  private:
-  class WSSServer {
+  class WSSServer : public std::enable_shared_from_this<WSSServer> {
    public:
     // Take ownership of the socket
     WSSServer(tcp::socket&& socket, ssl::context& ctx);
@@ -148,6 +150,7 @@ class WSSSession {
 
  private:
   boost::asio::io_context ioc_;
+  boost::asio::thread_pool io_pool_;
   tcp::acceptor acceptor_;
   tcp::socket socket_;
   ssl::context ctx_;
diff --git a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h
index daa9397b7d..dbac183d32 100644
--- a/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h
+++ b/src/components/transport_manager/test/include/transport_manager/tcp/mock_tcp_transport_adapter.h
@@ -33,10 +33,7 @@
 #ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TCP_MOCK_TCP_TRANSPORT_ADAPTER_H_
 #define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_TCP_MOCK_TCP_TRANSPORT_ADAPTER_H_
 
-#include "gmock/gmock.h"
-#include "transport_manager/common.h"
 #include "transport_manager/tcp/tcp_transport_adapter.h"
-#include "transport_manager/transport_manager_settings.h"
 
 namespace test {
 namespace components {
@@ -48,9 +45,9 @@ class MockTCPTransportAdapter : public TcpTransportAdapter {
  public:
   MockTCPTransportAdapter(
       uint16_t port,
-      resumption::LastState& last_state,
+      resumption::LastStateWrapperPtr last_state_wrapper,
       const transport_manager::TransportManagerSettings& settings)
-      : TcpTransportAdapter(port, last_state, settings) {}
+      : TcpTransportAdapter(port, last_state_wrapper, settings) {}
   MOCK_CONST_METHOD2(
       FindEstablishedConnection,
       ConnectionSPtr(const transport_manager::DeviceUID& device_handle,
@@ -63,6 +60,11 @@ class MockTCPTransportAdapter : public TcpTransportAdapter {
                TransportAdapter::Error(
                    const transport_manager::DeviceUID& device_handle,
                    const transport_manager::ApplicationHandle& app_handle));
+
+  MOCK_CONST_METHOD0(IsInitialised, bool());
+  MOCK_METHOD1(AddListener, void(TransportAdapterListener* listener));
+  MOCK_METHOD0(Init, TransportAdapter::Error());
+  MOCK_METHOD0(Terminate, void());
   void CallStore() {
     Store();
   }
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_client_connection_listener.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_client_connection_listener.h
index 0f6f1e9f14..6d451294de 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_client_connection_listener.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_client_connection_listener.h
@@ -51,6 +51,12 @@ class MockClientConnectionListener
       StartListening,
       ::transport_manager::transport_adapter::TransportAdapter::Error());
   MOCK_METHOD0(
+      SuspendListening,
+      ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_METHOD0(
+      ResumeListening,
+      ::transport_manager::transport_adapter::TransportAdapter::Error());
+  MOCK_METHOD0(
       StopListening,
       ::transport_manager::transport_adapter::TransportAdapter::Error());
 };
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_connection.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_connection.h
index d1f48c1ed9..7bb272c82e 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_connection.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_connection.h
@@ -48,6 +48,7 @@ class MockConnection : public Connection {
       SendData,
       TransportAdapter::Error(::protocol_handler::RawMessagePtr message));
   MOCK_METHOD0(Disconnect, TransportAdapter::Error());
+  MOCK_METHOD0(Terminate, void());
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h
index 1de5eac702..7ddb84001c 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_controller.h
@@ -45,56 +45,66 @@ using namespace ::transport_manager::transport_adapter;
 class MockTransportAdapterController : public TransportAdapterController {
  public:
   MOCK_METHOD1(AddDevice, DeviceSptr(DeviceSptr device));
-  MOCK_METHOD1(SearchDeviceDone, void(DeviceVector device));
+  MOCK_METHOD1(SearchDeviceDone, void(const DeviceVector& device));
   MOCK_METHOD1(ApplicationListUpdated,
-               ApplicationListUpdated(const DeviceUID& device_handle));
+               void(const transport_manager::DeviceUID& device_handle));
   MOCK_METHOD0(FindNewApplicationsRequest, void());
-  MOCK_METHOD1(SearchDeviceFailed, void(const SearchDeviceError& error));
-  MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle));
-  MOCK_CONST_METHOD3(FindDevice,
-                     void(ConnectionSPtr connection,
-                          const DeviceUID& device_handle,
-                          const ApplicationHandle& app_handle));
-  MOCK_CONST_METHOD2(FindPendingConnection,
-                     ConnectionSPtr(const DeviceUID& device_handle,
-                                    const ApplicationHandle& app_handle));
+  MOCK_METHOD1(SearchDeviceFailed,
+               void(const transport_manager::SearchDeviceError& error));
+  MOCK_CONST_METHOD1(
+      FindDevice,
+      DeviceSptr(const transport_manager::DeviceUID& device_handle));
+  MOCK_CONST_METHOD2(
+      FindPendingConnection,
+      ConnectionSPtr(const transport_manager::DeviceUID& device_handle,
+                     const transport_manager::ApplicationHandle& app_handle));
+  MOCK_METHOD3(ConnectionCreated,
+               void(ConnectionSPtr connection,
+                    const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle));
+  MOCK_METHOD2(ConnectPending,
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle));
   MOCK_METHOD2(ConnectDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle));
   MOCK_METHOD3(ConnectFailed,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const ConnectError& error));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle,
+                    const transport_manager::ConnectError& error));
   MOCK_METHOD2(ConnectionFinished,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle));
   MOCK_METHOD3(ConnectionAborted,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const CommunicationError& error));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle,
+                    const transport_manager::CommunicationError& error));
   MOCK_METHOD2(DeviceDisconnected,
-               void(const DeviceUID& device_handle,
-                    const DisconnectDeviceError& error));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::DisconnectDeviceError& error));
   MOCK_METHOD2(DisconnectDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle));
   MOCK_METHOD3(DataReceiveDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle,
                     ::protocol_handler::RawMessagePtr message));
   MOCK_METHOD3(DataReceiveFailed,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const DataReceiveError& error));
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle,
+                    const transport_manager::DataReceiveError& error));
   MOCK_METHOD3(DataSendDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle,
                     ::protocol_handler::RawMessagePtr message));
-  MOCK_METHOD3(DataReceiveFailed,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
+
+  MOCK_METHOD4(DataSendFailed,
+               void(const transport_manager::DeviceUID& device_handle,
+                    const transport_manager::ApplicationHandle& app_handle,
                     ::protocol_handler::RawMessagePtr message,
-                    const DataSendError& error));
+                    const transport_manager::DataSendError&));
+  MOCK_METHOD1(TransportConfigUpdated, void(const TransportConfig& new_config));
+  MOCK_CONST_METHOD0(GetWebEngineDevice, DeviceSptr());
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
index 592ed855cc..7b1d720ba2 100644
--- a/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
+++ b/src/components/transport_manager/test/include/transport_manager/transport_adapter/mock_transport_adapter_impl.h
@@ -58,14 +58,21 @@ class MockTransportAdapterImpl : public TransportAdapterImpl {
       DeviceScanner* device_scanner,
       ServerConnectionFactory* server_connection_factory,
       ClientConnectionListener* client_connection_listener,
-      resumption::LastState& last_state,
+      resumption::LastStateWrapperPtr last_state_wrapper,
       const transport_manager::TransportManagerSettings& settings)
       : TransportAdapterImpl(device_scanner,
                              server_connection_factory,
                              client_connection_listener,
-                             last_state,
+                             last_state_wrapper,
                              settings) {}
 
+  DEPRECATED
+  MockTransportAdapterImpl(DeviceScanner*,
+                           ServerConnectionFactory*,
+                           ClientConnectionListener*,
+                           resumption::LastState&,
+                           const transport_manager::TransportManagerSettings&);
+
   ConnectionSPtr FindStatedConnection(const DeviceUID& device_handle,
                                       const ApplicationHandle& app_handle) {
     return this->FindEstablishedConnection(device_handle, app_handle);
diff --git a/src/components/policy/policy_regular/test/generated_code_test.cc b/src/components/transport_manager/test/include/transport_manager/usb/mock_usb_aoa_adapter.h
index 671103bf51..affd6aee47 100644
--- a/src/components/policy/policy_regular/test/generated_code_test.cc
+++ b/src/components/transport_manager/test/include/transport_manager/usb/mock_usb_aoa_adapter.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2013, Ford Motor Company
+/*
+ * Copyright (c) 2019, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,44 +30,33 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <fstream>
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_USB_MOCK_USB_AOA_ADAPTER_H_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_USB_MOCK_USB_AOA_ADAPTER_H_
 
-#include "gtest/gtest.h"
-
-#include "json/reader.h"
-#include "json/value.h"
-#include "policy/policy_table/enums.h"
-#include "policy/policy_table/types.h"
-#include "rpc_base/gtest_support.h"
-
-using rpc::policy_table_interface_base::Table;
+#include "transport_manager/usb/usb_aoa_adapter.h"
 
 namespace test {
 namespace components {
-namespace policy_test {
+namespace transport_manager_test {
 
-TEST(PolicyGeneratedCodeTest, TestValidPTPreloadJsonIsValid) {
-  std::ifstream json_file("sdl_preloaded_pt.json");
-  ASSERT_TRUE(json_file.is_open());
-  Json::Value valid_table;
-  Json::Reader reader;
-  ASSERT_TRUE(reader.parse(json_file, valid_table));
-  Table table(&valid_table);
-  table.SetPolicyTableType(rpc::policy_table_interface_base::PT_PRELOADED);
-  ASSERT_RPCTYPE_VALID(table);
-}
+using namespace ::transport_manager::transport_adapter;
 
-TEST(PolicyGeneratedCodeTest, TestValidPTUpdateJsonIsValid) {
-  std::ifstream json_file("valid_sdl_pt_update.json");
-  ASSERT_TRUE(json_file.is_open());
-  Json::Value valid_table;
-  Json::Reader reader;
-  ASSERT_TRUE(reader.parse(json_file, valid_table));
-  Table table(&valid_table);
-  table.SetPolicyTableType(rpc::policy_table_interface_base::PT_UPDATE);
-  ASSERT_RPCTYPE_VALID(table);
-}
+class MockUsbAoaAdapter : public UsbAoaAdapter {
+ public:
+  MockUsbAoaAdapter(resumption::LastStateWrapperPtr last_state_wrapper,
+                    const transport_manager::TransportManagerSettings& settings)
+      : UsbAoaAdapter(last_state_wrapper, settings) {}
+  MOCK_CONST_METHOD0(GetDeviceType, DeviceType());
+  MOCK_CONST_METHOD0(IsInitialised, bool());
+  MOCK_METHOD1(AddListener, void(TransportAdapterListener* listener));
+  MOCK_METHOD0(Init, TransportAdapter::Error());
+  MOCK_METHOD0(Terminate, void());
 
-}  // namespace policy_test
+  MOCK_CONST_METHOD1(ToBeAutoConnected, bool(DeviceSptr device));
+};
+
+}  // namespace transport_manager_test
 }  // namespace components
 }  // namespace test
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_USB_MOCK_USB_AOA_ADAPTER_H_
diff --git a/src/components/transport_manager/test/include/transport_manager/websocket_server/websocket_sample_client.h b/src/components/transport_manager/test/include/transport_manager/websocket_server/websocket_sample_client.h
new file mode 100644
index 0000000000..138502e02c
--- /dev/null
+++ b/src/components/transport_manager/test/include/transport_manager/websocket_server/websocket_sample_client.h
@@ -0,0 +1,117 @@
+/*
+ * \file websocket_listener.h
+ * \brief WebSocketListener class header file.
+ *
+ * Copyright (c) 2020
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SAMPLE_CLIENT_
+#define SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SAMPLE_CLIENT_
+
+#include <boost/asio/bind_executor.hpp>
+#include <boost/asio/connect.hpp>
+#include <boost/asio/ssl/stream.hpp>
+#include <boost/asio/strand.hpp>
+#include <boost/asio/thread_pool.hpp>
+#include <boost/beast/core.hpp>
+#include <boost/beast/websocket.hpp>
+#include <boost/beast/websocket/ssl.hpp>
+#include <boost/beast/websocket/stream.hpp>
+#include <cstdlib>
+#include <functional>
+#include <iostream>
+#include <memory>
+#include <string>
+
+namespace transport_manager {
+namespace transport_adapter {
+
+namespace beast = boost::beast;
+namespace http = beast::http;
+namespace websocket = beast::websocket;
+namespace asio = boost::asio;
+namespace ssl = boost::asio::ssl;
+using tcp = boost::asio::ip::tcp;
+
+using WS = websocket::stream<tcp::socket>;
+using WSS = websocket::stream<ssl::stream<tcp::socket> >;
+
+struct SecurityParams {
+  std::string ca_cert_;
+  std::string client_cert_;
+  std::string client_key_;
+};
+
+template <typename Stream = WS>
+class WSSampleClient
+    : public std::enable_shared_from_this<WSSampleClient<Stream> > {
+ public:
+  WSSampleClient(const std::string& host, const std::string& port);
+  WSSampleClient(const std::string& host,
+                 const std::string& port,
+                 const SecurityParams& params);
+  ~WSSampleClient() {}
+
+  /**
+   * @brief Inside a Run(), functions are invoked from the boost (connection,
+   * handshake, message) which are blocking calls
+   * @return true if Run() did without errors
+   **/
+  bool Run();
+
+  void OnRead(beast::error_code ec, std::size_t bytes_transferred);
+
+  bool Connect(tcp::resolver::results_type& results);
+
+  bool Handshake(const std::string& host, const std::string& target);
+
+  void OnHandshakeTimeout();
+
+  bool IsHandshakeSuccessful() const;
+
+  void Stop();
+
+ private:
+  asio::io_context ioc_;
+  tcp::resolver resolver_;
+  ssl::context ctx_;
+  std::unique_ptr<Stream> ws_;
+  boost::asio::thread_pool io_pool_;
+  beast::flat_buffer buffer_;
+  std::string host_;
+  std::string port_;
+  std::atomic_bool handshake_successful_;
+};
+
+}  // namespace transport_adapter
+}  // namespace transport_manager
+
+#endif  // SRC_COMPONENTS_TRANSPORT_MANAGER_TEST_INCLUDE_TRANSPORT_MANAGER_WEBSOCKET_SERVER_WEBSOCKET_SAMPLE_CLIENT_
diff --git a/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc b/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc
index 97c8fac9c9..0f2f0a2045 100644
--- a/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc
+++ b/src/components/transport_manager/test/platform_specific/linux/linux_network_interface_listener_test.cc
@@ -32,6 +32,7 @@ class NetworkInterfaceListenerTest : public ::testing::Test {
  protected:
   struct InterfaceEntry {
     const char* name;
+    const unsigned int index;
     const char* ipv4_address;
     const char* ipv6_address;
     unsigned int flags;
@@ -48,8 +49,9 @@ class NetworkInterfaceListenerTest : public ::testing::Test {
     delete interface_listener_impl_;
   }
 
-  void SetDummyInterfaceTable(struct InterfaceEntry* entries) {
+  void SetDummyInterfaceTable(const struct InterfaceEntry* entries) {
     InterfaceStatusTable dummy_table;
+    std::map<unsigned int, std::string> dummy_name_map;
 
     while (entries->name != NULL) {
       InterfaceStatus status;
@@ -63,13 +65,16 @@ class NetworkInterfaceListenerTest : public ::testing::Test {
         ASSERT_EQ(1, inet_pton(AF_INET6, entries->ipv6_address, &addr6));
         status.SetIPv6Address(&addr6);
       }
+      status.SetName(entries->name);
       status.SetFlags(entries->flags);
 
-      dummy_table.insert(std::make_pair(entries->name, status));
+      dummy_table.insert(std::make_pair(entries->index, status));
+      dummy_name_map[entries->index] = std::string(entries->name);
       entries++;
     }
 
     interface_listener_impl_->OverwriteStatusTable(dummy_table);
+    interface_listener_impl_->SetDummyNameMap(dummy_name_map);
   }
 
   void SleepFor(long msec) const {
@@ -108,8 +113,8 @@ TEST_F(NetworkInterfaceListenerTest, Start_success) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries[] = {
-      {"dummy_int0", "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
   SetDummyInterfaceTable(entries);
 
   // after stated, it is expected that the listener notifies current IP address
@@ -198,11 +203,11 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_IPAddressChanged) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries1[] = {
-      {"dummy_int0", "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
   struct InterfaceEntry entries2[] = {
-      {"dummy_int0", "5.6.7.8", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "5.6.7.8", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries1);
 
@@ -230,13 +235,13 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_IPAddressNotChanged) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries1[] = {
-      {"dummy_int0", "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
+      {"dummy_int1", 2, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
   struct InterfaceEntry entries2[] = {
-      {"dummy_int0", "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
-      {"dummy_int1", "172.16.23.30", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
+      {"dummy_int1", 2, "172.16.23.30", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries1);
 
@@ -261,13 +266,13 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_GoesUnavailable) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries1[] = {
-      {"dummy_int0", "1.2.3.4", "fdc2:12af:327a::1", IFF_UP | IFF_RUNNING},
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", "fdc2:12af:327a::1", IFF_UP | IFF_RUNNING},
+      {"dummy_int1", 2, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
   struct InterfaceEntry entries2[] = {
-      {"dummy_int0", "1.2.3.4", "fdc2:12af:327a::1", IFF_UP},
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", "fdc2:12af:327a::1", IFF_UP},
+      {"dummy_int1", 2, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries1);
 
@@ -292,12 +297,12 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_Removed) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries1[] = {
-      {"dummy_int0", "1.2.3.4", "fdc2:12af:327a::1", IFF_UP | IFF_RUNNING},
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int0", 1, "1.2.3.4", "fdc2:12af:327a::1", IFF_UP | IFF_RUNNING},
+      {"dummy_int1", 2, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
   struct InterfaceEntry entries2[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int1", 2, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries1);
 
@@ -322,12 +327,12 @@ TEST_F(NetworkInterfaceListenerTest, DesignatedInterface_Added) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries1[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int1", 1, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
   struct InterfaceEntry entries2[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {"dummy_int0", "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int1", 1, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {"dummy_int0", 2, "1.2.3.4", NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries1);
 
@@ -350,9 +355,13 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_SelectInterface) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {"net_dummy2", "192.168.2.3", "fdc2:12af:327a::22", IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int1", 1, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {"net_dummy2",
+       2,
+       "192.168.2.3",
+       "fdc2:12af:327a::22",
+       IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries);
 
@@ -384,9 +393,13 @@ TEST_F(NetworkInterfaceListenerTest,
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP},
-      {"net_dummy2", "192.168.2.3", "fdc2:12af:327a::22", IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int1", 1, "10.10.10.12", NULL, IFF_UP},
+      {"net_dummy2",
+       2,
+       "192.168.2.3",
+       "fdc2:12af:327a::22",
+       IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries);
 
@@ -410,9 +423,9 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_SkipEmptyInterface) {
   EXPECT_TRUE(interface_listener_impl_->Init());
 
   struct InterfaceEntry entries[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
-      {"net_dummy2", NULL, NULL, IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+      {"dummy_int1", 1, "10.10.10.12", NULL, IFF_UP | IFF_RUNNING},
+      {"net_dummy2", 2, NULL, NULL, IFF_UP | IFF_RUNNING},
+      {NULL, 0, NULL, NULL, 0}};
 
   SetDummyInterfaceTable(entries);
 
@@ -435,10 +448,17 @@ TEST_F(NetworkInterfaceListenerTest,
   Init("");
   EXPECT_TRUE(interface_listener_impl_->Init());
 
-  struct InterfaceEntry entries[] = {
-      {"dummy_int1", "10.10.10.12", NULL, IFF_UP | IFF_RUNNING | IFF_LOOPBACK},
-      {"net_dummy2", "192.168.2.3", "fdc2:12af:327a::22", IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+  struct InterfaceEntry entries[] = {{"dummy_int1",
+                                      1,
+                                      "10.10.10.12",
+                                      NULL,
+                                      IFF_UP | IFF_RUNNING | IFF_LOOPBACK},
+                                     {"net_dummy2",
+                                      2,
+                                      "192.168.2.3",
+                                      "fdc2:12af:327a::22",
+                                      IFF_UP | IFF_RUNNING},
+                                     {NULL, 0, NULL, NULL, 0}};
 
   // dummy_int1 should not be selected
   struct InterfaceEntry* expected = &entries[1];
@@ -461,9 +481,12 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_DisableInterface) {
   Init("");
   EXPECT_TRUE(interface_listener_impl_->Init());
 
-  struct InterfaceEntry entries[] = {
-      {"net_dummy0", "192.168.2.3", "fdc2:12af:327a::22", IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+  struct InterfaceEntry entries[] = {{"net_dummy0",
+                                      1,
+                                      "192.168.2.3",
+                                      "fdc2:12af:327a::22",
+                                      IFF_UP | IFF_RUNNING},
+                                     {NULL, 0, NULL, NULL, 0}};
 
   EXPECT_CALL(mock_tcp_client_listener_, OnIPAddressUpdated(_, _)).Times(1);
   SetDummyInterfaceTable(entries);
@@ -487,9 +510,12 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_EnableInterface) {
   Init("");
   EXPECT_TRUE(interface_listener_impl_->Init());
 
-  struct InterfaceEntry entries[] = {
-      {"net_dummy0", "192.168.2.3", "fdc2:12af:327a::22", IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+  struct InterfaceEntry entries[] = {{"net_dummy0",
+                                      1,
+                                      "192.168.2.3",
+                                      "fdc2:12af:327a::22",
+                                      IFF_UP | IFF_RUNNING},
+                                     {NULL, 0, NULL, NULL, 0}};
 
   EXPECT_CALL(mock_tcp_client_listener_, OnIPAddressUpdated(_, _)).Times(1);
   SetDummyInterfaceTable(entries);
@@ -525,13 +551,17 @@ TEST_F(NetworkInterfaceListenerTest, AutoSelectInterface_SwitchInterface) {
   Init("");
   EXPECT_TRUE(interface_listener_impl_->Init());
 
-  struct InterfaceEntry entries[] = {
-      {"dummy_int1",
-       "10.10.10.12",
-       "fd53:ba79:241d:30c1::78",
-       IFF_UP | IFF_RUNNING},
-      {"net_dummy2", "192.168.2.3", "fdc2:12af:327a::22", IFF_UP | IFF_RUNNING},
-      {NULL, NULL, NULL, 0}};
+  struct InterfaceEntry entries[] = {{"dummy_int1",
+                                      1,
+                                      "10.10.10.12",
+                                      "fd53:ba79:241d:30c1::78",
+                                      IFF_UP | IFF_RUNNING},
+                                     {"net_dummy2",
+                                      2,
+                                      "192.168.2.3",
+                                      "fdc2:12af:327a::22",
+                                      IFF_UP | IFF_RUNNING},
+                                     {NULL, 0, NULL, NULL, 0}};
 
   EXPECT_CALL(mock_tcp_client_listener_, OnIPAddressUpdated(_, _)).Times(1);
   SetDummyInterfaceTable(entries);
diff --git a/src/components/transport_manager/test/sample_websocket_server.cc b/src/components/transport_manager/test/sample_websocket_server.cc
index 917184a361..9b0e5b59d5 100644
--- a/src/components/transport_manager/test/sample_websocket_server.cc
+++ b/src/components/transport_manager/test/sample_websocket_server.cc
@@ -51,11 +51,12 @@ void WSSession::WSServer::AddURLRoute(const std::string& target) {
 
 void WSSession::WSServer::Run() {
   req_ = {};
-  http::async_read(
-      ws_.next_layer(),
-      buffer_,
-      req_,
-      std::bind(&WSServer::OnWebsocketHandshake, this, std::placeholders::_1));
+  http::async_read(ws_.next_layer(),
+                   buffer_,
+                   req_,
+                   std::bind(&WSServer::OnWebsocketHandshake,
+                             shared_from_this(),
+                             std::placeholders::_1));
 }
 
 void WSSession::WSServer::OnWebsocketHandshake(
@@ -75,9 +76,10 @@ void WSSession::WSServer::OnWebsocketHandshake(
     // Accept the websocket handshake
     ws_.async_accept(
         req_,
-        boost::asio::bind_executor(
-            strand_,
-            std::bind(&WSServer::OnAccept, this, std::placeholders::_1)));
+        boost::asio::bind_executor(strand_,
+                                   std::bind(&WSServer::OnAccept,
+                                             shared_from_this(),
+                                             std::placeholders::_1)));
   }
 }
 
@@ -112,7 +114,8 @@ std::string WSSession::WSServer::ParseRouteFromTarget(
 }
 
 WSSession::WSSession(const std::string& address, uint16_t port)
-    : address_(address)
+    : io_pool_(1)
+    , address_(address)
     , port_(port)
     , acceptor_(ioc_)
     , socket_(ioc_)
@@ -152,8 +155,10 @@ WSSession::WSSession(const std::string& address, uint16_t port)
 void WSSession::Run() {
   if (acceptor_.is_open()) {
     acceptor_.async_accept(
-        socket_, std::bind(&WSSession::on_accept, this, std::placeholders::_1));
-    ioc_.run();
+        socket_,
+        std::bind(
+            &WSSession::on_accept, shared_from_this(), std::placeholders::_1));
+    boost::asio::post(io_pool_, [&]() { ioc_.run(); });
   }
 }
 
@@ -161,6 +166,7 @@ void WSSession::Stop() {
   try {
     ioc_.stop();
     acceptor_.close();
+    io_pool_.join();
   } catch (...) {
     std::cerr << "Failed to close connection" << std::endl;
   }
@@ -199,9 +205,10 @@ void WSSSession::WSSServer::AddURLRoute(const std::string& target) {
 }
 void WSSSession::WSSServer::Run() {
   // Perform the SSL handshake
-  wss_.next_layer().async_handshake(
-      ssl::stream_base::server,
-      std::bind(&WSSServer::OnSSLHandshake, this, std::placeholders::_1));
+  wss_.next_layer().async_handshake(ssl::stream_base::server,
+                                    std::bind(&WSSServer::OnSSLHandshake,
+                                              shared_from_this(),
+                                              std::placeholders::_1));
 }
 
 void WSSSession::WSSServer::OnSSLHandshake(beast::error_code ec) {
@@ -210,11 +217,12 @@ void WSSSession::WSSServer::OnSSLHandshake(beast::error_code ec) {
   }
 
   req_ = {};
-  http::async_read(
-      wss_.next_layer(),
-      buffer_,
-      req_,
-      std::bind(&WSSServer::OnWebsocketHandshake, this, std::placeholders::_1));
+  http::async_read(wss_.next_layer(),
+                   buffer_,
+                   req_,
+                   std::bind(&WSSServer::OnWebsocketHandshake,
+                             shared_from_this(),
+                             std::placeholders::_1));
 }
 
 void WSSSession::WSSServer::OnWebsocketHandshake(
@@ -233,7 +241,9 @@ void WSSSession::WSSServer::OnWebsocketHandshake(
     }
     // Accept the websocket handshake
     wss_.async_accept(
-        req_, std::bind(&WSSServer::OnAccept, this, std::placeholders::_1));
+        req_,
+        std::bind(
+            &WSSServer::OnAccept, shared_from_this(), std::placeholders::_1));
   }
 }
 
@@ -271,7 +281,8 @@ WSSSession::WSSSession(const std::string& address,
                        uint16_t port,
                        const std::string& certificate,
                        const std::string& private_key)
-    : acceptor_(ioc_)
+    : io_pool_(1)
+    , acceptor_(ioc_)
     , socket_(ioc_)
     , ctx_(ssl::context::sslv23_server)
     , wss_(nullptr) {
@@ -336,6 +347,7 @@ void WSSSession::Stop() {
   try {
     ioc_.stop();
     acceptor_.close();
+    io_pool_.join();
   } catch (...) {
     std::cerr << "Failed to close connection" << std::endl;
   }
@@ -353,8 +365,9 @@ void WSSSession::do_accept() {
   if (acceptor_.is_open()) {
     acceptor_.async_accept(
         socket_,
-        std::bind(&WSSSession::on_accept, this, std::placeholders::_1));
-    ioc_.run();
+        std::bind(
+            &WSSSession::on_accept, shared_from_this(), std::placeholders::_1));
+    boost::asio::post(io_pool_, [&]() { ioc_.run(); });
   }
 }
 
diff --git a/src/components/transport_manager/test/tcp_client_listener_test.cc b/src/components/transport_manager/test/tcp_client_listener_test.cc
index d524b3eb6a..dbd7799b62 100644
--- a/src/components/transport_manager/test/tcp_client_listener_test.cc
+++ b/src/components/transport_manager/test/tcp_client_listener_test.cc
@@ -42,6 +42,7 @@
 #include "transport_manager/tcp/tcp_client_listener.h"
 #include "transport_manager/transport_adapter/mock_device.h"
 #include "transport_manager/transport_adapter/mock_transport_adapter.h"
+#include "transport_manager/transport_adapter/mock_transport_adapter_controller.h"
 #include "transport_manager/transport_adapter/transport_adapter_controller.h"
 
 #include "utils/test_async_waiter.h"
@@ -62,67 +63,6 @@ const long kThreadStartWaitMsec = 10;
 const uint32_t kConnectionCreatedTimeoutMsec = 200;
 }  // namespace
 
-class MockTransportAdapterController : public TransportAdapterController {
- public:
-  MOCK_METHOD1(AddDevice, DeviceSptr(DeviceSptr device));
-  MOCK_METHOD0(AckDevices, void());
-  MOCK_METHOD1(SearchDeviceDone, void(const DeviceVector& devices));
-  MOCK_METHOD1(SearchDeviceFailed, void(const SearchDeviceError& error));
-  MOCK_CONST_METHOD1(FindDevice, DeviceSptr(const DeviceUID& device_handle));
-  MOCK_CONST_METHOD2(FindPendingConnection,
-                     ConnectionSPtr(const DeviceUID& device_handle,
-                                    const ApplicationHandle& app_handle));
-  MOCK_METHOD3(ConnectionCreated,
-               void(ConnectionSPtr connection,
-                    const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
-  MOCK_METHOD2(ConnectPending,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
-  MOCK_METHOD2(ConnectDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
-  MOCK_METHOD3(ConnectFailed,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const ConnectError& error));
-  MOCK_METHOD2(ConnectionFinished,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
-  MOCK_METHOD3(ConnectionAborted,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const CommunicationError& error));
-  MOCK_METHOD2(DisconnectDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle));
-  MOCK_METHOD3(DataReceiveDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const ::protocol_handler::RawMessagePtr message));
-  MOCK_METHOD3(DataReceiveFailed,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const DataReceiveError& error));
-  MOCK_METHOD3(DataSendDone,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const ::protocol_handler::RawMessagePtr message));
-  MOCK_METHOD4(DataSendFailed,
-               void(const DeviceUID& device_handle,
-                    const ApplicationHandle& app_handle,
-                    const ::protocol_handler::RawMessagePtr message,
-                    const DataSendError& error));
-  MOCK_METHOD0(FindNewApplicationsRequest, void());
-  MOCK_METHOD1(ApplicationListUpdated, void(const DeviceUID& device_handle));
-  MOCK_METHOD2(DeviceDisconnected,
-               void(const DeviceUID& device_handle,
-                    const DisconnectDeviceError& error));
-  MOCK_METHOD1(TransportConfigUpdated,
-               void(const transport_manager::transport_adapter::TransportConfig&
-                        new_config));
-};
-
 class MockNetworkInterfaceListener : public NetworkInterfaceListener {
  public:
   MOCK_METHOD0(Init, bool());
diff --git a/src/components/transport_manager/test/tcp_transport_adapter_test.cc b/src/components/transport_manager/test/tcp_transport_adapter_test.cc
index f5f6cc38c8..cacdfb6fbd 100644
--- a/src/components/transport_manager/test/tcp_transport_adapter_test.cc
+++ b/src/components/transport_manager/test/tcp_transport_adapter_test.cc
@@ -34,6 +34,7 @@
 #include "gtest/gtest.h"
 #include "protocol/raw_message.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "transport_manager/mock_transport_manager_settings.h"
 #include "transport_manager/tcp/mock_tcp_transport_adapter.h"
 #include "transport_manager/transport_adapter/connection.h"
@@ -55,9 +56,13 @@ using namespace transport_manager::transport_adapter;
 
 class TcpAdapterTest : public ::testing::Test {
  protected:
-  TcpAdapterTest() : last_state_("app_storage_folder", "app_info_storage") {}
+  TcpAdapterTest() {
+    last_state_wrapper_ = std::make_shared<resumption::LastStateWrapperImpl>(
+        std::make_shared<resumption::LastStateImpl>("app_storage_folder",
+                                                    "app_info_storage"));
+  }
   MockTransportManagerSettings transport_manager_settings;
-  resumption::LastStateImpl last_state_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
   const uint32_t port = 12345;
   const std::string string_port = "12345";
   std::string network_interface = "";
@@ -72,7 +77,7 @@ class TcpAdapterTest : public ::testing::Test {
 TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) {
   // Prepare
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   std::string uniq_id = "unique_device_name";
   std::shared_ptr<MockTCPDevice> mockdev =
       std::make_shared<MockTCPDevice>(port, uniq_id);
@@ -96,8 +101,9 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) {
   transport_adapter.CallStore();
 
   // Check that value is saved
-  Json::Value& tcp_dict =
-      last_state_.get_dictionary()["TransportManager"]["TcpAdapter"];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  const Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& tcp_dict = dictionary["TransportManager"]["TcpAdapter"];
 
   ASSERT_TRUE(tcp_dict.isObject());
   ASSERT_FALSE(tcp_dict["devices"].isNull());
@@ -112,7 +118,7 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDeviceAndOneApplication) {
 TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) {
   // Prepare
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   const uint32_t count_dev = 10;
   std::shared_ptr<MockTCPDevice> mockdev[count_dev];
   std::string uniq_id[count_dev];
@@ -148,8 +154,9 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) {
   transport_adapter.CallStore();
 
   // Check that values are saved
-  Json::Value& tcp_dict =
-      last_state_.get_dictionary()["TransportManager"]["TcpAdapter"];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  const Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& tcp_dict = dictionary["TransportManager"]["TcpAdapter"];
 
   ASSERT_TRUE(tcp_dict.isObject());
   ASSERT_FALSE(tcp_dict["devices"].isNull());
@@ -166,7 +173,7 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndOneApplication) {
 TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) {
   // Prepare
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   const uint32_t count_dev = 10;
 
   std::shared_ptr<MockTCPDevice> mockdev[count_dev];
@@ -206,8 +213,9 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) {
   transport_adapter.CallStore();
 
   // Check that value is saved
-  Json::Value& tcp_dict =
-      last_state_.get_dictionary()["TransportManager"]["TcpAdapter"];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  const Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& tcp_dict = dictionary["TransportManager"]["TcpAdapter"];
 
   ASSERT_TRUE(tcp_dict.isObject());
   ASSERT_FALSE(tcp_dict["devices"].isNull());
@@ -225,7 +233,7 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevicesAndSeveralApplications) {
 TEST_F(TcpAdapterTest, StoreData_ConnectionNotExist_DataNotStored) {
   // Prepare
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   std::string uniq_id = "unique_device_name";
   auto mockdev = std::make_shared<MockTCPDevice>(port, uniq_id);
   transport_adapter.AddDevice(mockdev);
@@ -243,26 +251,32 @@ TEST_F(TcpAdapterTest, StoreData_ConnectionNotExist_DataNotStored) {
   transport_adapter.CallStore();
 
   // Check that value is not saved
-  Json::Value& tcp_dict =
-      last_state_.get_dictionary()["TransportManager"]["TcpAdapter"]["devices"];
+  resumption::LastStateAccessor accessor = last_state_wrapper_->get_accessor();
+  const Json::Value dictionary = accessor.GetData().dictionary();
+  const Json::Value& tcp_dict =
+      dictionary["TransportManager"]["TcpAdapter"]["devices"];
 
   ASSERT_TRUE(tcp_dict.isNull());
 }
 
 TEST_F(TcpAdapterTest, RestoreData_DataNotStored) {
-  Json::Value& tcp_adapter_dictionary =
-      last_state_.get_dictionary()["TransportManager"]["TcpAdapter"];
-
-  tcp_adapter_dictionary = Json::Value();
+  {
+    resumption::LastStateAccessor accessor =
+        last_state_wrapper_->get_accessor();
+    Json::Value dictionary = accessor.GetData().dictionary();
+    Json::Value& tcp_dictionary = dictionary["TransportManager"]["TcpAdapter"];
+    tcp_dictionary = Json::Value();
+    accessor.GetMutableData().set_dictionary(dictionary);
+  }
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Connect(_, _)).Times(0);
   EXPECT_TRUE(transport_adapter.CallRestore());
 }
 
 TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) {
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   std::string uniq_id = "unique_device_name";
   std::shared_ptr<MockTCPDevice> mockdev =
       std::make_shared<MockTCPDevice>(port, uniq_id);
@@ -297,7 +311,7 @@ TEST_F(TcpAdapterTest, StoreDataWithOneDevice_RestoreData) {
 
 TEST_F(TcpAdapterTest, StoreDataWithSeveralDevices_RestoreData) {
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
   const uint32_t count_dev = 10;
 
   std::shared_ptr<MockTCPDevice> mockdev[count_dev];
@@ -350,8 +364,8 @@ TEST_F(TcpAdapterTest, StoreDataWithSeveralDevices_RestoreData) {
 TEST_F(TcpAdapterTest, NotifyTransportConfigUpdated) {
   MockTransportAdapterListener mock_adapter_listener;
 
-  MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+  TcpTransportAdapter transport_adapter(
+      port, last_state_wrapper_, transport_manager_settings);
   transport_adapter.AddListener(&mock_adapter_listener);
 
   TransportConfig config;
@@ -359,14 +373,16 @@ TEST_F(TcpAdapterTest, NotifyTransportConfigUpdated) {
   config[tc_tcp_ip_address] = std::string("192.168.1.1");
   config[tc_tcp_port] = std::string("12345");
 
-  EXPECT_CALL(mock_adapter_listener, OnTransportConfigUpdated(_)).Times(1);
+  EXPECT_CALL(mock_adapter_listener,
+              OnTransportConfigUpdated(&transport_adapter))
+      .Times(1);
 
   transport_adapter.TransportConfigUpdated(config);
 }
 
 TEST_F(TcpAdapterTest, GetTransportConfiguration) {
   MockTCPTransportAdapter transport_adapter(
-      port, last_state_, transport_manager_settings);
+      port, last_state_wrapper_, transport_manager_settings);
 
   TransportConfig config;
   config[tc_enabled] = std::string("true");
diff --git a/src/components/transport_manager/test/test_certs/ca-cert.pem b/src/components/transport_manager/test/test_certs/ca-cert.pem
new file mode 100644
index 0000000000..e28684043c
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/ca-cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDyzCCArOgAwIBAgIJAM6Tk4KJmUgsMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNV
+BAYTAlVBMQ8wDQYDVQQIDAZPZGVzc2ExDzANBgNVBAcMBk9kZXNzYTEPMA0GA1UE
+CgwGTHV4b2Z0MQ0wCwYDVQQLDARGVENOMQ8wDQYDVQQDDAZMdXgtQ0ExGjAYBgkq
+hkiG9w0BCQEWC2NhQGZ0Y24uY29tMB4XDTIwMDExMDE0MzA1OFoXDTIyMTAwNjE0
+MzA1OFowfDELMAkGA1UEBhMCVUExDzANBgNVBAgMBk9kZXNzYTEPMA0GA1UEBwwG
+T2Rlc3NhMQ8wDQYDVQQKDAZMdXhvZnQxDTALBgNVBAsMBEZUQ04xDzANBgNVBAMM
+Bkx1eC1DQTEaMBgGCSqGSIb3DQEJARYLY2FAZnRjbi5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDWEz7yGIAEs6w/7CdMjkZ5J0O9IghL0f9wZVFO
+ficeREJglClInPrD7BwG7MG1tydPULbrf1rXgxi1NdDY+lsJLFmkxrGVlgJUJl55
+cGpWGliTUepfPz/6CgIabRw2fEMx/eIUlcE+WjY+f4uowVyRYjmNj7IydlQ5UjcL
+wWhjg1QMcjgmDzh8Jdx8I+JHYuOP9CtEEfFZy5DjVPFDSlTYhhnNclfw+4NkOYcs
+hp+EcMBr6egfxpG2dZbdCJtGw6QqHGG7kqqtLr+9wM5VFhuvebus5waM1G18dIME
+SgZmDdgvHO3bbylR+DRmAjJVn4DaDW6uszK9MSPsk53idOUXAgMBAAGjUDBOMB0G
+A1UdDgQWBBSSRwc4sGpz6V1kb0H371ZqhDuQDzAfBgNVHSMEGDAWgBSSRwc4sGpz
+6V1kb0H371ZqhDuQDzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCb
+ZYtM2nrokFL1D34bhozrLu0MxWwDF+gQrUsRr45s63Y5Pv7BVvuS6gF2MubMXskw
+mVeCerFw2vQHJKqe7leTy69hwIydPxPQWWno7MamwBDm3VQThr+b18rEpcjbmBMm
+p50usYzU9nxEEbIaiSbxfuZNvInLNmvMhKnKO/CIazJnYin9TGdOj9vZnh0UkWF3
+780mMBisycfxG+VwPXQZz5OzWWFB1uMiYrRVdwU6Y5umc2Oce7+ykWy+fXeefMhb
+lLJXHZK584qY/krmW0Ec6ZWSbiWcLW5SjGh756n05gBGLDBwijHnfEHNaqn+KlnZ
+qqIAImNTA9F+DlMQ7BV3
+-----END CERTIFICATE-----
diff --git a/src/components/transport_manager/test/test_certs/client-cert.pem b/src/components/transport_manager/test/test_certs/client-cert.pem
new file mode 100644
index 0000000000..47e85876c8
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/client-cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDeDCCAmACAQIwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVUExDzANBgNV
+BAgMBk9kZXNzYTEPMA0GA1UEBwwGT2Rlc3NhMQ8wDQYDVQQKDAZMdXhvZnQxDTAL
+BgNVBAsMBEZUQ04xDzANBgNVBAMMBkx1eC1DQTEaMBgGCSqGSIb3DQEJARYLY2FA
+ZnRjbi5jb20wHhcNMjAwMTEwMTQzODQxWhcNMjIxMDA2MTQzODQxWjCBhzELMAkG
+A1UEBhMCVUExDTALBgNVBAgMBEt5aXYxDTALBgNVBAcMBEt5aXYxDzANBgNVBAoM
+Bkx1eG9mdDEVMBMGA1UECwwMQXBwc0VueXdoZXJlMRIwEAYDVQQDDAlsb2NhbGhv
+c3QxHjAcBgkqhkiG9w0BCQEWD2NsaWVudEBmdGNuLmNvbTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBALV4qI/gRvVip3u5JtT+n+7j7gUsUVW5DtwHruIy
+drzNvQbG1Ukd3EXvU69HTG4BtoDRubqlSe/sjvO5Ypmg/UvpzV36IbjrA46s98uR
+T6fKpJU/Zl2zwAHH++iWpFo3mqIDmu7i0KVBieKaGpz+Ft0zh7wHAztS7b6Mjns4
+QynpjDO+iaLIaHqBjc1hLn8dIBXNolOtLu8F8CL7RLRpWP2I2Fk2k0+Q5YKajbil
+gptA53Uu55wCBVLTOfUYzTarGwS00+7txLY06g2x20FHD8UQxfCK7kSAeZwSNkbt
+SUhXc9OWUvT1uggb2/wBHJN3fwj7y6pvzUJy7p09212hw7UCAwEAATANBgkqhkiG
+9w0BAQsFAAOCAQEAjfASZwfJMTPKk45XVbvuNqdlbiI20SNV7pQQ/FqTBKbFmh4g
+ndNCvECmBEUH5YdZegiGaONQlsQujmtIkguu3HnA0+2pO2SncmK6D1DLzJv1IFDC
+25tTStA6806hWcTK31sxEbi5/aPdy7FMmsRfyhRr/yew0TqlWCVOfJRwgDSc3NKH
+/AXgDBrqHzSBegnWe9v3xL8NxehFp41dJG2fyUab03cHzmNtR9v7/NrBglSdK9VS
+AU4BCmjmvYlbvmvhZai23y+uLqzlWZ9OtK3qhEWkg6QHor11iBvxBQFeYKp1ZjMl
+sQuTxyBLmXOZ/u3hkqLcKvasx9W4DmmPjG2T8Q==
+-----END CERTIFICATE-----
diff --git a/src/components/transport_manager/test/test_certs/client-key.pem b/src/components/transport_manager/test/test_certs/client-key.pem
new file mode 100644
index 0000000000..b286854bd5
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/client-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1eKiP4Eb1Yqd7
+uSbU/p/u4+4FLFFVuQ7cB67iMna8zb0GxtVJHdxF71OvR0xuAbaA0bm6pUnv7I7z
+uWKZoP1L6c1d+iG46wOOrPfLkU+nyqSVP2Zds8ABx/volqRaN5qiA5ru4tClQYni
+mhqc/hbdM4e8BwM7Uu2+jI57OEMp6YwzvomiyGh6gY3NYS5/HSAVzaJTrS7vBfAi
++0S0aVj9iNhZNpNPkOWCmo24pYKbQOd1LuecAgVS0zn1GM02qxsEtNPu7cS2NOoN
+sdtBRw/FEMXwiu5EgHmcEjZG7UlIV3PTllL09boIG9v8ARyTd38I+8uqb81Ccu6d
+PdtdocO1AgMBAAECggEALiPCf+pfQE7YFJ4L4IXo9h1fzFLrTydhPtJ5RavdAr4w
+vINbgV6lPebO2TcAmMu4smIgnfMerHDyG8fb6QHExUNp4uYRIuomGmWiD1Ef9qKQ
+XB4lkdd9Dzbgts9udD3FBEJ0Zx6mPA5A16uk7puwBofukAEccj3wks08ANpaQVJh
+LoYQdVY9Q2QHUucED9uO2hOv66bDM5aunk0x4Q/b0gIOAnJyqk0xXnmnU76FbkgI
+bU3YQ73ZEJKTFLF8B2JaE9REASmHyLQChYqGA9SPdObVhgxJ8gz5AWp5yHgMmYjf
+Dp66tCsyGnmfgTlG4Wi13HInxLpRWDWT2JWIy9cUlQKBgQDshRq/rTj4tuVW09hX
+bWlAEV2IDn7JOWEZqPagnxew0atqow44VORW+OoUZ5760aOVjvmXeyGXpWCJk5ch
+qsFRL9rLRzIy9oC6C/chkJQAprcaOBOSXvj3HnFHVChjbIBENf4dvtsYZHOW42h2
+br0kszv1bbBzVIyTTY0OvGsBUwKBgQDEauIuC6RiDN+qFAf4/lHkUx7wG6DPhvDm
+EhpkiVEHYVjH5vm132/cc12y9CvsFS4MJPK4KQR9P+HFhEu/uH3uLa1vvKY+69iU
+dZ1bfe4UrEm/bwBepDSbqlQk58WC6NyJ6fwMq0BYJVvx593znEbU2wLVUTm8H7l2
+yzyxQwXd1wKBgBkYvo/cJ5FshsVB0VDlkSd1MEGBmD5t0jnQzeqZNwBSHyg/iQC9
+MUVxQBVOMXZXzE3QT/ec3yGiMK4odP7jiYO92i97rH3v3hTftCdhmfK/veoQTTNY
+1H4UQtzYtzhliO6z8/TgDYt3DTTTiIAYnAVK52/RZcm3DPuMXQ1VPN11AoGBAIN5
+eASSTmpDa8OQvPVyZqaK7P6Tv8Sp8r5OB9ScBd0G0EKe3S9cbKgHoQSUZIIWe0gt
+wzp6WkLsa9emgn3GpKS1do6AnFcpz0MwpzACz0aPPJ4jUwAGsiAwlzpM2eySqmy2
+brycNOnLuAvoxKy4QsFgCDl5sUe3hJF74RhWYKrpAoGAUrJMF5IaAAsv367nD8CX
+CfDsDlez54H/sZD7iKj8LhyuspAQBU3vQ3xKfaKRi4px8bgnty3stOMZxEC7I6BC
+jHH1hQK8l9nqRhOjPvoViUM6aOpabCkVsOZjWKD+OCz3X9+MmlGkMuNd22GRdwlb
+Emb3yEoFr5vDbez0IQNxnLs=
+-----END PRIVATE KEY-----
diff --git a/src/components/transport_manager/test/test_certs/invalid_cert.pem b/src/components/transport_manager/test/test_certs/invalid_cert.pem
new file mode 100644
index 0000000000..70d124c2b7
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/invalid_cert.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnwCCQDIe7AwFpWRlDANBgkqhkiG9w0BAQUFADCBizELMAkGA1UEBhMC
+UlUxEzARBgNVBAgMClNvbWUtU3RhdGUxGTAXBgNVBAcMEFNhaW50LVBldGVyc2J1
+cmcxDzANBgNVBAoMBkx1eG9mdDEXMBUGA1UEAwwORG1pdHJ5IENobWVyZXYxIjAg
+BgkqhkiG9w0BCQEWE2RjaG1lcmV2QGx1eG9mdC5jb20wHhcNMTQwMjI1MDkxODUz
+WhcNMTYxMTIyMDkxODUzWjCBizELMAkGA1UEBhMCUlUxEzARBgNVBAgMClNvbWUt
+U3RhdGUxGTAXBgNVBAcMEFNhaW50LVBldGVyc2J1cmcxDzANBgNVBAoMBkx1eG9m
+dDEXMBUGA1UEAwwORG1pdHJ5IENobWVyZXYxIjAgBgkqhkiG9w0BCQEWE2RjaG1l
+cmV2QGx1eG9mdC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCn
+Mu9wNmXKaKOnefSv5iT8G2ESLjq+eYlxys/XAnDfkmnlgGYAcPno+XMhRj/lNV/c
+3A0L/R4631GFJA8vaM8m9Bn47FrPP4AXIHEQh9acA4qXiLfhhA8+9PPt4xVkjQYj
+bmexBLqDvRgT3MJwwFecUn/UABBlVZRCspn+6DkjiodbgmBOqyi1p0ng8BFeUbEH
++fLQVILCX3pjnMiP2bBtvq/7njgZT2luVtAAcOdRwRTuZT0YbgaXrHYsOa6VYDl1
+I0uOcdD8qENBXtBnykEqH+jZtKu6Rej1DsGOYWqz3AAaGiR1GJauNBxh+4v+i/eB
+0aCIA8T8qUqyuVVg48S/AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBACliraOJYijK
+yS+Sl6S6pFRqdF/evPdYF6zDJlM3P+/9qHoEy751vbBTzRkVbC/azyiZLwQMuyED
+6oCpkI7MqnrRip1ZelGx9K7ChaHOpX/QRN+3eqiDhzvMTGd2nPJf9np4xi8SJpGP
+UUROYI5fToIY5MaOKuOIR2a6c8xIuLWMG1XKJxXrRetLJZDgBqQPkuqaZIjYCY+q
+HQRjNUFNX4Mc453tKd90gFLGI3fxs1fJDIRSGfKJsj0qc+amSz4Sgiz4QUBcUQKd
+hJxUpStYhliZGZchEopLsShtIGfKKFaaPCIOTpVAwSr1oIDm9lpkdxeuQfedKT5f
+ZZmkez2pAF8=
+-----END CERTIFICATE-----   
diff --git a/src/components/transport_manager/test/test_certs/invalid_key.pem b/src/components/transport_manager/test/test_certs/invalid_key.pem
new file mode 100644
index 0000000000..d2aacc1638
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/invalid_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEApzLvcDZlymijp3n0r+Yk/BthEi46vnmJccrP1wJw35Jp5YBm
+AHD56PlzIUY/5TVf3NwNC/0eOt9RhSQPL2jPJvQZ+Oxazz+AFyBxEIfWnAOKl4i3
+4YQPPvTz7eMVZI0GI25nsQS6g70YE9zCcMBXnFJ/1AAQZVWUQrKZ/ug5I4qHW4Jg
+TqsotadJ4PARXlGxB/ny0FSCwl96Y5zIj9mwbb6v+544GU9pblbQAHDnUcEU7mU9
+GG4Gl6x2LDmulWA5dSNLjnHQ/KhDQV7QZ8pBKh/o2bSrukXo9Q7BjmFqs9wAGhok
+dRiWrjQcYfuL/ov3gdGgiAPE/KlKsrlVYOPEvwIDAQABAoIBAQCAjkNXzhuZ87bR
+UI34qUYKqaqLZgw45A3v9naz5OaQoGzXz0+eSz98CECjdvYt8EoS8Qb/DtGthoOR
+kVYzp6yPUOSfZmu0Kij8ny8P/MHgF0D6nl50ASwPxhu/7vhF5cCwgXUswGwAWuYm
+b3j5ZIp4YV5zzNDOeWyTk+uf+UHltqFD7Ae4M9z58r17/OWhva5mtusTuuEYjzC6
+AE/fsOC0gLNSM4+SfclfCkHpH+GikzNMSQ2H0hlXllPmR73BoC6N6aoY5hQWBLV7
+LxtYbJqx7TAqRyypBQekjJe36roRetXtzy3i6V/y69045td5kk70cVjmFhl79475
+82rnRLHBAoGBANgq4axr5OotTUmPkGd0afoaWSRPJfiTTdNeMkqTzM6zIcVLSKhB
+78ERwdDD9FOu+Bgivg4DlpmH7ArWn8QNDtdkhmPfKYfTqX6qH7AK4cybvYICMlct
+EdW4TvKm/ZB3mrVOP9JVPjdyFMp+Je6N+qp1w+ui9mxX8pWnrC/+DfTvAoGBAMYC
+GFjnw/O9hjF2Mb00qUarmM+reJZMXv/pVik+cm0eAiYvgGvKbAYkIXwdb7rLBw9k
+baJmxP0PrAoXy5TpPdfROqPwrRCyReKymKkEZeTpONgD0s8MbX167ovZu1OQVKQo
+IyJeUzWa0kpglnbL2lLVu49x8jWHDJdYhmkDNE0xAoGAR4ux07qGMoe5693rYoJi
+TRgJZv4XSDWg7ZNgu9Q9VjBtvfoT2zSvoMw6xNkGdegUTxC4rLS9VKVrF48/o8ja
+n6my3T1QZpdEoxq1kDOZ1nm5eF03wii1nXH6F0/z3qvndZingPsbs4g7n2WvMkyl
+qWN+6++s9eEJ9kRftia1AdsCgYAUnU05nE97RcT9y0dcYmopMF5FaJ2yUBsn23wb
+6SNylsg0f4eIMVfTv9k4mbvzH4YJpTQAz2A81G/d0SJhy3Kj0GWhgcIS1eyOsHdS
+SWHuVhWT77n30lxnzu+c4bst9P3K5V7bCiTxlL/F/I5NqeV98ECJq5xC1F+MNiww
+LKQ6UQKBgC2zL59Vf8QnRkRN0gOUfs3ejrLcxFRzTXvcKqcHtbaqzCs3qSNC6UvV
+wjBazEwQCo1wnM81X8uT5fLhnjXebWtnYexQo5P38PiaqTQDgrbAdhP5P8NwRCXM
+G3SNEz0XeL27jmWjf0VJdwD0LuHXYhcwAWq4alhJ024rjgVHwOze
+-----END RSA PRIVATE KEY-----
+
diff --git a/src/components/transport_manager/test/test_certs/server-cert.pem b/src/components/transport_manager/test/test_certs/server-cert.pem
new file mode 100644
index 0000000000..d2b1cf0ec8
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/server-cert.pem
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdDCCAlwCAQEwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVUExDzANBgNV
+BAgMBk9kZXNzYTEPMA0GA1UEBwwGT2Rlc3NhMQ8wDQYDVQQKDAZMdXhvZnQxDTAL
+BgNVBAsMBEZUQ04xDzANBgNVBAMMBkx1eC1DQTEaMBgGCSqGSIb3DQEJARYLY2FA
+ZnRjbi5jb20wHhcNMjAwMTEwMTQzMzM2WhcNMjIxMDA2MTQzMzM2WjCBgzELMAkG
+A1UEBhMCVUExDzANBgNVBAgMBk9kZXNzYTEPMA0GA1UEBwwGT2Rlc3NhMQ8wDQYD
+VQQKDAZMdXhvZnQxDTALBgNVBAsMBEZUQ04xEjAQBgNVBAMMCWxvY2FsaG9zdDEe
+MBwGCSqGSIb3DQEJARYPc2VydmVyQGZ0Y24uY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEApnW3zyWadWiD1eMPszMM0Hyzm3Zd6mr21LMtQMwqw10p
+PxMpZLo0rgCkJevVRxO/y4J+TcE9LtralzzsWK+DD/i2Gf8CfAOapcDETJ8b68jM
+rUMwmN3tdiEBqimHBKEKIgDOiJt2Y08Jw2AWR41LuyjtD+IWSWo1kqJF3rxpsfz0
+SfTQWkvHVXg1c0qbfsp2i82Nvt5HzvDdk0jzX+GNHSmkUECcE0GIhK8GHxAFYugk
+siRU/tgY/wzP9iUkj7UbPWb5k+d8Z3sqUFpVAa4dXhIzx5L0l5peXvhunYqr7Vk+
+cfBAHIQZKJa7coBBahA7gjBylz+BbIOadGYYoYZVBQIDAQABMA0GCSqGSIb3DQEB
+CwUAA4IBAQDNUMIv6X9scvVN8II/PbvvQzWAxi0qzDejnEF579PA9MCNt6JY20lj
+JTscUN5lWNuLGJtkUuscBMBYe21ePtGeS855Q6csoUe6m0fnY+ybKVYIKk+SL5Hx
+1vurBIsHOyX6097e8VIzWyxcWW1074oTYLpYfEWr0vECrGodoXGtPdEeyB0+QdbI
+H0Pcngqu5yLoWxoWwuAj94YG7eX3sJv6PXOW71i4yMmT8ToYNXFwqTK/xq/pl6H2
+KH150zDNOaE2Z5+u21Elau+3qWPWQ6C9KpxhmJ/iDftRe+hgMISSygYK0nwk0zk4
+rmNODAeuTvsrh9bNsYQfjERsh0VYaG24
+-----END CERTIFICATE-----
diff --git a/src/components/transport_manager/test/test_certs/server-key.pem b/src/components/transport_manager/test/test_certs/server-key.pem
new file mode 100644
index 0000000000..6ff13eaf28
--- /dev/null
+++ b/src/components/transport_manager/test/test_certs/server-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCmdbfPJZp1aIPV
+4w+zMwzQfLObdl3qavbUsy1AzCrDXSk/EylkujSuAKQl69VHE7/Lgn5NwT0u2tqX
+POxYr4MP+LYZ/wJ8A5qlwMRMnxvryMytQzCY3e12IQGqKYcEoQoiAM6Im3ZjTwnD
+YBZHjUu7KO0P4hZJajWSokXevGmx/PRJ9NBaS8dVeDVzSpt+ynaLzY2+3kfO8N2T
+SPNf4Y0dKaRQQJwTQYiErwYfEAVi6CSyJFT+2Bj/DM/2JSSPtRs9ZvmT53xneypQ
+WlUBrh1eEjPHkvSXml5e+G6diqvtWT5x8EAchBkolrtygEFqEDuCMHKXP4Fsg5p0
+ZhihhlUFAgMBAAECggEBAJ35UfuxACk0iwlNd/TlGeAyuHFtoCt8X8v0T5oTKPJH
+U4GcucfyP1RzH1Utvza5M2f768n2/g2dfZ3SH6r6xjM+IfQB42W2NengS2s8BM97
+vWMhRNmOpHFbWa0XxB9MhcVHZrqWb4BH3kggxIQbQCfa60ALnIMH3NfQUObVgKl8
+khPU3fWx5zH2fbLNiLbImr5U5ViNoOKw592cmAEocIgIE33SDf2LHuuByikb38/r
+98bAp6IdNhRb7qY/Jllq3fu06fLubGQusVT01vu3sp//G2gCzFwp0O/qX2M1JBPS
+JYKKGXrNxeaQNzzD6cEcSkADpZvIG/CmmnR9u/FjIXECgYEA2palcAJKXPWsnwLb
+QtDd7MQ6sG3qvkCaiiDsn5BAGkxn1rZ3NRGMxBx4Fb9oiIl6SBpQ/YdMkd7tMkLX
+MEmbPyOcHPnsxcCqeFGsiTejpx1OyPSUAtxtpxGc/D63wCPhHGO3xNdQ2FiYb5K3
+jG8cslE39gH+/9XSN8kS2gZZ4d8CgYEAwvMUbXSBYx01I+jjqsjSI9afk3w9VwKM
+vuW9MgUBYLP5ryadNqt2cuHydT5KJiZ7YUQSLNztZ++g5WR7yamWpLzoGFmrSyWb
+304xA9jdLRJHMsBM0V32abdfTV5+EW+24309UmcaUtsQoUTxXOSqwDaHF4Mq1zLg
+jwb2phYlzZsCgYEAtz5q2gdRh7R8TaD7ZnvqTz4BZT3/+BX4d6s6MlmfI2zB8AFu
+1ZIsy4qCMNkRLMTzOda15pOx4OddOTFHbDeIadnUWYY6s1zci5kMZsu56bJsBZLj
+MbLQSao+TEfXir+JS19dAyrtnzBGOeJo9NWA3QuxOg5aUuZRIGrz3spMN0kCgYB3
+ZLnpAwZO9k9aS8JLESypqEMY52kFxdj+/OKvJKOgXvkWzPZRyhcD6t878McmsEC1
+5COheDipg/etJaouan+JKuyWJSykHEdnLpMUQRfMB7q1GVKykvJb8mMaljltYlbG
+4ifRNLXJcsKvkfKkKqNsjriTrNBq9YzT67bZJw1F6wKBgGlEd9O+qWY4dSPKN60N
+khG1Splz+eBbbsqcISeFGZepEc4HaEIcYgIHTh8nw5ycYxh8A1UBdaBZmU9UHdfl
+j9M2u0htKZ27ntVVNZJCLeSgufaPUDIfvnK4o5q630NGhKJmVcYD3WeggIrPfca3
+fP8WaHq9fx5k4YZokD2VHOJb
+-----END PRIVATE KEY-----
diff --git a/src/components/transport_manager/test/transport_adapter_listener_test.cc b/src/components/transport_manager/test/transport_adapter_listener_test.cc
index 0813448e91..9f18d5bc13 100644
--- a/src/components/transport_manager/test/transport_adapter_listener_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_listener_test.cc
@@ -130,7 +130,7 @@ TEST_F(TransportAdapterListenerTest, OnDataReceiveFailed) {
 TEST_F(TransportAdapterListenerTest, OnDataSendDone) {
   unsigned char data[3] = {0x20, 0x07, 0x01};
   ::protocol_handler::RawMessagePtr data_container =
-      std::make_shared< ::protocol_handler::RawMessage>(1, 1, data, 3);
+      std::make_shared< ::protocol_handler::RawMessage>(1, 1, data, 3, false);
 
   EXPECT_CALL(tr_mock,
               ReceiveEventFromDevice(IsEvent(EventTypeEnum::ON_SEND_DONE,
@@ -146,7 +146,7 @@ TEST_F(TransportAdapterListenerTest, OnDataSendDone) {
 TEST_F(TransportAdapterListenerTest, OnDataSendFailed) {
   unsigned char data[3] = {0x20, 0x07, 0x01};
   ::protocol_handler::RawMessagePtr data_container =
-      std::make_shared< ::protocol_handler::RawMessage>(1, 1, data, 3);
+      std::make_shared< ::protocol_handler::RawMessage>(1, 1, data, 3, false);
   DataSendError err;
 
   EXPECT_CALL(tr_mock,
diff --git a/src/components/transport_manager/test/transport_adapter_test.cc b/src/components/transport_manager/test/transport_adapter_test.cc
index 56386db201..1773ecfb67 100644
--- a/src/components/transport_manager/test/transport_adapter_test.cc
+++ b/src/components/transport_manager/test/transport_adapter_test.cc
@@ -51,6 +51,7 @@
 
 #include "config_profile/profile.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 
 namespace test {
 namespace components {
@@ -65,8 +66,11 @@ using namespace ::protocol_handler;
 
 class TransportAdapterTest : public ::testing::Test {
  protected:
-  TransportAdapterTest()
-      : last_state_("app_storage_folder", "app_info_storage") {}
+  TransportAdapterTest() {
+    last_state_wrapper_ = std::make_shared<resumption::LastStateWrapperImpl>(
+        std::make_shared<resumption::LastStateImpl>("app_storage_folder",
+                                                    "app_info_storage"));
+  }
 
   void SetUp() OVERRIDE {
     dev_id = "device_id";
@@ -82,7 +86,7 @@ class TransportAdapterTest : public ::testing::Test {
   }
 
   NiceMock<MockTransportManagerSettings> transport_manager_settings;
-  resumption::LastStateImpl last_state_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
   std::string dev_id;
   std::string uniq_id;
   int app_handle;
@@ -228,7 +232,7 @@ TEST_F(TransportAdapterTest, Init) {
   MockTransportAdapterImpl transport_adapter(dev_mock,
                                              serverMock,
                                              clientMock,
-                                             last_state_,
+                                             last_state_wrapper_,
                                              transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -247,8 +251,11 @@ TEST_F(TransportAdapterTest, Init) {
 TEST_F(TransportAdapterTest, SearchDevices_WithoutScanner) {
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, clientMock, last_state_, transport_manager_settings);
+  MockTransportAdapterImpl transport_adapter(NULL,
+                                             serverMock,
+                                             clientMock,
+                                             last_state_wrapper_,
+                                             transport_manager_settings);
 
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -264,7 +271,7 @@ TEST_F(TransportAdapterTest, SearchDevices_WithoutScanner) {
 TEST_F(TransportAdapterTest, SearchDevices_DeviceNotInitialized) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockTransportAdapterImpl transport_adapter(
-      dev_mock, NULL, NULL, last_state_, transport_manager_settings);
+      dev_mock, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -280,7 +287,7 @@ TEST_F(TransportAdapterTest, SearchDevices_DeviceNotInitialized) {
 TEST_F(TransportAdapterTest, SearchDevices_DeviceInitialized) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockTransportAdapterImpl transport_adapter(
-      dev_mock, NULL, NULL, last_state_, transport_manager_settings);
+      dev_mock, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -296,7 +303,7 @@ TEST_F(TransportAdapterTest, SearchDevices_DeviceInitialized) {
 
 TEST_F(TransportAdapterTest, SearchDeviceDone_DeviceExisting) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -313,7 +320,7 @@ TEST_F(TransportAdapterTest, SearchDeviceDone_DeviceExisting) {
 
 TEST_F(TransportAdapterTest, SearchDeviceFailed) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -328,7 +335,7 @@ TEST_F(TransportAdapterTest, SearchDeviceFailed) {
 
 TEST_F(TransportAdapterTest, AddDevice) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -346,7 +353,7 @@ TEST_F(TransportAdapterTest, AddDevice) {
 TEST_F(TransportAdapterTest, Connect_ServerNotSupported) {
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, clientMock, last_state_, transport_manager_settings);
+      NULL, NULL, clientMock, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*clientMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -364,7 +371,7 @@ TEST_F(TransportAdapterTest, Connect_ServerNotSupported) {
 TEST_F(TransportAdapterTest, Connect_ServerNotInitialized) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -382,7 +389,7 @@ TEST_F(TransportAdapterTest, Connect_ServerNotInitialized) {
 TEST_F(TransportAdapterTest, Connect_Success) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -401,7 +408,7 @@ TEST_F(TransportAdapterTest, Connect_Success) {
 TEST_F(TransportAdapterTest, Connect_DeviceAddedTwice) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -424,7 +431,7 @@ TEST_F(TransportAdapterTest, Connect_DeviceAddedTwice) {
 
 TEST_F(TransportAdapterTest, ConnectDevice_ServerNotAdded_DeviceAdded) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -450,7 +457,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_ServerNotAdded_DeviceAdded) {
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceNotAdded) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
@@ -471,7 +478,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceNotAdded) {
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -504,7 +511,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded) {
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded_ConnectFailedRetry) {
   MockServerConnectionFactory* server_mock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, server_mock, NULL, last_state_, transport_manager_settings);
+      NULL, server_mock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*server_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -541,7 +548,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAdded_ConnectFailedRetry) {
 TEST_F(TransportAdapterTest, ConnectDevice_DeviceAddedTwice) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -585,7 +592,7 @@ TEST_F(TransportAdapterTest, ConnectDevice_DeviceAddedTwice) {
 TEST_F(TransportAdapterTest, Disconnect_ConnectDoneSuccess) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -611,13 +618,14 @@ TEST_F(TransportAdapterTest, Disconnect_ConnectDoneSuccess) {
   EXPECT_EQ(TransportAdapter::OK, new_res);
 
   EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*mock_connection, Terminate());
 }
 
 #if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
 TEST_F(TransportAdapterTest, FindPending) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -651,13 +659,16 @@ TEST_F(TransportAdapterTest, FindPending) {
   ConnectionSPtr mock_connection_fake =
       transport_adapter.FindPendingConnection(uniq_id, 1);
   ASSERT_TRUE(mock_connection_fake.use_count() == 0);
+
+  EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*connection, Terminate());
 }
 
 TEST_F(TransportAdapterTest,
        Pending_Connect_Disconnect_ConnectDoneSuccess_PendingDeviceAdded) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -743,12 +754,14 @@ TEST_F(TransportAdapterTest,
   EXPECT_EQ(ConnectionStatus::PENDING, mockdev2->connection_status());
 
   EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*mock_connection, Terminate());
+  EXPECT_CALL(*connection2, Terminate());
 }
 
 TEST_F(TransportAdapterTest, WebsocketEndpointParsing_SUCCESS) {
   std::shared_ptr<CloudWebsocketTransportAdapter> cta =
       std::make_shared<CloudWebsocketTransportAdapter>(
-          last_state_, transport_manager_settings);
+          last_state_wrapper_, transport_manager_settings);
 
   for (auto protocol : kWebsocketProtocols) {
     for (auto endpoint : kValidTestEndpoints) {
@@ -776,7 +789,7 @@ TEST_F(TransportAdapterTest, WebsocketEndpointParsing_SUCCESS) {
 TEST_F(TransportAdapterTest, WebsocketEndpointParsing_INVALID) {
   std::shared_ptr<CloudWebsocketTransportAdapter> cta =
       std::make_shared<CloudWebsocketTransportAdapter>(
-          last_state_, transport_manager_settings);
+          last_state_wrapper_, transport_manager_settings);
 
   for (auto protocol : kWebsocketProtocols) {
     for (auto endpoint : kInvalidTestEndpoints) {
@@ -796,7 +809,7 @@ TEST_F(TransportAdapterTest, WebsocketEndpointParsing_INVALID) {
 TEST_F(TransportAdapterTest, WebsocketEndpointParsing_INCORRECT) {
   std::shared_ptr<CloudWebsocketTransportAdapter> cta =
       std::make_shared<CloudWebsocketTransportAdapter>(
-          last_state_, transport_manager_settings);
+          last_state_wrapper_, transport_manager_settings);
 
   for (auto protocol : kWebsocketProtocols) {
     for (auto endpoint : kIncorrectTestEndpoints) {
@@ -826,7 +839,7 @@ TEST_F(TransportAdapterTest, WebsocketEndpointParsing_INCORRECT) {
 TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -864,12 +877,13 @@ TEST_F(TransportAdapterTest, DisconnectDevice_DeviceAddedConnectionCreated) {
   EXPECT_EQ(ConnectionStatus::CLOSING, mockdev->connection_status());
 
   EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*mock_connection, Terminate());
 }
 
 TEST_F(TransportAdapterTest, DeviceDisconnected) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -919,7 +933,7 @@ TEST_F(TransportAdapterTest, DeviceDisconnected) {
 TEST_F(TransportAdapterTest, AbortedConnectSuccess) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -945,8 +959,11 @@ TEST_F(TransportAdapterTest, AbortedConnectSuccess) {
 TEST_F(TransportAdapterTest, SendData) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
-  MockTransportAdapterImpl transport_adapter(
-      dev_mock, serverMock, NULL, last_state_, transport_manager_settings);
+  MockTransportAdapterImpl transport_adapter(dev_mock,
+                                             serverMock,
+                                             NULL,
+                                             last_state_wrapper_,
+                                             transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -969,7 +986,7 @@ TEST_F(TransportAdapterTest, SendData) {
   const unsigned int kSize = 3;
   unsigned char data[kSize] = {0x20, 0x07, 0x01};
   const RawMessagePtr kMessage =
-      std::make_shared<RawMessage>(1, 1, data, kSize);
+      std::make_shared<RawMessage>(1, 1, data, kSize, false);
 
   EXPECT_CALL(*mock_connection, SendData(kMessage))
       .WillOnce(Return(TransportAdapter::OK));
@@ -978,6 +995,7 @@ TEST_F(TransportAdapterTest, SendData) {
 
   EXPECT_CALL(*dev_mock, Terminate());
   EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*mock_connection, Terminate());
 }
 
 TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) {
@@ -987,7 +1005,7 @@ TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) {
   MockTransportAdapterImpl transport_adapter(dev_mock,
                                              serverMock,
                                              clientMock,
-                                             last_state_,
+                                             last_state_wrapper_,
                                              transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
@@ -1009,7 +1027,7 @@ TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) {
   const unsigned int kSize = 3;
   unsigned char data[kSize] = {0x20, 0x07, 0x01};
   const RawMessagePtr kMessage =
-      std::make_shared<RawMessage>(1, 1, data, kSize);
+      std::make_shared<RawMessage>(1, 1, data, kSize, false);
 
   EXPECT_CALL(*mock_connection, SendData(kMessage)).Times(0);
   res = transport_adapter.SendData(dev_id, app_handle, kMessage);
@@ -1018,13 +1036,17 @@ TEST_F(TransportAdapterTest, SendData_ConnectionNotEstablished) {
   EXPECT_CALL(*dev_mock, Terminate());
   EXPECT_CALL(*clientMock, Terminate());
   EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*mock_connection, Terminate());
 }
 
 TEST_F(TransportAdapterTest, StartClientListening_ClientNotInitialized) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
-  MockTransportAdapterImpl transport_adapter(
-      dev_mock, NULL, clientMock, last_state_, transport_manager_settings);
+  MockTransportAdapterImpl transport_adapter(dev_mock,
+                                             NULL,
+                                             clientMock,
+                                             last_state_wrapper_,
+                                             transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -1035,7 +1057,8 @@ TEST_F(TransportAdapterTest, StartClientListening_ClientNotInitialized) {
   EXPECT_CALL(*clientMock, IsInitialised()).WillOnce(Return(false));
   EXPECT_CALL(*clientMock, StartListening()).Times(0);
 
-  TransportAdapter::Error res = transport_adapter.StartClientListening();
+  TransportAdapter::Error res = transport_adapter.ChangeClientListening(
+      transport_manager::TransportAction::kVisibilityOn);
   EXPECT_EQ(TransportAdapter::BAD_STATE, res);
 
   EXPECT_CALL(*dev_mock, Terminate());
@@ -1045,8 +1068,11 @@ TEST_F(TransportAdapterTest, StartClientListening_ClientNotInitialized) {
 TEST_F(TransportAdapterTest, StartClientListening) {
   MockDeviceScanner* dev_mock = new MockDeviceScanner();
   MockClientConnectionListener* clientMock = new MockClientConnectionListener();
-  MockTransportAdapterImpl transport_adapter(
-      dev_mock, NULL, clientMock, last_state_, transport_manager_settings);
+  MockTransportAdapterImpl transport_adapter(dev_mock,
+                                             NULL,
+                                             clientMock,
+                                             last_state_wrapper_,
+                                             transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*dev_mock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -1058,7 +1084,8 @@ TEST_F(TransportAdapterTest, StartClientListening) {
   EXPECT_CALL(*clientMock, StartListening())
       .WillOnce(Return(TransportAdapter::OK));
 
-  TransportAdapter::Error res = transport_adapter.StartClientListening();
+  TransportAdapter::Error res = transport_adapter.ChangeClientListening(
+      transport_manager::TransportAction::kVisibilityOn);
   EXPECT_EQ(TransportAdapter::OK, res);
 
   EXPECT_CALL(*dev_mock, Terminate());
@@ -1072,7 +1099,7 @@ TEST_F(TransportAdapterTest, StopClientListening_Success) {
   MockTransportAdapterImpl transport_adapter(dev_mock,
                                              serverMock,
                                              clientMock,
-                                             last_state_,
+                                             last_state_wrapper_,
                                              transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
@@ -1092,7 +1119,8 @@ TEST_F(TransportAdapterTest, StopClientListening_Success) {
   EXPECT_CALL(*clientMock, StopListening())
       .WillOnce(Return(TransportAdapter::OK));
 
-  res = transport_adapter.StopClientListening();
+  res = transport_adapter.ChangeClientListening(
+      transport_manager::TransportAction::kVisibilityOff);
   EXPECT_EQ(TransportAdapter::OK, res);
 
   EXPECT_CALL(*dev_mock, Terminate());
@@ -1107,7 +1135,7 @@ TEST_F(TransportAdapterTest, FindNewApplicationsRequest) {
   MockTransportAdapterImpl transport_adapter(dev_mock,
                                              serverMock,
                                              clientMock,
-                                             last_state_,
+                                             last_state_wrapper_,
                                              transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
@@ -1130,7 +1158,7 @@ TEST_F(TransportAdapterTest, FindNewApplicationsRequest) {
 
 TEST_F(TransportAdapterTest, GetDeviceAndApplicationLists) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -1155,7 +1183,7 @@ TEST_F(TransportAdapterTest, GetDeviceAndApplicationLists) {
 TEST_F(TransportAdapterTest, FindEstablishedConnection) {
   MockServerConnectionFactory* serverMock = new MockServerConnectionFactory();
   MockTransportAdapterImpl transport_adapter(
-      NULL, serverMock, NULL, last_state_, transport_manager_settings);
+      NULL, serverMock, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   EXPECT_CALL(*serverMock, Init()).WillOnce(Return(TransportAdapter::OK));
@@ -1168,7 +1196,7 @@ TEST_F(TransportAdapterTest, FindEstablishedConnection) {
   TransportAdapter::Error res = transport_adapter.Connect(dev_id, app_handle);
   EXPECT_EQ(TransportAdapter::OK, res);
 
-  ConnectionSPtr mock_connection = std::make_shared<MockConnection>();
+  auto mock_connection = std::make_shared<MockConnection>();
   transport_adapter.ConnectionCreated(mock_connection, dev_id, app_handle);
 
   EXPECT_CALL(transport_adapter, Store());
@@ -1179,13 +1207,14 @@ TEST_F(TransportAdapterTest, FindEstablishedConnection) {
   EXPECT_EQ(mock_connection, conn);
 
   EXPECT_CALL(*serverMock, Terminate());
+  EXPECT_CALL(*mock_connection, Terminate());
 }
 
 TEST_F(TransportAdapterTest, RunAppOnDevice_NoDeviseWithAskedId_UNSUCCESS) {
   const std::string bundle_id = "test_bundle_id";
 
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   std::shared_ptr<MockDevice> mock_device =
@@ -1205,7 +1234,7 @@ TEST_F(TransportAdapterTest, RunAppOnDevice_DeviseWithAskedIdWasFound_SUCCESS) {
   const std::string device_uid = "test_device_uid";
 
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
 
   std::shared_ptr<MockDevice> mock_device =
@@ -1222,7 +1251,7 @@ TEST_F(TransportAdapterTest, RunAppOnDevice_DeviseWithAskedIdWasFound_SUCCESS) {
 
 TEST_F(TransportAdapterTest, StopDevice) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
 
@@ -1237,7 +1266,7 @@ TEST_F(TransportAdapterTest, StopDevice) {
 
 TEST_F(TransportAdapterTest, TransportConfigUpdated) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
@@ -1256,7 +1285,7 @@ TEST_F(TransportAdapterTest, TransportConfigUpdated) {
 
 TEST_F(TransportAdapterTest, GetTransportConfigration) {
   MockTransportAdapterImpl transport_adapter(
-      NULL, NULL, NULL, last_state_, transport_manager_settings);
+      NULL, NULL, NULL, last_state_wrapper_, transport_manager_settings);
   SetDefaultExpectations(transport_adapter);
   EXPECT_CALL(transport_adapter, Restore()).WillOnce(Return(true));
   transport_adapter.Init();
diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc
index e102458b96..67b4a0a8ba 100644
--- a/src/components/transport_manager/test/transport_manager_default_test.cc
+++ b/src/components/transport_manager/test/transport_manager_default_test.cc
@@ -32,15 +32,23 @@
 
 #include "transport_manager/transport_manager_default.h"
 #include "gtest/gtest.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "resumption/mock_last_state.h"
+#include "transport_manager/bt/mock_bluetooth_transport_adapter.h"
+#include "transport_manager/cloud/mock_cloud_websocket_transport_adapter.h"
 #include "transport_manager/mock_transport_manager_settings.h"
+#include "transport_manager/tcp/mock_tcp_transport_adapter.h"
+#include "transport_manager/transport_adapter/mock_device.h"
+#include "transport_manager/transport_adapter/mock_transport_adapter_listener.h"
 #include "transport_manager/transport_manager.h"
+#include "transport_manager/usb/mock_usb_aoa_adapter.h"
 
 namespace test {
 namespace components {
 namespace transport_manager_test {
 
 using resumption_test::MockLastState;
+using ::testing::_;
 using ::testing::NiceMock;
 using ::testing::Return;
 using ::testing::ReturnRef;
@@ -57,6 +65,12 @@ const std::string kTransportManager = "TransportManager";
 const std::string kTcpAdapter = "TcpAdapter";
 const std::string kBluetoothAdapter = "BluetoothAdapter";
 const std::string kDevices = "devices";
+const uint16_t kPort = 12345u;
+const std::string kAddress = "127.0.0.1";
+const std::string kServerCertPath = "server_certificate.crt";
+const std::string kServerCACertPath = "ca-certificate.crt";
+const std::string kWSServerKeyPathKey = "WSServerKeyPath";
+const std::string kWSServerCACertPath = "WSServerCACertificatePath";
 std::vector<uint8_t> kBTUUID = {0x93,
                                 0x6D,
                                 0xA0,
@@ -75,104 +89,229 @@ std::vector<uint8_t> kBTUUID = {0x93,
                                 0xA8};
 }  // namespace
 
-TEST(TestTransportManagerDefault, Init_LastStateNotUsed) {
-  MockTransportManagerSettings transport_manager_settings;
-  transport_manager::TransportManagerDefault transport_manager(
-      transport_manager_settings);
-
-  NiceMock<MockLastState> mock_last_state;
-  Json::Value custom_dictionary = Json::Value();
-
-  ON_CALL(mock_last_state, get_dictionary())
-      .WillByDefault(ReturnRef(custom_dictionary));
-
-  EXPECT_CALL(transport_manager_settings, use_last_state())
-      .WillRepeatedly(Return(false));
-  EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port())
-      .WillRepeatedly(Return(12345u));
-  std::string network_interface = "";
-  EXPECT_CALL(transport_manager_settings,
-              transport_manager_tcp_adapter_network_interface())
-      .WillRepeatedly(ReturnRef(network_interface));
-  EXPECT_CALL(transport_manager_settings, bluetooth_uuid())
-      .WillRepeatedly(Return(kBTUUID.data()));
+class TestTransportManagerDefault : public ::testing::Test {
+ public:
+  TestTransportManagerDefault()
+      : transport_manager_settings_()
+      , mock_last_state_(std::make_shared<MockLastState>())
+      , unique_tcp_dev_name_("unique_tcp_device_name")
+      , dev_id_("device_id")
+      , tcp_adapter_port_(1u)
+      , network_interface_("test_iface")
+      , last_state_wrapper_(std::make_shared<resumption::LastStateWrapperImpl>(
+            mock_last_state_)) {}
 
-  transport_manager.Init(mock_last_state);
-  transport_manager.Stop();
-}
+  void SetUp() OVERRIDE {
+    EXPECT_CALL(transport_manager_settings_,
+                transport_manager_tcp_adapter_network_interface())
+        .WillRepeatedly(ReturnRef(network_interface_));
+
+    // Replace creation of real transport adapters by mock objects
+    // to be able to check related function calls
+    mock_bt_ta_ = new MockBluetoothTransportAdapter();
+    mock_tcp_ta_ = new MockTCPTransportAdapter(
+        tcp_adapter_port_, last_state_wrapper_, transport_manager_settings_);
+    mock_usb_aoa_ta_ =
+        new MockUsbAoaAdapter(last_state_wrapper_, transport_manager_settings_);
+    mock_cloud_websocket_ta_ = new MockCloudWebsocketTransportAdapter(
+        last_state_wrapper_, transport_manager_settings_);
+
+    TransportAdapterFactory ta_factory;
+#ifdef BLUETOOTH_SUPPORT
+    ta_factory.ta_bluetooth_creator_ =
+        [&](resumption::LastStateWrapperPtr& last_state_wrapper,
+            const TransportManagerSettings& settings) {
+          UNUSED(last_state_wrapper);
+          UNUSED(settings);
+          return mock_bt_ta_;
+        };
+#endif
+    ta_factory.ta_tcp_creator_ =
+        [&](const uint16_t port,
+            resumption::LastStateWrapperPtr& last_state_wrapper,
+            const TransportManagerSettings& settings) {
+          UNUSED(port);
+          UNUSED(last_state_wrapper);
+          UNUSED(settings);
+          return mock_tcp_ta_;
+        };
+#if defined(USB_SUPPORT)
+    ta_factory.ta_usb_creator_ =
+        [&](resumption::LastStateWrapperPtr& last_state_wrapper,
+            const TransportManagerSettings& settings) {
+          UNUSED(last_state_wrapper);
+          UNUSED(settings);
+          return mock_usb_aoa_ta_;
+        };
+#endif
+#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
+    ta_factory.ta_cloud_creator_ =
+        [&](resumption::LastStateWrapperPtr& last_state_wrapper,
+            const TransportManagerSettings& settings) {
+          UNUSED(last_state_wrapper);
+          UNUSED(settings);
+          return mock_cloud_websocket_ta_;
+        };
+#endif
+    transport_manager_ = std::unique_ptr<TransportManagerDefault>(
+        new TransportManagerDefault(transport_manager_settings_, ta_factory));
+  }
 
-TEST(TestTransportManagerDefault, Init_LastStateUsed) {
-  MockTransportManagerSettings transport_manager_settings;
-  transport_manager::TransportManagerDefault transport_manager(
-      transport_manager_settings);
+  void ExpectationsSettings_TM(const bool use_last_state);
+  void ExpectationsBluetooth_TA();
+  void ExpectationsTCP_TA();
+  void ExpectationsUSB_TA();
+  void ExpectationsCloudWebsocket_TA();
 
-  NiceMock<MockLastState> mock_last_state;
-  Json::Value custom_dictionary;
+ protected:
+  MockTransportManagerSettings transport_manager_settings_;
+  std::unique_ptr<TransportManagerDefault> transport_manager_;
+  std::shared_ptr<MockLastState> mock_last_state_;
+  Json::Value custom_dictionary_;
+  const std::string unique_tcp_dev_name_;
+  const std::string dev_id_;
+  const uint16_t tcp_adapter_port_;
+  std::string network_interface_;
+  std::string dummy_parameter_;
+  // Arrange necessary transport adapters mock objects
+  MockBluetoothTransportAdapter* mock_bt_ta_;
+  MockTCPTransportAdapter* mock_tcp_ta_;
+  MockUsbAoaAdapter* mock_usb_aoa_ta_;
+  MockCloudWebsocketTransportAdapter* mock_cloud_websocket_ta_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
+};
+
+void TestTransportManagerDefault::ExpectationsSettings_TM(
+    const bool use_last_state) {
+  // Arrange TM Settings expectations
   Json::Value tcp_device;
-  tcp_device[kDeviceName] = "unique_tcp_device_name";
-  tcp_device[kDeviceAddress] = "127.0.0.1";
-  tcp_device[kDeviceApplications][0][kApplicationPort] = kApplicationPortValue;
+  tcp_device[kDeviceName] = unique_tcp_dev_name_;
+  tcp_device[kDeviceAddress] = kAddress;
+  tcp_device[kDeviceApplications][0][kApplicationPort] = "1";
   Json::Value bluetooth_device;
-  bluetooth_device[kDeviceName] = "unique_bluetooth_device_name";
+
+  std::string unique_bt_dev_name("unique_bluetooth_device_name");
+  bluetooth_device[kDeviceName] = unique_bt_dev_name;
   bluetooth_device[kDeviceAddress] = "AB:CD:EF:GH:IJ:KL";
   bluetooth_device[kDeviceApplications][0][kApplicationRfcomm] =
       kApplicationRfcommValue;
-  custom_dictionary[kTransportManager][kTcpAdapter][kDevices][0] = tcp_device;
-  custom_dictionary[kTransportManager][kBluetoothAdapter][kDevices][0] =
+  custom_dictionary_[kTransportManager][kTcpAdapter][kDevices][0] = tcp_device;
+  custom_dictionary_[kTransportManager][kBluetoothAdapter][kDevices][0] =
       bluetooth_device;
+  ON_CALL(transport_manager_settings_, websocket_server_port())
+      .WillByDefault(Return(kPort));
+  ON_CALL(transport_manager_settings_, websocket_server_address())
+      .WillByDefault(ReturnRef(kAddress));
+  ON_CALL(transport_manager_settings_, ws_server_cert_path())
+      .WillByDefault(ReturnRef(kServerCertPath));
+  ON_CALL(transport_manager_settings_, ws_server_key_path())
+      .WillByDefault(ReturnRef(kWSServerKeyPathKey));
+  ON_CALL(transport_manager_settings_, ws_server_ca_cert_path())
+      .WillByDefault(ReturnRef(kWSServerCACertPath));
+  ON_CALL(*mock_last_state_, dictionary())
+      .WillByDefault(Return(custom_dictionary_));
+  ON_CALL(*mock_last_state_, get_dictionary())
+      .WillByDefault(ReturnRef(custom_dictionary_));
 
-  ON_CALL(mock_last_state, get_dictionary())
-      .WillByDefault(ReturnRef(custom_dictionary));
+  EXPECT_CALL(transport_manager_settings_, use_last_state())
+      .WillRepeatedly(Return(use_last_state));
+  EXPECT_CALL(transport_manager_settings_, transport_manager_tcp_adapter_port())
+      .WillRepeatedly(Return(tcp_adapter_port_));
 
-  EXPECT_CALL(transport_manager_settings, use_last_state())
-      .WillRepeatedly(Return(true));
-  EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port())
-      .WillRepeatedly(Return(12345u));
-  std::string network_interface = "";
-  EXPECT_CALL(transport_manager_settings,
-              transport_manager_tcp_adapter_network_interface())
-      .WillRepeatedly(ReturnRef(network_interface));
-  EXPECT_CALL(transport_manager_settings, bluetooth_uuid())
+  EXPECT_CALL(transport_manager_settings_, bluetooth_uuid())
       .WillRepeatedly(Return(kBTUUID.data()));
-  transport_manager.Init(mock_last_state);
-  transport_manager.Stop();
+
+  EXPECT_CALL(transport_manager_settings_, aoa_filter_manufacturer())
+      .WillRepeatedly(ReturnRef(dummy_parameter_));
+  EXPECT_CALL(transport_manager_settings_, aoa_filter_model_name())
+      .WillRepeatedly(ReturnRef(dummy_parameter_));
+  EXPECT_CALL(transport_manager_settings_, aoa_filter_description())
+      .WillRepeatedly(ReturnRef(dummy_parameter_));
+  EXPECT_CALL(transport_manager_settings_, aoa_filter_version())
+      .WillRepeatedly(ReturnRef(dummy_parameter_));
+  EXPECT_CALL(transport_manager_settings_, aoa_filter_uri())
+      .WillRepeatedly(ReturnRef(dummy_parameter_));
+  EXPECT_CALL(transport_manager_settings_, aoa_filter_serial_number())
+      .WillRepeatedly(ReturnRef(dummy_parameter_));
 }
 
-TEST(TestTransportManagerDefault, Init_LastStateUsed_InvalidPort) {
-  MockTransportManagerSettings transport_manager_settings;
-  transport_manager::TransportManagerDefault transport_manager(
-      transport_manager_settings);
+void TestTransportManagerDefault::ExpectationsBluetooth_TA() {
+  // Expectations for Mock of bluetooth transport adapter
+#ifdef BLUETOOTH_SUPPORT
+  EXPECT_CALL(*mock_bt_ta_, AddListener(_));
+  EXPECT_CALL(*mock_bt_ta_, IsInitialised()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*mock_bt_ta_, Init())
+      .WillRepeatedly(Return(TransportAdapter::OK));
+  EXPECT_CALL(*mock_bt_ta_, Terminate());
+#endif
+}
 
-  NiceMock<MockLastState> mock_last_state;
-  Json::Value custom_dictionary;
-  Json::Value tcp_device;
-  tcp_device[kDeviceName] = "unique_tcp_device_name";
-  tcp_device[kDeviceAddress] = "127.0.0.1";
-  tcp_device[kDeviceApplications][0][kApplicationPort] = "1";
-  Json::Value bluetooth_device;
-  bluetooth_device[kDeviceName] = "unique_bluetooth_device_name";
-  bluetooth_device[kDeviceAddress] = "AB:CD:EF:GH:IJ:KL";
-  bluetooth_device[kDeviceApplications][0][kApplicationRfcomm] =
-      kApplicationRfcommValue;
-  custom_dictionary[kTransportManager][kTcpAdapter][kDevices][0] = tcp_device;
-  custom_dictionary[kTransportManager][kBluetoothAdapter][kDevices][0] =
-      bluetooth_device;
+void TestTransportManagerDefault::ExpectationsTCP_TA() {
+  // Expectations for Mock of TCP transport adapter
+  EXPECT_CALL(*mock_tcp_ta_, AddListener(_));
+  EXPECT_CALL(*mock_tcp_ta_, IsInitialised()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*mock_tcp_ta_, Init())
+      .WillRepeatedly(Return(TransportAdapter::OK));
 
-  ON_CALL(mock_last_state, get_dictionary())
-      .WillByDefault(ReturnRef(custom_dictionary));
+  std::shared_ptr<MockDevice> mockdev =
+      std::make_shared<MockDevice>(dev_id_, unique_tcp_dev_name_);
+  EXPECT_CALL(*mock_tcp_ta_, FindDevice(unique_tcp_dev_name_))
+      .WillRepeatedly(Return(mockdev));
+  const int app_handle = 1;
+  EXPECT_CALL(*mock_tcp_ta_, Connect(unique_tcp_dev_name_, app_handle))
+      .Times(0);
+  EXPECT_CALL(*mock_tcp_ta_, Terminate());
+}
 
-  EXPECT_CALL(transport_manager_settings, use_last_state())
+void TestTransportManagerDefault::ExpectationsUSB_TA() {
+  // Expectations for Mock of USB transport adapter
+#if defined(USB_SUPPORT)
+  EXPECT_CALL(*mock_usb_aoa_ta_, AddListener(_));
+  EXPECT_CALL(*mock_usb_aoa_ta_, IsInitialised()).WillRepeatedly(Return(true));
+  EXPECT_CALL(*mock_usb_aoa_ta_, Init())
+      .WillRepeatedly(Return(TransportAdapter::OK));
+  EXPECT_CALL(*mock_usb_aoa_ta_, Terminate());
+#endif
+}
+
+void TestTransportManagerDefault::ExpectationsCloudWebsocket_TA() {
+  // Expectations for Mock of Cloud Websocket transport adapter
+#if defined(CLOUD_APP_WEBSOCKET_TRANSPORT_SUPPORT)
+  EXPECT_CALL(*mock_cloud_websocket_ta_, AddListener(_));
+  EXPECT_CALL(*mock_cloud_websocket_ta_, IsInitialised())
       .WillRepeatedly(Return(true));
-  EXPECT_CALL(transport_manager_settings, transport_manager_tcp_adapter_port())
-      .WillRepeatedly(Return(1u));
-  std::string network_interface = "";
-  EXPECT_CALL(transport_manager_settings,
-              transport_manager_tcp_adapter_network_interface())
-      .WillRepeatedly(ReturnRef(network_interface));
-  EXPECT_CALL(transport_manager_settings, bluetooth_uuid())
-      .WillRepeatedly(Return(kBTUUID.data()));
-  transport_manager.Init(mock_last_state);
-  transport_manager.Stop();
+  EXPECT_CALL(*mock_cloud_websocket_ta_, Init())
+      .WillRepeatedly(Return(TransportAdapter::OK));
+  EXPECT_CALL(*mock_cloud_websocket_ta_, Terminate());
+#endif
+}
+
+TEST_F(TestTransportManagerDefault, Init_LastStateNotUsed) {
+  const bool use_last_state = false;
+  ExpectationsSettings_TM(use_last_state);
+
+  ExpectationsBluetooth_TA();
+  ExpectationsTCP_TA();
+  ExpectationsUSB_TA();
+  ExpectationsCloudWebsocket_TA();
+
+  // Act
+  transport_manager_->Init(last_state_wrapper_);
+  transport_manager_->Stop();
+}
+
+TEST_F(TestTransportManagerDefault, Init_LastStateUsed) {
+  const bool use_last_state = true;
+  ExpectationsSettings_TM(use_last_state);
+
+  ExpectationsBluetooth_TA();
+  ExpectationsTCP_TA();
+  ExpectationsUSB_TA();
+  ExpectationsCloudWebsocket_TA();
+
+  // Act
+  transport_manager_->Init(last_state_wrapper_);
+  transport_manager_->Stop();
 }
 
 }  // namespace transport_manager_test
diff --git a/src/components/transport_manager/test/transport_manager_impl_test.cc b/src/components/transport_manager/test/transport_manager_impl_test.cc
index 3c3e336d0a..db4813be9a 100644
--- a/src/components/transport_manager/test/transport_manager_impl_test.cc
+++ b/src/components/transport_manager/test/transport_manager_impl_test.cc
@@ -35,6 +35,7 @@
 #include "gtest/gtest.h"
 #include "protocol/raw_message.h"
 #include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
 #include "transport_manager/common.h"
 #include "transport_manager/mock_telemetry_observer.h"
 #include "transport_manager/mock_transport_manager_impl.h"
@@ -79,9 +80,11 @@ class TransportManagerImplTest : public ::testing::Test {
             device_handle_, mac_address_, device_name_, connection_type_) {}
 
   void SetUp() OVERRIDE {
-    resumption::LastStateImpl last_state_("app_storage_folder",
-                                          "app_info_storage");
-    tm_.Init(last_state_);
+    std::shared_ptr<resumption::LastStateWrapperImpl> wrapper =
+        std::make_shared<resumption::LastStateWrapperImpl>(
+            std::make_shared<resumption::LastStateImpl>("app_storage_folder",
+                                                        "app_info_storage"));
+    tm_.Init(wrapper);
     mock_adapter_ = new MockTransportAdapter();
     tm_listener_ = std::make_shared<MockTransportManagerListener>();
 
@@ -101,7 +104,7 @@ class TransportManagerImplTest : public ::testing::Test {
     unsigned char data[kSize] = {
         0x20, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     test_message_ = std::make_shared<RawMessage>(
-        connection_key_, version_protocol_, data, kSize);
+        connection_key_, version_protocol_, data, kSize, false);
   }
 
   DeviceInfo ConstructDeviceInfo(const std::string& mac_address,
@@ -664,15 +667,23 @@ TEST_F(TransportManagerImplTest, RemoveDevice_DeviceWasAdded) {
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOn_StartClientListening) {
-  EXPECT_CALL(*mock_adapter_, StartClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOn))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(::transport_manager::E_SUCCESS, tm_.Visibility(true));
+  EXPECT_EQ(::transport_manager::E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOn));
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOff_StopClientListening) {
-  EXPECT_CALL(*mock_adapter_, StopClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOff))
       .WillOnce(Return(TransportAdapter::OK));
-  EXPECT_EQ(::transport_manager::E_SUCCESS, tm_.Visibility(false));
+  EXPECT_EQ(::transport_manager::E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOff));
 }
 
 TEST_F(TransportManagerImplTest, StopTransportManager) {
@@ -691,12 +702,14 @@ TEST_F(TransportManagerImplTest, StopTransportManager) {
 TEST_F(TransportManagerImplTest, Reinit) {
   EXPECT_CALL(*mock_adapter_, Terminate());
   EXPECT_CALL(*mock_adapter_, Init()).WillOnce(Return(TransportAdapter::OK));
+  tm_.Deinit();
   EXPECT_EQ(E_SUCCESS, tm_.Reinit());
 }
 
 TEST_F(TransportManagerImplTest, Reinit_InitAdapterFailed) {
   EXPECT_CALL(*mock_adapter_, Terminate());
   EXPECT_CALL(*mock_adapter_, Init()).WillOnce(Return(TransportAdapter::FAIL));
+  tm_.Deinit();
   EXPECT_EQ(E_ADAPTERS_FAIL, tm_.Reinit());
 }
 
@@ -940,12 +953,16 @@ TEST_F(TransportManagerImplTest, RemoveDevice_TMIsNotInitialized) {
 
 TEST_F(TransportManagerImplTest, Visibility_TMIsNotInitialized) {
   // Arrange
-  const bool visible = true;
+  const transport_manager::TransportAction action =
+      transport_manager::TransportAction::kVisibilityOn;
   // Check before Act
   UninitializeTM();
   // Act and Assert
-  EXPECT_CALL(*mock_adapter_, StartClientListening()).Times(0);
-  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.Visibility(visible));
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOn))
+      .Times(0);
+  EXPECT_EQ(E_TM_IS_NOT_INITIALIZED, tm_.PerformActionOnClients(action));
 }
 
 TEST_F(TransportManagerImplTest, HandleMessage_ConnectionNotExist) {
@@ -971,16 +988,24 @@ TEST_F(TransportManagerImplTest, SearchDevices_TMIsNotInitialized) {
 }
 
 TEST_F(TransportManagerImplTest, SetVisibilityOn_TransportAdapterNotSupported) {
-  EXPECT_CALL(*mock_adapter_, StartClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOn))
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_SUCCESS, tm_.Visibility(true));
+  EXPECT_EQ(E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOn));
 }
 
 TEST_F(TransportManagerImplTest,
        SetVisibilityOff_TransportAdapterNotSupported) {
-  EXPECT_CALL(*mock_adapter_, StopClientListening())
+  EXPECT_CALL(
+      *mock_adapter_,
+      ChangeClientListening(transport_manager::TransportAction::kVisibilityOff))
       .WillOnce(Return(TransportAdapter::NOT_SUPPORTED));
-  EXPECT_EQ(E_SUCCESS, tm_.Visibility(false));
+  EXPECT_EQ(E_SUCCESS,
+            tm_.PerformActionOnClients(
+                transport_manager::TransportAction::kVisibilityOff));
 }
 
 TEST_F(TransportManagerImplTest,
diff --git a/src/components/transport_manager/test/websocket_client_connection_test.cc b/src/components/transport_manager/test/websocket_client_connection_test.cc
new file mode 100644
index 0000000000..b9aa6f7c7e
--- /dev/null
+++ b/src/components/transport_manager/test/websocket_client_connection_test.cc
@@ -0,0 +1,482 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "transport_manager/cloud/websocket_client_connection.h"
+#include "gtest/gtest.h"
+#include "resumption/last_state_impl.h"
+#include "resumption/last_state_wrapper_impl.h"
+#include "transport_manager/cloud/cloud_websocket_transport_adapter.h"
+#include "transport_manager/cloud/sample_websocket_server.h"
+#include "transport_manager/transport_adapter/connection.h"
+#include "transport_manager/transport_adapter/transport_adapter_impl.h"
+
+#include "transport_manager/mock_transport_manager_settings.h"
+
+namespace test {
+namespace components {
+namespace transport_manager_test {
+
+using ::testing::_;
+using ::testing::NiceMock;
+using ::testing::Return;
+using namespace ::transport_manager;
+using namespace ::transport_manager::transport_adapter;
+namespace websocket = sample::websocket;
+
+class WebsocketConnectionTest : public ::testing::Test {
+ public:
+  struct WebsocketClient {
+    std::shared_ptr<CloudWebsocketTransportAdapter> adapter;
+    std::shared_ptr<WebsocketClientConnection> connection;
+  };
+
+  void InitWebsocketClient(
+      const transport_manager::transport_adapter::CloudAppProperties&
+          properties,
+      WebsocketClient& client_out) {
+    uniq_id = dev_id = properties.endpoint;
+
+    client_out =
+        WebsocketClient{std::make_shared<CloudWebsocketTransportAdapter>(
+                            last_state_wrapper_, transport_manager_settings),
+                        nullptr};
+    client_out.adapter->SetAppCloudTransportConfig(uniq_id, properties);
+
+    TransportAdapterImpl* ta_cloud =
+        dynamic_cast<TransportAdapterImpl*>(client_out.adapter.get());
+    ta_cloud->CreateDevice(uniq_id);
+
+    auto connection = client_out.adapter->FindPendingConnection(dev_id, 0);
+
+    ASSERT_NE(connection, nullptr);
+
+    client_out.connection =
+        std::dynamic_pointer_cast<WebsocketClientConnection>(connection);
+
+    ASSERT_NE(client_out.connection.use_count(), 0);
+  }
+
+  void StartWSServer(std::string path) {
+    ws_session = std::make_shared<websocket::WSSession>(kHost, kPort);
+    ws_session->AddRoute(path);
+    ws_session->Run();
+  }
+
+  void StartWSSServer(std::string path) {
+    wss_session = std::make_shared<websocket::WSSSession>(
+        kHost, kPort, kCertificate, kPrivateKey);
+    wss_session->AddRoute(path);
+    wss_session->Run();
+  }
+
+ protected:
+  WebsocketConnectionTest()
+      : last_state_(std::make_shared<resumption::LastStateImpl>(
+            "app_storage_folder", "app_info_storage"))
+      , last_state_wrapper_(
+            std::make_shared<resumption::LastStateWrapperImpl>(last_state_)) {}
+
+  ~WebsocketConnectionTest() {}
+
+  void SetUp() OVERRIDE {
+    ON_CALL(transport_manager_settings, use_last_state())
+        .WillByDefault(Return(true));
+  }
+
+  NiceMock<MockTransportManagerSettings> transport_manager_settings;
+  std::shared_ptr<resumption::LastStateImpl> last_state_;
+  std::shared_ptr<resumption::LastStateWrapperImpl> last_state_wrapper_;
+  std::string dev_id;
+  std::string uniq_id;
+  std::shared_ptr<websocket::WSSession> ws_session;
+  std::shared_ptr<websocket::WSSSession> wss_session;
+  WebsocketClient ws_client;
+  std::string kHost = "127.0.0.1";
+  uint16_t kPort = 8080;
+  std::string kPath = "/folder/file.html/";
+  std::string kQuery = "?eventId=2345&eventName='Test'&expectedResult=true";
+  std::string kFragment = "#section_1";
+
+  // Sample certificate for localhost
+  std::string kCertificate =
+      "-----BEGIN "
+      "CERTIFICATE-----\nMIIDqTCCApECCQC/"
+      "5LlQ+"
+      "GLgqTANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAwx\nMjcuMC4wLjEgQ0EwIBcNMTkwNTA"
+      "2MTkzMjM2WhgPMjExOTA0MTIxOTMyMzZaMBQx\nEjAQBgNVBAMMCTEyNy4wLjAuMTCCAiIwD"
+      "QYJKoZIhvcNAQEBBQADggIPADCCAgoC\nggIBALbeIoAHFaFeNqbMnhtAO5QTgRd0X9qxpB0"
+      "d4M0dEeog2l/+inNA/eu+CCvm\nJj2I8+6MWH2TUrl/"
+      "2xfhHjzsMrtISCdpNcjaNzCnvi8ZcspFi3evknvs3+uo2/"
+      "wn\nyNZ04jp0oQ0k1cZ6WBpLTYV7WgmueemiWEiAfw+YE+wtRg+"
+      "0H7rksrbpeNPnxQHX\nBDDkWqwvfkD15Sd0XFQkW27K72/"
+      "et2uKuAcJHCIUbsA4iZyJw4Uu4eusy7W5kddX\nThE7Y1WqTXyA4j/"
+      "ZCYigXmsHbWrikPLVXbORhiMF4/60u8RDs0jI8xtgRQhLR9Vp\n3xys7/"
+      "5tHZX00s6x6OVy8aMSZIIVS0eWoVN8bGd9B4+fDMOcNT0YODeQA10w/"
+      "85P\nEiZDQ8AxneQkh8H3qjD2+"
+      "G9oHZaTk0zHTyaKRg3xGP3N9C96onaJX4Rm6nNvApO8\nU7lQ+xHkLwjKCQke39W+"
+      "r3FHwwQvUDeoJBXf6iVkIMFoUPAHNZqKf9Db6KKIEp8i\nDgIhbBxiB4MSn36Zly4SOMojyM"
+      "ZFri+"
+      "HzMbuHFlm8e8QRWGmM4UM2rHIpl4OJolg\nejesDqO8YZR5mZXV0FJRiPgLo2Q4OTtb3tEHJ"
+      "ZLmlT+"
+      "f42bge4ZCZmGPrkNfr68Y\nDEnJ6z4ksOVkMefOp2SNYLYYGPYyiKwa9qVkH9Obkect1omNA"
+      "gMBAAEwDQYJKoZI\nhvcNAQELBQADggEBABFJQtOTftrzbLBA5Vm6aPkbUyxhcaOpz+d+"
+      "Ljd6pIs4H+"
+      "Eb\nXkoHhmay4stZkDc2HVSKESZloI3Ylup8z3aRJjfOexJqHlYzk2vraYryWm8odgID\n5V"
+      "B0Zle8ofpHTJw1LCOXHkzKt1G6vdQpuq/"
+      "4OKpmggaIqqEC1bfOYZt5t6vIx3OF\nxjPz91NTR9gZ4lKrho1+sfS+"
+      "jbSjKkqVAhE4yTpKLPHRshQnBFEhvATXNvdZGftF\n+tXxqKsBZ9aX0/"
+      "YmPFIXFcjdjSSiuq1F1DjiqIZo88qfa9jlTg6VJdayyQ/"
+      "cu41C\nBucY8YTF0Ui8ccIS55h2UTzPy5/4PbrwI4P+Zgo=\n-----END "
+      "CERTIFICATE-----\n";
+  // Sample private key
+  std::string kPrivateKey =
+      "-----BEGIN RSA PRIVATE "
+      "KEY-----\nMIIJKAIBAAKCAgEAtt4igAcVoV42psyeG0A7lBOBF3Rf2rGkHR3gzR0R6iDaX/"
+      "6K\nc0D9674IK+YmPYjz7oxYfZNSuX/"
+      "bF+EePOwyu0hIJ2k1yNo3MKe+LxlyykWLd6+S\ne+zf66jb/"
+      "CfI1nTiOnShDSTVxnpYGktNhXtaCa556aJYSIB/"
+      "D5gT7C1GD7QfuuSy\ntul40+fFAdcEMORarC9+"
+      "QPXlJ3RcVCRbbsrvb963a4q4BwkcIhRuwDiJnInDhS7h\n66zLtbmR11dOETtjVapNfIDiP9"
+      "kJiKBeawdtauKQ8tVds5GGIwXj/rS7xEOzSMjz\nG2BFCEtH1WnfHKzv/"
+      "m0dlfTSzrHo5XLxoxJkghVLR5ahU3xsZ30Hj58Mw5w1PRg4\nN5ADXTD/"
+      "zk8SJkNDwDGd5CSHwfeqMPb4b2gdlpOTTMdPJopGDfEY/"
+      "c30L3qidolf\nhGbqc28Ck7xTuVD7EeQvCMoJCR7f1b6vcUfDBC9QN6gkFd/"
+      "qJWQgwWhQ8Ac1mop/"
+      "\n0NvooogSnyIOAiFsHGIHgxKffpmXLhI4yiPIxkWuL4fMxu4cWWbx7xBFYaYzhQza\nscim"
+      "Xg4miWB6N6wOo7xhlHmZldXQUlGI+AujZDg5O1ve0QclkuaVP5/"
+      "jZuB7hkJm\nYY+uQ1+"
+      "vrxgMScnrPiSw5WQx586nZI1gthgY9jKIrBr2pWQf05uR5y3WiY0CAwEA\nAQKCAgBGSDGyS"
+      "wbBMliG2vWZO6KqUqS2wv9kKgoNNsKDkryj42SKqGXFziDJTgwN\n8zKXS9+Uu1P3T3vn13/"
+      "5OYhJme4VlL5Gh2UogNXdWVr69yjrHLdxlIUUJAIbrJZ/"
+      "\n3zqNUfbwyIptZs7SrYrW8EInHzWHqwsoBEEx/"
+      "FDZSXW+u9fFiVD4n5UgP7M0nktV\nXbI6qElBDC/V/"
+      "6vG8i3aGO8bMdu8fzi3mGUKLzIk1v2J2zDofPosYcxqq8rPWTb4\nMJHMhaqz7fRB+"
+      "bb7GwtS+2/Oathe0B0td1u//Bo1s7ng1s2jrPFm8/"
+      "SbfPCLM4O0\nPjCF8OF8Q6uvSp0K283LAdZk+liuDztc/"
+      "Ed8mcnCZQhBp86mJQi0Jj3Mje7prOAY\nXojMroYj7r2igCJvcwGb1y6zZWSj3jXuHze3bLy"
+      "fv7pCD+hkiZR7mZhQpOhQRZaU\ntdFGc+"
+      "DuykxKPqVjAPy7iVQXYnMjpo36SGIWoZLuepQto3GvU6czyOwhK0/"
+      "Mwbwd\nZpYpLH3L9IetY8GcPefmUR5wQUlUTrpxgGElIzkkWW8zmUWBXwrGbAtN1HJWpJdN"
+      "\neVshKod2fo03IQMPywSdENCJVeSrgRMuwPyFaOM+"
+      "CVrBJwD66K9YWn4cVRUIZsTq\nAXhQ8DzF+WCOZshhMUbCJX+KpcOFI8nxOrPp+"
+      "J1s1YpLLvdmcQKCAQEA7bwvOiCD\nHvaqpYg1jJak6l/"
+      "iY3QIOOpFyjfYrQXS0BNRmmxK8Lzevi/"
+      "NPTqu146QKDaIGvzu\n+"
+      "bXnuV1LmZqnOm5J6Kdx0Mk4Fb88akRtS9gOdzU7WWMYIGkeF1oih0ZrhHuIey6e\nCeLSmJh"
+      "UDaTIWcCirALRHcLWUS6BTGGuE+up5QG7djIW/"
+      "LD17lhGE6fXPlbYXb7l\nPbYwL1Yr0urIp9Un+zrExw+77TTGK7T37T1ZJv46qnro0/"
+      "HK8XxZ+"
+      "JNc18F763O4\nPmwu8KWrx4qnyPYAuB1rbVntK6UxYks9jvk93XecCUP6HHp0I0tV/"
+      "kBNd2+"
+      "18zux\n033xFEVKrUksmwKCAQEAxOrPGyBVFp29V4gQsMQdmafkDAgCLREgjQTOamFsYL5+"
+      "\nZWq+6VhT/"
+      "B650sIoRdX0N8timnSLBfjeqaBG5VVhhyKZhP5hulfRjALhdbGBOYvf\n0gLSffImwWdYQfx"
+      "jtCSO+"
+      "XCLVdAJGOOWeBVVKzH18ZvCFQwUr3Yrp7KmKWKAqgf7\n6rYovWh8T5LLYS0NzXCEwf9nJ0N"
+      "JMOy7I9B7EtF8Cs6tK3aaHVqDz7zufwosS7gI\n3aI51Qh4a5D1p95+"
+      "YU09beWjWGYnPiCKk4D47zaeOe7OQINaWugExlelHtJh9unO\nnhOFXhziav2Kxq1CICAuXl"
+      "Vx3A+gn/cU3niNHz2A9wKCAQEAws+aw78ws4bef5cG\nipZHveek1GqY8krHtdXdsKs8/"
+      "VVXYXusTWn3/VGelbYo4GrqpolJLxRloCr4IGXb\nNZwNvUvzNLtCAR1i4C89irdX+Paro/"
+      "PzFmSluKlrByfNc5y5Lm8sgATLbL56ZKEu\n/58wrpu0sc/"
+      "9HK40gYHiYn0I8ToElqy8uTaCr78zSIT9p826DFOOKgPsRo2tHp02\nfDf5Bc8eXDjkV1sFX"
+      "HQKkHZTVA0ZqWJbIKhncoaJDyofcBsR0ZuzuFWzfTOZo4mf\nInz00TEFldpF1e4C8+"
+      "kCdtHBOA/2Ki2Bp/YUVpHh6aoqZZa75Euehhs8tVpW242M\njEOSUQKCAQAM64sjMH/kt/"
+      "zQXXEa6AM5LbbcwznBUzpbhlE00aeWwWjxpotYLB92\nj12J4otZ6avYbVPO5o6omaeiYY3F"
+      "RlDb2P1RqI8o9tIc6aN5YWglKnRJBz5gXR8F\n2Y4E5lZ0X2GyJBxASSIPq/"
+      "8Xae7ooqKMc7fMQbqpuIssuaAFXx0qCtQQllsd8lkV\nr4AApEAflp5fTC6seNG4kA/"
+      "HTcqFdZE59E2QaHu8KVA0tSTA2R4G6dBLGnXI8IFW\nLXCwzvxjzfmV2FdbWXiBrwjonLG4o"
+      "FDJZE3MFdI73LVTfjSrTQp4dObFoGpDvols\nk64jUwLfsLzaG6kY0z2qwT9xSV+"
+      "ZCSQJAoIBADsSBeyELc5KnmOhT0Xue2o0bkAS\n8KcGWdAoQlaLCIs3vtdlC7DXDXO1l8FkT"
+      "Qrd+GwP3eWDq6ymtO4vkJ3m4cZ1PEsv\n6Qet7qtkVhUfa+"
+      "FYKtDzSMRuSaFPW3Ro1PesFa1H3y+sw5HL36vhRaSK+T4Wy5k2\nf7EwNZIf/"
+      "ZZeA+"
+      "sEtqj33obOBIiuU9htAjN81Kz4a0Xlh6jc4q6iwYKL8nZ76JYV\n8hXWIz6OXxLXE158+"
+      "QtJSZaRCvdr6L5UtWfMPKSMqgfhXfTYViPDleQCkJ132mIS\nH28UoET0Y5wI8M6pMkWpSqW"
+      "WcKPFGwyLInvHdxgnTAsutowkldA7qFwoRz4=\n-----END RSA PRIVATE KEY-----\n";
+  // Sample CA certificate(used to sign the server certificate)
+  std::string kCACertificate =
+      "-----BEGIN "
+      "CERTIFICATE-----"
+      "\nMIIDBjCCAe6gAwIBAgIJAPyCrKRDl3SWMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV\nBAMM"
+      "DDEyNy4wLjAuMSBDQTAgFw0xOTA1MDYxOTMyMzZaGA8yMTE5MDQxMjE5MzIz\nNlowFzEVMB"
+      "MGA1UEAwwMMTI3LjAuMC4xIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC\nAQ8AMIIBCgKCAQEA"
+      "xrNHoY5+"
+      "JCgnyvEdG2dvvOaZ3sg6uhuF5Ssb5snyo9ixrxO5\nZkDGWwUqFO9PiYuO5ovNeq9LZtPG6s"
+      "K8zsCS062ChZX/7tZHndf4MKCUDzv/"
+      "LPHe\nnROoPi9n2FAiOPctY5hpgpIJDPI5Ofx0el2KPeFGeUO/"
+      "W3yqnfol1ZqzZ2h3uErR\noHkgT2Ja4K+5gnPkr/"
+      "RluJIu3AmWYw4eKi8i3+"
+      "PoThGmCFvoGfcWvRoctgnOHYHE\n4bDRirXL9nGkZ5FMzOVDeoIAEAShOqJwL08VcY+Pg/"
+      "qFQjzRrTmiKgm6QsHNnm0q\nzg70XaD88VJimiGYZOuJHNZpX8o0W+1Ls/"
+      "NbawIDAQABo1MwUTAdBgNVHQ4EFgQU\nkW3hgFWYMpVUkq9AlzGlI3awTGEwHwYDVR0jBBgw"
+      "FoAUkW3hgFWYMpVUkq9AlzGl\nI3awTGEwDwYDVR0TAQH/BAUwAwEB/"
+      "zANBgkqhkiG9w0BAQsFAAOCAQEAZeMkILiG\neEcELWb8cktP3LzvS47O8hys9+"
+      "6TFmftuO7kjDBd9YH2v8iQ7qCcUvMJ7bqL5RP1\nQssKfNOHZtw/"
+      "MMcKE6E3nl4yQSKc8ymivvYSVu5SYtQCedcgfRLb5zvVxXw8JmCp\nGNS3/"
+      "OlIYZAamh76GxkKSaV3tv0XZB6n3rUVQZShncFbMpyJRW0XWxReGWrhXv4s\nNxMeC1r07EE"
+      "WIDecv8KKf1F8uT4UF48HnC0VBpXiOyDGvn35NiKp+"
+      "Q5k7QV6jdCS\ngPRcnZhs6jiU0jnV8C9A1A+"
+      "3pXSSPrAed7tvECOgHCfS10CLsLWsLuSjc93BE5Vt\nav7kmxSwrdvQ2A==\n-----END "
+      "CERTIFICATE-----\n";
+  std::string kIncorrectCertificate =
+      "-----BEGIN "
+      "CERTIFICATE-----\nMIIC/"
+      "jCCAeagAwIBAgIJAIZjLucUID1mMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV\nBAMMCTEyNy4"
+      "wLjAuMTAeFw0xOTA1MDYxNDA1MzdaFw0yOjA1MDZxNDA1MzdaMBQx\nEjAQBgNVBAMMCTEyN"
+      "y4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC\nggEBALfE5Qhc2mHTIux30l7"
+      "eHFjFLdzYeXE8vcaXKodalCG8EkRxojDOfUv+y2DV\nJzHAMiGxMFAEcSz71k+"
+      "jFZwhNG8PLY0b36ChnUsrGkOSJWq3OKUFrg8KxO9At9dL\nJsa+"
+      "R0N0D1bMoPYdpCi3m0b0q2ITHe56qKuTLTrIPia+"
+      "qXGEVD7EoEhU9tnwlcwE\npsUURMXCn2+FhHyqN9wjFkldmu4k8U3OJOK4385L+"
+      "4RJoIV8dsYawAMAf+"
+      "WuxyWq\niPQTPxr8q33ZZm6z0XrgsgxHYCCsryx8L9Ub9Zwu0mie7eL63rYdr86gULvnF1bY"
+      "\ncOunKFc71rBYFalbD6YYsre733kCAwEAAaNTMFEwHQYDVR0OBBYEFKW9ByUNG84Z\nYiSc"
+      "hUrB7KV9FinZMB8GA1UdIwQYMBaAFKW9ByUNG84ZYiSchUrB7KV9FinZMA8G\nA1UdEwEB/"
+      "wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHYROS1EL2qnrwmAsR6c\nqo8yrk8qzLKt4os"
+      "41nv7QMUQFIO+QLPE8SbH4fK1YOMMUJ4ppARQBDaIIR3UEhp1\nZHT/"
+      "wGjK9qxcuQ1EXLyHOY0rxS5q57dYGxOyQo4v6IoLVMZ1ij+RJGPYI/"
+      "2fDXs0\nbDldeJyC1voHmG6lqTN5nLG7Y3j9j6rtSqJyRz5muaecQNiFPQOM2OTp0rC4VeAF"
+      "\ndejmTmLhUFVuHMzLF+"
+      "bpzsN76GnnQquJy2jexzFoWgbEfFVLKuyhTHQAalRb4ccq\nXCIx1hecNDYRY3Sc2Gzv5qxk"
+      "kWF8zqltT/0d5tx0JwN3k5nP4SlaEldFvD6BELxy\nVkU=\n-----END "
+      "CERTIFICATE-----\n";
+};
+
+TEST_F(WebsocketConnectionTest, WSConnection_SUCCESS) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "ws://" + kHost + ":" + std::to_string(kPort),
+      .certificate = "no cert",
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSServer("/");
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> ws_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = ws_connection->Start();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop client
+  ret_code = ws_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  ws_session->Stop();
+}
+
+TEST_F(WebsocketConnectionTest, WSConnection_SUCCESS_ValidTarget) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "ws://" + kHost + ":" + std::to_string(kPort) + kPath +
+                  kQuery + kFragment,
+      .certificate = "no cert",
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSServer(kPath);
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> ws_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = ws_connection->Start();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop client
+  ret_code = ws_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  ws_session->Stop();
+}
+
+TEST_F(WebsocketConnectionTest, WSConnection_FAILURE_InvalidTarget) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "ws://" + kHost + ":" + std::to_string(kPort) + kPath +
+                  kQuery + kFragment,
+      .certificate = "no cert",
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSServer("/");
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> ws_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = ws_connection->Start();
+  EXPECT_EQ(TransportAdapter::FAIL, ret_code);
+
+  // Stop client
+  ret_code = ws_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  ws_session->Stop();
+}
+
+TEST_F(WebsocketConnectionTest, WSSConnection_SUCCESS) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort),
+      .certificate = kCACertificate,
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WSS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSSServer("/");
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> wss_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = wss_connection->Start();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop client
+  ret_code = wss_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  wss_session->Stop();
+}
+
+TEST_F(WebsocketConnectionTest, WSSConnection_SUCCESS_ValidTarget) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort) + kPath,
+      .certificate = kCACertificate,
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WSS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSSServer((kPath + kQuery + kFragment));
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> wss_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = wss_connection->Start();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop client
+  ret_code = wss_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  wss_session->Stop();
+}
+
+#ifdef ENABLE_SECURITY
+TEST_F(WebsocketConnectionTest, WSSConnection_FAILURE_InvalidTarget) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort),
+      .certificate = kCACertificate,
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WSS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSSServer(kPath);
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> wss_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = wss_connection->Start();
+  EXPECT_EQ(TransportAdapter::FAIL, ret_code);
+
+  // Stop client
+  ret_code = wss_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  wss_session->Stop();
+}
+
+TEST_F(WebsocketConnectionTest, WSSConnection_FAILURE_IncorrectCert) {
+  transport_manager::transport_adapter::CloudAppProperties properties{
+      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort),
+      .certificate = kIncorrectCertificate,
+      .enabled = true,
+      .auth_token = "auth_token",
+      .cloud_transport_type = "WSS",
+      .hybrid_app_preference = "CLOUD"};
+
+  // Start server
+  StartWSSServer("/");
+
+  // Start client
+  InitWebsocketClient(properties, ws_client);
+  std::shared_ptr<WebsocketClientConnection> wss_connection =
+      ws_client.connection;
+
+  // Check websocket connection
+  TransportAdapter::Error ret_code = wss_connection->Start();
+  EXPECT_EQ(TransportAdapter::FAIL, ret_code);
+
+  // Stop client
+  ret_code = wss_connection->Disconnect();
+  EXPECT_EQ(TransportAdapter::OK, ret_code);
+
+  // Stop server thread
+  wss_session->Stop();
+}
+#endif  // ENABLE_SECURITY
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/transport_manager/test/websocket_connection_test.cc b/src/components/transport_manager/test/websocket_connection_test.cc
index db3bc598b1..306bdc4784 100644
--- a/src/components/transport_manager/test/websocket_connection_test.cc
+++ b/src/components/transport_manager/test/websocket_connection_test.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Ford Motor Company
+ * Copyright (c) 2020, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,14 +31,26 @@
  */
 
 #include "gtest/gtest.h"
+
+#include <memory>
+#include <string>
+
 #include "resumption/last_state_impl.h"
-#include "transport_manager/cloud/cloud_websocket_transport_adapter.h"
-#include "transport_manager/cloud/sample_websocket_server.h"
-#include "transport_manager/cloud/websocket_client_connection.h"
-#include "transport_manager/transport_adapter/connection.h"
-#include "transport_manager/transport_adapter/transport_adapter_impl.h"
+#include "transport_manager/websocket_server/websocket_connection.h"
+#include "transport_manager/websocket_server/websocket_session.h"
 
 #include "transport_manager/mock_transport_manager_settings.h"
+#include "transport_manager/transport_adapter/mock_transport_adapter_controller.h"
+
+namespace {
+const std::string kHost = "127.0.0.1";
+const uint16_t kPort = 8080;
+const std::string kPath = "/folder/file.html/";
+const std::uint32_t kConnectionKey = 1u;
+const std::uint32_t kProtocolVersion = 5u;
+const std::string kDeviceUid_ = "deviceUID";
+const transport_manager::ApplicationHandle kAppHandle = 12345u;
+}  // namespace
 
 namespace test {
 namespace components {
@@ -47,445 +59,112 @@ namespace transport_manager_test {
 using ::testing::_;
 using ::testing::NiceMock;
 using ::testing::Return;
+
+using protocol_handler::RawMessagePtr;
+using protocol_handler::ServiceType;
+
 using namespace ::transport_manager;
 using namespace ::transport_manager::transport_adapter;
-namespace websocket = sample::websocket;
 
-class WebsocketConnectionTest : public ::testing::Test {
+class WebsocketNotSecureSessionConnectionTest : public testing::Test {
  public:
-  struct WebsocketClient {
-    std::shared_ptr<CloudWebsocketTransportAdapter> adapter;
-    std::shared_ptr<WebsocketClientConnection> connection;
-  };
+  WebsocketNotSecureSessionConnectionTest()
+      : websocket_connection_(
+            std::make_shared<WebSocketConnection<WebSocketSession<> > >(
+                kDeviceUid_,
+                kAppHandle,
+                boost::asio::ip::tcp::socket(i_co_),
+                &mock_transport_adapter_ctrl_))
 
-  void InitWebsocketClient(
-      const transport_manager::transport_adapter::CloudAppProperties&
-          properties,
-      WebsocketClient& client_out) {
-    uniq_id = dev_id = properties.endpoint;
+      , last_state_("test_app_folder", "test_app_info_storage") {}
 
-    client_out =
-        WebsocketClient{std::make_shared<CloudWebsocketTransportAdapter>(
-                            last_state_, transport_manager_settings),
-                        nullptr};
-    client_out.adapter->SetAppCloudTransportConfig(uniq_id, properties);
-
-    TransportAdapterImpl* ta_cloud =
-        dynamic_cast<TransportAdapterImpl*>(client_out.adapter.get());
-    ta_cloud->CreateDevice(uniq_id);
+  void SetUp() OVERRIDE {
+    ON_CALL(mock_transport_manager_settings_, use_last_state())
+        .WillByDefault(Return(true));
+  }
 
-    auto connection = client_out.adapter->FindPendingConnection(dev_id, 0);
+  RawMessagePtr CreateDefaultRawMessage() {
+    const uint32_t data_sending_size = 3u;
+    unsigned char data_sending[data_sending_size] = {0x20, 0x07, 0x01};
+    RawMessagePtr raw_message_ptr(
+        new ::protocol_handler::RawMessage(kConnectionKey,
+                                           kProtocolVersion,
+                                           data_sending,
+                                           data_sending_size,
+                                           false,
+                                           ServiceType::kAudio));
+    return raw_message_ptr;
+  }
 
-    ASSERT_NE(connection, nullptr);
+ protected:
+  boost::asio::io_context i_co_;
+  std::shared_ptr<WebSocketConnection<WebSocketSession<> > >
+      websocket_connection_;
+  NiceMock<MockTransportAdapterController> mock_transport_adapter_ctrl_;
+  NiceMock<MockTransportManagerSettings> mock_transport_manager_settings_;
+  resumption::LastStateImpl last_state_;
+};
 
-    client_out.connection =
-        std::dynamic_pointer_cast<WebsocketClientConnection>(connection);
+TEST_F(WebsocketNotSecureSessionConnectionTest, Disconnect_SUCCESS) {
+  websocket_connection_->Run();
+  EXPECT_CALL(mock_transport_adapter_ctrl_,
+              DisconnectDone(kDeviceUid_, kAppHandle))
+      .Times(1);
 
-    ASSERT_NE(client_out.connection.use_count(), 0);
-  }
+  auto error = websocket_connection_->Disconnect();
 
-  void StartWSServer(std::string path) {
-    ws_session = std::make_shared<websocket::WSSession>(kHost, kPort);
-    ws_session->AddRoute(path);
-    ws_session->Run();
-  }
+  ASSERT_EQ(TransportAdapter::Error::OK, error);
+}
 
-  void StartWSSServer(std::string path) {
-    wss_session = std::make_shared<websocket::WSSSession>(
-        kHost, kPort, kCertificate, kPrivateKey);
-    wss_session->AddRoute(path);
-    wss_session->Run();
-  }
+TEST_F(WebsocketNotSecureSessionConnectionTest, SecondDisconnect_UNSUCCESS) {
+  websocket_connection_->Run();
+  EXPECT_CALL(mock_transport_adapter_ctrl_,
+              DisconnectDone(kDeviceUid_, kAppHandle))
+      .Times(1);
 
- protected:
-  WebsocketConnectionTest()
-      : last_state_("app_storage_folder", "app_info_storage") {}
+  auto result_error = websocket_connection_->Disconnect();
 
-  ~WebsocketConnectionTest() {}
+  ASSERT_EQ(TransportAdapter::Error::OK, result_error);
 
-  void SetUp() OVERRIDE {
-    ON_CALL(transport_manager_settings, use_last_state())
-        .WillByDefault(Return(true));
-  }
+  EXPECT_CALL(mock_transport_adapter_ctrl_,
+              DisconnectDone(kDeviceUid_, kAppHandle))
+      .Times(0);
 
-  NiceMock<MockTransportManagerSettings> transport_manager_settings;
-  resumption::LastStateImpl last_state_;
-  std::string dev_id;
-  std::string uniq_id;
-  std::shared_ptr<websocket::WSSession> ws_session;
-  std::shared_ptr<websocket::WSSSession> wss_session;
-  WebsocketClient ws_client;
-  std::string kHost = "127.0.0.1";
-  uint16_t kPort = 8080;
-  std::string kPath = "/folder/file.html/";
-  std::string kQuery = "?eventId=2345&eventName='Test'&expectedResult=true";
-  std::string kFragment = "#section_1";
-
-  // Sample certificate for localhost
-  std::string kCertificate =
-      "-----BEGIN "
-      "CERTIFICATE-----\nMIIDqTCCApECCQC/"
-      "5LlQ+"
-      "GLgqTANBgkqhkiG9w0BAQsFADAXMRUwEwYDVQQDDAwx\nMjcuMC4wLjEgQ0EwIBcNMTkwNTA"
-      "2MTkzMjM2WhgPMjExOTA0MTIxOTMyMzZaMBQx\nEjAQBgNVBAMMCTEyNy4wLjAuMTCCAiIwD"
-      "QYJKoZIhvcNAQEBBQADggIPADCCAgoC\nggIBALbeIoAHFaFeNqbMnhtAO5QTgRd0X9qxpB0"
-      "d4M0dEeog2l/+inNA/eu+CCvm\nJj2I8+6MWH2TUrl/"
-      "2xfhHjzsMrtISCdpNcjaNzCnvi8ZcspFi3evknvs3+uo2/"
-      "wn\nyNZ04jp0oQ0k1cZ6WBpLTYV7WgmueemiWEiAfw+YE+wtRg+"
-      "0H7rksrbpeNPnxQHX\nBDDkWqwvfkD15Sd0XFQkW27K72/"
-      "et2uKuAcJHCIUbsA4iZyJw4Uu4eusy7W5kddX\nThE7Y1WqTXyA4j/"
-      "ZCYigXmsHbWrikPLVXbORhiMF4/60u8RDs0jI8xtgRQhLR9Vp\n3xys7/"
-      "5tHZX00s6x6OVy8aMSZIIVS0eWoVN8bGd9B4+fDMOcNT0YODeQA10w/"
-      "85P\nEiZDQ8AxneQkh8H3qjD2+"
-      "G9oHZaTk0zHTyaKRg3xGP3N9C96onaJX4Rm6nNvApO8\nU7lQ+xHkLwjKCQke39W+"
-      "r3FHwwQvUDeoJBXf6iVkIMFoUPAHNZqKf9Db6KKIEp8i\nDgIhbBxiB4MSn36Zly4SOMojyM"
-      "ZFri+"
-      "HzMbuHFlm8e8QRWGmM4UM2rHIpl4OJolg\nejesDqO8YZR5mZXV0FJRiPgLo2Q4OTtb3tEHJ"
-      "ZLmlT+"
-      "f42bge4ZCZmGPrkNfr68Y\nDEnJ6z4ksOVkMefOp2SNYLYYGPYyiKwa9qVkH9Obkect1omNA"
-      "gMBAAEwDQYJKoZI\nhvcNAQELBQADggEBABFJQtOTftrzbLBA5Vm6aPkbUyxhcaOpz+d+"
-      "Ljd6pIs4H+"
-      "Eb\nXkoHhmay4stZkDc2HVSKESZloI3Ylup8z3aRJjfOexJqHlYzk2vraYryWm8odgID\n5V"
-      "B0Zle8ofpHTJw1LCOXHkzKt1G6vdQpuq/"
-      "4OKpmggaIqqEC1bfOYZt5t6vIx3OF\nxjPz91NTR9gZ4lKrho1+sfS+"
-      "jbSjKkqVAhE4yTpKLPHRshQnBFEhvATXNvdZGftF\n+tXxqKsBZ9aX0/"
-      "YmPFIXFcjdjSSiuq1F1DjiqIZo88qfa9jlTg6VJdayyQ/"
-      "cu41C\nBucY8YTF0Ui8ccIS55h2UTzPy5/4PbrwI4P+Zgo=\n-----END "
-      "CERTIFICATE-----\n";
-  // Sample private key
-  std::string kPrivateKey =
-      "-----BEGIN RSA PRIVATE "
-      "KEY-----\nMIIJKAIBAAKCAgEAtt4igAcVoV42psyeG0A7lBOBF3Rf2rGkHR3gzR0R6iDaX/"
-      "6K\nc0D9674IK+YmPYjz7oxYfZNSuX/"
-      "bF+EePOwyu0hIJ2k1yNo3MKe+LxlyykWLd6+S\ne+zf66jb/"
-      "CfI1nTiOnShDSTVxnpYGktNhXtaCa556aJYSIB/"
-      "D5gT7C1GD7QfuuSy\ntul40+fFAdcEMORarC9+"
-      "QPXlJ3RcVCRbbsrvb963a4q4BwkcIhRuwDiJnInDhS7h\n66zLtbmR11dOETtjVapNfIDiP9"
-      "kJiKBeawdtauKQ8tVds5GGIwXj/rS7xEOzSMjz\nG2BFCEtH1WnfHKzv/"
-      "m0dlfTSzrHo5XLxoxJkghVLR5ahU3xsZ30Hj58Mw5w1PRg4\nN5ADXTD/"
-      "zk8SJkNDwDGd5CSHwfeqMPb4b2gdlpOTTMdPJopGDfEY/"
-      "c30L3qidolf\nhGbqc28Ck7xTuVD7EeQvCMoJCR7f1b6vcUfDBC9QN6gkFd/"
-      "qJWQgwWhQ8Ac1mop/"
-      "\n0NvooogSnyIOAiFsHGIHgxKffpmXLhI4yiPIxkWuL4fMxu4cWWbx7xBFYaYzhQza\nscim"
-      "Xg4miWB6N6wOo7xhlHmZldXQUlGI+AujZDg5O1ve0QclkuaVP5/"
-      "jZuB7hkJm\nYY+uQ1+"
-      "vrxgMScnrPiSw5WQx586nZI1gthgY9jKIrBr2pWQf05uR5y3WiY0CAwEA\nAQKCAgBGSDGyS"
-      "wbBMliG2vWZO6KqUqS2wv9kKgoNNsKDkryj42SKqGXFziDJTgwN\n8zKXS9+Uu1P3T3vn13/"
-      "5OYhJme4VlL5Gh2UogNXdWVr69yjrHLdxlIUUJAIbrJZ/"
-      "\n3zqNUfbwyIptZs7SrYrW8EInHzWHqwsoBEEx/"
-      "FDZSXW+u9fFiVD4n5UgP7M0nktV\nXbI6qElBDC/V/"
-      "6vG8i3aGO8bMdu8fzi3mGUKLzIk1v2J2zDofPosYcxqq8rPWTb4\nMJHMhaqz7fRB+"
-      "bb7GwtS+2/Oathe0B0td1u//Bo1s7ng1s2jrPFm8/"
-      "SbfPCLM4O0\nPjCF8OF8Q6uvSp0K283LAdZk+liuDztc/"
-      "Ed8mcnCZQhBp86mJQi0Jj3Mje7prOAY\nXojMroYj7r2igCJvcwGb1y6zZWSj3jXuHze3bLy"
-      "fv7pCD+hkiZR7mZhQpOhQRZaU\ntdFGc+"
-      "DuykxKPqVjAPy7iVQXYnMjpo36SGIWoZLuepQto3GvU6czyOwhK0/"
-      "Mwbwd\nZpYpLH3L9IetY8GcPefmUR5wQUlUTrpxgGElIzkkWW8zmUWBXwrGbAtN1HJWpJdN"
-      "\neVshKod2fo03IQMPywSdENCJVeSrgRMuwPyFaOM+"
-      "CVrBJwD66K9YWn4cVRUIZsTq\nAXhQ8DzF+WCOZshhMUbCJX+KpcOFI8nxOrPp+"
-      "J1s1YpLLvdmcQKCAQEA7bwvOiCD\nHvaqpYg1jJak6l/"
-      "iY3QIOOpFyjfYrQXS0BNRmmxK8Lzevi/"
-      "NPTqu146QKDaIGvzu\n+"
-      "bXnuV1LmZqnOm5J6Kdx0Mk4Fb88akRtS9gOdzU7WWMYIGkeF1oih0ZrhHuIey6e\nCeLSmJh"
-      "UDaTIWcCirALRHcLWUS6BTGGuE+up5QG7djIW/"
-      "LD17lhGE6fXPlbYXb7l\nPbYwL1Yr0urIp9Un+zrExw+77TTGK7T37T1ZJv46qnro0/"
-      "HK8XxZ+"
-      "JNc18F763O4\nPmwu8KWrx4qnyPYAuB1rbVntK6UxYks9jvk93XecCUP6HHp0I0tV/"
-      "kBNd2+"
-      "18zux\n033xFEVKrUksmwKCAQEAxOrPGyBVFp29V4gQsMQdmafkDAgCLREgjQTOamFsYL5+"
-      "\nZWq+6VhT/"
-      "B650sIoRdX0N8timnSLBfjeqaBG5VVhhyKZhP5hulfRjALhdbGBOYvf\n0gLSffImwWdYQfx"
-      "jtCSO+"
-      "XCLVdAJGOOWeBVVKzH18ZvCFQwUr3Yrp7KmKWKAqgf7\n6rYovWh8T5LLYS0NzXCEwf9nJ0N"
-      "JMOy7I9B7EtF8Cs6tK3aaHVqDz7zufwosS7gI\n3aI51Qh4a5D1p95+"
-      "YU09beWjWGYnPiCKk4D47zaeOe7OQINaWugExlelHtJh9unO\nnhOFXhziav2Kxq1CICAuXl"
-      "Vx3A+gn/cU3niNHz2A9wKCAQEAws+aw78ws4bef5cG\nipZHveek1GqY8krHtdXdsKs8/"
-      "VVXYXusTWn3/VGelbYo4GrqpolJLxRloCr4IGXb\nNZwNvUvzNLtCAR1i4C89irdX+Paro/"
-      "PzFmSluKlrByfNc5y5Lm8sgATLbL56ZKEu\n/58wrpu0sc/"
-      "9HK40gYHiYn0I8ToElqy8uTaCr78zSIT9p826DFOOKgPsRo2tHp02\nfDf5Bc8eXDjkV1sFX"
-      "HQKkHZTVA0ZqWJbIKhncoaJDyofcBsR0ZuzuFWzfTOZo4mf\nInz00TEFldpF1e4C8+"
-      "kCdtHBOA/2Ki2Bp/YUVpHh6aoqZZa75Euehhs8tVpW242M\njEOSUQKCAQAM64sjMH/kt/"
-      "zQXXEa6AM5LbbcwznBUzpbhlE00aeWwWjxpotYLB92\nj12J4otZ6avYbVPO5o6omaeiYY3F"
-      "RlDb2P1RqI8o9tIc6aN5YWglKnRJBz5gXR8F\n2Y4E5lZ0X2GyJBxASSIPq/"
-      "8Xae7ooqKMc7fMQbqpuIssuaAFXx0qCtQQllsd8lkV\nr4AApEAflp5fTC6seNG4kA/"
-      "HTcqFdZE59E2QaHu8KVA0tSTA2R4G6dBLGnXI8IFW\nLXCwzvxjzfmV2FdbWXiBrwjonLG4o"
-      "FDJZE3MFdI73LVTfjSrTQp4dObFoGpDvols\nk64jUwLfsLzaG6kY0z2qwT9xSV+"
-      "ZCSQJAoIBADsSBeyELc5KnmOhT0Xue2o0bkAS\n8KcGWdAoQlaLCIs3vtdlC7DXDXO1l8FkT"
-      "Qrd+GwP3eWDq6ymtO4vkJ3m4cZ1PEsv\n6Qet7qtkVhUfa+"
-      "FYKtDzSMRuSaFPW3Ro1PesFa1H3y+sw5HL36vhRaSK+T4Wy5k2\nf7EwNZIf/"
-      "ZZeA+"
-      "sEtqj33obOBIiuU9htAjN81Kz4a0Xlh6jc4q6iwYKL8nZ76JYV\n8hXWIz6OXxLXE158+"
-      "QtJSZaRCvdr6L5UtWfMPKSMqgfhXfTYViPDleQCkJ132mIS\nH28UoET0Y5wI8M6pMkWpSqW"
-      "WcKPFGwyLInvHdxgnTAsutowkldA7qFwoRz4=\n-----END RSA PRIVATE KEY-----\n";
-  // Sample CA certificate(used to sign the server certificate)
-  std::string kCACertificate =
-      "-----BEGIN "
-      "CERTIFICATE-----"
-      "\nMIIDBjCCAe6gAwIBAgIJAPyCrKRDl3SWMA0GCSqGSIb3DQEBCwUAMBcxFTATBgNV\nBAMM"
-      "DDEyNy4wLjAuMSBDQTAgFw0xOTA1MDYxOTMyMzZaGA8yMTE5MDQxMjE5MzIz\nNlowFzEVMB"
-      "MGA1UEAwwMMTI3LjAuMC4xIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC\nAQ8AMIIBCgKCAQEA"
-      "xrNHoY5+"
-      "JCgnyvEdG2dvvOaZ3sg6uhuF5Ssb5snyo9ixrxO5\nZkDGWwUqFO9PiYuO5ovNeq9LZtPG6s"
-      "K8zsCS062ChZX/7tZHndf4MKCUDzv/"
-      "LPHe\nnROoPi9n2FAiOPctY5hpgpIJDPI5Ofx0el2KPeFGeUO/"
-      "W3yqnfol1ZqzZ2h3uErR\noHkgT2Ja4K+5gnPkr/"
-      "RluJIu3AmWYw4eKi8i3+"
-      "PoThGmCFvoGfcWvRoctgnOHYHE\n4bDRirXL9nGkZ5FMzOVDeoIAEAShOqJwL08VcY+Pg/"
-      "qFQjzRrTmiKgm6QsHNnm0q\nzg70XaD88VJimiGYZOuJHNZpX8o0W+1Ls/"
-      "NbawIDAQABo1MwUTAdBgNVHQ4EFgQU\nkW3hgFWYMpVUkq9AlzGlI3awTGEwHwYDVR0jBBgw"
-      "FoAUkW3hgFWYMpVUkq9AlzGl\nI3awTGEwDwYDVR0TAQH/BAUwAwEB/"
-      "zANBgkqhkiG9w0BAQsFAAOCAQEAZeMkILiG\neEcELWb8cktP3LzvS47O8hys9+"
-      "6TFmftuO7kjDBd9YH2v8iQ7qCcUvMJ7bqL5RP1\nQssKfNOHZtw/"
-      "MMcKE6E3nl4yQSKc8ymivvYSVu5SYtQCedcgfRLb5zvVxXw8JmCp\nGNS3/"
-      "OlIYZAamh76GxkKSaV3tv0XZB6n3rUVQZShncFbMpyJRW0XWxReGWrhXv4s\nNxMeC1r07EE"
-      "WIDecv8KKf1F8uT4UF48HnC0VBpXiOyDGvn35NiKp+"
-      "Q5k7QV6jdCS\ngPRcnZhs6jiU0jnV8C9A1A+"
-      "3pXSSPrAed7tvECOgHCfS10CLsLWsLuSjc93BE5Vt\nav7kmxSwrdvQ2A==\n-----END "
-      "CERTIFICATE-----\n";
-  std::string kIncorrectCertificate =
-      "-----BEGIN "
-      "CERTIFICATE-----\nMIIC/"
-      "jCCAeagAwIBAgIJAIZjLucUID1mMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV\nBAMMCTEyNy4"
-      "wLjAuMTAeFw0xOTA1MDYxNDA1MzdaFw0yOjA1MDZxNDA1MzdaMBQx\nEjAQBgNVBAMMCTEyN"
-      "y4wLjAuMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC\nggEBALfE5Qhc2mHTIux30l7"
-      "eHFjFLdzYeXE8vcaXKodalCG8EkRxojDOfUv+y2DV\nJzHAMiGxMFAEcSz71k+"
-      "jFZwhNG8PLY0b36ChnUsrGkOSJWq3OKUFrg8KxO9At9dL\nJsa+"
-      "R0N0D1bMoPYdpCi3m0b0q2ITHe56qKuTLTrIPia+"
-      "qXGEVD7EoEhU9tnwlcwE\npsUURMXCn2+FhHyqN9wjFkldmu4k8U3OJOK4385L+"
-      "4RJoIV8dsYawAMAf+"
-      "WuxyWq\niPQTPxr8q33ZZm6z0XrgsgxHYCCsryx8L9Ub9Zwu0mie7eL63rYdr86gULvnF1bY"
-      "\ncOunKFc71rBYFalbD6YYsre733kCAwEAAaNTMFEwHQYDVR0OBBYEFKW9ByUNG84Z\nYiSc"
-      "hUrB7KV9FinZMB8GA1UdIwQYMBaAFKW9ByUNG84ZYiSchUrB7KV9FinZMA8G\nA1UdEwEB/"
-      "wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHYROS1EL2qnrwmAsR6c\nqo8yrk8qzLKt4os"
-      "41nv7QMUQFIO+QLPE8SbH4fK1YOMMUJ4ppARQBDaIIR3UEhp1\nZHT/"
-      "wGjK9qxcuQ1EXLyHOY0rxS5q57dYGxOyQo4v6IoLVMZ1ij+RJGPYI/"
-      "2fDXs0\nbDldeJyC1voHmG6lqTN5nLG7Y3j9j6rtSqJyRz5muaecQNiFPQOM2OTp0rC4VeAF"
-      "\ndejmTmLhUFVuHMzLF+"
-      "bpzsN76GnnQquJy2jexzFoWgbEfFVLKuyhTHQAalRb4ccq\nXCIx1hecNDYRY3Sc2Gzv5qxk"
-      "kWF8zqltT/0d5tx0JwN3k5nP4SlaEldFvD6BELxy\nVkU=\n-----END "
-      "CERTIFICATE-----\n";
-};
+  result_error = websocket_connection_->Disconnect();
 
-TEST_F(WebsocketConnectionTest, WSConnection_SUCCESS) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "ws://" + kHost + ":" + std::to_string(kPort),
-      .certificate = "no cert",
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSServer, this, "/");
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> ws_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = ws_connection->Start();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop client
-  ret_code = ws_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  ws_session->Stop();
-  t1.join();
+  ASSERT_EQ(TransportAdapter::Error::BAD_STATE, result_error);
 }
 
-TEST_F(WebsocketConnectionTest, WSConnection_SUCCESS_ValidTarget) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "ws://" + kHost + ":" + std::to_string(kPort) + kPath +
-                  kQuery + kFragment,
-      .certificate = "no cert",
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSServer, this, kPath);
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> ws_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = ws_connection->Start();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop client
-  ret_code = ws_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  ws_session->Stop();
-  t1.join();
-}
+TEST_F(WebsocketNotSecureSessionConnectionTest, SUCCESS_SendData) {
+  auto message = CreateDefaultRawMessage();
 
-TEST_F(WebsocketConnectionTest, WSConnection_FAILURE_InvalidTarget) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "ws://" + kHost + ":" + std::to_string(kPort) + kPath +
-                  kQuery + kFragment,
-      .certificate = "no cert",
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSServer, this, "/");
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> ws_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = ws_connection->Start();
-  EXPECT_EQ(TransportAdapter::FAIL, ret_code);
-
-  // Stop client
-  ret_code = ws_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  ws_session->Stop();
-  t1.join();
-}
+  auto error = websocket_connection_->SendData(message);
 
-TEST_F(WebsocketConnectionTest, WSSConnection_SUCCESS) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort),
-      .certificate = kCACertificate,
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WSS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSSServer, this, "/");
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> wss_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = wss_connection->Start();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop client
-  ret_code = wss_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  wss_session->Stop();
-  t1.join();
+  ASSERT_EQ(TransportAdapter::Error::OK, error);
 }
 
-TEST_F(WebsocketConnectionTest, WSSConnection_SUCCESS_ValidTarget) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort) + kPath,
-      .certificate = kCACertificate,
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WSS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSSServer,
-                 this,
-                 (kPath + kQuery + kFragment));
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> wss_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = wss_connection->Start();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop client
-  ret_code = wss_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  wss_session->Stop();
-  t1.join();
-}
+TEST_F(WebsocketNotSecureSessionConnectionTest, UNSUCCESS_SendData_BAD_STATE) {
+  websocket_connection_->Run();
+  auto message = CreateDefaultRawMessage();
+
+  auto disconnect_error = websocket_connection_->Disconnect();
+
+  auto send_data_error = websocket_connection_->SendData(message);
 
-TEST_F(WebsocketConnectionTest, WSSConnection_FAILURE_InvalidTarget) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort),
-      .certificate = kCACertificate,
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WSS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSSServer, this, kPath);
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> wss_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = wss_connection->Start();
-  EXPECT_EQ(TransportAdapter::FAIL, ret_code);
-
-  // Stop client
-  ret_code = wss_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  wss_session->Stop();
-  t1.join();
+  ASSERT_EQ(TransportAdapter::Error::OK, disconnect_error);
+  ASSERT_EQ(TransportAdapter::Error::BAD_STATE, send_data_error);
 }
 
-TEST_F(WebsocketConnectionTest, WSSConnection_FAILURE_IncorrectCert) {
-  transport_manager::transport_adapter::CloudAppProperties properties{
-      .endpoint = "wss://" + kHost + ":" + std::to_string(kPort),
-      .certificate = kIncorrectCertificate,
-      .enabled = true,
-      .auth_token = "auth_token",
-      .cloud_transport_type = "WSS",
-      .hybrid_app_preference = "CLOUD"};
-
-  // Start server
-  std::thread t1(&WebsocketConnectionTest::StartWSSServer, this, "/");
-  usleep(5000);
-
-  // Start client
-  InitWebsocketClient(properties, ws_client);
-  std::shared_ptr<WebsocketClientConnection> wss_connection =
-      ws_client.connection;
-
-  // Check websocket connection
-  TransportAdapter::Error ret_code = wss_connection->Start();
-  EXPECT_EQ(TransportAdapter::FAIL, ret_code);
-
-  // Stop client
-  ret_code = wss_connection->Disconnect();
-  EXPECT_EQ(TransportAdapter::OK, ret_code);
-
-  // Stop server thread
-  wss_session->Stop();
-  t1.join();
+TEST_F(WebsocketNotSecureSessionConnectionTest, DataReceive_SUCCESS) {
+  auto message = CreateDefaultRawMessage();
+
+  EXPECT_CALL(mock_transport_adapter_ctrl_,
+              DataReceiveDone(kDeviceUid_, kAppHandle, _))
+      .Times(1);
+
+  websocket_connection_->DataReceive(message);
 }
+
 }  // namespace transport_manager_test
 }  // namespace components
 }  // namespace test
diff --git a/src/components/transport_manager/test/websocket_sample_client/websocket_sample_client.cc b/src/components/transport_manager/test/websocket_sample_client/websocket_sample_client.cc
new file mode 100644
index 0000000000..88525ad29d
--- /dev/null
+++ b/src/components/transport_manager/test/websocket_sample_client/websocket_sample_client.cc
@@ -0,0 +1,193 @@
+/*
+ * \file websocket_listener.h
+ * \brief WebSocketListener class header file.
+ *
+ * Copyright (c) 2020
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "transport_manager/websocket_server/websocket_sample_client.h"
+
+namespace transport_manager {
+namespace transport_adapter {
+
+template <>
+WSSampleClient<websocket::stream<ssl::stream<tcp::socket> > >::WSSampleClient(
+    const std::string& host,
+    const std::string& port,
+    const SecurityParams& params)
+    : resolver_(ioc_)
+    , ctx_(ssl::context::sslv23_client)
+    , ws_(nullptr)
+    , io_pool_(1)
+    , host_(host)
+    , port_(port)
+    , handshake_successful_(false) {
+  ctx_.set_verify_mode(ssl::context::verify_peer);
+  ctx_.load_verify_file(params.ca_cert_);
+  ctx_.use_certificate_chain_file(params.client_cert_);
+  ctx_.use_private_key_file(params.client_key_, boost::asio::ssl::context::pem);
+  ws_.reset(new WSS(ioc_, ctx_));
+}
+
+template <>
+WSSampleClient<WS>::WSSampleClient(const std::string& host,
+                                   const std::string& port)
+    : resolver_(ioc_)
+    , ctx_(ssl::context::sslv23_client)
+    , ws_(new WS(ioc_))
+    , host_(host)
+    , port_(port) {}
+
+template <typename Stream>
+bool WSSampleClient<Stream>::Run() {
+  boost::system::error_code ec;
+  ctx_.set_verify_mode(ssl::verify_none);
+
+  auto results = resolver_.resolve(host_, port_, ec);
+  if (ec) {
+    std::cout << "ErrorMessage: " + ec.message() << std::endl;
+    return false;
+  }
+
+  if (!Connect(results)) {
+    return false;
+  }
+
+  if (!Handshake(host_, "/")) {
+    return false;
+  }
+
+  ws_->async_read(buffer_,
+                  std::bind(&WSSampleClient::OnRead,
+                            this->shared_from_this(),
+                            std::placeholders::_1,
+                            std::placeholders::_2));
+  boost::asio::post(io_pool_, [&]() { ioc_.run(); });
+  return true;
+}
+
+template <typename Stream>
+void WSSampleClient<Stream>::OnRead(beast::error_code ec,
+                                    std::size_t bytes_transferred) {
+  boost::ignore_unused(bytes_transferred);
+}
+
+template <>
+bool WSSampleClient<WS>::Connect(tcp::resolver::results_type& results) {
+  boost::system::error_code ec;
+  boost::asio::connect(ws_->next_layer(), results.begin(), results.end(), ec);
+  if (ec) {
+    std::string str_err = "ErrorMessage: " + ec.message();
+    return false;
+  }
+  return true;
+}
+
+template <>
+bool WSSampleClient<WSS>::Connect(tcp::resolver::results_type& results) {
+  boost::system::error_code ec;
+  boost::asio::connect(ws_->lowest_layer(), results.begin(), results.end(), ec);
+  if (ec) {
+    std::string str_err = "ErrorMessage: " + ec.message();
+    return false;
+  }
+  return true;
+}
+
+template <>
+bool WSSampleClient<WS>::Handshake(const std::string& host,
+                                   const std::string& target) {
+  boost::system::error_code ec;
+  ws_->handshake(host, target, ec);
+  if (ec) {
+    std::string str_err = "ErrorMessage: " + ec.message();
+    return false;
+  }
+  return true;
+}
+
+template <>
+void WSSampleClient<WS>::Stop() {
+  ioc_.stop();
+  ws_->lowest_layer().close();
+
+  io_pool_.stop();
+  io_pool_.join();
+}
+
+template <>
+bool WSSampleClient<WSS>::Handshake(const std::string& host,
+                                    const std::string& target) {
+  boost::system::error_code ec;
+
+  ws_->next_layer().handshake(ssl::stream_base::client, ec);
+  if (ec) {
+    std::cout << "ErrorMessage: " + ec.message() << std::endl;
+    return false;
+  }
+
+  ws_->handshake(host, target, ec);
+  if (ec) {
+    std::string str_err = "ErrorMessage: " + ec.message();
+    return false;
+  }
+
+  handshake_successful_ = true;
+  return true;
+}
+
+template <>
+void WSSampleClient<WSS>::Stop() {
+  ioc_.stop();
+  ws_->next_layer().next_layer().shutdown(
+      boost::asio::ip::tcp::socket::shutdown_both);
+  ws_->lowest_layer().close();
+
+  io_pool_.stop();
+  io_pool_.join();
+}
+
+template <>
+void WSSampleClient<WSS>::OnHandshakeTimeout() {
+  if (!handshake_successful_) {
+    Stop();
+  }
+}
+
+template <>
+bool WSSampleClient<WSS>::IsHandshakeSuccessful() const {
+  return handshake_successful_;
+}
+
+template class WSSampleClient<WS>;
+template class WSSampleClient<WSS>;
+}  // namespace transport_adapter
+}  // namespace transport_manager
diff --git a/src/components/transport_manager/test/websocket_server_listener_test.cc b/src/components/transport_manager/test/websocket_server_listener_test.cc
new file mode 100644
index 0000000000..7991c6f1cb
--- /dev/null
+++ b/src/components/transport_manager/test/websocket_server_listener_test.cc
@@ -0,0 +1,260 @@
+/*
+ * Copyright (c) 2020, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+#include "transport_manager/mock_transport_manager_settings.h"
+#include "transport_manager/transport_adapter/mock_transport_adapter_controller.h"
+#include "transport_manager/websocket_server/websocket_device.h"
+#include "transport_manager/websocket_server/websocket_listener.h"
+#include "utils/timer.h"
+#include "utils/timer_task_impl.h"
+
+#include <thread>
+#include "transport_manager/websocket_server/websocket_sample_client.h"
+
+namespace test {
+namespace components {
+namespace transport_manager_test {
+
+using ::testing::_;
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnArg;
+using ::testing::ReturnPointee;
+using ::testing::ReturnRef;
+using namespace ::transport_manager;
+using namespace ::transport_manager::transport_adapter;
+
+namespace {
+const std::string kDefaultAddress = "127.0.0.1";
+const std::string kDefaultCertPath = "";
+const std::string kDefaultKeyPath = "";
+const std::string kDefaultCACertPath = "";
+const uint32_t kDefaultPort = 2021;
+const std::string kDefaultPortStr = "2021";
+const uint32_t kWrongPort = 1000;
+const std::string kCACertPath = "./test_certs/ca-cert.pem";
+const std::string kClientCertPath = "./test_certs/client-cert.pem";
+const std::string kClientKeyPath = "./test_certs/client-key.pem";
+const std::string kServerCert = "./test_certs/server-cert.pem";
+const std::string kServerKey = "./test_certs/server-key.pem";
+const std::string kCACert = "./test_certs/ca-cert.pem";
+const std::string kDefaultDeviceName = "Web Engine";
+const int kNumThreads = 2;
+}  // namespace
+
+class WebSocketListenerTest : public ::testing::Test {
+ protected:
+  MockTransportAdapterController mock_ta_controller_;
+  MockTransportManagerSettings mock_tm_settings_;
+
+ public:
+  WebSocketListenerTest() {}
+  ~WebSocketListenerTest() {}
+
+  void SetUp() OVERRIDE {
+    ON_CALL(mock_tm_settings_, websocket_server_address())
+        .WillByDefault(ReturnRef(kDefaultAddress));
+    ON_CALL(mock_tm_settings_, websocket_server_port())
+        .WillByDefault(Return(kDefaultPort));
+    ON_CALL(mock_tm_settings_, ws_server_cert_path())
+        .WillByDefault(ReturnRef(kServerCert));
+    ON_CALL(mock_tm_settings_, ws_server_key_path())
+        .WillByDefault(ReturnRef(kServerKey));
+    ON_CALL(mock_tm_settings_, ws_server_ca_cert_path())
+        .WillByDefault(ReturnRef(kCACert));
+    ON_CALL(mock_tm_settings_, wss_server_supported())
+        .WillByDefault(Return(true));
+  }
+
+  std::shared_ptr<WebSocketDevice> CreateDevice(const bool secure_connection) {
+    return std::make_shared<WebSocketDevice>(kDefaultDeviceName,
+                                             kDefaultDeviceName);
+  }
+};
+
+TEST_F(WebSocketListenerTest, StartListening_ClientConnect_SUCCESS) {
+  ON_CALL(mock_tm_settings_, ws_server_cert_path())
+      .WillByDefault(ReturnRef(kDefaultCertPath));
+  ON_CALL(mock_tm_settings_, ws_server_key_path())
+      .WillByDefault(ReturnRef(kDefaultKeyPath));
+  ON_CALL(mock_tm_settings_, ws_server_ca_cert_path())
+      .WillByDefault(ReturnRef(kDefaultCACertPath));
+  ON_CALL(mock_tm_settings_, wss_server_supported())
+      .WillByDefault(Return(false));
+
+  const auto ws_listener = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const auto ws_client =
+      std::make_shared<WSSampleClient<WS> >(kDefaultAddress, kDefaultPortStr);
+
+  EXPECT_CALL(mock_ta_controller_, ConnectDone(_, _));
+  EXPECT_CALL(mock_ta_controller_, ConnectionCreated(_, _, _));
+  EXPECT_CALL(mock_ta_controller_, GetWebEngineDevice())
+      .WillOnce(Return(CreateDevice(false)));
+
+  ws_listener->StartListening();
+  EXPECT_TRUE(ws_client->Run());
+  ws_client->Stop();
+}
+
+TEST_F(WebSocketListenerTest, StartListening_ClientConnectSecure_SUCCESS) {
+  const auto ws_listener = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const SecurityParams params{kCACertPath, kClientCertPath, kClientKeyPath};
+  const auto wss_client = std::make_shared<WSSampleClient<WSS> >(
+      kDefaultAddress, kDefaultPortStr, params);
+
+  EXPECT_CALL(mock_ta_controller_, ConnectDone(_, _));
+  EXPECT_CALL(mock_ta_controller_, ConnectionCreated(_, _, _));
+  EXPECT_CALL(mock_ta_controller_, GetWebEngineDevice())
+      .WillOnce(Return(CreateDevice(true)));
+
+  ws_listener->StartListening();
+  EXPECT_TRUE(wss_client->Run());
+  wss_client->Stop();
+}
+
+TEST_F(WebSocketListenerTest,
+       StartListening_ClientConnectSecureInvalidCert_FAIL) {
+  const auto ws_listener = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const SecurityParams params{kCACertPath,
+                              "./test_certs/invalid_cert.pem",
+                              "./test_certs/invalid_key.pem"};
+  const auto wss_client = std::make_shared<WSSampleClient<WSS> >(
+      kDefaultAddress, kDefaultPortStr, params);
+
+  EXPECT_CALL(mock_ta_controller_, ConnectDone(_, _));
+  EXPECT_CALL(mock_ta_controller_, ConnectionCreated(_, _, _));
+  EXPECT_CALL(mock_ta_controller_, GetWebEngineDevice())
+      .WillOnce(Return(CreateDevice(true)));
+  EXPECT_CALL(mock_ta_controller_, ConnectionAborted(_, _, _));
+
+  ws_listener->StartListening();
+  timer::Timer handshake_timer(
+      "HandshakeTimer",
+      new ::timer::TimerTaskImpl<WSSampleClient<WSS> >(
+          wss_client.get(), &WSSampleClient<WSS>::OnHandshakeTimeout));
+  handshake_timer.Start(3000, timer::kSingleShot);
+  wss_client->Run();
+  EXPECT_EQ(wss_client->IsHandshakeSuccessful(), false);
+}
+
+TEST_F(WebSocketListenerTest, StartListening_CertificateNotFound_Fail) {
+  const std::string server_cert = "./test_certs/server-cert.pem";
+  const std::string server_key = "./test_certs/server-key.pem";
+  const std::string ca_cert = "./not_valid_path/ca-cert.pem";
+  ON_CALL(mock_tm_settings_, ws_server_cert_path())
+      .WillByDefault(ReturnRef(server_cert));
+  ON_CALL(mock_tm_settings_, ws_server_key_path())
+      .WillByDefault(ReturnRef(server_key));
+  ON_CALL(mock_tm_settings_, ws_server_ca_cert_path())
+      .WillByDefault(ReturnRef(ca_cert));
+
+  const auto ws_listener_ = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const auto ws_client_ =
+      std::make_shared<WSSampleClient<WS> >(kDefaultAddress, kDefaultPortStr);
+
+  EXPECT_EQ(TransportAdapter::Error::FAIL, ws_listener_->StartListening());
+}
+
+TEST_F(WebSocketListenerTest, StartListening_WrongConfig_FAIL) {
+  const std::string server_cert = "./test_certs/server-cert.pem";
+
+  ON_CALL(mock_tm_settings_, ws_server_cert_path())
+      .WillByDefault(ReturnRef(server_cert));
+  ON_CALL(mock_tm_settings_, ws_server_key_path())
+      .WillByDefault(ReturnRef(kDefaultKeyPath));
+  EXPECT_CALL(mock_tm_settings_, ws_server_ca_cert_path())
+      .WillOnce(ReturnRef(kDefaultCACertPath));
+
+  const auto ws_listener_ = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const auto ws_client_ =
+      std::make_shared<WSSampleClient<WS> >(kDefaultAddress, kDefaultPortStr);
+
+  EXPECT_EQ(TransportAdapter::Error::FAIL, ws_listener_->StartListening());
+}
+
+TEST_F(WebSocketListenerTest, StartListening_BindToTheServerAddress_FAIL) {
+  ON_CALL(mock_tm_settings_, ws_server_cert_path())
+      .WillByDefault(ReturnRef(kDefaultCertPath));
+  ON_CALL(mock_tm_settings_, ws_server_key_path())
+      .WillByDefault(ReturnRef(kDefaultKeyPath));
+  ON_CALL(mock_tm_settings_, wss_server_supported())
+      .WillByDefault(Return(false));
+  EXPECT_CALL(mock_tm_settings_, ws_server_ca_cert_path())
+      .WillOnce(ReturnRef(kDefaultCACertPath));
+  EXPECT_CALL(mock_tm_settings_, websocket_server_port())
+      .WillOnce(Return(kWrongPort));
+
+  const auto ws_listener_ = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const auto ws_client_ =
+      std::make_shared<WSSampleClient<WS> >(kDefaultAddress, kDefaultPortStr);
+
+  EXPECT_EQ(TransportAdapter::Error::FAIL, ws_listener_->StartListening());
+}
+
+TEST_F(WebSocketListenerTest, StartListening_AcceptorIsOpen_SUCCESS) {
+  ON_CALL(mock_tm_settings_, ws_server_cert_path())
+      .WillByDefault(ReturnRef(kDefaultCertPath));
+  ON_CALL(mock_tm_settings_, ws_server_key_path())
+      .WillByDefault(ReturnRef(kDefaultKeyPath));
+  ON_CALL(mock_tm_settings_, wss_server_supported())
+      .WillByDefault(Return(false));
+
+  EXPECT_CALL(mock_ta_controller_, ConnectDone(_, _));
+  EXPECT_CALL(mock_ta_controller_, ConnectionCreated(_, _, _));
+  EXPECT_CALL(mock_ta_controller_, GetWebEngineDevice())
+      .WillOnce(Return(CreateDevice(false)));
+
+  EXPECT_CALL(mock_tm_settings_, ws_server_ca_cert_path())
+      .WillOnce(ReturnRef(kDefaultCACertPath));
+
+  const auto ws_listener = std::make_shared<WebSocketListener>(
+      &mock_ta_controller_, mock_tm_settings_, kNumThreads);
+  const auto ws_client =
+      std::make_shared<WSSampleClient<WS> >(kDefaultAddress, kDefaultPortStr);
+
+  ws_listener->StartListening();
+  ws_client->Run();
+  EXPECT_EQ(TransportAdapter::Error::OK, ws_listener->StartListening());
+  ws_client->Stop();
+}
+
+}  // namespace transport_manager_test
+}  // namespace components
+}  // namespace test
diff --git a/src/components/utils/CMakeLists.txt b/src/components/utils/CMakeLists.txt
index 9562b50e78..451a8a629e 100644
--- a/src/components/utils/CMakeLists.txt
+++ b/src/components/utils/CMakeLists.txt
@@ -58,7 +58,10 @@ set(EXCLUDE_PATHS
   ${DBMS_PATHS}
 )
 
-set(LIBRARIES)
+set(LIBRARIES
+  encryption
+  jsoncpp
+)
 
 if(NOT BUILD_BACKTRACE_SUPPORT)
   list(APPEND EXCLUDE_PATHS
diff --git a/src/components/utils/include/utils/file_system.h b/src/components/utils/include/utils/file_system.h
index f62858417d..f575da129f 100644
--- a/src/components/utils/include/utils/file_system.h
+++ b/src/components/utils/include/utils/file_system.h
@@ -70,10 +70,10 @@ uint64_t FileSize(const std::string& path);
 
 /**
  * @brief Creates directory with owner_all permissions
- * @param name path to directory
- * @return path to created directory.
+ * @param name directory to create
+ * @return true if directory was created or already existed.
  */
-std::string CreateDirectory(const std::string& name);
+bool CreateDirectory(const std::string& name);
 
 /**
  * @brief Creates directory recursively
@@ -188,7 +188,7 @@ void remove_directory_content(const std::string& directory_name);
  * @return returns true if the directory is successfully deleted.
  */
 bool RemoveDirectory(const std::string& directory_name,
-                     bool is_recursively = true);
+                     const bool is_recursively = true);
 
 /**
  * @brief Check access rights
@@ -197,7 +197,7 @@ bool RemoveDirectory(const std::string& directory_name,
  * @param how Read/write attribute.
  * @return returns true if file has the given mode.
  */
-bool IsAccessible(const std::string& name, int32_t how);
+bool IsAccessible(const std::string& name, const int32_t how);
 
 /**
  * @brief Check access rights for writing
diff --git a/src/components/utils/include/utils/jsoncpp_reader_wrapper.h b/src/components/utils/include/utils/jsoncpp_reader_wrapper.h
new file mode 100644
index 0000000000..deebe23cae
--- /dev/null
+++ b/src/components/utils/include/utils/jsoncpp_reader_wrapper.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_JSONCPP_READER_WRAPPER_H_
+#define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_JSONCPP_READER_WRAPPER_H_
+
+#include <memory>
+#include <string>
+#include "json/reader.h"
+
+namespace utils {
+
+class JsonReader {
+ public:
+  JsonReader();
+  bool parse(const std::string& json, Json::Value* root);
+
+ private:
+  std::unique_ptr<Json::CharReader> reader_;
+  Json::CharReaderBuilder reader_builder_;
+};
+}  // namespace utils
+#endif  // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_JSONCPP_READER_WRAPPER_H_
diff --git a/src/components/utils/include/utils/stl_utils.h b/src/components/utils/include/utils/stl_utils.h
index 4a4e3d2fe8..48511e6fb3 100644
--- a/src/components/utils/include/utils/stl_utils.h
+++ b/src/components/utils/include/utils/stl_utils.h
@@ -32,6 +32,7 @@
 #ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_STL_UTILS_H_
 #define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_STL_UTILS_H_
 
+#include <cstddef>
 #include "utils/macro.h"
 
 namespace utils {
diff --git a/src/components/utils/include/utils/system_time_handler.h b/src/components/utils/include/utils/system_time_handler.h
index 15b2dd0cca..2013622f30 100644
--- a/src/components/utils/include/utils/system_time_handler.h
+++ b/src/components/utils/include/utils/system_time_handler.h
@@ -50,6 +50,11 @@ class SystemTimeListener {
    * @param utc_time current system time.
    */
   virtual void OnSystemTimeArrived(const time_t utc_time) = 0;
+
+  /**
+   * @brief OnSystemTimeFailed Notify about system request failure
+   */
+  virtual void OnSystemTimeFailed() = 0;
 };
 
 /**
@@ -97,6 +102,12 @@ class SystemTimeHandler {
   time_t GetUTCTime();
 
   /**
+   * @brief ResetPendingSystemTimeRequests resets waiting for system time
+   * requests flag
+   */
+  virtual void ResetPendingSystemTimeRequests() = 0;
+
+  /**
    * @brief Checks if system time is ready
    * and can be requested by GetSystemTime request
    * @return True if HMI is ready to provide UTC time
diff --git a/src/components/utils/src/date_time.cc b/src/components/utils/src/date_time.cc
index 3ca6050b3f..cea35a977e 100644
--- a/src/components/utils/src/date_time.cc
+++ b/src/components/utils/src/date_time.cc
@@ -102,4 +102,17 @@ TimeCompare compareTime(const TimeDuration& time1, const TimeDuration& time2) {
   return EQUAL;
 }
 
+int64_t calculateAmountDaysFromDate(const std::time_t& start_date) {
+  const time_t current_date = std::time(NULL);
+
+  // std::difftime returns difference between two timepoints in seconds
+  const uint32_t diff_consent_and_current_dates = (static_cast<uint32_t>(
+      std::fabs(std::difftime(current_date, start_date))));
+
+  const uint32_t past_period_in_days =
+      diff_consent_and_current_dates / date_time::SECONDS_IN_DAY;
+
+  return past_period_in_days;
+}
+
 }  // namespace date_time
diff --git a/src/components/utils/src/file_system.cc b/src/components/utils/src/file_system.cc
index 430cf40da0..015dc25a22 100644
--- a/src/components/utils/src/file_system.cc
+++ b/src/components/utils/src/file_system.cc
@@ -47,80 +47,116 @@
 #include <cstdio>
 #include <fstream>
 
-CREATE_LOGGERPTR_GLOBAL(logger_, "Utils")
+CREATE_LOGGERPTR_GLOBAL(logger_, "Utils::FileSystem")
 
 // Easier reference
 namespace fs = boost::filesystem;
 using boost::system::error_code;
 
 uint64_t file_system::GetAvailableDiskSpace(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  fs::space_info si = fs::space(path, ec);
+  fs::space_info si = {0, 0, 0};
+  si = fs::space(path, ec);
 
   if (ec) {
     // If something went wrong, assume no free space
-    return 0;
-  } else {
-    return si.free;
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to get available disk space: '"
+                                 << path << "', reason: " << ec.message());
   }
+  return si.free;
 }
 
 uint64_t file_system::FileSize(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
   // Boost returns sizes as unsigned
-  uint64_t fsize = (uint64_t)fs::file_size(path, ec);
+  const uint64_t fsize = static_cast<uint64_t>(fs::file_size(path, ec));
 
   if (ec) {
-    LOG4CXX_WARN_WITH_ERRNO(logger_, "Could not get file size: " << path);
+    LOG4CXX_ERROR_WITH_ERRNO(
+        logger_,
+        "Unable to get file size: '" << path << "', reason: " << ec.message());
     return 0;
   }
   return fsize;
 }
 
 size_t file_system::DirectorySize(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
   size_t dir_size = 0;
   error_code ec;
   // Recursively iterate through directory to accumulate file sizes
   fs::recursive_directory_iterator iter(path, ec);
-  // Directory does not exist
   if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to get directory size: '"
+                                 << path << "', reason: " << ec.message());
     return 0;
   }
+
   // default constructor gives end iterator
   fs::recursive_directory_iterator end;
-  while (iter != end) {
-    size_t fsize = fs::file_size(iter->path(), ec);
-    // No error means we can add the file
-    if (!ec) {
-      dir_size += fsize;
+  while (end != iter) {
+    const bool is_directory = fs::is_directory(iter->path(), ec);
+    if (ec) {
+      LOG4CXX_WARN_WITH_ERRNO(
+          logger_,
+          "Failed check if '" << iter->path()
+                              << "' is directory, reason: " << ec.message());
+    }
+
+    if (!is_directory && !ec) {
+      const size_t fsize = fs::file_size(iter->path(), ec);
+      if (ec) {
+        LOG4CXX_WARN_WITH_ERRNO(logger_,
+                                "Failed to get file_size: '"
+                                    << path << "', reason: " << ec.message());
+      } else {
+        // No error means we can add the file
+        dir_size += fsize;
+        LOG4CXX_DEBUG(logger_, "Adding: " << fsize << ", total: " << dir_size);
+      }
+    }
+
+    // Increment the iterator to point to next entry in recursive iteration
+    iter.increment(ec);
+    if (ec) {
+      LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                               "Failed to increment iterator for path '"
+                                   << path << "', reason: " << ec.message());
+      return dir_size;
     }
-    iter++;  // next entry
   }
+
   return dir_size;
 }
 
 // NOTE that boost makes 0777 permissions by default
-std::string file_system::CreateDirectory(const std::string& name) {
+bool file_system::CreateDirectory(const std::string& name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  bool success = fs::create_directory(name, ec);
+  const bool success = fs::create_directory(name, ec);
   if (!success || ec) {
     LOG4CXX_WARN_WITH_ERRNO(logger_, "Unable to create directory: " << name);
   } else {
     // Set 0700 permissions to maintain previous API
     fs::permissions(name, fs::perms::owner_all, ec);
   }
-  return name;
+  return success;
 }
 
 bool file_system::CreateDirectoryRecursively(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
   // Create directory and all parents
   fs::create_directories(path, ec);
 
   if (ec) {
-    LOG4CXX_WARN_WITH_ERRNO(logger_,
-                            "Unable to create directory recursively: "
-                                << path << " reason: " << ec.message());
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to create directory recursively: '"
+                                 << path << "', reason: " << ec.message());
 
     return false;
   }
@@ -129,23 +165,44 @@ bool file_system::CreateDirectoryRecursively(const std::string& path) {
 }
 
 bool file_system::IsDirectory(const std::string& name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  return fs::is_directory(name, ec);
+  const bool is_directory = fs::is_directory(name, ec);
+  if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to check if it is directory: "
+                                 << name << " reason: " << ec.message());
+  }
+  return is_directory;
 }
+
 // NOTE this may be a duplicate of IsDirectory since it already checks
 // existence
 bool file_system::DirectoryExists(const std::string& name) {
-  return FileExists(name) && IsDirectory(name);
+  LOG4CXX_AUTO_TRACE(logger_);
+  const bool exists = FileExists(name) && IsDirectory(name);
+  LOG4CXX_DEBUG(
+      logger_,
+      "Directory '" << name << "' " << (exists ? "exists" : "NOT exists"));
+  return exists;
 }
 
 bool file_system::FileExists(const std::string& name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  return fs::exists(name, ec);
+  const bool exists = fs::exists(name, ec);
+  if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to check that file exists: "
+                                 << name << " reason: " << ec.message());
+  }
+  return exists;
 }
 
 bool file_system::Write(const std::string& file_name,
                         const std::vector<uint8_t>& data,
                         std::ios_base::openmode mode) {
+  LOG4CXX_AUTO_TRACE(logger_);
   std::ofstream file(file_name.c_str(), std::ios_base::binary | mode);
   if (file.is_open()) {
     for (uint32_t i = 0; i < data.size(); ++i) {
@@ -159,6 +216,7 @@ bool file_system::Write(const std::string& file_name,
 
 std::ofstream* file_system::Open(const std::string& file_name,
                                  std::ios_base::openmode mode) {
+  LOG4CXX_AUTO_TRACE(logger_);
   std::ofstream* file = new std::ofstream();
   file->open(file_name.c_str(), std::ios_base::binary | mode);
   if (file->is_open()) {
@@ -166,12 +224,13 @@ std::ofstream* file_system::Open(const std::string& file_name,
   }
 
   delete file;
-  return NULL;
+  return nullptr;
 }
 
 bool file_system::Write(std::ofstream* const file_stream,
                         const uint8_t* data,
                         uint32_t data_size) {
+  LOG4CXX_AUTO_TRACE(logger_);
   bool result = false;
   if (file_stream) {
     for (size_t i = 0; i < data_size; ++i) {
@@ -183,69 +242,105 @@ bool file_system::Write(std::ofstream* const file_stream,
 }
 
 void file_system::Close(std::ofstream* file_stream) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (file_stream) {
     file_stream->close();
   }
 }
 
 std::string file_system::CurrentWorkingDirectory() {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  fs::path currpath = fs::current_path(ec);
+  const fs::path currpath = fs::current_path(ec);
   if (ec) {
-    LOG4CXX_WARN(logger_, "Could not get CWD");
+    LOG4CXX_WARN_WITH_ERRNO(logger_,
+                            "Unable to get current working directory: '"
+                                << currpath << "' reason: " << ec.message());
   }
   return currpath.string();
 }
 
 std::string file_system::GetAbsolutePath(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
   error_code ec;
-  fs::path absolute = fs::canonical(path, ec);
+  const fs::path absolute = fs::canonical(path, ec);
   if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to get absolute path: '"
+                                 << path << "', reason: " << ec.message());
     return std::string();  // invalid path
   }
   return absolute.string();
 }
 
 bool file_system::IsFileNameValid(const std::string& file_name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   return file_name.end() == std::find(file_name.begin(), file_name.end(), '/');
 }
 
 // Does not remove if file is write-protected
 bool file_system::DeleteFile(const std::string& name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (FileExists(name) && IsAccessible(name, W_OK)) {
     error_code ec;
-    bool success = fs::remove(name.c_str(), ec);
+    const bool success = fs::remove(name.c_str(), ec);
+    if (ec) {
+      LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                               "Unable to delete file: '"
+                                   << name << "', reason: " << ec.message()
+                                   << "success: " << success);
+    }
+
     return success && !ec;
   }
+  LOG4CXX_WARN(
+      logger_,
+      "Unable to delete file either doesn't exist or is not accessible");
   return false;
 }
 
 void file_system::remove_directory_content(const std::string& directory_name) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
   error_code ec;
   fs::directory_iterator dir_iter(directory_name, ec);
-
   if (ec) {
-    LOG4CXX_WARN_WITH_ERRNO(logger_,
-                            "Unable to empty directory: " << directory_name);
+    LOG4CXX_ERROR_WITH_ERRNO(
+        logger_,
+        "Unable to remove directory contents: " << directory_name
+                                                << " reason: " << ec.message());
   }
 
   // According to Boost's documentation, removing shouldn't invalidate the
   // iterator, although it may cause the removed entry to appear again,
   // duplicating the warning message. See here:
   // https://www.boost.org/doc/libs/1_67_0/libs/filesystem/doc/reference.html#Class-directory_iterator
-  for (auto& dirent : dir_iter) {
-    fs::remove_all(dirent, ec);
+  const fs::directory_iterator end;
+  while (dir_iter != end) {
+    fs::remove_all(dir_iter->path(), ec);
     if (ec) {
-      LOG4CXX_WARN_WITH_ERRNO(
-          logger_, "Unable to remove file: " << dirent.path().string());
+      LOG4CXX_ERROR_WITH_ERRNO(
+          logger_,
+          "Unable to remove file: " << dir_iter->path().string() << " reason "
+                                    << ec.message());
+    }
+    dir_iter.increment(ec);
+    if (ec) {
+      LOG4CXX_ERROR_WITH_ERRNO(
+          logger_, "Unable to increment dir_iter: reason " << ec.message());
+      break;
     }
   }
 }
 
 bool file_system::RemoveDirectory(const std::string& directory_name,
-                                  bool is_recursively) {
+                                  const bool is_recursively) {
+  LOG4CXX_AUTO_TRACE(logger_);
   // Make sure the directory exists
   if (!DirectoryExists(directory_name) && IsAccessible(directory_name, W_OK)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Unable to remove directory either doesn't exist or is not accessible");
     return false;
   }
   error_code ec;
@@ -253,42 +348,67 @@ bool file_system::RemoveDirectory(const std::string& directory_name,
   // If recursive, just force full remove
   if (is_recursively) {
     success = (fs::remove_all(directory_name, ec) != 0);
+    if (ec) {
+      LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                               "Unable to remove all: '" << directory_name
+                                                         << "', reason "
+                                                         << ec.message());
+    }
   } else {
     // Otherwise try to remove
     success = fs::remove(directory_name, ec);
+    if (ec) {
+      LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                               "Unable to remove: '" << directory_name
+                                                     << "', reason "
+                                                     << ec.message());
+    }
   }
   return success && !ec;
 }
 
-bool file_system::IsAccessible(const std::string& name, int32_t how) {
+bool file_system::IsAccessible(const std::string& name, const int32_t how) {
+  LOG4CXX_AUTO_TRACE(logger_);
   return !access(name.c_str(), how);
 }
 
 bool file_system::IsWritingAllowed(const std::string& name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   return IsAccessible(name, W_OK);
 }
 
 bool file_system::IsReadingAllowed(const std::string& name) {
+  LOG4CXX_AUTO_TRACE(logger_);
   return IsAccessible(name, R_OK);
 }
 
 std::vector<std::string> file_system::ListFiles(
     const std::string& directory_name) {
-  error_code ec;
-
-  fs::directory_iterator dir_iter(directory_name, ec);
-  std::vector<std::string> listFiles;
+  LOG4CXX_AUTO_TRACE(logger_);
 
-  // In case the directory doesn't exist / can't be read, second check may be
-  // redundant
-  if (ec || !DirectoryExists(directory_name)) {
-    return listFiles;
+  error_code ec;
+  fs::directory_iterator iter(directory_name, ec), end;
+  if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(
+        logger_,
+        "Unable to get directory_iterator: " << directory_name << " reason "
+                                             << ec.message());
+    return std::vector<std::string>();
   }
 
-  for (auto& dirent : dir_iter) {
-    listFiles.push_back(dirent.path().filename().string());
+  std::vector<std::string> list_files;
+  while (end != iter) {
+    list_files.push_back(iter->path().filename().string());
+    iter.increment(ec);
+    if (ec) {
+      LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                               "Failed to increment iterator for path '"
+                                   << directory_name
+                                   << "', reason: " << ec.message());
+      return list_files;
+    }
   }
-  return listFiles;
+  return list_files;
 }
 
 bool file_system::WriteBinaryFile(const std::string& name,
@@ -302,17 +422,22 @@ bool file_system::WriteBinaryFile(const std::string& name,
 
 bool file_system::ReadBinaryFile(const std::string& name,
                                  std::vector<uint8_t>& result) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  LOG4CXX_DEBUG(logger_, "Filename: " << name);
   if (!FileExists(name) || !IsAccessible(name, R_OK)) {
+    LOG4CXX_ERROR(logger_, "Not able to read binary file: " << name);
     return false;
   }
 
-  std::ifstream file(name.c_str(), std::ios_base::binary);
-  std::ostringstream ss;
-  ss << file.rdbuf();
-  const std::string s = ss.str();
+  std::ifstream file(name.c_str(), std::ios::in | std::ios_base::binary);
+  if (!file.is_open()) {
+    return false;
+  }
+
+  std::vector<uint8_t> content((std::istreambuf_iterator<char>(file)),
+                               std::istreambuf_iterator<char>());
+  result.swap(content);
 
-  result.resize(s.length());
-  std::copy(s.begin(), s.end(), result.begin());
   return true;
 }
 
@@ -321,12 +446,16 @@ bool file_system::ReadBinaryFile(const std::string& name,
                                  uint32_t offset,
                                  uint32_t length) {
   if (!FileExists(name) || !IsAccessible(name, R_OK)) {
+    LOG4CXX_ERROR(logger_, "Not able to read binary file: " << name);
     return false;
   }
 
   std::ifstream file(name.c_str(), std::ios_base::binary);
+  if (!file.is_open()) {
+    return false;
+  }
+
   file.ignore(offset);
-  std::ostringstream ss;
   std::string s;
   s.resize(length);
   file.read(&s[0], length);
@@ -337,11 +466,16 @@ bool file_system::ReadBinaryFile(const std::string& name,
 }
 
 bool file_system::ReadFile(const std::string& name, std::string& result) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!FileExists(name) || !IsAccessible(name, R_OK)) {
+    LOG4CXX_ERROR(logger_, "Not able to read file: " << name);
     return false;
   }
-
   std::ifstream file(name.c_str());
+  if (!file) {
+    LOG4CXX_ERROR(logger_, "Not able to open binary file: " << name);
+    return false;
+  }
   std::ostringstream ss;
   ss << file.rdbuf();
   result = ss.str();
@@ -349,53 +483,66 @@ bool file_system::ReadFile(const std::string& name, std::string& result) {
 }
 
 const std::string file_system::ConvertPathForURL(const std::string& path) {
-  std::string::const_iterator it_path = path.begin();
-  std::string::const_iterator it_path_end = path.end();
-
+  LOG4CXX_AUTO_TRACE(logger_);
   const std::string reserved_symbols = "!#$&'()*+,:;=?@[] ";
   size_t pos = std::string::npos;
   std::string converted_path;
 
-  for (; it_path != it_path_end; ++it_path) {
-    pos = reserved_symbols.find_first_of(*it_path);
+  for (const auto symbol : path) {
+    pos = reserved_symbols.find_first_of(symbol);
     if (pos != std::string::npos) {
       const size_t size = 100;
       char percent_value[size];
-      snprintf(percent_value, size, "%%%x", *it_path);
+      snprintf(percent_value, size, "%%%x", symbol);
       converted_path += percent_value;
     } else {
-      converted_path += *it_path;
+      converted_path += symbol;
     }
   }
   return converted_path;
 }
 
 bool file_system::CreateFile(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
   std::ofstream file(path);
   if (!(file.is_open())) {
+    LOG4CXX_WARN(logger_, "failed to create file: " << path);
     return false;
-  } else {
-    file.close();
-    return true;
   }
+  file.close();
+  return true;
 }
 
 time_t file_system::GetFileModificationTime(const std::string& path) {
+  LOG4CXX_AUTO_TRACE(logger_);
+
   error_code ec;
   std::time_t time = fs::last_write_time(path, ec);
   if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(logger_,
+                             "Unable to get file modification time: "
+                                 << path << " reason " << ec.message());
+
     return 0;
   }
   return time;
 }
 
 bool file_system::CopyFile(const std::string& src, const std::string& dst) {
+  LOG4CXX_AUTO_TRACE(logger_);
   if (!FileExists(src) || FileExists(dst) || !CreateFile(dst)) {
+    LOG4CXX_WARN(
+        logger_,
+        "Failed to copy file from: '" << src << "', to: '" << dst << "'");
     return false;
   }
   error_code ec;
   fs::copy_file(src, dst, ec);
   if (ec) {
+    LOG4CXX_ERROR_WITH_ERRNO(
+        logger_,
+        "Unable to copy file: '" << src << "', reason: " << ec.message());
     // something failed
     return false;
   }
@@ -403,7 +550,7 @@ bool file_system::CopyFile(const std::string& src, const std::string& dst) {
 }
 
 bool file_system::MoveFile(const std::string& src, const std::string& dst) {
-  error_code ec;
+  LOG4CXX_AUTO_TRACE(logger_);
 
   if (std::rename(src.c_str(), dst.c_str()) == 0) {
     return true;
@@ -413,9 +560,15 @@ bool file_system::MoveFile(const std::string& src, const std::string& dst) {
   // Instead, copy the file over and delete the old one
   bool success = CopyFile(src, dst);
   if (!success) {
+    LOG4CXX_ERROR(
+        logger_,
+        "Failed to copy file from: '" << src << "', to: '" << dst << "'");
+    return false;
+  }
+  success = DeleteFile(src);
+  if (!success) {
+    LOG4CXX_ERROR(logger_, "Failed to delete file '" << src << "'");
     return false;
   }
-  DeleteFile(src);
-
   return true;
 }
diff --git a/src/components/utils/src/jsoncpp_reader_wrapper.cc b/src/components/utils/src/jsoncpp_reader_wrapper.cc
new file mode 100644
index 0000000000..69da386eed
--- /dev/null
+++ b/src/components/utils/src/jsoncpp_reader_wrapper.cc
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019, Ford Motor Company
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * Neither the name of the Ford Motor Company nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "utils/jsoncpp_reader_wrapper.h"
+#include "utils/logger.h"
+
+namespace utils {
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "JsoncppReaderWrapper")
+
+JsonReader::JsonReader() {
+  reader_ = std::unique_ptr<Json::CharReader>(reader_builder_.newCharReader());
+}
+
+bool JsonReader::parse(const std::string& json, Json::Value* root) {
+  LOG4CXX_AUTO_TRACE(logger_);
+  JSONCPP_STRING err;
+  bool is_parsing_ok = false;
+  const size_t json_len = json.length();
+  try {
+    is_parsing_ok =
+        reader_->parse(json.c_str(), json.c_str() + json_len, root, &err);
+  } catch (Json::RuntimeError& e) {
+    LOG4CXX_DEBUG(logger_, "Exception caught during parse json: " << e.what());
+    return false;
+  }
+
+  if (!is_parsing_ok) {
+    LOG4CXX_ERROR(logger_, "Json parsing fails: " << err);
+  }
+  return is_parsing_ok;
+}
+}  // namespace utils
diff --git a/src/components/utils/src/logger.cc b/src/components/utils/src/logger.cc
index 2a4b8eb108..5a7922afc4 100644
--- a/src/components/utils/src/logger.cc
+++ b/src/components/utils/src/logger.cc
@@ -39,11 +39,8 @@ void deinit_logger() {
   CREATE_LOGGERPTR_LOCAL(logger_, "Utils")
   LOG4CXX_DEBUG(logger_, "Logger deinitialization");
   logger::set_logs_enabled(false);
-  if (logger::logger_status == logger::LoggerThreadCreated) {
-    logger::flush_logger();
-  }
-  logger::delete_log_message_loop_thread();
   log4cxx::LoggerPtr rootLogger = log4cxx::Logger::getRootLogger();
+  logger::delete_log_message_loop_thread(rootLogger);
   log4cxx::spi::LoggerRepositoryPtr repository =
       rootLogger->getLoggerRepository();
   log4cxx::LoggerList loggers = repository->getCurrentLoggers();
diff --git a/src/components/utils/src/push_log.cc b/src/components/utils/src/push_log.cc
index 6e16c99181..f9d1cd738a 100644
--- a/src/components/utils/src/push_log.cc
+++ b/src/components/utils/src/push_log.cc
@@ -36,8 +36,21 @@
 
 namespace logger {
 
-static bool logs_enabled_ = false;
-static LogMessageLoopThread* log_message_loop_thread = NULL;
+struct __attribute__((visibility("default"))) LogsEnabled {
+  static std::atomic_bool logs_enabled_;
+};
+
+std::atomic_bool LogsEnabled::logs_enabled_(false);
+
+template <typename T>
+using logger_ptr = std::unique_ptr<T, std::function<void(T*)> >;
+
+static logger_ptr<LogMessageLoopThread> log_message_loop_thread;
+
+auto deinit_logger = [](LogMessageLoopThread* logMsgThread) {
+  delete logMsgThread;
+  logger::logger_status = logger::LoggerThreadNotCreated;
+};
 
 bool push_log(log4cxx::LoggerPtr logger,
               log4cxx::LevelPtr level,
@@ -73,22 +86,46 @@ bool push_log(log4cxx::LoggerPtr logger,
 }
 
 bool logs_enabled() {
-  return logs_enabled_;
+  return LogsEnabled::logs_enabled_;
 }
 
 void set_logs_enabled(bool state) {
-  logs_enabled_ = state;
+  LogsEnabled::logs_enabled_ = state;
 }
 
 void create_log_message_loop_thread() {
   if (!log_message_loop_thread) {
-    log_message_loop_thread = new LogMessageLoopThread();
+    log_message_loop_thread = logger_ptr<LogMessageLoopThread>(
+        new LogMessageLoopThread, deinit_logger);
   }
 }
 
-void delete_log_message_loop_thread() {
-  delete log_message_loop_thread;
-  log_message_loop_thread = NULL;
+void delete_log_message_loop_thread(log4cxx::LoggerPtr& logger) {
+  if (logger::logger_status == logger::LoggerThreadCreated) {
+    logger::flush_logger();
+  }
+
+  log_message_loop_thread.reset();
+
+  if (LOG4CXX_UNLIKELY(logger->isDebugEnabled())) {
+    ::log4cxx::helpers::MessageBuffer oss_;
+    logger->forcedLog(::log4cxx::Level::getDebug(),
+                      oss_.str(oss_ << "Logger loop thread deinitialized"),
+                      LOG4CXX_LOCATION);
+  }
+
+  if (logger->getRootLogger() == logger) {
+    return;
+  }
+
+  if (LOG4CXX_UNLIKELY(logger->isDebugEnabled())) {
+    ::log4cxx::helpers::MessageBuffer oss_;
+    logger->forcedLog(::log4cxx::Level::getDebug(),
+                      oss_.str(oss_ << "Logger calling removeAllAppenders"),
+                      LOG4CXX_LOCATION);
+  }
+
+  logger->removeAllAppenders();
 }
 
 void flush_logger() {
diff --git a/src/components/utils/src/signals_posix.cc b/src/components/utils/src/signals_posix.cc
index 8d1134576f..9b23aba804 100644
--- a/src/components/utils/src/signals_posix.cc
+++ b/src/components/utils/src/signals_posix.cc
@@ -83,7 +83,7 @@ pid_t Signals::Fork() {
 }
 
 void Signals::ExitProcess(const int status) {
-  exit(status);
+  _Exit(status);
 }
 
 void Signals::WaitPid(pid_t cpid, int* status, int options) {
diff --git a/src/components/utils/src/timer.cc b/src/components/utils/src/timer.cc
index 8e854654de..582458e5c4 100644
--- a/src/components/utils/src/timer.cc
+++ b/src/components/utils/src/timer.cc
@@ -222,6 +222,5 @@ void timer::Timer::TimerDelegate::threadMain() {
 }
 
 void timer::Timer::TimerDelegate::exitThreadMain() {
-  sync_primitives::AutoLock auto_lock(state_lock_ref_);
   state_condition_.NotifyOne();
 }
diff --git a/src/components/utils/test/CMakeLists.txt b/src/components/utils/test/CMakeLists.txt
index f6bd24ff09..b5127ccabc 100644
--- a/src/components/utils/test/CMakeLists.txt
+++ b/src/components/utils/test/CMakeLists.txt
@@ -87,7 +87,7 @@ collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}")
 set(LIBRARIES
   gmock
   Utils
-  Policy
+  PolicyStatic
   ConfigProfile
 )
 
diff --git a/src/components/utils/test/test_generator/CMakeLists.txt b/src/components/utils/test/test_generator/CMakeLists.txt
index 5a7f939659..cd4243930a 100644
--- a/src/components/utils/test/test_generator/CMakeLists.txt
+++ b/src/components/utils/test/test_generator/CMakeLists.txt
@@ -41,8 +41,8 @@ include_directories (
 
 set(XML_NAME ${CMAKE_SOURCE_DIR}/src/components/interfaces/MOBILE_API.xml)
 add_custom_target(generate_version
-  COMMAND ${INTEFRACE_GENERATOR_CMD} ${XML_NAME} "mobile_apis"
-  ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "sdlrpcv2"
+  COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${XML_NAME}" "--namespace" "mobile_apis"
+  "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "sdlrpcv2" "-y"
   DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${XML_NAME}
   VERBATIM
 )
diff --git a/third_party.md b/third_party.md
index 249d58fade..0737d7a657 100644
--- a/third_party.md
+++ b/third_party.md
@@ -1,9 +1,9 @@
 ### SDL CORE
 
-Copyright (C) 2018 SmartDeviceLink Consortium, Inc.
+Copyright (C) 2018 - 2020, SmartDeviceLink Consortium, Inc.
 
 #### License
-Copyright (c) 2017 - 2018, SmartDeviceLink Consortium, Inc.
+Copyright (c) 2017 - 2020, SmartDeviceLink Consortium, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -41,12 +41,11 @@ The third party software included and used by this project is:
 * The library is included in the Google Mock class generator
 * See [https://github.com/google/googletest/tree/master/googlemock](https://github.com/google/googletest/tree/master/googlemock)
 
-**json-cpp 0.6.0 rc2**
+**json-cpp 1.9.2**
 
-* Copyright (c) 2007-2010 Baptiste Lepilleur
-* Licensed under MIT License
-* The library is included in jsoncpp 3rd party static src folder
-* See [https://github.com/open-source-parsers/jsoncpp/releases/tag/svn-release-0.6.0-rc2](https://github.com/open-source-parsers/jsoncpp/releases/tag/svn-release-0.6.0-rc2)
+* Any copyright is dedicated to the Public Domain 
+* The library is included as a git submodule in jsoncpp 3rd party static src folder
+* See [https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.2](https://github.com/open-source-parsers/jsoncpp/releases/tag/1.9.2)
 
 **Apache log4cxx 0.10.0**
 
diff --git a/tools/InterfaceGenerator/Generator.py b/tools/InterfaceGenerator/Generator.py
index 932620c153..6f90f62e71 100755
--- a/tools/InterfaceGenerator/Generator.py
+++ b/tools/InterfaceGenerator/Generator.py
@@ -16,108 +16,161 @@ optional arguments:
   --parser-type {sdlrpcv2}
 """
 
-import os.path
-import argparse
-import errno
+import os
+import re
 import sys
-
-import generator.parsers.SDLRPCV1
-import generator.parsers.SDLRPCV2
-import generator.parsers.JSONRPC
-import generator.generators.SmartFactorySDLRPC
-import generator.generators.SmartFactoryJSONRPC
-import MsgVersionGenerate
-
-from generator.parsers.RPCBase import ParseError
-from generator.generators.SmartFactoryBase import GenerateError
-
-SUPPORTED_FORMATS = {
-    "sdlrpcv1": (generator.parsers.SDLRPCV1.Parser,
-                 generator.generators.SmartFactorySDLRPC.CodeGenerator),
-    "sdlrpcv2": (generator.parsers.SDLRPCV2.Parser,
-                 generator.generators.SmartFactorySDLRPC.CodeGenerator),
-    "jsonrpc": (generator.parsers.JSONRPC.Parser,
-                generator.generators.SmartFactoryJSONRPC.CodeGenerator)
-}
-
-
-def _create_parser():
-    """Create parser for parsing command-line arguments.
-
-    Returns an instance of argparse.ArgumentParser
-
-    """
-
-    parser = argparse.ArgumentParser(
-        description="SmartSchema interface generator"
-    )
-    parser.add_argument("source-xml")
-    parser.add_argument("namespace")
-    parser.add_argument("output-dir")
-    parser.add_argument("--parser-type",
-                        choices=SUPPORTED_FORMATS.keys(),
-                        required=True)
-    return parser
-
-
-def _handle_fatal_error(error):
-    """Handle fatal error during parsing or code generation.
-
-    Keyword arguments:
-    error -- base exception to handle.
+from argparse import ArgumentParser
+from pathlib import Path
+
+ROOT = Path(__file__).absolute().parents[1]
+sys.path.append(ROOT.joinpath('rpc_spec/InterfaceParser').as_posix())
+
+try:
+    from model.interface import Interface
+    from parsers import sdl_rpc_v2
+    from parsers.parse_error import ParseError
+    from MsgVersionGenerate import generate_msg_version
+    from generator.generators import SmartFactorySDLRPC, SmartFactoryJSONRPC, PolicyTypes
+    from generator.generators.SmartFactoryBase import GenerateError
+    from generator.parsers import SDLRPCV1, JSONRPC
+except ModuleNotFoundError as error:
+    print(str(error) + '\nPlease make sure the RPC Spec Generator Submodule is initialized.\n'
+                       'Check the sdl_core source directory in `tools/rpc_spec`.\n'
+                       'Try running in the source directory:\n'
+                       '$ git submodule init\n'
+                       '$ git submodule update')
+    sys.exit(1)
+
+
+class Generator:
+    """Generator application that generates c++ interfaces code from xml description
 
     """
 
-    print(error.message)
-    print
-    sys.exit(errno.EINVAL)
-
-def main():
-    """Main function of the generator that does actual work."""
-
-    args = vars(_create_parser().parse_args())
-
-    src_xml = args["source-xml"]
-    src_xml_name = os.path.splitext(os.path.basename(src_xml))[0]
-    namespace = args["namespace"]
-    output_dir = args["output-dir"]
-    parser_type = args["parser_type"]
-
-    print("""
+    def __init__(self):
+        self._supported_formats = {
+            'sdlrpcv1': (SDLRPCV1.Parser, SmartFactorySDLRPC.CodeGenerator),
+            'sdlrpcv2': (sdl_rpc_v2.Parser, SmartFactorySDLRPC.CodeGenerator),
+            'jsonrpc': (JSONRPC.Parser, SmartFactoryJSONRPC.CodeGenerator),
+            'mobile-policy-types': (sdl_rpc_v2.Parser, PolicyTypes.CodeGenerator),
+            'hmi-policy-types': (JSONRPC.Parser, PolicyTypes.CodeGenerator)
+        }
+
+    @property
+    def supported_formats(self):
+        """
+        :return: dictionary with supported_formats
+        """
+        return self._supported_formats
+
+    def _create_parser(self):
+        """
+        Parsing command-line arguments, or evaluating required Paths interactively.
+        :return: an instance of argparse.ArgumentParser
+        """
+        if len(sys.argv) == 2 and sys.argv[1] in ('-v', '--version'):
+            print('1.0.0')
+            sys.exit(0)
+
+        parser = ArgumentParser(description='Proxy Library RPC Generator')
+        parser.add_argument('-xml', '--source-xml', '--input-file', required=True,
+                            help='should point to MOBILE_API.xml')
+        parser.add_argument('-ns', '--namespace', required=True)
+        parser.add_argument('-d', '-o', '--output-dir', required=True,
+                            help='define the place where the generated output should be placed')
+        parser.add_argument('-t', '--parser-type', required=True, choices=self.supported_formats.keys())
+        parser.add_argument('-v', '--version', action='store_true', help='print the version and exit')
+        parser.add_argument('-r', '--regex-pattern', required=False,
+                            help='only elements matched with defined regex pattern will be parsed and generated')
+        parser.add_argument('--verbose', action='store_true', help='display additional details like logs etc')
+        parser.add_argument('-e', '--enums', required=False, action='store_true',
+                            help='only specified elements will be generated, if present')
+        parser.add_argument('-s', '--structs', required=False, action='store_true',
+                            help='only specified elements will be generated, if present')
+        parser.add_argument('-m', '-f', '--functions', required=False, action='store_true',
+                            help='only specified elements will be generated, if present')
+        parser.add_argument('-y', '--overwrite', action='store_true',
+                            help='force overwriting of existing files in output directory, ignore confirmation message')
+        parser.add_argument('-n', '--skip', action='store_true',
+                            help='skip overwriting of existing files in output directory, ignore confirmation message')
+
+        args, unknown = parser.parse_known_args()
+
+        if unknown:
+            print('found unknown arguments: ' + ' '.join(unknown))
+            parser.print_help(sys.stderr)
+            sys.exit(1)
+
+        if args.skip and args.overwrite or not args.skip and not args.overwrite:
+            print('please select one option skip or overwrite')
+            sys.exit(1)
+
+        if not args.enums and not args.structs and not args.functions:
+            args.enums = args.structs = args.functions = True
+
+        return args
+
+    @staticmethod
+    def filter_pattern(interface, pattern):
+        """
+        Filtring model according to regex pattern
+        :param interface: Interface model
+        :param pattern: regex pattern
+        :return:
+        """
+        match = {i: {} for i in vars(interface).keys()}
+        match['params'] = interface.params
+        if pattern:
+            for key, value in vars(interface).items():
+                if key == 'params':
+                    continue
+                for name, item in value.items():
+                    if re.match(pattern, item.name):
+                        if key in match:
+                            match[key].update({name: item})
+        else:
+            return interface
+
+        return Interface(**match)
+
+    def main(self):
+        """Main function of the generator that does actual work."""
+
+        args = self._create_parser()
+
+        print("""
 Generating interface source code with following parameters:
     Source xml      : {0}
     Namespace       : {1}
     Output directory: {2}
     Parser type     : {3}
-""".format(src_xml, namespace, output_dir, parser_type))
+    overwrite       : {4}
+""".format(args.source_xml, args.namespace, args.output_dir, args.parser_type, args.overwrite))
 
-    # Select required parser and code generator
-    parser = SUPPORTED_FORMATS[parser_type][0]()
-    code_generator = SUPPORTED_FORMATS[parser_type][1]()
+        # Select required parser and code generator
+        parser = self.supported_formats[args.parser_type][0]()
+        code_generator = self.supported_formats[args.parser_type][1]()
 
-    # Convert incoming xml to internal model
-    try:
-        interface = parser.parse(args["source-xml"])
-    except ParseError as error:
-        _handle_fatal_error(error)
-
-    # Parse sdl version from MOBILE_API.xml and create source file with this version
-    if src_xml_name == "MOBILE_API":
+        # Convert incoming xml to internal model
         try:
-            MsgVersionGenerate.generate_msg_version(src_xml, output_dir)
-        except ParseError as error:
-            _handle_fatal_error(error)
+            interface = parser.parse(args.source_xml)
+            filtered = self.filter_pattern(interface, args.regex_pattern)
+            src_xml_name = os.path.splitext(os.path.basename(args.source_xml))[0]
+            # Parse sdl version from MOBILE_API.xml and create source file with this version
+            if src_xml_name == "MOBILE_API":
+                generate_msg_version(args.source_xml, args.output_dir)
+
+            # Generate SmartFactory source code from internal model
+            code_generator.generate(filtered,
+                                    src_xml_name,
+                                    args.namespace,
+                                    args.output_dir)
+        except (ParseError, GenerateError) as error1:
+            print(error1)
+            sys.exit(1)
 
-    # Generate SmartFactory source code from internal model
-    try:
-        code_generator.generate(interface,
-                                src_xml_name,
-                                namespace,
-                                output_dir)
-    except GenerateError as error:
-        _handle_fatal_error(error)
+        print('Done.')
 
-    print("Done.")
 
 if __name__ == '__main__':
-    main()
+    Generator().main()
diff --git a/tools/InterfaceGenerator/MsgVersionGenerate.py b/tools/InterfaceGenerator/MsgVersionGenerate.py
index 6ec0c40a68..85b3cfd38f 100644
--- a/tools/InterfaceGenerator/MsgVersionGenerate.py
+++ b/tools/InterfaceGenerator/MsgVersionGenerate.py
@@ -4,8 +4,10 @@ Generate file with major and minor msg_version.
 import xml.etree.ElementTree
 from string import Template
 import re
-from generator.parsers import RPCBase
- 
+
+from parsers.parse_error import ParseError
+
+
 def generate_msg_version(file_name, path_to_storage):
     """Parses MOBILE_API.xml in order to
     receive major_version, minor_version, and patch_version
@@ -33,9 +35,9 @@ def generate_msg_version(file_name, path_to_storage):
                 minimum_major_version,  minimum_minor_version,  minimum_patch_version)
             store_data_to_file(path_to_storage, data_for_storage)  
         else:
-            raise RPCBase.ParseError("Attribute version has incorect value in MOBILE_API.xml")
+            raise ParseError("Attribute version has incorect value in MOBILE_API.xml")
     else:
-        raise RPCBase.ParseError("Check MOBILE_API.xml file, parser can not find first element "
+        raise ParseError("Check MOBILE_API.xml file, parser can not find first element "
                                  " with tag interface or atribute version")
 
 def store_data_to_file(path_to_storage, data_for_storage):
@@ -53,7 +55,7 @@ def check_version_format(version):
     p = re.compile('\d+\\.\d+\\.\d+')
     result = p.match(version)
     if result == None or (result.end() != len(version)):
-        raise RPCBase.ParseError("Incorrect format of version please check MOBILE_API.xml. "
+        raise ParseError("Incorrect format of version please check MOBILE_API.xml. "
                                  "Need format of version major_version.minor_version.patch_version")
 
 
@@ -63,13 +65,13 @@ def check_minimum_version_format(version):
     p = re.compile('\d+\\.\d+\\.\d+|\d+\\.\d+')
     result = p.match(version)
     if result == None or (result.end() != len(version)):
-        raise RPCBase.ParseError("Incorrect format of version please check MOBILE_API.xml. "
+        raise ParseError("Incorrect format of version please check MOBILE_API.xml. "
                                  "Need format of minVersion major_version.minor_version or major_version.minor_version.patch_version")
 def prepare_data_for_storage(major_version, minor_version, patch_version, minimum_major_version, minimum_minor_version, minimum_patch_version):
     """Prepares data to store to file.
     """
     temp = Template(
-    u'''/*Copyright (c) 2016, Ford Motor Company\n'''
+    u'''/*Copyright (c) 2019, SmartDeviceLink Consortium, Inc.\n'''
     u'''All rights reserved.\n'''
     u'''Redistribution and use in source and binary forms, with or without\n'''
     u'''modification, are permitted provided that the following conditions are met:\n'''
@@ -79,9 +81,9 @@ def prepare_data_for_storage(major_version, minor_version, patch_version, minimu
     u'''this list of conditions and the following\n'''
     u'''disclaimer in the documentation and/or other materials provided with the\n'''
     u'''distribution.\n'''
-    u'''Neither the name of the Ford Motor Company nor the names of its contributors\n'''
-    u'''may be used to endorse or promote products derived from this software\n'''
-    u'''without specific prior written permission.\n'''
+    u'''Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its\n'''
+    u'''contributors may be used to endorse or promote products derived from this\n'''
+    u'''software without specific prior written permission.\n'''
     u'''THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"\n'''
     u'''AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n'''
     u'''IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n'''
diff --git a/tools/InterfaceGenerator/generator/Model.py b/tools/InterfaceGenerator/generator/Model.py
deleted file mode 100755
index e7cce732ed..0000000000
--- a/tools/InterfaceGenerator/generator/Model.py
+++ /dev/null
@@ -1,354 +0,0 @@
-"""Interface model.
-
-Interface model is represented by Interface class.
-Parser must provide an instance of this model as a result of parsing
-interface definition file.
-Generator must take an instance of this model as input for generating
-output files.
-"""
-
-# In this module there are classes that are used as data container
-# pylint: disable=R0903
-
-import collections
-
-
-class Boolean(object):
-
-    """Boolean type.
-
-    default_value -- default value
-
-    """
-
-    def __init__(self, default_value=None):
-        self.default_value = default_value
-
-
-class Integer(object):
-
-    """Integer type.
-
-    Instance variables:
-    min_value -- minimum allowed value
-    max_value -- maximum allowed value
-    default_value -- default value
-
-    """
-
-    def __init__(self, min_value=None, max_value=None, default_value=None):
-        self.min_value = min_value
-        self.max_value = max_value
-        self.default_value = default_value
-
-
-class Double(object):
-
-    """Floating-point type.
-
-    Instance variables:
-    min_value -- minimum allowed value
-    max_value -- maximum allowed value
-    default_value -- default value
-
-    """
-
-    def __init__(self, min_value=None, max_value=None, default_value=None):
-        self.min_value = min_value
-        self.max_value = max_value
-        self.default_value = default_value
-
-class String(object):
-
-    """String type.
-
-    Instance variables:
-    min_length -- minimum string length
-    max_length -- maximum string length
-    default_value -- default value
-
-    """
-
-    def __init__(self, min_length=None, max_length=None, default_value=None):
-        self.min_length = min_length
-        self.max_length = max_length
-        self.default_value = default_value
-
-
-class Array(object):
-
-    """Array type.
-
-    Instance variables:
-    min_size -- minimum array size
-    max_size -- maximum array size
-    element_type -- type of array element
-
-    """
-
-    def __init__(self, min_size=None, max_size=None, element_type=None):
-        self.min_size = min_size
-        self.max_size = max_size
-        self.element_type = element_type
-
-
-class Issue(object):
-
-    """Issue.
-
-    Instance variables:
-    creator -- issue creator
-    value -- issue text
-
-    """
-
-    def __init__(self, creator=None, value=None):
-        self.creator = creator
-        self.value = value
-
-
-class InterfaceItemBase(object):
-
-    """Base class for interface item.
-
-    Instance variables:
-    name -- item name
-    description -- list of string description elements
-    design_description -- list of string design description elements
-    issues -- list of issues
-    todos -- list of string todo elements
-    platform -- optional platform (string or None)
-    default_value -- default value
-    scope -- optional scope: internal, partner or none (none by defaul, means public)
-
-    """
-
-    def __init__(self, name, description=None, design_description=None,
-                 issues=None, todos=None, platform=None, default_value=None, scope=None,
-                 since=None, until=None, deprecated=None, removed=None, history=None):
-        self.name = name
-        self.description = description if description is not None else []
-        self.design_description = \
-            design_description if design_description is not None else []
-        self.issues = issues if issues is not None else []
-        self.todos = todos if todos is not None else []
-        self.platform = platform
-        self.default_value = default_value
-        self.scope = scope
-        self.since = since
-        self.until = until
-        self.deprecated = deprecated
-        self.removed = removed
-        self.history = history
-
-
-class EnumElement(InterfaceItemBase):
-
-    """Element of enumeration.
-
-    Instance variables:
-    internal_name -- internal name of an element must be used by a
-                     generator if it is provided (not None)
-    value -- optional element value
-
-    """
-
-    def __init__(self, name, description=None, design_description=None,
-                 issues=None, todos=None, platform=None, internal_name=None,
-                 value=None, since=None, until=None, deprecated=None, removed=None, history=None):
-        super(EnumElement, self).__init__(
-            name, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, history=history)
-        self.internal_name = internal_name
-        self.value = value
-        self.since = since
-        self.until = until
-        self.deprecated = deprecated
-        self.removed = removed
-
-
-    @property
-    def primary_name(self):
-        """Primary name of the EnumElement.
-
-        Return the 'internal_name' property if presented or 'name' property
-        otherwise.
-
-        """
-        return self.name if self.internal_name is None else self.internal_name
-
-
-class Enum(InterfaceItemBase):
-
-    """Enumeration.
-
-    Instance variables:
-    internal_scope -- optional internal scope
-    elements -- enumeration elements
-
-    """
-
-    def __init__(self, name, description=None, design_description=None,
-                 issues=None, todos=None, platform=None, internal_scope=None,
-                 elements=None, scope=None, since=None, until=None, deprecated=None, removed=None, history=None):
-        super(Enum, self).__init__(
-            name, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, scope=scope, history=history)
-
-        self.internal_scope = internal_scope
-        self.elements = \
-            elements if elements is not None else collections.OrderedDict()
-        self.since = since
-        self.until = until
-        self.deprecated = deprecated
-        self.removed = removed
-
-
-class EnumSubset(InterfaceItemBase):
-
-    """Enumeration subset.
-
-    Instance variables:
-    enum -- enumeration
-    allowed_elements -- dictionary of elements of enumeration
-                        which are allowed in this subset
-
-    """
-
-    def __init__(self, name, enum, description=None, design_description=None,
-                 issues=None, todos=None, platform=None,
-                 allowed_elements=None, since=None, until=None, deprecated=None, removed=None, history=None):
-        super(EnumSubset, self).__init__(
-            name, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, history=history)
-
-        self.enum = enum
-        self.allowed_elements = \
-            allowed_elements if allowed_elements is not None else {}
-        self.since = since
-        self.until = until
-        self.deprecated = deprecated
-        self.removed = removed
-
-
-class Param(InterfaceItemBase):
-
-    """Parameter.
-
-    Instance variables:
-    is_mandatory -- boolean value indicating whether
-                    this parameter is mandatory
-    param_type -- parameter type
-    default_value -- default value
-
-    """
-
-    def __init__(self, name, param_type, description=None,
-                 design_description=None, issues=None, todos=None,
-                 platform=None, is_mandatory=True, default_value=None, scope=None,
-                 since=None, until=None, deprecated=None, removed=None, history=None):
-        super(Param, self).__init__(
-            name, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, default_value=default_value, scope=scope, history=history)
-
-        self.is_mandatory = is_mandatory
-        self.param_type = param_type
-        self.default_value = default_value
-        self.since = since
-        self.until = until
-        self.deprecated = deprecated
-        self.removed=removed
-
-
-class FunctionParam(Param):
-
-    """Function parameter.
-
-    Instance variables:
-    default_value -- optional default value of this parameter
-
-    """
-
-    def __init__(self, name, param_type, description=None,
-                 design_description=None, issues=None, todos=None,
-                 platform=None, is_mandatory=True, default_value=None, scope=None,
-                 since=None, until=None, deprecated=None, removed=None, history=None):
-        super(FunctionParam, self).__init__(
-            name, param_type=param_type, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, is_mandatory=is_mandatory, default_value=default_value, 
-            scope=scope, since=since, until=until, deprecated=deprecated, removed=removed, history=history)
-
-        self.default_value = default_value
-
-
-class Struct(InterfaceItemBase):
-
-    """Structure.
-
-    Instance variables:
-    members -- dictionary of structure members (instances of Param class)
-
-    """
-
-    def __init__(self, name, description=None, design_description=None,
-                 issues=None, todos=None, platform=None, members=None, scope=None, 
-                 since=None, until=None, deprecated=None, removed=None, history=None):
-        super(Struct, self).__init__(
-            name, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, scope=scope, since=since, until=until,
-            deprecated=deprecated, removed=removed, history=history)
-
-        self.members = \
-            members if members is not None else collections.OrderedDict()
-
-
-class Function(InterfaceItemBase):
-
-    """Function.
-
-    Instance variables:
-    function_id -- function identifier (EnumElement from Enum "FunctionID")
-    message_type -- message type (EnumElement from Enum "messageType")
-    params -- function parameters
-
-    """
-
-    def __init__(self, name, function_id, message_type, description=None,
-                 design_description=None, issues=None, todos=None,
-                 platform=None, params=None, scope=None, since=None, until=None, deprecated=None, removed=None, history=None):
-        super(Function, self).__init__(
-            name, description=description,
-            design_description=design_description, issues=issues, todos=todos,
-            platform=platform, scope=scope, since=since, until=until, deprecated=deprecated, removed=removed, history=history)
-
-        self.function_id = function_id
-        self.message_type = message_type
-        self.params = \
-            params if params is not None else collections.OrderedDict()
-
-
-class Interface(object):
-
-    """Interface.
-
-    Instance variables:
-    enums -- dictionary of enumerations
-    structs -- dictionary of structures
-    functions -- dictionary of functions
-    params -- dictionary of interface parameters (name, version, etc.)
-
-    """
-
-    def __init__(self, enums=None, structs=None, functions=None, params=None):
-        self.enums = enums if enums is not None else collections.OrderedDict()
-        self.structs = \
-            structs if structs is not None else collections.OrderedDict()
-        self.functions = \
-            functions if functions is not None else collections.OrderedDict()
-        self.params = params if params is not None else {}
diff --git a/tools/InterfaceGenerator/generator/generators/PolicyTypes.py b/tools/InterfaceGenerator/generator/generators/PolicyTypes.py
new file mode 100644
index 0000000000..53c3062f30
--- /dev/null
+++ b/tools/InterfaceGenerator/generator/generators/PolicyTypes.py
@@ -0,0 +1,689 @@
+"""SmartFactory code generator base.
+
+Base of code generator for SmartFactory that provides SmartSchema object in
+accordance with given internal model.
+
+"""
+# pylint: disable=W0402
+# pylint: disable=C0302
+import codecs
+import os
+import string
+import uuid
+import re
+
+from model.enum import Enum
+from model.enum_element import EnumElement
+from model.function import Function
+
+
+class GenerateError(Exception):
+
+    """Generate error.
+
+    This exception is raised when generator is unable to create
+    output from given model.
+
+    """
+
+    pass
+
+def to_camel_case(snake_str):
+    components = snake_str.split('_')
+    return components[0].lower() + "".join(x.title() for x in components[1:])
+
+def to_snake_case(camel_str):
+    s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', camel_str)
+    return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1)
+
+class CodeGenerator(object):
+
+    """Base PolicyTypes generator.
+
+    This class provides service which allows to generate *.h files with types required for Policy
+
+    """
+
+    def __init__(self):
+        """Construct new object."""
+
+        self._generated_structs = []
+        self._structs_add_code = u""
+
+    def generate_vehicledatatype_names(self, enum):
+        template = string.Template('''static std::set<std::string> ${enum_name}_enum_names = { \n${values}\n};\n''')
+        enum_element_name = lambda enum_element: enum_element.internal_name if enum_element.internal_name else enum_element.name
+        values = ", \n".join(["  \"{}\"".format(enum_element_name(enum_element)) for enum_element in enum.elements.values()])
+        return template.substitute(enum_name=enum.name, values = values)
+
+    def generate_all_enum_values(self, enum):
+        template = string.Template('''static std::set<mobile_apis::${enum_name}::eType> ${enum_name}_all_enum_values = { \n${values}\n};\n''')
+        enum_element_name = lambda enum_element: enum_element.internal_name if enum_element.internal_name else enum_element.name
+        values = ", \n".join(["  mobile_apis::{}::{}".format(enum.name, enum_element_name(enum_element)) for enum_element in enum.elements.values()])
+        return template.substitute(enum_name=enum.name, values = values)
+
+    def generate_enums_schema_factory_content(self, enums):
+        return "\n".join([self._enum_factory_element_template.substitute(enum_name = enum.name) for enum in enums])
+
+    def generate_enums_schema_factory_impl(self, enums):
+        enums_values = ""
+        for enum in enums:
+            enums_values += "\n".join([self.generate_all_enum_values(enum)])
+            if enum.name == "VehicleDataType":
+                enums_values += "\n".join([self.generate_vehicledatatype_names(enum)])
+        return self._enum_factory_template.substitute(enums_values = enums_values,
+                                                      enum_factory_content = self.generate_enums_schema_factory_content(enums))
+
+    def generate_POD_types_schema_factory_impl(self, enums):
+        pod_types = {
+        "Integer" : "int32_t",
+        "Float" : "double",
+        }
+        '''if (enum_name == "DriverDistractionState") {
+                            return Get<mobile_apis::DriverDistractionState::eType>(DriverDistractionState_all_enum_values);
+                          }'''
+        enums_values = "\n".join([self.generate_all_enum_values(enum) for enum in enums])
+        return self._enum_factory_template.substitute(enums_values = enums_values,
+                                                      enum_factory_content = self.generate_enums_schema_factory_content(enums))
+
+    def generate(self, interface, filename, namespace, destination_dir):
+        """ Generate SmartFactory source files.
+
+        Generates source code files at destination directory in
+        accordance with given model in specified namespace.
+
+        Keyword arguments:
+        interface -- model of the interface to generate source code for.
+        filename -- name of initial XML file.
+        namespace -- name of destination namespace.
+        destination_dir -- directory to create source files.
+
+        """
+
+        if interface is None:
+            raise GenerateError("Given interface is None.")
+
+        params_set = set()
+        for func in interface.functions.values():
+            for param in func.params:
+                params_set.add(param)
+        parameter_enum = Enum('Parameter')
+        
+        for item in params_set:
+            parameter_enum.elements[item.upper()] = EnumElement(item)
+                
+
+        required_enums_for_policy = [
+            "HMILevel",
+            "FunctionID",
+            "HybridAppPreference",
+            "AppHMIType",
+            "RequestType",
+            "ModuleType",
+            "Common_AppPriority",
+            "Parameter"
+        ]
+
+        self.required_empty_value = [
+            "RequestType",
+            "ModuleType",
+            "Parameter"
+        ]
+
+        self.enum_items_naming_conversion_ = {
+            "HMILevel" :  lambda item_name : "HL_" + item_name.replace("HMI_", ""),
+            "AppHMIType" : lambda item_name : "AHT_" + item_name,
+            "FunctionID" : lambda item_name : item_name,
+            "HybridAppPreference" : lambda item_name : item_name,
+            "RequestType" : lambda item_name : "RT_" + item_name,
+            "ModuleType" : lambda item_name : "MT_" + item_name,
+            "Common_AppPriority" :  lambda item_name : "P_" + item_name if not item_name == "VOICE_COMMUNICATION" else "P_VOICECOM",
+            "Parameter" :  lambda item_name : "P_" + to_snake_case(item_name).upper()
+        }
+
+        self.enum_items_string_naming_conversion_ = {
+            "HMILevel" :  lambda item_name : item_name,
+            "AppHMIType" : lambda item_name : item_name,
+            "FunctionID" : lambda item_name : item_name[:item_name.rfind("ID")],
+            "HybridAppPreference" : lambda item_name : item_name,
+            "RequestType" : lambda item_name : item_name,
+            "ModuleType" : lambda item_name : item_name,
+            "Common_AppPriority" :  lambda item_name : item_name if not item_name == "VOICE_COMMUNICATION" else "VOICECOM",
+            "Parameter" :  lambda item_name : item_name
+        }
+
+        self.enum_naming_conversion_ = {
+            "HMILevel" : "HmiLevel",
+            "AppHMIType" : "AppHMIType",
+            "FunctionID" : "FunctionID",
+            "HybridAppPreference" : "HybridAppPreference",
+            "RequestType" : "RequestType",
+            "ModuleType" : "ModuleType",
+            "Common_AppPriority" : "Priority",
+            "Parameter" : "Parameter"
+        }
+
+
+        # In case if "." is in FunctionID name this is HMI_API function ID and should not be included in Policy  enums
+
+        required_enum_values = list(filter(lambda e: e.name in required_enums_for_policy
+                                    and "." not in list(e.elements.values())[0].name, list(interface.enums.values())))
+
+        if filename == "MOBILE_API":
+            self._write_cc_with_enum_schema_factory(filename, namespace, destination_dir, interface.enums.values())
+
+            # Params should be generated as enum for MOBILE_API to validate RPCSpec parameters
+            required_enum_values.append(parameter_enum)
+
+        self._write_header_with_enums(filename, namespace, destination_dir, required_enum_values)
+        self._write_cc_with_enums(filename, namespace, destination_dir, required_enum_values)
+
+    def _write_cc_with_enum_schema_factory(self,filename, namespace, destination_dir, required_enum_values):
+        class_name = u"generated_{0}_enum_schema_factory".format(filename)
+        header_file_name = '''policy/policy_table/policy_enum_schema_factory.h'''
+        cc_file_name = u"".join("{0}.cc".format(class_name))
+        if not os.path.exists(destination_dir):
+            os.makedirs(destination_dir)
+        print(os.path.join(destination_dir, cc_file_name))
+        with codecs.open(os.path.join(destination_dir, cc_file_name),
+                         encoding="utf-8",
+                         mode="w") as f_cc:
+            guard = u"_{0}_{1}_CC__".format( class_name.upper(),
+                    uuid.uuid1().hex.capitalize())
+            namespace_open, namespace_close = self._namespaces_strings(namespace)
+            includes = '''#include <set>\n'''\
+            '''#include "interfaces/MOBILE_API.h"\n'''\
+            '''#include "smart_objects/enum_schema_item.h"\n'''
+            f_cc.write(self._cc_file_template.substitute(
+                class_name=class_name,
+                header_file=header_file_name,
+                includes = includes,
+                namespace_open=namespace_open,
+                enums_content=self.generate_enums_schema_factory_impl(required_enum_values),
+                namespace_close=namespace_close))
+
+    def _write_header_with_enums(self,filename, namespace, destination_dir, required_enum_values):
+        class_name = u"generated_{0}_policy_types".format(filename)
+        header_file_name = u"".join("{0}.h".format(class_name))
+        if not os.path.exists(destination_dir):
+            os.makedirs(destination_dir)
+        with codecs.open(os.path.join(destination_dir, header_file_name),
+                         encoding="utf-8",
+                         mode="w") as f_h:
+            guard = u"_{0}_{1}_H__".format( class_name.upper(),
+                    uuid.uuid1().hex.capitalize())
+            namespace_open, namespace_close = self._namespaces_strings(namespace)
+            f_h.write(self._h_file_template.substitute(
+                class_name=class_name,
+                guard=guard,
+                includes="",
+                namespace_open=namespace_open,
+                enums_content=self._gen_enums(required_enum_values
+                    ),
+                namespace_close=namespace_close))
+
+    def _write_cc_with_enums(self,filename, namespace, destination_dir, required_enum_values):
+        class_name = u"generated_{0}_policy_types".format(filename)
+        header_file_name = u"".join("{0}.h".format(class_name))
+        cc_file_name = u"".join("{0}.cc".format(class_name))
+        if not os.path.exists(destination_dir):
+            os.makedirs(destination_dir)
+        with codecs.open(os.path.join(destination_dir, cc_file_name),
+                         encoding="utf-8",
+                         mode="w") as f_cc:
+            guard = u"_{0}_{1}_CC__".format( class_name.upper(),
+                    uuid.uuid1().hex.capitalize())
+            namespace_open, namespace_close = self._namespaces_strings(namespace)
+            f_cc.write(self._cc_file_template.substitute(
+                class_name=class_name,
+                header_file=header_file_name,
+                includes="",
+                namespace_open=namespace_open,
+                enums_content=self.gen_enums_processing(required_enum_values
+                    ),
+                namespace_close=namespace_close))
+
+    def _namespaces_strings(self, namespace):
+
+        """ Generate open and close namespaces strings
+
+        Generates source code for opening and close namespaces
+
+        Keyword arguments:
+        namespace -- name of destination namespace.
+
+        Returns:
+        Tuple with namespace open string and namespace close string
+        """
+
+        namespace_open = u""
+        namespace_close = u""
+        if namespace:
+            parts = namespace.split(u"::")
+            for part in parts:
+                namespace_open = u"".join(
+                    [namespace_open,
+                     self._namespace_open_template.substitute(name=part)])
+                namespace_close = u"".join(
+                    [namespace_close,
+                     "}} // {0}\n".format(part)])
+
+        return namespace_open, namespace_close
+
+
+    def _gen_enums(self, enums):
+        """Generate enums for header file.
+
+        Generates declaration of enumerations for the header file.
+
+        Keyword arguments:
+        enums -- list of enums to generate.
+
+        Returns:
+        String with enums declaration source code.
+
+        """
+
+        if enums is None:
+            raise GenerateError("Enums is None")
+
+        return u"\n".join([self._gen_enum(x) for x in enums])
+
+    def _gen_enum(self, enum):
+        """Generate enum for header file.
+
+        Generates declaration of enumeration for the header file.
+
+        Keyword arguments:
+        enum -- enum to generate.
+
+        Returns:
+        String with enum declaration source code.
+
+        """
+
+        enum_elements = enum.elements.values()
+        return self._enum_template.substitute(
+            comment=self._gen_comment(enum),
+            name=self.enum_naming_conversion_[enum.name],
+            enum_items=self._indent_code(self._gen_enum_elements(
+                enum_elements, enum.name), 1))
+
+    def _gen_enum_elements(self, enum_elements, enum_name):
+        """Generate enum elements for header file.
+
+        Generates declaration of enumeration elements for the header file.
+
+        Keyword arguments:
+        enum_elements -- list of enum elements to generate.
+
+        Returns:
+        String with enum elements declaration source code.
+
+        """
+        enum_elements = [self._gen_enum_element(x, enum_name)
+                              for x in enum_elements]
+        if (enum_name in self.required_empty_value):
+            enum_elements.append(self._gen_empty_enum_element(enum_name))
+        return u",\n\n".join(enum_elements)
+
+    def _gen_empty_enum_element(self, enum_name) :
+        return self._enum_element_with_value_template.substitute(
+                comment="",
+                name=self.enum_items_naming_conversion_[enum_name]("EMPTY"),
+                value=-1)
+
+    def _gen_enum_element(self, enum_element, enum_name):
+        """Generate enum element for header file.
+
+        Generates declaration of enumeration element for the header file.
+
+        Keyword arguments:
+        enum_element -- enum element to generate.
+
+        Returns:
+        String with enum element declaration source code.
+
+        """
+
+        if enum_element.value is not None:
+            return self._enum_element_with_value_template.substitute(
+                comment=self._gen_comment(enum_element),
+                name=self.enum_items_naming_conversion_[enum_name](enum_element.primary_name),
+                value=enum_element.value)
+        else:
+            return self._enum_element_with_no_value_template.substitute(
+                comment=self._gen_comment(enum_element),
+                name=self.enum_items_naming_conversion_[enum_name](enum_element.primary_name))
+
+    def gen_enums_processing(self, enums):
+        validation = "\n".join([self._gen_enum_validation(enum) for enum in enums])
+        to_json = "\n".join([self._gen_enum_to_json(enum) for enum in enums])
+        from_json = "\n".join([self._gen_enum_from_json(enum) for enum in enums])
+        return "\n".join([validation, to_json, from_json])
+
+    def _gen_enum_validation(self, enum):
+        return self._valiation_enum_template.substitute(
+            name = self.enum_naming_conversion_[enum.name],
+            enum_items = "\n".join([self._gen_enum_item_validation(enum_item.name, enum.name) for enum_item in enum.elements.values()])
+        )
+
+    def _gen_enum_item_validation(self, item_name, enum_name):
+        return self._valiation_enum_item_template.substitute(
+            name = self.enum_items_naming_conversion_[enum_name](item_name))
+
+    def _gen_enum_to_json(self, enum):
+        name = self.enum_naming_conversion_[enum.name]
+        enum_items = "\n".join([self._gen_enum_item_to_json(enum_item.name, enum.name) for enum_item in enum.elements.values()])
+        if (enum.name in self.required_empty_value):
+            enum_items+= "\n" + self._gen_enum_item_to_json("EMPTY", enum.name)
+        return self._enum_to_json_template.substitute(
+            name = name,
+            enum_items = enum_items
+        )
+
+    def _gen_enum_item_to_json(self, item_name, enum_name):
+        return self._enum_to_json_item_template.substitute(
+            name =  self.enum_items_naming_conversion_[enum_name](item_name),
+            string_name = self.enum_items_string_naming_conversion_[enum_name](item_name)
+            )
+
+
+    def _gen_enum_from_json(self, enum):
+        name = self.enum_naming_conversion_[enum.name]
+        enum_items = "\n".join([self._gen_enum_item_from_json(enum_item.name, enum.name) for enum_item in enum.elements.values()])
+        if (enum.name in self.required_empty_value):
+            enum_items += "\n" + self._gen_enum_item_from_json("EMPTY", enum.name)
+        return self._enum_from_json_template.substitute(
+            name = name,
+            enum_items = enum_items
+        )
+
+    def _gen_enum_item_from_json(self, item_name, enum_name):
+        return self._enum_from_json_item_template.substitute(
+            name = self.enum_items_naming_conversion_[enum_name](item_name),
+            string_name = self.enum_items_string_naming_conversion_[enum_name](item_name)
+            )
+
+    def _gen_comment(self, interface_item_base, use_doxygen=True):
+        """Generate doxygen comment for iterface_item_base for header file.
+
+        Generates doxygen comment for any iterface_item_base for the header
+        file.
+
+        Keyword arguments:
+        interface_item_base -- object to generate doxygen comment for.
+        use_doxygen -- Flag that indicates does function uses doxygen or not.
+
+        Returns:
+        String with generated doxygen comment.
+
+        """
+
+        brief_type_title = None
+        interface_item_base_classname = interface_item_base.__class__.__name__
+        if interface_item_base_classname in self._model_types_briefs:
+            brief_type_title = \
+                self._model_types_briefs[interface_item_base_classname]
+        else:
+            raise GenerateError("Unable to create comment for unknown type " +
+                                interface_item_base_classname)
+
+        name = interface_item_base.primary_name if \
+            type(interface_item_base) is EnumElement else \
+            interface_item_base.name
+        brief_description = (u" * @brief {0}{1}.\n" if use_doxygen is
+                             True else u"// {0}{1}.\n").format(
+                                 brief_type_title,
+                                 name)
+
+        description = u"".join([(u" * {0}\n" if use_doxygen
+                                is True else u"// {0}\n").format(x)
+                                for x in self._normalize_multiline_comments(
+                                    interface_item_base.description)])
+        if description is not u"":
+            description = u"".join([u" *\n" if use_doxygen
+                                    is True else u"//\n", description])
+
+        design_description = u"".join([(u" * {0}\n" if use_doxygen is
+                                       True else u"// {0}\n").format(x)
+                                       for x in
+                                       self._normalize_multiline_comments(
+                                           interface_item_base.
+                                           design_description)])
+        if design_description is not u"":
+            design_description = u"".join([u" *\n" if use_doxygen is
+                                           True else "//\n",
+                                           design_description])
+
+        issues = u"".join([(u" * @note {0}\n" if use_doxygen is
+                           True else u"// Note: {0}\n").format(x)
+                           for x in self._normalize_multiline_comments(
+                               [x.value for x in interface_item_base.issues])])
+        if issues is not u"":
+            issues = u"".join([u" *\n" if use_doxygen is
+                              True else u"//\n", issues])
+
+        todos = u"".join([(u" * @todo {0}\n" if use_doxygen is
+                          True else u"// ToDo: {0}\n").format(x)
+                          for x in self._normalize_multiline_comments(
+                              interface_item_base.todos)])
+        if todos is not u"":
+            todos = u"".join([u" *\n" if use_doxygen is
+                              True else u"//\n", todos])
+
+        returns = u""
+        if type(interface_item_base) is Function:
+            returns = u"".join([u" *\n", self._function_return_comment])
+
+        template = self._comment_doxygen_template if use_doxygen is \
+            True else self._comment_cc_template
+
+        return template.substitute(
+            brief_description=brief_description,
+            description=description,
+            design_description=design_description,
+            issues=issues,
+            todos=todos,
+            returns=returns)
+
+    def _indent_code(self, code, indent_level):
+        """Indent given source code.
+
+        Indents given source code right by given indentation level.
+
+        Keyword arguments:
+        code -- given source code.
+        indent_level -- desired indentation level.
+
+        Returns:
+        String with processed code.
+
+        """
+
+        code_lines = code.split("\n")
+        return u"".join(
+            [u"{0}{1}\n".format(
+                self._indent_template * indent_level,
+                x) if x is not u"" else u"\n" for x in code_lines])
+
+    @staticmethod
+    def _normalize_multiline_comments(initial_strings):
+        """Normalize multiline comments.
+
+        Makes multiline comment clean of any line breaks creating additional
+        strings for the comment.
+
+        Keyword arguments:
+        initial_strings -- initial list of strings to process.
+
+        Returns:
+        New list of the strings (with contains no strings with line breaks).
+
+        """
+
+        result = []
+        for initial_string in initial_strings:
+            result = result + initial_string.splitlines()
+        return result
+
+    _model_types_briefs = dict(
+        {u"EnumElement": u"",
+         u"Enum": u"Enumeration ",
+         u"Function": u"Method that generates schema for function ",
+         u"Struct": u"Method that generates schema item for structure ",
+         u"Param": u"Struct member ",
+         u"FunctionParam": u"Function parameter "})
+
+    _cc_file_template = string.Template(
+        u'''/**\n'''
+        u''' * @file ${class_name}.h\n'''
+        u''' * @brief Generated class ${class_name} source file.\n'''
+        u''' *\n'''
+        u'''*/\n'''
+        u'''#include "${header_file}"\n'''
+        u'''${includes}'''
+        u'''\n\n'''
+        u'''$namespace_open'''
+        u'''\n'''
+        u'''$enums_content'''
+        u'''\n'''
+        u'''$namespace_close'''
+        u'''\n\n''')
+
+
+    _h_file_template = string.Template(
+        u'''/**\n'''
+        u''' * @file ${class_name}.h\n'''
+        u''' * @brief Generated class ${class_name} header file.\n'''
+        u''' *\n'''
+        u'''* Copyright (c) 2017, Ford Motor Company\n'''
+        u'''* All rights reserved.\n'''
+        u'''*\n'''
+        u'''* Redistribution and use in source and binary forms, with or without\n'''
+        u'''* modification, are permitted provided that the following conditions are met:\n'''
+        u'''*\n'''
+        u'''* Redistributions of source code must retain the above copyright notice, this\n'''
+        u'''* list of conditions and the following disclaimer.\n'''
+        u'''*\n'''
+        u'''* Redistributions in binary form must reproduce the above copyright notice,\n'''
+        u'''* this list of conditions and the following\n'''
+        u'''* disclaimer in the documentation and/or other materials provided with the\n'''
+        u'''* distribution.\n'''
+        u'''*\n'''
+        u'''* Neither the name of the Ford Motor Company nor the names of its contributors\n'''
+        u'''* may be used to endorse or promote products derived from this software\n'''
+        u'''* without specific prior written permission.\n'''
+        u'''*\n'''
+        u'''* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"\n'''
+        u'''* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n'''
+        u'''* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE\n'''
+        u'''* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE\n'''
+        u'''* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n'''
+        u'''* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n'''
+        u'''* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS\n'''
+        u'''* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN\n'''
+        u'''* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n'''
+        u'''* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE\n'''
+        u'''* POSSIBILITY OF SUCH DAMAGE.\n'''
+        u'''*/\n'''
+        u'''\n'''
+        u'''#ifndef $guard\n'''
+        u'''#define $guard\n'''
+        u'''#include <string>\n'''
+        u'''${includes}'''
+        u'''\n'''
+        u'''$namespace_open'''
+        u'''$enums_content'''
+        u'''$namespace_close'''
+        u'''#endif //$guard\n'''
+        u'''\n\n''')
+
+
+    _namespace_open_template = string.Template(
+        u'''namespace $name {\n''')
+
+    _comment_doxygen_template = string.Template(
+        u'''/**\n'''
+        u'''$brief_description'''
+        u'''$description'''
+        u'''$design_description'''
+        u'''$issues'''
+        u'''$todos'''
+        u'''$returns */''')
+
+    _enum_template = string.Template(
+        u'''$comment\n'''
+        u'''enum $name {\n'''
+        u'''$enum_items};\n'''
+        u'''bool IsValidEnum($name val);\n'''
+        u'''const char* EnumToJsonString($name val);\n'''
+        u'''bool EnumFromJsonString(const std::string& literal, $name* result);\n'''
+        )
+    _valiation_enum_template = string.Template(
+        u'''bool IsValidEnum($name val) {\n'''
+        u'''  return !(std::string(EnumToJsonString(val)).empty());\n'''
+        u'''};\n''')
+
+    _valiation_enum_item_template = string.Template(
+        u'''    case $name: return true;''')
+
+    _enum_to_json_template = string.Template(
+        u'''const char* EnumToJsonString($name val) {\n'''
+        u'''  switch (val) {\n'''
+        u'''$enum_items\n'''
+        u'''    default: return "";\n'''
+        u'''  }\n'''
+        u'''};\n''')
+
+    _enum_to_json_item_template = string.Template(
+        u'''    case $name: return "$string_name";''')
+
+    _enum_from_json_template = string.Template(
+        u'''bool EnumFromJsonString(const std::string& literal, $name* result) {\n'''
+        u'''$enum_items'''
+        u'''  return false;\n'''
+        u'''};\n''')
+
+    _enum_from_json_item_template = string.Template(
+        u'''  if ("$string_name" == literal) {\n'''
+        u'''    *result = $name;\n'''
+        u'''    return true;\n'''
+        u'''  }\n''')
+
+    _enum_element_with_value_template = string.Template(
+        u'''$comment\n'''
+        u'''$name = $value''')
+
+    _enum_element_with_no_value_template = string.Template(
+        u'''$comment\n'''
+        u'''$name''')
+    _enum_factory_template = string.Template(
+        '''${enums_values}\n'''
+        '''template<typename EnumType>\n'''
+        '''std::shared_ptr<smart_objects::ISchemaItem> Create(const std::set<EnumType>& all_enum_values) {\n'''
+        '''using namespace smart_objects;\n'''
+        '''  static auto schemaItem = TEnumSchemaItem<EnumType>::create(all_enum_values, TSchemaItemParameter<EnumType>());\n'''
+        '''  return schemaItem;\n'''
+        '''}\n\n'''
+        '''std::shared_ptr<smart_objects::ISchemaItem> EnumSchemaItemFactory::Get(const std::string & enum_name) {\n'''
+        '''${enum_factory_content}\n'''
+        '''  return std::shared_ptr<smart_objects::ISchemaItem>();\n'''
+        '''}\n\n'''
+        '''bool EnumSchemaItemFactory::IsRPCSpecVehicleDataType(const std::string& vd_name) {\n'''
+        '''  for(auto& item_name : VehicleDataType_enum_names) {\n'''
+        '''    if (vd_name == item_name) {\n'''
+        '''      return true;\n'''
+        '''   }\n'''
+        '''  }\n'''
+        '''  return false;\n'''
+        '''}\n''')
+    _enum_factory_element_template = string.Template(
+        '''  if (enum_name == "${enum_name}") {\n'''
+        '''    return Create<mobile_apis::${enum_name}::eType>(${enum_name}_all_enum_values);\n'''
+        '''  }''')
+    _POD_type_factory_element_template = string.Template(
+        '''  if (typename == "${type_name}") {\n'''
+        '''    return TNumberSchemaItem<${cpp_type}>::create(TSchemaItemParameter<double>(${min_val}), TSchemaItemParameter<double>(${${max_val}}), TSchemaItemParameter<${cpp_type}>());'''
+        '''  }''')
+    _indent_template = u"  "
diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py b/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py
index c6a0145ac6..de0067bba8 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactoryBase.py
@@ -12,7 +12,17 @@ import os
 import string
 import uuid
 
-from generator import Model
+from model.array import Array
+from model.boolean import Boolean
+from model.float import Float
+from model.enum import Enum
+from model.enum_element import EnumElement
+from model.enum_subset import EnumSubset
+from model.function import Function
+from model.integer import Integer
+from model.param import Param
+from model.string import String
+from model.struct import Struct
 
 
 class GenerateError(Exception):
@@ -56,8 +66,6 @@ class CodeGenerator(object):
 
         """
 
-        namespace = unicode(namespace)
-
         if interface is None:
             raise GenerateError("Given interface is None.")
 
@@ -84,16 +92,16 @@ class CodeGenerator(object):
                     [namespace_close,
                      "}} // {0}\n".format(part)])
 
-        class_name = unicode(os.path.splitext(filename)[0])
+        class_name = os.path.splitext(filename)[0]
         guard = u"__CSMARTFACTORY_{0}_{1}_H__".format(
             class_name.upper(),
-            unicode(uuid.uuid1().hex.capitalize()))
+            uuid.uuid1().hex.capitalize())
         header_file_name = u"".join("{0}.h".format(class_name))
 
         with codecs.open(os.path.join(destination_dir, header_file_name),
                          encoding="utf-8",
                          mode="w") as f_h:
-            f_h.write(self._h_file_tempalte.substitute(
+            f_h.write(self._h_file_template.substitute(
                 class_name=class_name,
                 guard=guard,
                 namespace_open=namespace_open,
@@ -127,14 +135,14 @@ class CodeGenerator(object):
         header_file_name = "".join("{0}_schema.h".format(class_name))
         guard = u"__CSMARTFACTORY_{0}_{1}_HPP__".format(
             class_name.upper(),
-            unicode(uuid.uuid1().hex.capitalize()))
+            uuid.uuid1().hex.capitalize())
         with codecs.open(os.path.join(destination_dir, header_file_name),
                          encoding="utf-8",
                          mode="w") as f_h:
-            f_h.write(self._hpp_schema_file_tempalte.substitute(
+            f_h.write(self._hpp_schema_file_template.substitute(
                 class_name=class_name,
                 guard=guard,
-                header_file_name=unicode("".join("{0}.h".format(class_name))),
+                header_file_name="".join("{0}.h".format(class_name)),
                 namespace_open=namespace_open,
                 class_content=self._gen_h_class(
                     class_name,
@@ -147,7 +155,7 @@ class CodeGenerator(object):
                                       u"".join("{0}_schema.cc".format(class_name))),
                          encoding="utf-8", mode="w") as f_s:
             f_s.write(self._cc_file_template.substitute(
-                header_file_name=unicode(header_file_name),
+                header_file_name=header_file_name,
                 namespace=namespace,
                 class_name=class_name,
                 function_id_items=self._indent_code(function_id_items, 1),
@@ -157,6 +165,8 @@ class CodeGenerator(object):
                     interface.functions.values()),
                 function_schemas=self._gen_function_schemas(
                     interface.functions.values()),
+                function_schemas_switch=self._gen_function_schema_switch(
+                    interface.functions.values()),
                 init_function_impls=self._gen_function_impls(
                     interface.functions.values(),
                     namespace,
@@ -380,7 +390,7 @@ class CodeGenerator(object):
 
         """
 
-        if type(member.param_type) is Model.Struct:
+        if type(member.param_type) is Struct:
             self._ensure_struct_generated(member.param_type)
 
     def _ensure_struct_generated(self, struct):
@@ -450,6 +460,48 @@ class CodeGenerator(object):
             self._gen_function_schema(x), 1)
             for x in functions])
 
+    def _gen_function_schema_switch(self, functions):
+        """Generate initialization code of each function for source file.
+
+        Generates function schema initialization code that should be used
+        in the source file.
+
+        Keyword arguments:
+        function -- function to generate method for.
+
+        Returns:
+        String with switch for functions initialization source code.
+
+        """
+
+        if functions is None:
+            raise GenerateError("Functions is None")
+
+        def function_id_switch(self, message_type, functions):
+            case_list = [self._function_id_case_template.substitute(
+                function_id=x.function_id.primary_name,
+                message_type=x.message_type.primary_name)
+            for x in functions if x.message_type.primary_name == message_type ]
+            case_list.append("default:\n  break;\n")
+            switch_function_id_cases =  self._indent_code(u"".join(case_list), 1)[:-1]
+
+            return self._indent_code(self._function_switch_template.substitute(
+                switchable="function_id",
+                cases=switch_function_id_cases
+            ), 1)[:-1]
+
+        message_type_case_list = [self._message_type_case_template.substitute(
+                message_type = message_type,
+                case_body = function_id_switch(self, message_type, functions)
+            ) for message_type in set([x.message_type.primary_name for x in functions])]
+        message_type_case_list.append("default:\n  break;\n")
+        message_type_cases = self._indent_code(u"".join(message_type_case_list), 1)[:-1]
+
+        return self._indent_code(self._function_switch_template.substitute(
+            switchable="message_type",
+            cases=message_type_cases
+        ), 1)[:-1]
+
     def _gen_function_schema(self, function):
         """Generate function initialization code for source file.
 
@@ -574,7 +626,7 @@ class CodeGenerator(object):
 
         result = u""
         for member in members:
-            if type(member.param_type) is Model.Enum and \
+            if type(member.param_type) is Enum and \
                member.param_type.name not in processed_enums:
                 has_history = self._enum_has_history_present(member)
                 local_var = self._gen_schema_loc_emum_var_name(
@@ -634,7 +686,7 @@ class CodeGenerator(object):
 
                 processed_enums.append(member.param_type.name)
                 result = u"".join([result, u"\n\n"]) if result else u""
-            elif type(member.param_type) is Model.EnumSubset:
+            elif type(member.param_type) is EnumSubset:
                 local_var = self._gen_schema_loc_emum_s_var_name(member.name)
                 result = u"\n".join(
                     [u"".join(
@@ -651,12 +703,12 @@ class CodeGenerator(object):
                              for x in member.param_type.
                              allowed_elements.values()])])
                 result = u"".join([result, u"\n\n"]) if result else u""
-            elif type(member.param_type) is Model.Array:
+            elif type(member.param_type) is Array:
                 result = u"".join(
                     [result, self._gen_schema_loc_decls(
-                        [Model.Param(name=member.param_type.element_type.name
+                        [Param(name=member.param_type.element_type.name
                          if type(member.param_type.element_type) is
-                         Model.EnumSubset else "",
+                         EnumSubset else "",
                             param_type=member.param_type.element_type)],
                         processed_enums)])
 
@@ -749,13 +801,13 @@ class CodeGenerator(object):
 
         """
         code = u""
-        if type(param) is Model.Boolean:
+        if type(param) is Boolean:
             code = self._impl_code_bool_item_template.substitute(
                 params=self._gen_schema_item_param_values(
                     [[u"bool", None if param.default_value is None
                       else u"true" if param.default_value is True else u"false"]]))
-        elif type(param) is Model.Integer:
-            if param.max_value < 2 ** 31:
+        elif type(param) is Integer:
+            if not param.max_value or param.max_value and param.max_value < 2 ** 31:
                 code = self._impl_code_integer_item_template.substitute(
                     type=u"int32_t",
                     params=self._gen_schema_item_param_values(
@@ -771,14 +823,14 @@ class CodeGenerator(object):
                          [u"int64_t", param.default_value]]))
             else:
                 raise GenerateError("Parameter value too large: " + str(param.max_value))
-        elif type(param) is Model.Double:
+        elif type(param) is Float:
             code = self._impl_code_integer_item_template.substitute(
                 type=u"double",
                 params=self._gen_schema_item_param_values(
                     [[u"double", param.min_value],
                      [u"double", param.max_value],
                      [u"double", param.default_value]]))
-        elif type(param) is Model.String:
+        elif type(param) is String:
             code = self._impl_code_string_item_template.substitute(
                 params=self._gen_schema_item_param_values(
                     [[u"size_t", param.min_length],
@@ -786,23 +838,23 @@ class CodeGenerator(object):
                      [u"std::string", u"".join(
                      [u'"', param.default_value, u'"']) if param.default_value
                          is not None else u""]]))
-        elif type(param) is Model.Array:
+        elif type(param) is Array:
             code = self._impl_code_array_item_template.substitute(
                 params=u"".join(
                     [u"".join(
                         [self._gen_schema_item_decl_code(
                             param.element_type,
                             param.element_type.name if type(param.element_type)
-                            is Model.EnumSubset else u"",
+                            is EnumSubset else u"",
                             None),
                             u", "]),
                         self._gen_schema_item_param_values(
                             [[u"size_t", param.min_size],
                              [u"size_t", param.max_size]])]))
-        elif type(param) is Model.Struct:
+        elif type(param) is Struct:
             code = self._impl_code_struct_item_template.substitute(
                 name=param.name)
-        elif type(param) is Model.Enum:
+        elif type(param) is Enum:
             if self._enum_param_type_has_history_present(param):
                 code = self._impl_code_enum_item_with_history_template.substitute(
                     type=param.name,
@@ -827,7 +879,7 @@ class CodeGenerator(object):
                               u"".join([param.name, u"::",
                                         default_value.primary_name]) if
                                default_value is not None else None]])]))
-        elif type(param) is Model.EnumSubset:
+        elif type(param) is EnumSubset:
             code = self._impl_code_enum_item_template.substitute(
                 type=param.enum.name,
                 params=u"".join(
@@ -1002,7 +1054,7 @@ class CodeGenerator(object):
                 deprecated=member.deprecated if member.deprecated is not None else u"false", 
                 removed=member.removed if member.removed is not None else u"false")
         else:
-            print "Warning! History item does not have any version history. Omitting %s" % member.name      
+            print("Warning! History item does not have any version history. Omitting " + member.name)
 
     @staticmethod
     def _gen_schema_item_var_name(member):
@@ -1131,11 +1183,11 @@ class CodeGenerator(object):
         if structs:
             struct_id_enum_elements = collections.OrderedDict()
             for struct in structs:
-                struct_id_enum_elements[struct.name] = Model.EnumElement(
+                struct_id_enum_elements[struct.name] = EnumElement(
                     name=struct.name)
             return u"\n".join(
                 [self._gen_enum(
-                    Model.Enum(name="StructIdentifiers",
+                    Enum(name="StructIdentifiers",
                                elements=struct_id_enum_elements)),
                  u"\n".join([self._gen_enum(x) for x in enums])])
 
@@ -1154,8 +1206,8 @@ class CodeGenerator(object):
 
         """
 
-        enum_elements = enum.elements.values()
-        enum_elements.insert(0, Model.EnumElement(
+        enum_elements = list(enum.elements.values())
+        enum_elements.insert(0, EnumElement(
             name=u"INVALID_ENUM",
             description=None,
             design_description=None,
@@ -1256,7 +1308,7 @@ class CodeGenerator(object):
                                 interface_item_base_classname)
 
         name = interface_item_base.primary_name if \
-            type(interface_item_base) is Model.EnumElement else \
+            type(interface_item_base) is EnumElement else \
             interface_item_base.name
         brief_description = (u" * @brief {0}{1}.\n" if use_doxygen is
                              True else u"// {0}{1}.\n").format(
@@ -1299,7 +1351,7 @@ class CodeGenerator(object):
                               True else u"//\n", todos])
 
         returns = u""
-        if type(interface_item_base) is Model.Function:
+        if type(interface_item_base) is Function:
             returns = u"".join([u" *\n", self._function_return_comment])
 
         template = self._comment_doxygen_template if use_doxygen is \
@@ -1361,7 +1413,7 @@ class CodeGenerator(object):
          u"Param": u"Struct member ",
          u"FunctionParam": u"Function parameter "})
 
-    _h_file_tempalte = string.Template(
+    _h_file_template = string.Template(
         u'''/**\n'''
         u''' * @file ${class_name}.h\n'''
         u''' * @brief Generated class ${class_name} header file.\n'''
@@ -1426,7 +1478,7 @@ class CodeGenerator(object):
         u'''#endif //$guard\n'''
         u'''\n\n''')
 
-    _hpp_schema_file_tempalte = string.Template(
+    _hpp_schema_file_template = string.Template(
         u'''/**\n'''
         u''' * @file ${class_name}.h\n'''
         u''' * @brief Generated class ${class_name} header file.\n'''
@@ -1488,6 +1540,7 @@ class CodeGenerator(object):
         u'''#include "formatters/CSmartFactory.h"\n'''
         u'''#include "smart_objects/smart_schema.h"\n'''
         u'''#include "smart_objects/schema_item.h"\n'''
+        u'''#include "smart_objects/object_schema_item.h"\n'''
         u'''#include "$header_file_name"\n'''
         u'''\n'''
         u'''$namespace_open'''
@@ -1512,7 +1565,7 @@ class CodeGenerator(object):
         u'''SmartSchemas\n'''
         u''' * in accordance with definitions from ${class_name}.xml file\n'''
         u''' */\n'''
-        u'''// Copyright (c) 2013, Ford Motor Company\n'''
+        u'''// Copyright (c) 2019, SmartDeviceLink Consortium, Inc.\n'''
         u'''// All rights reserved.\n'''
         u'''//\n'''
         u'''// Redistribution and use in source and binary forms, '''
@@ -1531,11 +1584,11 @@ class CodeGenerator(object):
         u'''provided with the\n'''
         u'''// distribution.\n'''
         u'''//\n'''
-        u'''// Neither the name of the Ford Motor Company nor the names '''
-        u'''of its contributors\n'''
-        u'''// may be used to endorse or promote products derived '''
-        u'''from this software\n'''
-        u'''// without specific prior written permission.\n'''
+        u'''// Neither the name of the SmartDeviceLink Consortium, Inc. nor the names '''
+        u'''of its\n'''
+        u'''// contributors may be used to endorse or promote products derived '''
+        u'''from this\n'''
+        u'''// software without specific prior written permission.\n'''
         u'''//\n'''
         u'''// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND '''
         u'''CONTRIBUTORS "AS IS"\n'''
@@ -1604,6 +1657,32 @@ class CodeGenerator(object):
         u'''CAlwaysFalseSchemaItem::create();\n'''
         u'''}\n'''
         u'''\n'''
+        u'''bool $namespace::$class_name::AddCustomMember(FunctionID::eType function_id,\n'''
+        u'''                                              messageType::eType message_type,\n'''
+        u'''                                              std::string member_key, ns_smart_device_link::ns_smart_objects::SMember member) {\n'''
+        u'''  using namespace ns_smart_device_link::ns_json_handler;\n'''
+        u'''  using namespace ns_smart_device_link::ns_smart_objects;\n'''
+        u'''  SmartSchemaKey<FunctionID::eType, messageType::eType> shema_key(function_id, message_type);\n'''
+        u'''  auto function_schema = functions_schemes_.find(shema_key);\n'''
+        u'''  if (functions_schemes_.end() == function_schema){\n'''
+        u'''    return false;\n'''
+        u'''  }\n'''
+        u'''\n'''
+        u'''  auto schema = function_schema->second.getSchemaItem();\n'''
+        u'''  auto msg_params_schema_item = schema->GetMemberSchemaItem(ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS);\n'''
+        u'''  if (!msg_params_schema_item.is_initialized()){\n'''
+        u'''    return false;\n'''
+        u'''  }\n'''
+        u'''\n'''
+        u'''  msg_params_schema_item->mSchemaItem->AddMemberSchemaItem(member_key, member);\n'''
+        u'''  return true;\n'''
+        u'''}\n'''
+        u'''\n'''
+        u'''void $namespace::$class_name::ResetFunctionSchema(FunctionID::eType function_id,\n'''
+        u'''                         messageType::eType message_type) {\n'''
+        u'''  InitFunctionSchema(function_id, message_type);\n'''
+        u'''}\n'''
+        u'''\n'''
         u'''void $namespace::$class_name::InitStructSchemes(\n'''
         u'''    TStructsSchemaItems &struct_schema_items) {'''
         u'''$struct_schema_items'''
@@ -1617,6 +1696,19 @@ class CodeGenerator(object):
         u'''$function_schemas'''
         u'''}\n'''
         u'''\n'''
+        u'''void $namespace::$class_name::InitFunctionSchema(\n'''
+        u'''    const FunctionID::eType &function_id,\n'''
+        u'''    const messageType::eType &message_type) {\n'''
+        u'''\n'''
+        u'''  TStructsSchemaItems struct_schema_items;\n'''
+        u'''  InitStructSchemes(struct_schema_items);\n'''
+        u'''\n'''
+        u'''  std::set<FunctionID::eType> function_id_items { function_id };\n'''
+        u'''  std::set<messageType::eType> message_type_items { message_type };\n'''
+        u'''\n'''
+        u'''$function_schemas_switch'''
+        u'''}\n'''
+        u'''\n'''
         u'''//------------- Functions schemes initialization -------------\n'''
         u'''\n'''
         u'''$init_function_impls'''
@@ -1668,6 +1760,26 @@ class CodeGenerator(object):
         u'''};\n'''
         u'''\n''')
 
+    _function_switch_template = string.Template(
+        u'''switch(${switchable}) {\n'''
+        u'''${cases}'''
+        u'''}\n''')
+
+    _message_type_case_template = string.Template(
+        u'''case messageType::${message_type}: {\n'''
+        u'''${case_body}'''
+        u'''  break;\n'''
+        u'''}\n''')
+
+    _function_id_case_template = string.Template(
+        u'''case FunctionID::${function_id}: {\n'''
+        u'''  ns_smart_device_link::ns_json_handler::SmartSchemaKey<FunctionID::eType, messageType::eType> shema_key(function_id, message_type);\n'''
+        u'''  functions_schemes_[shema_key] = '''
+        u'''InitFunction_${function_id}_${message_type}('''
+        u'''struct_schema_items, function_id_items, message_type_items);\n'''
+        u'''  break;\n'''
+        u'''}\n''')
+
     _struct_schema_item_template = string.Template(
         u'''std::shared_ptr<ISchemaItem> struct_schema_item_${name} = '''
         u'''InitStructSchemaItem_${name}(struct_schema_items);\n'''
@@ -1695,7 +1807,7 @@ class CodeGenerator(object):
     _struct_impl_code_tempate = string.Template(
         u'''${schema_loc_decl}'''
         u'''${schema_items_decl}'''
-        u'''CObjectSchemaItem::Members '''
+        u'''Members '''
         u'''schema_members;\n\n'''
         u'''${schema_item_fill}'''
         u'''return CObjectSchemaItem::create(schema_members);''')
@@ -1724,10 +1836,10 @@ class CodeGenerator(object):
         u'''std::shared_ptr<ISchemaItem> ${var_name} = ${item_decl};''')
 
     _impl_code_shared_ptr_vector_template = string.Template(
-        u'''std::vector<CObjectSchemaItem::SMember> ${var_name}_history_vector;''')
+        u'''std::vector<SMember> ${var_name}_history_vector;''')
 
     _impl_code_append_history_vector_template = string.Template(
-        u'''${vector_name}_history_vector.push_back(CObjectSchemaItem::SMember(${name}_SchemaItem, ${mandatory}, "${since}", "${until}", ${deprecated}, ${removed}));''')
+        u'''${vector_name}_history_vector.push_back(SMember(${name}_SchemaItem, ${mandatory}, "${since}", "${until}", ${deprecated}, ${removed}));''')
 
     _impl_code_integer_item_template = string.Template(
         u'''TNumberSchemaItem<${type}>::create(${params})''')
@@ -1755,16 +1867,13 @@ class CodeGenerator(object):
         u'''TSchemaItemParameter<$type>($value)''')
 
     _impl_code_item_fill_template = string.Template(
-        u'''schema_members["${name}"] = CObjectSchemaItem::'''
-        u'''SMember(${var_name}, ${is_mandatory});''')
+        u'''schema_members["${name}"] = SMember(${var_name}, ${is_mandatory});''')
 
     _impl_code_item_fill_template_with_version = string.Template(
-        u'''schema_members["${name}"] = CObjectSchemaItem::'''
-        u'''SMember(${var_name}, ${is_mandatory}, "${since}", "${until}", ${deprecated}, ${removed});''')
+        u'''schema_members["${name}"] = SMember(${var_name}, ${is_mandatory}, "${since}", "${until}", ${deprecated}, ${removed});''')
 
     _impl_code_item_fill_template_with_version_and_history_vector = string.Template(
-        u'''schema_members["${name}"] = CObjectSchemaItem::'''
-        u'''SMember(${var_name}, ${is_mandatory}, "${since}", "${until}", ${deprecated}, ${removed}, ${vector_name}_history_vector);''')
+        u'''schema_members["${name}"] = SMember(${var_name}, ${is_mandatory}, "${since}", "${until}", ${deprecated}, ${removed}, ${vector_name}_history_vector);''')
 
     _function_impl_template = string.Template(
         u'''CSmartSchema $namespace::$class_name::'''
@@ -1778,22 +1887,22 @@ class CodeGenerator(object):
     _function_impl_code_tempate = string.Template(
         u'''${schema_loc_decl}'''
         u'''${schema_items_decl}'''
-        u'''CObjectSchemaItem::Members '''
+        u'''Members '''
         u'''schema_members;\n\n'''
         u'''${schema_item_fill}'''
-        u'''CObjectSchemaItem::Members '''
+        u'''Members '''
         u'''params_members;\n'''
         u'''${schema_params_fill}'''
         u'''\n'''
-        u'''CObjectSchemaItem::Members '''
+        u'''Members '''
         u'''root_members_map;\n'''
         u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_MSG_PARAMS] = '''
-        u'''CObjectSchemaItem::SMember(CObjectSchemaItem::'''
+        u'''SMember(CObjectSchemaItem::'''
         u'''create(schema_members), true);\n'''
         u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
         u'''strings::S_PARAMS] = '''
-        u'''CObjectSchemaItem::SMember(CObjectSchemaItem::'''
+        u'''SMember(CObjectSchemaItem::'''
         u'''create(params_members), true);\n\n'''
         u'''return CSmartSchema(CObjectSchemaItem::'''
         u'''create(root_members_map));''')
@@ -1809,7 +1918,19 @@ class CodeGenerator(object):
         u'''   */\n'''
         u'''  $class_name();\n'''
         u'''\n'''
-        u''' protected:\n'''
+        u'''  /**\n'''
+        u'''   * @brief Adds custom members to existing list of params.\n'''
+        u'''   */\n'''
+        u'''  bool AddCustomMember(FunctionID::eType function_id,\n'''
+        u'''                       messageType::eType message_type,\n'''
+        u'''                       std::string member_key, ns_smart_device_link::ns_smart_objects::SMember member);\n'''
+        u'''\n'''
+        u'''  /**\n'''
+        u'''   * @brief Reset function schema to state defined in API.\n'''
+        u'''   */\n'''
+        u'''  void ResetFunctionSchema(FunctionID::eType function_id,\n'''
+        u'''                           messageType::eType message_type);\n'''
+        u'''\n'''
         u'''  /**\n'''
         u'''   * @brief Type that maps of struct IDs to schema items.\n'''
         u'''   */\n'''
@@ -1817,6 +1938,7 @@ class CodeGenerator(object):
         u'''std::shared_ptr<ns_smart_device_link::ns_smart_objects::'''
         u'''ISchemaItem> > TStructsSchemaItems;\n'''
         u'''\n'''
+        u''' protected:\n'''
         u'''  /**\n'''
         u'''   * @brief Helper that allows to make reference to struct\n'''
         u'''   *\n'''
@@ -1852,8 +1974,19 @@ class CodeGenerator(object):
         u'''      const std::set<messageType::eType> '''
         u'''&message_type_items);\n'''
         u'''\n'''
+        u'''  /**\n'''
+        u'''   * @brief Initializes single function schema.\n'''
+        u'''   *\n'''
+        u'''   * @param function_id Function ID of schema to be initialized.\n'''
+        u'''   * @param message_type Message type of schema to be initialized.\n'''
+        u'''   */\n'''
+        u'''  void InitFunctionSchema(\n'''
+        u'''      const FunctionID::eType &function_id,\n'''
+        u'''      const messageType::eType &message_type);\n'''
+        u'''\n'''
         u'''$init_function_decls'''
         u'''\n'''
+        u''' public:\n'''
         u'''$init_struct_decls'''
         u'''};''')
 
diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py b/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
index 6924ec67aa..f7241af30c 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactoryJSONRPC.py
@@ -6,7 +6,7 @@ Defines JSONRPC format specific code generation rules.
 import string
 
 from generator.generators import SmartFactoryBase
-from generator import Model
+from model.enum_element import EnumElement
 
 
 class CodeGenerator(SmartFactoryBase.CodeGenerator):
@@ -40,7 +40,7 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
 
         code = u""
         for function in functions:
-            if unicode(function.message_type.primary_name) == u"response":
+            if function.message_type.primary_name == u"response":
                 code = u"".join(
                     [code, self._error_response_insert_template.substitute(
                         function_id=function.function_id.primary_name)])
@@ -66,7 +66,7 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
         """
 
         if "response" in message_type.elements:
-            message_type.elements[u"error_response"] = Model.EnumElement(
+            message_type.elements[u"error_response"] = EnumElement(
                 name=u"error_response")
 
         return message_type
@@ -88,9 +88,9 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
         return u"".join(
             [self._base_params,
              self._correlation_id_param
-                if unicode(message_type_name) != u"notification" else u"",
+                if message_type_name != u"notification" else u"",
              self._additional_response_params
-                if unicode(message_type_name) == u"response" else u""])
+                if message_type_name == u"response" else u""])
 
     _error_response_insert_template = string.Template(
         u'''functions_schemes_.insert(std::make_pair('''
@@ -100,35 +100,35 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
         u'''error_response_schema));\n''')
 
     _error_response_schema_template = (
-        u'''CObjectSchemaItem::Members '''
+        u'''Members '''
         u'''params_members;\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember('''
+        u'''strings::S_FUNCTION_ID] = SMember('''
         u'''TEnumSchemaItem<FunctionID::eType>::create('''
         u'''function_id_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember('''
+        u'''strings::S_MESSAGE_TYPE] = SMember('''
         u'''TEnumSchemaItem<messageType::eType>::create('''
         u'''message_type_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember('''
+        u'''strings::S_PROTOCOL_VERSION] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember('''
+        u'''strings::S_PROTOCOL_TYPE] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember('''
+        u'''strings::S_CORRELATION_ID] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::kCode] = CObjectSchemaItem::SMember('''
+        u'''strings::kCode] = SMember('''
         u'''TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::kMessage] = CObjectSchemaItem::SMember('''
+        u'''strings::kMessage] = SMember('''
         u'''CStringSchemaItem::create(), true);\n'''
         u'''\n'''
-        u'''CObjectSchemaItem::Members root_members_map;\n'''
+        u'''Members root_members_map;\n'''
         u'''root_members_map[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PARAMS] = CObjectSchemaItem::SMember('''
+        u'''strings::S_PARAMS] = SMember('''
         u'''CObjectSchemaItem::create(params_members), true);\n'''
         u'''\n'''
         u'''CSmartSchema error_response_schema('''
@@ -137,29 +137,23 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
 
     _base_params = (
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::'''
-        u'''SMember(TEnumSchemaItem<FunctionID::eType>::'''
+        u'''strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::'''
         u'''create(function_id_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::'''
-        u'''SMember(TEnumSchemaItem<messageType::eType>::'''
+        u'''strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::'''
         u'''create(message_type_items), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
 
     _correlation_id_param = (
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
 
     _additional_response_params = (
         u'''params_members[ns_smart_device_link::ns_json_handler::'''
-        u'''strings::kCode] = CObjectSchemaItem::'''
-        u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+        u'''strings::kCode] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
     )
diff --git a/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py b/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py
index c3244f7e95..ef5cf9286b 100755
--- a/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py
+++ b/tools/InterfaceGenerator/generator/generators/SmartFactorySDLRPC.py
@@ -68,25 +68,20 @@ class CodeGenerator(SmartFactoryBase.CodeGenerator):
 
         base_params = \
             u'''params_members[ns_smart_device_link::ns_json_handler::''' \
-            u'''strings::S_FUNCTION_ID] = CObjectSchemaItem::''' \
-            u'''SMember(TEnumSchemaItem<FunctionID::eType>::''' \
+            u'''strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::''' \
             u'''create(function_id_items), true);\n''' \
             u'''params_members[ns_smart_device_link::ns_json_handler::''' \
-            u'''strings::S_MESSAGE_TYPE] = CObjectSchemaItem::''' \
-            u'''SMember(TEnumSchemaItem<messageType::eType>::''' \
+            u'''strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::''' \
             u'''create(message_type_items), true);\n''' \
             u'''params_members[ns_smart_device_link::ns_json_handler::''' \
-            u'''strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::''' \
-            u'''SMember(TNumberSchemaItem<int>::create(), true);\n''' \
+            u'''strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);\n''' \
             u'''params_members[ns_smart_device_link::ns_json_handler::''' \
-            u'''strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::''' \
-            u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+            u'''strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
 
         correlation_id_param = \
             u'''params_members[ns_smart_device_link::ns_json_handler::''' \
-            u'''strings::S_CORRELATION_ID] = CObjectSchemaItem::''' \
-            u'''SMember(TNumberSchemaItem<int>::create(), true);\n'''
+            u'''strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);\n'''
 
         return u"".join([base_params, correlation_id_param
-                        if unicode(message_type_name) !=
+                        if message_type_name !=
                         u"notification" else u""])
diff --git a/tools/InterfaceGenerator/generator/parsers/JSONRPC.py b/tools/InterfaceGenerator/generator/parsers/JSONRPC.py
index 092f41ec17..e63bcc38aa 100755
--- a/tools/InterfaceGenerator/generator/parsers/JSONRPC.py
+++ b/tools/InterfaceGenerator/generator/parsers/JSONRPC.py
@@ -4,13 +4,17 @@ Contains parser for JSON RPC XML format.
 
 """
 
-from generator.parsers import RPCBase
+from parsers.parse_error import ParseError
+from parsers.rpc_base import RPCBase
 
 
-class Parser(RPCBase.Parser):
-
+class Parser(RPCBase):
     """JSON RPC parser."""
 
+    @property
+    def get_version(self):
+        return '1.0.0'
+
     def __init__(self):
         """Constructor."""
         super(Parser, self).__init__()
@@ -32,16 +36,27 @@ class Parser(RPCBase.Parser):
 
         for element in root:
             if element.tag != "interface":
-                raise RPCBase.ParseError("Subelement '" + element.tag +
-                                         "' is unexpected in interfaces")
+                raise ParseError("Subelement '" + element.tag +
+                                 "' is unexpected in interfaces")
 
             if "name" not in element.attrib:
-                raise RPCBase.ParseError(
+                raise ParseError(
                     "Name is not specified for interface")
 
             self._interface_name = element.attrib["name"]
             self._parse_interface(element, self._interface_name + "_")
 
+    def _check_enum_name(self, enum):
+        """Check enum name.
+
+        This method is called to check whether the newly parsed enum's name
+        conflicts with some predefined enum.
+        As SDLRPCV2 has no predefined enums this implementation does nothing.
+
+        """
+
+        pass
+
     def _provide_enum_element_for_function(self, enum_name, element_name):
         """Provide enum element for functions.
 
@@ -60,7 +75,7 @@ class Parser(RPCBase.Parser):
         if "FunctionID" == enum_name:
             prefix_length = len(self._interface_name) + 1
             if element_name[:prefix_length] != self._interface_name + '_':
-                raise RPCBase.ParseError(
+                raise ParseError(
                     "Unexpected prefix for function id '" +
                     element_name + "'")
             name = self._interface_name + "." + element_name[prefix_length:]
@@ -83,7 +98,7 @@ class Parser(RPCBase.Parser):
         """
 
         if function_param_name in ['method', 'code']:
-            raise RPCBase.ParseError(
+            raise ParseError(
                 "'" + function_param_name +
                 "' is a predefined name and can't be used" +
                 " as a function parameter name")
diff --git a/tools/InterfaceGenerator/generator/parsers/RPCBase.py b/tools/InterfaceGenerator/generator/parsers/RPCBase.py
deleted file mode 100755
index 21f07e6ac5..0000000000
--- a/tools/InterfaceGenerator/generator/parsers/RPCBase.py
+++ /dev/null
@@ -1,915 +0,0 @@
-"""RPC XML base parser.
-
-Contains base parser for SDLRPC v1/v2 and JSON RPC XML format.
-
-"""
-
-import collections
-import xml.etree.ElementTree
-import re
-from generator import Model
-
-
-class ParseError(Exception):
-
-    """Parse error.
-
-    This exception is raised when XML contains errors and can't be parsed.
-
-    """
-
-    pass
-
-
-class Parser(object):
-
-    """RPC XML Parser base.
-
-    This class must not be used directly. One of its subclasses must be used
-    instead.
-
-    """
-
-    def __init__(self):
-        """Constructor."""
-        self._types = {}
-        self._enums = collections.OrderedDict()
-        self._structs = collections.OrderedDict()
-        self._functions = collections.OrderedDict()
-        self._params = {}
-
-    def parse(self, filename):
-        """Parse XML.
-
-        Returns an instance of generator.Model.Interface containing parsed
-        interface or raises ParseError if input XML contains errors
-        and can't be parsed.
-
-        Keyword arguments:
-        filename -- name of input XML file.
-
-        """
-
-        tree = xml.etree.ElementTree.parse(filename)
-        root = tree.getroot()
-
-        self._enums = self._initialize_enums()
-        self._structs = collections.OrderedDict()
-        self._functions = collections.OrderedDict()
-        self._params = {}
-
-        self._types = dict(self._enums.items())
-
-        self._parse_root(root)
-
-        return Model.Interface(enums=self._enums, structs=self._structs,
-                               functions=self._functions, params=self._params)
-
-    def _initialize_enums(self):
-        """Initialize enums.
-
-        The default implementation returns an OrderedDict with two empty
-        enums: "FunctionID" and "messageType". Required for formats where
-        these enums must be generated automatically according to the declared
-        in the XML functions.
-
-        These enums are filled during the parsing of the functions.
-
-        """
-        return collections.OrderedDict(
-            [("FunctionID", Model.Enum(name="FunctionID")),
-             ("messageType", Model.Enum(name="messageType"))])
-
-    def _check_enum_name(self, enum):
-        """Check enum name.
-
-        This method is called to check whether the newly parsed enum's name
-        conflicts with some predefined enum.
-
-        This implementation raises an error if enum name is one of the
-        predefined enums "FunctionID" or "messageType" which must not be
-        declared explicitly in the XML.
-
-        """
-        if enum.name in ["FunctionID", "messageType"]:
-            raise ParseError(
-                "Enum '" + enum.name +
-                "' is generated automatically in SDLRPCV1 and"
-                " must not be declared in xml file")
-
-    def _check_function_param_name(self, function_param_name):
-        """Check function param name.
-
-        This method is called to check whether the newly parsed function
-        parameter name conflicts with some predefined name.
-
-        This implementation doesn't check anything because there is no
-        predefined names in base RPC XML.
-        """
-
-        pass
-
-    def _parse_root(self, root):
-        """Parse root XML element.
-
-        Default implementation parses root as interface element without a
-        prefix.
-
-        Keyword arguments:
-        root -- root element.
-
-        """
-
-        self._parse_interface(root, "")
-
-    def _parse_interface(self, interface, prefix):
-        """Parse interface element.
-
-        Keyword arguments:
-        interface -- interface element.
-        prefix -- string prefix for all types of the interface.
-
-        """
-        if interface.tag != "interface":
-            raise ParseError("Invalid interface tag: " + interface.tag)
-
-        params, subelements, attrib = self._parse_base_item(interface, "")
-
-        for param in ["description", "design_description", "todos"]:
-            if 0 != len(params[param]):
-                attrib[param] = "\n".join(params[param])
-
-        if 0 != len(params["issues"]):
-            attrib["issues"] = "\n".join(i.value for i in params["issues"])
-
-        self._params = dict(
-            self._params.items() +
-            [(prefix + p[0], p[1]) for p in attrib.items()])
-
-        for element in subelements:
-            if element.tag == "enum":
-                enum = self._parse_enum(element, prefix)
-                self._check_enum_name(enum)
-                self._add_item(self._enums, enum)
-                self._add_type(enum)
-            elif element.tag == "struct":
-                struct = self._parse_struct(element, prefix)
-                self._add_item(self._structs, struct)
-                self._add_type(struct)
-            elif element.tag == "function":
-                function = self._parse_function(element, prefix)
-                self._add_item(self._functions, function,
-                               (function.function_id, function.message_type))
-            else:
-                raise ParseError("Unexpected element: " + element.tag)
-
-    @staticmethod
-    def _add_item(items, item, key=None):
-        """Add new item in the items dictionary with given key.
-
-        Performs additional check for presence in the dictionary and throws
-        ParseError exception if key already exist.
-
-        """
-        if key is None:
-            key = item.name
-
-        if key in items:
-            raise ParseError(type(item).__name__ + " '" + str(key) +
-                             "' is declared more than once")
-        items[key] = item
-
-    def _add_type(self, _type):
-        """Add new type in the internal types dictionary.
-
-        Performs additional check for presence type with same name in the
-        dictionary and throws ParseError exception if key already exist.
-
-        """
-        if _type.name in self._types:
-            raise ParseError("Type '" + _type.name +
-                             "' is declared as both struct and enum")
-
-        self._types[_type.name] = _type
-
-    def _parse_enum(self, element, prefix):
-        """Parse element as enumeration.
-
-        Returns an instance of generator.Model.Enum
-
-        """
-        params, subelements, attributes = \
-            self._parse_base_item(element, prefix)
-
-        internal_scope = None
-        scope = None
-        since = None
-        until = None
-        deprecated = None
-        removed = None
-        result = None
-        for attribute in attributes:
-            if attribute == "internal_scope":
-                internal_scope = attributes[attribute]
-            elif attribute == "scope":
-                scope = attributes[attribute]
-            elif attribute == "since":
-                result = self._parse_version(attributes[attribute])
-                since = result
-            elif attribute == "until":
-                result = self._parse_version(attributes[attribute])
-                until = result
-            elif attribute == "deprecated":
-                deprecated = attributes[attribute]
-            elif attribute == "removed":
-                removed = attributes[attribute]
-            else:
-                raise ParseError("Unexpected attribute '" + attribute +
-                                 "' in enum '" + params["name"] + "'")
-        params["internal_scope"] = internal_scope
-        params["scope"] = scope
-        params["since"] = since
-        params["until"] = until
-        params["deprecated"] = deprecated
-        params["removed"] = removed
-
-        elements = collections.OrderedDict()
-        for subelement in subelements:
-            if subelement.tag == "element":
-                self._add_item(elements, self._parse_enum_element(subelement))
-            else:
-                raise ParseError("Unexpected element '" + subelement.tag +
-                                 "' in enum '" + params["name"] + "'")
-        params["elements"] = elements
-
-        # Magic usage is correct
-        # pylint: disable=W0142
-        return Model.Enum(**params)
-
-    def _parse_struct(self, element, prefix):
-        """Parse element as structure.
-
-        Returns an instance of generator.Model.Struct
-
-        """
-        params, subelements, attrib = self._parse_base_item(element, prefix)
-
-        scope = None
-        since = None
-        until = None
-        deprecated = None
-        removed = None
-        result = None
-        for attribute in attrib:
-            if attribute == "scope":
-                scope = attrib[attribute]
-            elif attribute == "since":
-                result = self._parse_version(attrib[attribute])
-                since = result
-            elif attribute == "until":
-                result = self._parse_version(attrib[attribute])
-                until = result
-            elif attribute == "deprecated":
-                deprecated = attributes[attribute]
-            elif attribute == "removed":
-                removed = attrib[attribute]
-            else:
-                raise ParseError("Unexpected attribute '" + attribute +
-                                 "' in struct '" + params["name"] + "'")
-        params["scope"] = scope
-        params["since"] = since
-        params["until"] = until
-        params["deprecated"] = deprecated
-        params["removed"] = removed
-
-        members = collections.OrderedDict()
-        for subelement in subelements:
-            if subelement.tag == "param":
-                self._add_item(members, self._parse_param(subelement, prefix))
-            else:
-                raise ParseError("Unexpected subelement '" + subelement.name +
-                                 "' in struct '" + params["name"] + "'")
-        params["members"] = members
-
-        # Magic usage is correct
-        # pylint: disable=W0142
-        return Model.Struct(**params)
-
-    def _parse_function(self, element, prefix):
-        """Parse element as function.
-
-        Returns an instance of generator.Model.Function
-
-        """
-        params, subelements, attributes = \
-            self._parse_base_item(element, prefix)
-
-        function_id, message_type = self._parse_function_id_type(
-            params["name"],
-            attributes)
-
-        scope = None
-        since = None
-        until = None
-        deprecated = None
-        removed = None
-        result = None
-        for attribute in attributes:
-            if attribute == "scope":
-                scope = attributes[attribute]
-            elif attribute == "since":
-                result = self._parse_version(attributes[attribute])
-                since = result
-            elif attribute == "until":
-                result = self._parse_version(attributes[attribute])
-                until = result
-            elif attribute == "deprecated":
-                deprecated = attributes[attribute]
-            elif attribute == "removed":
-                removed = attributes[attribute]
-
-        params["function_id"] = function_id
-        params["message_type"] = message_type
-        params["scope"] = scope
-        params["since"] = since
-        params["until"] = until
-        params["deprecated"] = deprecated
-        params["removed"] = removed
-
-        function_params = collections.OrderedDict()
-        for subelement in subelements:
-            if subelement.tag == "param":
-                function_param = self._parse_function_param(subelement,
-                                                            prefix)
-                self._check_function_param_name(function_param.name)
-                if function_param.name in function_params:
-                    raise ParseError("Parameter '" + function_param.name +
-                                     "' is specified more than once" +
-                                     " for function '" + params["name"] + "'")
-                function_params[function_param.name] = function_param
-            else:
-                raise ParseError("Unexpected subelement '" + subelement.tag +
-                                 "' in function '" + params["name"] + "'")
-        params["params"] = function_params
-
-        # Magic usage is correct
-        # pylint: disable=W0142
-        return Model.Function(**params)
-
-    def _parse_function_id_type(self, function_name, attrib):
-        """Parse function id and message type according to XML format.
-
-        This implementation takes function name as function id and extracts
-        attribute "messagetype" as message type and searches them in enums
-        "FunctionID" and "messageType" adding the missing elements if
-        necessary.
-
-        Returns function id and message type as an instances of EnumElement.
-
-        """
-        if "messagetype" not in attrib:
-            raise ParseError("No messagetype specified for function '" +
-                             function_name + "'")
-
-        function_id = self._provide_enum_element_for_function(
-            "FunctionID",
-            function_name)
-
-        message_type = self._provide_enum_element_for_function(
-            "messageType",
-            self._extract_attrib(attrib, "messagetype"))
-
-        return function_id, message_type
-
-    def _provide_enum_element_for_function(self, enum_name, element_name):
-        """Provide enum element for functions.
-
-        Search an element in an enum and add it if it is missing.
-
-        Returns EnumElement.
-
-        """
-        if enum_name not in self._types:
-            raise ParseError("Enum '" + enum_name +
-                             "' is not initialized")
-
-        enum = self._types[enum_name]
-
-        if not isinstance(enum, Model.Enum):
-            raise ParseError("'" + enum_name + "' is not an enum")
-
-        if element_name not in enum.elements:
-            enum.elements[element_name] = Model.EnumElement(name=element_name)
-
-        return enum.elements[element_name]
-
-    def _parse_base_item(self, element, prefix):
-        """Parse element as base item.
-
-        Returns an params, sub-elements and attributes of the element
-
-        """
-        params = {}
-
-        description = []
-        design_description = []
-        issues = []
-        todos = []
-        subelements = []
-        history = None
-        warnings = []
-
-        if "name" not in element.attrib:
-            raise ParseError("Name is not specified for " + element.tag)
-
-        params["name"] = prefix + element.attrib["name"]
-        attrib = dict(element.attrib.items())
-        del attrib["name"]
-
-        params["platform"] = self._extract_attrib(attrib, "platform")
-
-        for subelement in element:
-            if subelement.tag == "description":
-                description.append(self._parse_simple_element(subelement))
-            elif subelement.tag == "designdescription":
-                design_description.append(
-                    self._parse_simple_element(subelement))
-            elif subelement.tag == "todo":
-                todos.append(self._parse_simple_element(subelement))
-            elif subelement.tag == "issue":
-                issues.append(self._parse_issue(subelement))
-            elif subelement.tag == "history":
-                if history is not None:
-                    raise ParseError("Elements can only have one history tag: " + element.tag)
-                history = self._parse_history(subelement, prefix, element)
-            elif subelement.tag == "warning":
-                warnings.append(self._parse_simple_element(subelement))
-            else:
-                subelements.append(subelement)
-
-        params["description"] = description
-        params["design_description"] = design_description
-        params["issues"] = issues
-        params["todos"] = todos
-        params["history"] = history
-
-        return params, subelements, attrib
-
-    @staticmethod
-    def _parse_simple_element(element):
-        """Parse element as simple element and returns it's text.
-
-        Element is simple when it contains no subelements and attributes.
-
-        Returns element text if present or empty string if not
-
-        """
-        if len(element) != 0:
-            raise ParseError("Unexpected subelements in '" +
-                             element.tag + "'")
-        if len(element.attrib) != 0:
-            raise ParseError("Unexpected attributes in '" +
-                             element.tag + "'")
-        return element.text if element.text is not None else ""
-
-    @staticmethod
-    def _parse_issue(element):
-        """Parse element as issue.
-
-        Issue must not contain subelements and attributes.
-
-        Returns an instance of generator.Model.Issue
-
-        """
-        if len(element) != 0:
-            raise ParseError("Unexpected subelements in issue")
-        if "creator" not in element.attrib:
-            raise ParseError("No creator in issue")
-        if len(element.attrib) != 1:
-            raise ParseError("Unexpected attributes in issue")
-
-        return Model.Issue(
-            creator=element.attrib["creator"],
-            value=element.text if element.text is not None else "")
-
-    def _parse_enum_element(self, element):
-        """Parse element as element of enumeration.
-
-        Returns an instance of generator.Model.EnumElement
-
-        """
-        params, subelements, attributes = self._parse_base_item(element, "")
-
-        if len(subelements) != 0:
-            raise ParseError("Unexpected subelements in enum element")
-
-        self._ignore_attribute(attributes, "hexvalue")
-        self._ignore_attribute(attributes, "scope")
-        self._ignore_attribute(attributes, "rootscreen")
-
-        internal_name = None
-        value = None
-        since = None
-        until = None
-        deprecated = None
-        removed = None
-        result = None
-        for attribute in attributes:
-            if attribute == "internal_name":
-                internal_name = attributes[attribute]
-            elif attribute == "value":
-                try:
-                    value = int(attributes[attribute])
-                except:
-                    raise ParseError("Invalid value for enum element: '" +
-                                     attributes[attribute] + "'")
-            elif attribute == "since":
-                result = self._parse_version(attributes[attribute])
-                since = result
-            elif attribute == "until":
-                result = self._parse_version(attributes[attribute])
-                until = result
-            elif attribute == "deprecated":
-                deprecated = attributes[attribute]
-            elif attribute == "removed":
-                removed = attributes[attribute]
-        params["internal_name"] = internal_name
-        params["value"] = value
-        params["since"] = since
-        params["until"] = until
-        params["deprecated"] = deprecated
-        params["removed"] = removed
-        # Magic usage is correct
-        # pylint: disable=W0142
-        return Model.EnumElement(**params)
-
-    def _parse_param(self, element, prefix):
-        """Parse element as structure parameter.
-
-        Returns an instance of generator.Model.Param
-
-        """
-        params, subelements, attrib = \
-            self._parse_param_base_item(element, prefix)
-
-        if len(attrib) != 0:
-            raise ParseError("""Unknown attribute(s) {0} in param {1}
-                """.format(attrib, params["name"]))
-
-        if len(subelements) != 0:
-            raise ParseError("Unknown subelements in param '" +
-                             params["name"] + "'")
-
-        # Magic usage is correct
-        # pylint: disable=W0142
-        return Model.Param(**params)
-
-    def _parse_function_param(self, element, prefix):
-        """Parse element as function parameter.
-
-        Returns an instance of generator.Model.FunctionParam
-
-        """
-        params, subelements, attrib = \
-            self._parse_param_base_item(element, prefix)
-
-        default_value = None
-        default_value_string = self._extract_attrib(attrib, "defvalue")
-        if default_value_string is not None:
-            param_type = params["param_type"]
-            if type(param_type) is Model.Boolean:
-                default_value = \
-                    self._get_bool_from_string(default_value_string)
-            elif type(param_type) is Model.Integer:
-                try:
-                    default_value = int(default_value_string)
-                except:
-                    raise ParseError("Invalid value for integer: '" +
-                                     default_value_string + "'")
-            elif type(param_type) is Model.Double:
-                try:
-                    default_value = float(default_value_string)
-                except:
-                    raise ParseError("Invalid value for float: '" +
-                                     default_value_string + "'")
-            elif type(param_type) is Model.String:
-                default_value = default_value_string
-            elif type(param_type) is Model.Enum or \
-                    type(param_type) is Model.EnumSubset:
-                if type(param_type) is Model.EnumSubset:
-                    allowed_elements = param_type.allowed_elements
-                else:
-                    allowed_elements = param_type.elements
-                if default_value_string not in allowed_elements:
-                    raise ParseError("Default value '" + default_value_string +
-                                     "' for parameter '" + params["name"] +
-                                     "' is not a member of " +
-                                     type(param_type).__name__ +
-                                     "'" + params["name"] + "'")
-                default_value = allowed_elements[default_value_string]
-            else:
-                raise ParseError("Default value specified for " +
-                                 type(param_type).__name__)
-        params["default_value"] = default_value
-
-        if len(attrib) != 0:
-            raise ParseError("Unexpected attributes in parameter '" +
-                             params["name"] + "'")
-
-        if len(subelements) != 0:
-            raise ParseError("Unexpected subelements in parameter '" +
-                             params["name"] + "'")
-
-        # Magic usage is correct
-        # pylint: disable=W0142
-        return Model.FunctionParam(**params)
-
-    def _parse_param_base_item(self, element, prefix):
-        """Parse base param items.
-
-        Returns params, other subelements and attributes.
-
-        """
-        params, subelements, attrib = self._parse_base_item(element, "")
-
-        since_version = self._extract_attrib(attrib, "since")
-        if since_version is not None:
-            result = self._parse_version(since_version)
-            params["since"] = result
-
-        until_version = self._extract_attrib(attrib, "until")
-        if until_version is not None:
-            result = self._parse_version(until_version)
-            params["until"] = result
-
-        deprecated = self._extract_attrib(attrib, "deprecated")
-        if deprecated is not None:
-            params["deprecated"] = deprecated
-
-        removed = self._extract_attrib(attrib, "removed")
-        if removed is not None:
-            params["removed"] = removed
-
-
-        is_mandatory = self._extract_attrib(attrib, "mandatory")
-        if is_mandatory is None:
-            raise ParseError("'mandatory' is not specified for parameter '" +
-                             params["name"] + "'")
-        
-        params["is_mandatory"] = self._get_bool_from_string(is_mandatory)
-
-        scope = self._extract_attrib(attrib, "scope")
-        if scope is not None:
-            params["scope"] = scope
-
-        default_value = None;
-        param_type = None
-        type_name = self._extract_attrib(attrib, "type")
-        if type_name is None:
-            raise ParseError("Type is not specified for parameter '" +
-                             params["name"] + "'")
-        if type_name == "Boolean":
-            default_value = self._extract_attrib(
-                attrib, "defvalue")
-            if default_value != None:
-                default_value = self._get_bool_from_string(default_value);
-            param_type = Model.Boolean(default_value=default_value)
-        elif type_name == "Integer" or \
-                type_name == "Float" or \
-                type_name == "Double" :
-            min_value = self._extract_optional_number_attrib(
-                attrib, "minvalue", int if type_name == "Integer" else float)
-            max_value = self._extract_optional_number_attrib(
-                attrib, "maxvalue", int if type_name == "Integer" else float)
-            default_value = self._extract_optional_number_attrib(
-                attrib, "defvalue", int if type_name == "Integer" else float)
-
-            param_type = \
-                (Model.Integer if type_name == "Integer" else Model.Double)(
-                    min_value=min_value,
-                    max_value=max_value,
-                    default_value=default_value)
-        elif type_name == "String":
-            min_length = self._extract_optional_number_attrib(
-                attrib, "minlength")
-            # if minlength is not defined default value is 1
-            if min_length is None:
-                min_length = 1
-            max_length = self._extract_optional_number_attrib(
-                attrib, "maxlength")
-            default_value = self._extract_attrib(attrib, "defvalue")
-            param_type = Model.String(min_length=min_length, max_length=max_length, default_value=default_value)
-        else:
-            if 1 == type_name.count("."):
-                custom_type_name = type_name.replace(".", "_")
-            else:
-                custom_type_name = prefix + type_name
-
-            if custom_type_name in self._types:
-                param_type = self._types[custom_type_name]
-                default_value = self._extract_attrib(attrib, "defvalue")
-                if default_value != None:
-                    if default_value not in param_type.elements:
-                        raise ParseError("Default value '" + default_value +
-                                     "' for parameter '" + params["name"] +
-                                     "' is not a member of " +
-                                     type(param_type).__name__ +
-                                     "'" + params["name"] + "'")
-                    default_value = param_type.elements[default_value]
-            else:
-                raise ParseError("Unknown type '" + type_name + "'")
-
-        if self._extract_optional_bool_attrib(attrib, "array", False):
-            min_size = self._extract_optional_number_attrib(attrib,
-                                                            "minsize")
-            max_size = self._extract_optional_number_attrib(attrib,
-                                                            "maxsize")
-            param_type = Model.Array(element_type=param_type,
-                                     min_size=min_size,
-                                     max_size=max_size)
-            
-        base_type = \
-            param_type.element_type if isinstance(param_type, Model.Array) \
-            else param_type
-
-        other_subelements = []
-        for subelement in subelements:
-            if subelement.tag == "element":
-                if type(base_type) is not Model.Enum and \
-                   type(base_type) is not Model.EnumSubset:
-                    raise ParseError("Elements specified for parameter '" +
-                                     params["name"] + "' of type " +
-                                     type(base_type).__name__)
-                if type(base_type) is Model.Enum:
-                    base_type = Model.EnumSubset(
-                        name=params["name"],
-                        enum=base_type,
-                        description=params["description"],
-                        design_description=params["design_description"],
-                        issues=params["issues"],
-                        todos=params["todos"],
-                        allowed_elements={})
-                if "name" not in subelement.attrib:
-                    raise ParseError(
-                        "Element name is not specified for parameter '" +
-                        params["name"] + "'")
-                element_name = subelement.attrib["name"]
-                if len(subelement.attrib) != 1:
-                    raise ParseError("Unexpected attributes for element '" +
-                                     element_name + "' of parameter '" +
-                                     params["name"])
-                children = subelement.getchildren()
-                for child in children:
-                    if child.tag == "description":
-                        children.remove(child)
-                if len(children) != 0:
-                    raise ParseError("Unexpected subelements for element '" +
-                                     element_name + "' of parameter '" +
-                                     params["name"])
-                if element_name in base_type.allowed_elements:
-                    raise ParseError("Element '" + element_name +
-                                     "' is specified more than once for" +
-                                     " parameter '" + params["name"] + "'")
-                if element_name not in base_type.enum.elements:
-                    raise ParseError("Element '" + element_name +
-                                     "' is not a member of enum '" +
-                                     base_type.enum.name + "'")
-                base_type.allowed_elements[element_name] = \
-                    base_type.enum.elements[element_name]
-            else:
-                other_subelements.append(subelement)
-
-        if isinstance(param_type, Model.Array):
-            param_type.element_type = base_type
-        else:
-            param_type = base_type
-
-        params["param_type"] = param_type
-        if default_value is not None:
-            params["default_value"] = default_value
-
-        return params, other_subelements, attrib
-
-    def _extract_optional_bool_attrib(self, attrib, name, default):
-        """Extract boolean attribute with given name.
-
-        Returns value of the attribute.
-
-        """
-        value = self._extract_attrib(attrib, name)
-
-        if value is None:
-            value = default
-        else:
-            value = self._get_bool_from_string(value)
-
-        return value
-
-    def _extract_optional_number_attrib(self, attrib, name, _type=int):
-        """Extract number attribute with given name.
-
-        Returns value of the attribute.
-
-        """
-        value = self._extract_attrib(attrib, name)
-
-        if value is not None:
-            try:
-                value = _type(value)
-            except:
-                raise ParseError("Invlaid value for " + _type.__name__ +
-                                 ": '" + value + "'")
-
-        return value
-
-    @staticmethod
-    def _extract_attrib(attrib, name):
-        """Extract attribute with given name.
-
-        Returns value of the attribute.
-
-        """
-        value = None
-
-        if name in attrib:
-            value = attrib[name]
-            del attrib[name]
-
-        return value
-
-    @staticmethod
-    def _get_bool_from_string(bool_string):
-        """Convert string representation of boolean to real bool value.
-
-        Returns converted value.
-
-        """
-        value = None
-
-        if bool_string in ['0', 'false']:
-            value = False
-        elif bool_string in ['1', 'true']:
-            value = True
-        else:
-            raise ParseError("Invalid value for bool: '" +
-                             bool_string + "'")
-
-        return value
-
-    def _ignore_attribute(self, attrib, name):
-        """To be called when attribute is meaningless in terms
-        of code generation but it's presence is not issue.
-
-        Removes this attribute from attribute list.
-
-        """
-        if name in attrib:
-            del attrib[name]
-            print ("Ignoring attribute '" +
-                   name + "'")
-        return True
-
-    def _parse_version(self, version):
-        """
-            Validates if a version supplied is in the correct
-            format of Major.Minor.Patch. If Major.Minor format
-            is supplied, a patch version of 0 will be added to
-            the end.
-        """
-        p = re.compile('\d+\\.\d+\\.\d+|\d+\\.\d+')
-        result = p.match(version)
-        if result == None or (result.end() != len(version)):
-            raise RPCBase.ParseError("Incorrect format of version please check MOBILE_API.xml. "
-                                     "Need format of major_version.minor_version or major_version.minor_version.patch_version")
-
-        version_array = version.split(".")
-        if (len(version_array) == 2):
-            version_array.append("0")
-        dot_str = "."
-        return dot_str.join(version_array)
-
-    def _parse_history(self, history, prefix, parent):
-        if history.tag != "history":
-            raise ParseError("Invalid history tag: " + interface.tag)
-        
-        items = []
-
-        for subelement in history:
-            if subelement.tag == "enum" and parent.tag == "enum":
-                items.append(self._parse_enum(subelement, prefix))
-            elif subelement.tag == "element" and parent.tag == "element":
-                items.append(self._parse_enum_element(subelement))
-            elif subelement.tag == "description" and parent.tag == "description":
-                items.append(self._parse_simple_element(subelement))
-            elif subelement.tag == "struct" and parent.tag == "struct":
-                items.append(self._parse_struct(subelement, prefix))
-            elif subelement.tag == "param" and parent.tag == "param":
-                items.append(self._parse_function_param(subelement, prefix))
-            elif subelement.tag == "function" and parent.tag == "function":
-                items.append(self.__parse_function(subelement, prefix))
-            else: 
-                raise ParseError("A history tag must be nested within the element it notes the history for. Fix item: '" +
-                 parent.attrib["name"] + "'")
-
-        return items
-
diff --git a/tools/InterfaceGenerator/generator/parsers/SDLRPCV1.py b/tools/InterfaceGenerator/generator/parsers/SDLRPCV1.py
index 52158ee93b..eacf9d9f09 100755
--- a/tools/InterfaceGenerator/generator/parsers/SDLRPCV1.py
+++ b/tools/InterfaceGenerator/generator/parsers/SDLRPCV1.py
@@ -3,12 +3,12 @@
 Contains parser for SDLRPCV1 XML format.
 
 """
+from parsers.rpc_base import RPCBase
 
-from generator.parsers import RPCBase
-
-
-class Parser(RPCBase.Parser):
 
+class Parser(RPCBase):
     """SDLRPCV1 parser."""
 
-    pass
+    @property
+    def get_version(self):
+        return '1.0.0'
diff --git a/tools/InterfaceGenerator/generator/parsers/SDLRPCV2.py b/tools/InterfaceGenerator/generator/parsers/SDLRPCV2.py
deleted file mode 100755
index 3d67c6e4c6..0000000000
--- a/tools/InterfaceGenerator/generator/parsers/SDLRPCV2.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""SDLRPCV2 parser.
-
-Contains parser for SDLRPCV2 XML format.
-
-"""
-
-import collections
-
-from generator import Model
-from generator.parsers import RPCBase
-
-
-class Parser(RPCBase.Parser):
-
-    """SDLRPCV2 parser."""
-
-    def _initialize_enums(self):
-        """Initialize enums.
-
-        This implementation returns empty OrderedDict because in SDLRPCV2
-        all enums must be declared explicitly in the XML file.
-
-        """
-        return collections.OrderedDict()
-
-    def _check_enum_name(self, enum):
-        """Check enum name.
-
-        This method is called to check whether the newly parsed enum's name
-        conflicts with some predefined enum.
-        As SDLRPCV2 has no predefined enums this implementation does nothing.
-
-        """
-        pass
-
-    def _parse_function_id_type(self, function_name, attrib):
-        """Parse function id and message type according to XML format.
-
-        This implementation extracts attribute "FunctionID" as function id
-        and messagetype as message type and searches them in enums
-        "FunctionID" and "messageType". If at least one of them (or the entire
-        enum) is missing it raises an error.
-
-        Returns function id and message type as an instances of EnumElement.
-
-        """
-        if "functionID" not in attrib:
-            raise RPCBase.ParseError(
-                "No functionID specified for function '" +
-                function_name + "'")
-
-        if "messagetype" not in attrib:
-            raise RPCBase.ParseError(
-                "No messagetype specified for function '" +
-                function_name + "'")
-
-        function_id = self._get_enum_element_for_function(
-            "FunctionID",
-            self._extract_attrib(attrib, "functionID"))
-        message_type = self._get_enum_element_for_function(
-            "messageType",
-            self._extract_attrib(attrib, "messagetype"))
-
-        return function_id, message_type
-
-    def _get_enum_element_for_function(self, enum_name, element_name):
-        """Get enum element with given name from given enumeration.
-
-        Returns an instance of generator.Model.EnumElement.
-
-        """
-        if enum_name not in self._types:
-            raise RPCBase.ParseError(
-                "Enumeration '" + enum_name +
-                "' must be declared before any function")
-
-        enum = self._types[enum_name]
-
-        if type(enum) is not Model.Enum:
-            raise RPCBase.ParseError("'" + enum_name +
-                                     "' is not an enumeration")
-
-        if element_name not in enum.elements:
-            raise RPCBase.ParseError(
-                "'" + element_name +
-                "' is not a member of enum '" + enum_name + "'")
-
-        return enum.elements[element_name]
diff --git a/tools/InterfaceGenerator/requirements.txt b/tools/InterfaceGenerator/requirements.txt
index af21f6cb96..a76759eea6 100644
--- a/tools/InterfaceGenerator/requirements.txt
+++ b/tools/InterfaceGenerator/requirements.txt
@@ -1,6 +1,3 @@
-flake8
-pep8-naming
-pep257
-mccabe
+xmlschema
 pylint
-mock
\ No newline at end of file
+coverage
diff --git a/tools/InterfaceGenerator/test/CodeFormatAndQuality.py b/tools/InterfaceGenerator/test/CodeFormatAndQuality.py
new file mode 100755
index 0000000000..d403c821ab
--- /dev/null
+++ b/tools/InterfaceGenerator/test/CodeFormatAndQuality.py
@@ -0,0 +1,39 @@
+# pylint: disable=C0103, C0301, C0115, C0116
+"""Interface model unit test
+
+"""
+
+import unittest
+from os import walk
+from os.path import join
+from pathlib import Path
+
+from pylint.lint import Run
+
+
+class TestCodeFormatAndQuality(unittest.TestCase):
+    MINIMUM_SCORE = 3.7
+
+    def setUp(self):
+        """Searching for all python files to be checked
+
+        """
+        self.list_of_files = []
+        root = Path(__file__).absolute().parents[1]
+        for (directory, _, filenames) in walk(root.as_posix()):
+            self.list_of_files += [join(directory, file) for file in filenames
+                                   if file.endswith('.py') and not file.startswith('test')]
+        self.list_of_files.append('--max-line-length=130')
+            # self.list_of_files.append('--rcfile=../pylint.ini')
+
+    def test_pylint_conformance(self):
+        """Performing checks by PyLint
+
+        """
+        results = Run(self.list_of_files, do_exit=False)
+        score = results.linter.stats['global_note']
+        self.assertGreaterEqual(score, self.MINIMUM_SCORE)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryBase.py b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryBase.py
index aea91f4a45..08f231abe6 100755
--- a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryBase.py
+++ b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryBase.py
@@ -5,10 +5,21 @@ Verifies common helper functions and produced source code.
 """
 import collections
 import unittest
-
-from generator.generators import SmartFactoryBase
-from generator import Model
-
+from pathlib import Path
+
+import sys
+
+sys.path.append(Path(__file__).absolute().parents[3].as_posix())
+sys.path.append(Path(__file__).absolute().parents[4].joinpath('rpc_spec/InterfaceParser').as_posix())
+try:
+    from generator.generators import SmartFactoryBase
+    from model.enum import Enum
+    from model.enum_element import EnumElement
+    from model.issue import Issue
+    from generator.generators import SmartFactoryBase
+except ModuleNotFoundError as error:
+    print('{}.\nProbably you did not initialize submodule'.format(error))
+    sys.exit(1)
 
 EXPECTED_RESULT_FULL_COMMENT = u"""/**
  * @brief Enumeration Test Name.
@@ -133,15 +144,14 @@ DESCRIPTION = [u"Description Line1", u"Description Line2"]
 
 DESIGN_DESCRIPTION = [u"Design Line1"]
 
-ISSUES = [Model.Issue(value=u"Issue1"),
-          Model.Issue(value=u"Issue2"),
-          Model.Issue(value=u"Issue3")]
+ISSUES = [Issue(value=u"Issue1"),
+          Issue(value=u"Issue2"),
+          Issue(value=u"Issue3")]
 
 TODOS = [u"Do1", u"Do2"]
 
 
 class Test(unittest.TestCase):
-
     """Test for SmartFactory base generator.
 
     This class holds set of test cases for the SmartFactory base generator.
@@ -156,11 +166,11 @@ class Test(unittest.TestCase):
         """
         generator = SmartFactoryBase.CodeGenerator()
 
-        enum = Model.Enum(name=u"Test Name",
-                          description=DESCRIPTION,
-                          design_description=DESIGN_DESCRIPTION,
-                          issues=ISSUES,
-                          todos=TODOS)
+        enum = Enum(name=u"Test Name",
+                    description=DESCRIPTION,
+                    design_description=DESIGN_DESCRIPTION,
+                    issues=ISSUES,
+                    todos=TODOS)
         self.assertEqual(generator._gen_comment(enum),
                          EXPECTED_RESULT_FULL_COMMENT,
                          "Full comment for enum is invalid")
@@ -173,16 +183,16 @@ class Test(unittest.TestCase):
         """
         generator = SmartFactoryBase.CodeGenerator()
 
-        enum_element1 = Model.EnumElement(name=u"Element1",
-                                          internal_name=u"InternalName",
-                                          value=u"10")
+        enum_element1 = EnumElement(name=u"Element1",
+                                    internal_name=u"InternalName",
+                                    value=u"10")
 
         self.assertEqual(
             generator._gen_enum_element(enum_element1),
             EXPECTED_RESULT_ENUM_ELEMENT1,
             "Short commented enum element with internal name is invalid")
 
-        enum_element2 = Model.EnumElement(
+        enum_element2 = EnumElement(
             name=u"NO_VALUE_ELEMENT",
             description=DESCRIPTION,
             design_description=DESIGN_DESCRIPTION)
@@ -198,14 +208,14 @@ class Test(unittest.TestCase):
         """
         generator = SmartFactoryBase.CodeGenerator()
 
-        elements = [Model.EnumElement(name=u"name1",
-                                      design_description=DESIGN_DESCRIPTION,
-                                      todos=TODOS,
-                                      value=u"1"),
-                    Model.EnumElement(name=u"name2",
-                                      description=DESCRIPTION,
-                                      issues=ISSUES,
-                                      internal_name=u"internal_name2")]
+        elements = [EnumElement(name=u"name1",
+                                design_description=DESIGN_DESCRIPTION,
+                                todos=TODOS,
+                                value=u"1"),
+                    EnumElement(name=u"name2",
+                                description=DESCRIPTION,
+                                issues=ISSUES,
+                                internal_name=u"internal_name2")]
         self.assertEqual(generator._gen_enum_elements(elements),
                          EXPECTED_RESULT_ENUM_ELEMENTS1,
                          "Simple enum elements are invalid")
@@ -219,35 +229,35 @@ class Test(unittest.TestCase):
         generator = SmartFactoryBase.CodeGenerator()
 
         elements1 = collections.OrderedDict()
-        elements1[u"name1"] = Model.EnumElement(
+        elements1[u"name1"] = EnumElement(
             name=u"name1",
             design_description=DESIGN_DESCRIPTION,
             todos=TODOS,
             value=u"1")
-        elements1[u"name2"] = Model.EnumElement(
+        elements1[u"name2"] = EnumElement(
             name=u"name2",
             description=DESCRIPTION,
             issues=ISSUES,
             internal_name=u"internal_name2")
 
-        enum1 = Model.Enum(name=u"Enum1",
-                           todos=TODOS,
-                           elements=elements1)
+        enum1 = Enum(name=u"Enum1",
+                     todos=TODOS,
+                     elements=elements1)
 
         self.assertEqual(generator._gen_enum(enum1),
                          EXPECTED_RESULT_ENUM1,
                          "Simple enum is invalid")
 
         elements2 = collections.OrderedDict()
-        elements2[u"xxx"] = Model.EnumElement(name=u"xxx",
-                                              internal_name=u"val_1")
-        elements2[u"yyy"] = Model.EnumElement(name=u"yyy",
-                                              internal_name=u"val_2",
-                                              value=u"100")
-        elements2[u"zzz"] = Model.EnumElement(name=u"val_3")
-
-        enum2 = Model.Enum(name=u"E2",
-                           elements=elements2)
+        elements2[u"xxx"] = EnumElement(name=u"xxx",
+                                        internal_name=u"val_1")
+        elements2[u"yyy"] = EnumElement(name=u"yyy",
+                                        internal_name=u"val_2",
+                                        value=u"100")
+        elements2[u"zzz"] = EnumElement(name=u"val_3")
+
+        enum2 = Enum(name=u"E2",
+                     elements=elements2)
         self.assertEqual(generator._gen_enum(enum2),
                          EXPECTED_RESULT_ENUM2,
                          "Long enum is invalid")
@@ -279,5 +289,6 @@ class Test(unittest.TestCase):
                                                                   "aaa aaa"]),
                          ["aaa", "1", "bbb", "2", "ccc", "3", "aaa aaa"])
 
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
index c4813d00a8..d3262c8da2 100755
--- a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
+++ b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactoryJSONRPC.py
@@ -3,110 +3,128 @@
 Verifies format specific functions and produced source code.
 
 """
-import collections
 import codecs
+import collections
 import os
 import unittest
 import uuid
-
-from mock import MagicMock
-from mock import call
-
-from generator.generators import SmartFactoryJSONRPC
-from generator import Model
-
+from pathlib import Path
+from unittest.mock import MagicMock
+from unittest.mock import call
+
+import sys
+
+sys.path.append(Path(__file__).absolute().parents[3].as_posix())
+sys.path.append(Path(__file__).absolute().parents[4].joinpath('rpc_spec/InterfaceParser').as_posix())
+try:
+    from generator.generators import SmartFactoryJSONRPC
+    from model.array import Array
+    from model.boolean import Boolean
+    from model.float import Float
+    from model.enum import Enum
+    from model.enum_element import EnumElement
+    from model.enum_subset import EnumSubset
+    from model.function import Function
+    from model.integer import Integer
+    from model.interface import Interface
+    from model.issue import Issue
+    from model.param import Param
+    from model.struct import Struct
+except ModuleNotFoundError as error:
+    print('{}.\nProbably you did not initialize submodule'.format(error))
+    sys.exit(1)
 
 EXPECTED_RESULT_REQUEST = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_RESULT_RESPONSE = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::kCode] = CObjectSchemaItem::SMember("""
+    u"""strings::kCode] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_RESULT_NOTIFICATION = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
 )
 
 EXPECTED_PRE_FUNCTION_CODE = (
-    u"""  std::map<std::string, CObjectSchemaItem::SMember> """
+    u"""  std::map<std::string, SMember> """
     u"""params_members;\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler"""
-    u"""::strings::kCode] = CObjectSchemaItem::SMember("""
+    u"""::strings::kCode] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""  params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::kMessage] = CObjectSchemaItem::SMember("""
+    u"""strings::kMessage] = SMember("""
     u"""CStringSchemaItem::create(), true);\n"""
     u"""\n"""
-    u"""  std::map<std::string, CObjectSchemaItem::SMember> """
+    u"""  std::map<std::string, SMember> """
     u"""root_members_map;\n"""
     u"""  root_members_map[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PARAMS] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PARAMS] = SMember("""
     u"""CObjectSchemaItem::create(params_members), true);\n"""
     u"""\n"""
     u"""  CSmartSchema error_response_schema(CObjectSchemaItem::create("""
@@ -124,15 +142,14 @@ DESCRIPTION = [u"Description Line1", u"Description Line2"]
 
 DESIGN_DESCRIPTION = [u"Design Line1"]
 
-ISSUES = [Model.Issue(value=u"Issue1"),
-          Model.Issue(value=u"Issue2"),
-          Model.Issue(value=u"Issue3")]
+ISSUES = [Issue(value=u"Issue1"),
+          Issue(value=u"Issue2"),
+          Issue(value=u"Issue3")]
 
 TODOS = [u"Do1", u"Do2"]
 
 
 class Test(unittest.TestCase):
-
     """Test for JSONRPC SmartFactory generator.
 
     This class holds set of test cases for the JSONRPC SmartFactory generator.
@@ -183,14 +200,14 @@ class Test(unittest.TestCase):
         generator = SmartFactoryJSONRPC.CodeGenerator()
 
         message_type_elements = collections.OrderedDict()
-        message_type_elements[u"request"] = Model.EnumElement(name=u"request")
-        message_type_elements[u"response"] = Model.EnumElement(
+        message_type_elements[u"request"] = EnumElement(name=u"request")
+        message_type_elements[u"response"] = EnumElement(
             name=u"response")
-        message_type_elements[u"notification"] = Model.EnumElement(
+        message_type_elements[u"notification"] = EnumElement(
             name=u"notification")
 
-        message_type = Model.Enum(name=u"messageType",
-                                  elements=message_type_elements)
+        message_type = Enum(name=u"messageType",
+                            elements=message_type_elements)
 
         result_enum = generator._preprocess_message_type(message_type)
 
@@ -199,12 +216,12 @@ class Test(unittest.TestCase):
                          result_enum.elements["error_response"].primary_name)
 
         message_type_elements = collections.OrderedDict()
-        message_type_elements[u"request"] = Model.EnumElement(name=u"request")
-        message_type_elements[u"notification"] = Model.EnumElement(
+        message_type_elements[u"request"] = EnumElement(name=u"request")
+        message_type_elements[u"notification"] = EnumElement(
             name=u"notification")
 
-        message_type = Model.Enum(name=u"messageType",
-                                  elements=message_type_elements)
+        message_type = Enum(name=u"messageType",
+                            elements=message_type_elements)
 
         result_enum = generator._preprocess_message_type(message_type)
 
@@ -217,6 +234,7 @@ class Test(unittest.TestCase):
         function.
 
         """
+        self.maxDiff = None
 
         generator = SmartFactoryJSONRPC.CodeGenerator()
 
@@ -225,16 +243,16 @@ class Test(unittest.TestCase):
                          "Invalid code for empty functions list")
 
         message_type_elements = collections.OrderedDict()
-        message_type_elements[u"request"] = Model.EnumElement(name=u"request")
-        message_type_elements[u"response"] = Model.EnumElement(
+        message_type_elements[u"request"] = EnumElement(name=u"request")
+        message_type_elements[u"response"] = EnumElement(
             name=u"response")
-        message_type_elements[u"notification"] = Model.EnumElement(
+        message_type_elements[u"notification"] = EnumElement(
             name=u"notification")
 
-        message_type = Model.Enum(name=u"messageType",
-                                  elements=message_type_elements)
+        message_type = Enum(name=u"messageType",
+                            elements=message_type_elements)
 
-        function1 = Model.Function(
+        function1 = Function(
             "func1", function_id=message_type.elements[u"request"],
             message_type=message_type.elements[u"request"])
 
@@ -242,18 +260,20 @@ class Test(unittest.TestCase):
                          generator._gen_pre_function_schemas([function1]),
                          "Invalid code for empty functions list")
 
-        function2 = Model.Function(
+        function2 = Function(
             "func2", function_id=message_type.elements[u"request"],
             message_type=message_type.elements[u"response"])
-
-        self.assertEqual(EXPECTED_PRE_FUNCTION_CODE,
-                         generator._gen_pre_function_schemas([function2]),
-                         "Invalid code for single response function")
-
-        self.assertEqual(EXPECTED_PRE_FUNCTION_CODE,
-                         generator._gen_pre_function_schemas([function1,
-                                                              function2]),
-                         "Invalid code for mixed function list")
+        try:
+            self.assertEqual(EXPECTED_PRE_FUNCTION_CODE,
+                             generator._gen_pre_function_schemas([function2]),
+                             "Invalid code for single response function")
+
+            self.assertEqual(EXPECTED_PRE_FUNCTION_CODE,
+                             generator._gen_pre_function_schemas([function1,
+                                                                  function2]),
+                             "Invalid code for mixed function list")
+        except AssertionError as message:
+            print(message)
 
     def test_full_generation(self):
         """Test full generation using JSONRPC SmartSchema generator.
@@ -264,66 +284,66 @@ class Test(unittest.TestCase):
         directory as this module.
 
         """
-
-        expected_h_file_content = open("test_expected_jsonrpc.h", "r").read()
-        expected_cc_file_content = open("test_expected_jsonrpc.cc", "r").read()
+        self.maxDiff = None
+        expected_h_file_content = Path(__file__).parents[0].joinpath("test_expected_jsonrpc.h").read_text()
+        expected_cc_file_content = Path(__file__).parents[0].joinpath("test_expected_jsonrpc.cc").read_text()
 
         generator = SmartFactoryJSONRPC.CodeGenerator()
 
         message_type_elements = collections.OrderedDict()
-        message_type_elements[u"request"] = Model.EnumElement(name=u"request")
-        message_type_elements[u"response"] = Model.EnumElement(
+        message_type_elements[u"request"] = EnumElement(name=u"request")
+        message_type_elements[u"response"] = EnumElement(
             name=u"response")
-        message_type_elements[u"notification"] = Model.EnumElement(
+        message_type_elements[u"notification"] = EnumElement(
             name=u"notification")
 
-        message_type = Model.Enum(name=u"messageType",
-                                  elements=message_type_elements)
+        message_type = Enum(name=u"messageType",
+                            elements=message_type_elements)
 
         elements1 = collections.OrderedDict()
-        elements1[u"name1"] = Model.EnumElement(
+        elements1[u"name1"] = EnumElement(
             name=u"name1",
             design_description=DESIGN_DESCRIPTION,
             todos=TODOS,
             value=u"1")
-        elements1[u"name2"] = Model.EnumElement(
+        elements1[u"name2"] = EnumElement(
             name="name2",
             description=DESCRIPTION,
             issues=ISSUES,
             internal_name=u"internal_name2")
 
-        enum1 = Model.Enum(name=u"Enum1",
-                           todos=TODOS,
-                           elements=elements1)
+        enum1 = Enum(name=u"Enum1",
+                     todos=TODOS,
+                     elements=elements1)
 
         elements2 = collections.OrderedDict()
-        elements2[u"xxx"] = Model.EnumElement(name=u"xxx",
-                                              internal_name=u"val_1")
-        elements2[u"yyy"] = Model.EnumElement(name=u"yyy",
-                                              internal_name=u"val_2",
-                                              value=u"100")
-        elements2[u"zzz"] = Model.EnumElement(name=u"val_3")
+        elements2[u"xxx"] = EnumElement(name=u"xxx",
+                                        internal_name=u"val_1")
+        elements2[u"yyy"] = EnumElement(name=u"yyy",
+                                        internal_name=u"val_2",
+                                        value=u"100")
+        elements2[u"zzz"] = EnumElement(name=u"val_3")
 
-        enum2 = Model.Enum(name=u"E2",
-                           elements=elements2)
+        enum2 = Enum(name=u"E2",
+                     elements=elements2)
 
         elements3 = collections.OrderedDict()
-        elements3["1"] = Model.EnumElement(name="xxx",
-                                           internal_name="_1")
-        elements3["2"] = Model.EnumElement(name="xxx",
-                                           internal_name="_2")
-        elements3["3"] = Model.EnumElement(name="xxx",
-                                           internal_name="_3")
-        enum3 = Model.Enum(name="Enum_new2",
-                           elements=elements3)
+        elements3["1"] = EnumElement(name="xxx",
+                                     internal_name="_1")
+        elements3["2"] = EnumElement(name="xxx",
+                                     internal_name="_2")
+        elements3["3"] = EnumElement(name="xxx",
+                                     internal_name="_3")
+        enum3 = Enum(name="Enum_new2",
+                     elements=elements3)
 
         elements4 = collections.OrderedDict()
-        elements4["name1"] = Model.EnumElement(name="xxx",
-                                               internal_name="_11")
-        elements4["name2"] = Model.EnumElement(name="xxx",
-                                               internal_name="_22")
-        enum4 = Model.Enum(name="Enum_new4",
-                           elements=elements4)
+        elements4["name1"] = EnumElement(name="xxx",
+                                         internal_name="_11")
+        elements4["name2"] = EnumElement(name="xxx",
+                                         internal_name="_22")
+        enum4 = Enum(name="Enum_new4",
+                     elements=elements4)
 
         enums = collections.OrderedDict()
         enums["Enum1"] = enum1
@@ -333,7 +353,7 @@ class Test(unittest.TestCase):
         enums["messageType"] = message_type
 
         params1 = collections.OrderedDict()
-        params1["1"] = Model.FunctionParam(
+        params1["1"] = Param(
             name="param1",
             design_description=DESIGN_DESCRIPTION,
             description=DESCRIPTION,
@@ -341,110 +361,110 @@ class Test(unittest.TestCase):
             todos=TODOS,
             param_type=enum4,
             default_value=elements4["name1"])
-        params1["2"] = Model.FunctionParam(
+        params1["2"] = Param(
             name="param2",
-            param_type=Model.EnumSubset(
+            param_type=EnumSubset(
                 name="sub1",
                 enum=enum1,
                 allowed_elements={"e1": elements1["name1"]}),
             default_value=elements1["name1"])
 
         functions = collections.OrderedDict()
-        functions["Function1"] = Model.Function(
+        functions["Function1"] = Function(
             name="Function1",
             function_id=elements1["name1"],
             message_type=message_type_elements["request"],
             params=params1)
-        functions["Function2"] = Model.Function(
+        functions["Function2"] = Function(
             name="Function2",
             function_id=elements2["xxx"],
             message_type=message_type_elements["response"])
-        functions["Function3"] = Model.Function(
+        functions["Function3"] = Function(
             name="Function2",
             function_id=elements2["yyy"],
             message_type=message_type_elements["notification"])
 
         members1 = collections.OrderedDict()
-        members1["m1"] = Model.Param(name="intParam",
-                                     param_type=Model.Integer(max_value=2))
-        members1["m11"] = Model.Param(name="doubleParam",
-                                      param_type=Model.Double(min_value=0.333),
-                                      is_mandatory=False)
-        members1["m222"] = Model.Param(name="boolParam",
-                                       param_type=Model.Boolean())
-        members1["m2"] = Model.Param(name="structParam",
-                                     param_type=Model.Struct(name="Struct2"))
-        members1["aaa"] = Model.Param(name="enumParam",
-                                      param_type=enum1)
-        members1["bbb"] = Model.Param(name="enumParam1",
-                                      param_type=enum1)
-        members1["xxx"] = Model.Param(
+        members1["m1"] = Param(name="intParam",
+                               param_type=Integer(max_value=2))
+        members1["m11"] = Param(name="doubleParam",
+                                param_type=Float(min_value=0.333),
+                                is_mandatory=False)
+        members1["m222"] = Param(name="boolParam",
+                                 param_type=Boolean())
+        members1["m2"] = Param(name="structParam",
+                               param_type=Struct(name="Struct2"))
+        members1["aaa"] = Param(name="enumParam",
+                                param_type=enum1)
+        members1["bbb"] = Param(name="enumParam1",
+                                param_type=enum1)
+        members1["xxx"] = Param(
             name="enumSubset1",
-            param_type=Model.EnumSubset(
+            param_type=EnumSubset(
                 name="sub",
                 enum=enum1,
                 allowed_elements={"e1": elements1["name1"]}),
             is_mandatory=False)
-        members1["1"] = Model.Param(
+        members1["1"] = Param(
             name="arrayOfInt",
-            param_type=Model.Array(min_size=0,
-                                   max_size=20,
-                                   element_type=Model.Boolean()),
+            param_type=Array(min_size=0,
+                             max_size=20,
+                             element_type=Boolean()),
             is_mandatory=False)
-        members1["2"] = Model.Param(
+        members1["2"] = Param(
             name="arrayOfEnum1",
-            param_type=Model.Array(min_size=0,
-                                   max_size=20,
-                                   element_type=enum1),
+            param_type=Array(min_size=0,
+                             max_size=20,
+                             element_type=enum1),
             is_mandatory=False)
-        members1["3"] = Model.Param(
+        members1["3"] = Param(
             name="arrayOfEnum3",
-            param_type=Model.Array(min_size=10,
-                                   max_size=40,
-                                   element_type=enum3),
+            param_type=Array(min_size=10,
+                             max_size=40,
+                             element_type=enum3),
             is_mandatory=True)
-        members1["4"] = Model.Param(
+        members1["4"] = Param(
             name="arrayOfEnum4",
-            param_type=Model.Array(
+            param_type=Array(
                 min_size=10,
                 max_size=41,
-                element_type=Model.EnumSubset(
+                element_type=EnumSubset(
                     name="sub1",
                     enum=enum1,
                     allowed_elements={"e1": elements1["name1"]})))
-        members1["5"] = Model.Param(
+        members1["5"] = Param(
             name="arrayOfEnum5",
-            param_type=Model.Array(
+            param_type=Array(
                 min_size=10,
                 max_size=42,
-                element_type=Model.EnumSubset(
+                element_type=EnumSubset(
                     name="sub2",
                     enum=enum1,
                     allowed_elements={"e1": elements1["name2"]})))
-        members1["6"] = Model.Param(
+        members1["6"] = Param(
             name="arrayOfEnum6",
-            param_type=Model.Array(
+            param_type=Array(
                 min_size=10,
                 max_size=43,
-                element_type=Model.EnumSubset(
+                element_type=EnumSubset(
                     name="sub3",
                     enum=enum4,
                     allowed_elements={"e1": elements4["name2"]})))
 
         structs = collections.OrderedDict()
-        structs["Struct1"] = Model.Struct(
+        structs["Struct1"] = Struct(
             name="Struct1",
             design_description=DESIGN_DESCRIPTION,
             issues=ISSUES,
             members=members1)
-        structs["Struct2"] = Model.Struct(name="Struct2",
-                                          issues=ISSUES)
+        structs["Struct2"] = Struct(name="Struct2",
+                                    issues=ISSUES)
 
-        interface = Model.Interface(enums=enums,
-                                    structs=structs,
-                                    functions=functions,
-                                    params={"param1": "value1",
-                                            "param2": "value2"})
+        interface = Interface(enums=enums,
+                              structs=structs,
+                              functions=functions,
+                              params={"param1": "value1",
+                                      "param2": "value2"})
 
         os.path.exists = MagicMock(return_value=True)
         uuid.uuid1 = MagicMock(
@@ -468,15 +488,21 @@ class Test(unittest.TestCase):
                          "Invalid header file creation")
 
         self.assertEqual(mock_calls[4],
-                         call('/some/test/dir/Test.cc',
+                         call('/some/test/dir/Test_schema.h',
                               mode='w',
                               encoding='utf-8'),
                          "Invalid source file creation")
+        try:
+            self.assertSequenceEqual(str(mock_calls[2])[27:-2].replace("\\n", "\n"),
+                                     expected_h_file_content,
+                                     "Invalid header file content")
+
+            self.assertSequenceEqual(str(mock_calls[6])[27:-2].replace("\\n", "\n"),
+                                     expected_cc_file_content,
+                                     "Invalid source file content")
+        except AssertionError as message:
+            print(message)
 
-        self.assertEqual(str(mock_calls[2])[27:-2].replace("\\n", "\n"),
-                         expected_h_file_content,
-                         "Invalid header file content")
 
-        self.assertEqual(str(mock_calls[6])[27:-2].replace("\\n", "\n"),
-                         expected_cc_file_content,
-                         "Invalid source file content")
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py
index 35e4aeb6ce..4b21a64ec1 100755
--- a/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py
+++ b/tools/InterfaceGenerator/test/generator/generators/test_SmartFactorySDLRPC.py
@@ -3,53 +3,70 @@
 Verifies format specific functions and produced source code.
 
 """
-import collections
 import codecs
+import collections
 import os
 import unittest
 import uuid
-
-from mock import MagicMock
-from mock import call
-
-from generator.generators import SmartFactorySDLRPC
-from generator import Model
-
+from pathlib import Path
+from unittest.mock import MagicMock
+from unittest.mock import call
+
+import sys
+
+sys.path.append(Path(__file__).absolute().parents[3].as_posix())
+sys.path.append(Path(__file__).absolute().parents[4].joinpath('rpc_spec/InterfaceParser').as_posix())
+try:
+    from generator.generators import SmartFactorySDLRPC
+    from model.array import Array
+    from model.boolean import Boolean
+    from model.float import Float
+    from model.enum import Enum
+    from model.enum_element import EnumElement
+    from model.enum_subset import EnumSubset
+    from model.function import Function
+    from model.integer import Integer
+    from model.interface import Interface
+    from model.issue import Issue
+    from model.param import Param
+    from model.struct import Struct
+except ModuleNotFoundError as error:
+    print('{}.\nProbably you did not initialize submodule'.format(error))
+    sys.exit(1)
 
 EXPECTED_NOTIFICATION_RESULT = (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_FUNCTION_ID] = SMember("""
     u"""TEnumSchemaItem<FunctionID::eType>::create("""
     u"""function_id_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_MESSAGE_TYPE] = SMember("""
     u"""TEnumSchemaItem<messageType::eType>::create("""
     u"""message_type_items), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_VERSION] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n"""
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember("""
+    u"""strings::S_PROTOCOL_TYPE] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n""")
 
 EXPECTED_REQ_RESP_RESULT = "".join([EXPECTED_NOTIFICATION_RESULT, (
     u"""params_members[ns_smart_device_link::ns_json_handler::"""
-    u"""strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember("""
+    u"""strings::S_CORRELATION_ID] = SMember("""
     u"""TNumberSchemaItem<int>::create(), true);\n""")])
 
 DESCRIPTION = [u"Description Line1", u"Description Line2"]
 
 DESIGN_DESCRIPTION = [u"Design Line1"]
 
-ISSUES = [Model.Issue(value=u"Issue1"),
-          Model.Issue(value=u"Issue2"),
-          Model.Issue(value=u"Issue3")]
+ISSUES = [Issue(value=u"Issue1"),
+          Issue(value=u"Issue2"),
+          Issue(value=u"Issue3")]
 
 TODOS = [u"Do1", u"Do2"]
 
 
 class Test(unittest.TestCase):
-
     """Test for SLDRPC SmartFactory generator.
 
     This class holds set of test cases for the SDLRPC SmartFactory generator.
@@ -107,66 +124,66 @@ class Test(unittest.TestCase):
         this module.
 
         """
-
-        expected_h_file_content = open("test_expected_sdlrpc.h", "r").read()
-        expected_cc_file_content = open("test_expected_sdlrpc.cc", "r").read()
+        self.maxDiff = None
+        expected_h_file_content = Path(__file__).parents[0].joinpath('test_expected_sdlrpc.h').read_text()
+        expected_cc_file_content = Path(__file__).parents[0].joinpath('test_expected_sdlrpc.cc').read_text()
 
         generator = SmartFactorySDLRPC.CodeGenerator()
 
         message_type_elements = collections.OrderedDict()
-        message_type_elements[u"request"] = Model.EnumElement(name=u"request")
-        message_type_elements[u"response"] = Model.EnumElement(
+        message_type_elements[u"request"] = EnumElement(name=u"request")
+        message_type_elements[u"response"] = EnumElement(
             name=u"response")
-        message_type_elements[u"notification"] = Model.EnumElement(
+        message_type_elements[u"notification"] = EnumElement(
             name=u"notification")
 
-        message_type = Model.Enum(name=u"messageType",
-                                  elements=message_type_elements)
+        message_type = Enum(name=u"messageType",
+                            elements=message_type_elements)
 
         elements1 = collections.OrderedDict()
-        elements1[u"name1"] = Model.EnumElement(
+        elements1[u"name1"] = EnumElement(
             name=u"name1",
             design_description=DESIGN_DESCRIPTION,
             todos=TODOS,
             value=u"1")
-        elements1[u"name2"] = Model.EnumElement(
+        elements1[u"name2"] = EnumElement(
             name="name2",
             description=DESCRIPTION,
             issues=ISSUES,
             internal_name=u"internal_name2")
 
-        enum1 = Model.Enum(name=u"Enum1",
-                           todos=TODOS,
-                           elements=elements1)
+        enum1 = Enum(name=u"Enum1",
+                     todos=TODOS,
+                     elements=elements1)
 
         elements2 = collections.OrderedDict()
-        elements2[u"xxx"] = Model.EnumElement(name=u"xxx",
-                                              internal_name=u"val_1")
-        elements2[u"yyy"] = Model.EnumElement(name=u"yyy",
-                                              internal_name=u"val_2",
-                                              value=u"100")
-        elements2[u"zzz"] = Model.EnumElement(name=u"val_3")
+        elements2[u"xxx"] = EnumElement(name=u"xxx",
+                                        internal_name=u"val_1")
+        elements2[u"yyy"] = EnumElement(name=u"yyy",
+                                        internal_name=u"val_2",
+                                        value=u"100")
+        elements2[u"zzz"] = EnumElement(name=u"val_3")
 
-        enum2 = Model.Enum(name=u"E2",
-                           elements=elements2)
+        enum2 = Enum(name=u"E2",
+                     elements=elements2)
 
         elements3 = collections.OrderedDict()
-        elements3["1"] = Model.EnumElement(name="xxx",
-                                           internal_name="_1")
-        elements3["2"] = Model.EnumElement(name="xxx",
-                                           internal_name="_2")
-        elements3["3"] = Model.EnumElement(name="xxx",
-                                           internal_name="_3")
-        enum3 = Model.Enum(name="Enum_new2",
-                           elements=elements3)
+        elements3["1"] = EnumElement(name="xxx",
+                                     internal_name="_1")
+        elements3["2"] = EnumElement(name="xxx",
+                                     internal_name="_2")
+        elements3["3"] = EnumElement(name="xxx",
+                                     internal_name="_3")
+        enum3 = Enum(name="Enum_new2",
+                     elements=elements3)
 
         elements4 = collections.OrderedDict()
-        elements4["name1"] = Model.EnumElement(name="xxx",
-                                               internal_name="_11")
-        elements4["name2"] = Model.EnumElement(name="xxx",
-                                               internal_name="_22")
-        enum4 = Model.Enum(name="Enum_new4",
-                           elements=elements4)
+        elements4["name1"] = EnumElement(name="xxx",
+                                         internal_name="_11")
+        elements4["name2"] = EnumElement(name="xxx",
+                                         internal_name="_22")
+        enum4 = Enum(name="Enum_new4",
+                     elements=elements4)
 
         enums = collections.OrderedDict()
         enums["Enum1"] = enum1
@@ -176,7 +193,7 @@ class Test(unittest.TestCase):
         enums["messageType"] = message_type
 
         params1 = collections.OrderedDict()
-        params1["1"] = Model.FunctionParam(
+        params1["1"] = Param(
             name="param1",
             design_description=DESIGN_DESCRIPTION,
             description=DESCRIPTION,
@@ -184,110 +201,110 @@ class Test(unittest.TestCase):
             todos=TODOS,
             param_type=enum4,
             default_value=elements4["name1"])
-        params1["2"] = Model.FunctionParam(
+        params1["2"] = Param(
             name="param2",
-            param_type=Model.EnumSubset(
+            param_type=EnumSubset(
                 name="sub1",
                 enum=enum1,
                 allowed_elements={"e1": elements1["name1"]}),
             default_value=elements1["name1"])
 
         functions = collections.OrderedDict()
-        functions["Function1"] = Model.Function(
+        functions["Function1"] = Function(
             name="Function1",
             function_id=elements1["name1"],
             message_type=message_type_elements["request"],
             params=params1)
-        functions["Function2"] = Model.Function(
+        functions["Function2"] = Function(
             name="Function2",
             function_id=elements2["xxx"],
             message_type=message_type_elements["response"])
-        functions["Function3"] = Model.Function(
+        functions["Function3"] = Function(
             name="Function2",
             function_id=elements2["yyy"],
             message_type=message_type_elements["notification"])
 
         members1 = collections.OrderedDict()
-        members1["m1"] = Model.Param(name="intParam",
-                                     param_type=Model.Integer(max_value=2))
-        members1["m11"] = Model.Param(name="doubleParam",
-                                      param_type=Model.Double(min_value=0.333),
-                                      is_mandatory=False)
-        members1["m222"] = Model.Param(name="boolParam",
-                                       param_type=Model.Boolean())
-        members1["m2"] = Model.Param(name="structParam",
-                                     param_type=Model.Struct(name="Struct2"))
-        members1["aaa"] = Model.Param(name="enumParam",
-                                      param_type=enum1)
-        members1["bbb"] = Model.Param(name="enumParam1",
-                                      param_type=enum1)
-        members1["xxx"] = Model.Param(
+        members1["m1"] = Param(name="intParam",
+                               param_type=Integer(max_value=2))
+        members1["m11"] = Param(name="doubleParam",
+                                param_type=Float(min_value=0.333),
+                                is_mandatory=False)
+        members1["m222"] = Param(name="boolParam",
+                                 param_type=Boolean())
+        members1["m2"] = Param(name="structParam",
+                               param_type=Struct(name="Struct2"))
+        members1["aaa"] = Param(name="enumParam",
+                                param_type=enum1)
+        members1["bbb"] = Param(name="enumParam1",
+                                param_type=enum1)
+        members1["xxx"] = Param(
             name="enumSubset1",
-            param_type=Model.EnumSubset(
+            param_type=EnumSubset(
                 name="sub",
                 enum=enum1,
                 allowed_elements={"e1": elements1["name1"]}),
             is_mandatory=False)
-        members1["1"] = Model.Param(
+        members1["1"] = Param(
             name="arrayOfInt",
-            param_type=Model.Array(min_size=0,
-                                   max_size=20,
-                                   element_type=Model.Boolean()),
+            param_type=Array(min_size=0,
+                             max_size=20,
+                             element_type=Boolean()),
             is_mandatory=False)
-        members1["2"] = Model.Param(
+        members1["2"] = Param(
             name="arrayOfEnum1",
-            param_type=Model.Array(min_size=0,
-                                   max_size=20,
-                                   element_type=enum1),
+            param_type=Array(min_size=0,
+                             max_size=20,
+                             element_type=enum1),
             is_mandatory=False)
-        members1["3"] = Model.Param(
+        members1["3"] = Param(
             name="arrayOfEnum3",
-            param_type=Model.Array(min_size=10,
-                                   max_size=40,
-                                   element_type=enum3),
+            param_type=Array(min_size=10,
+                             max_size=40,
+                             element_type=enum3),
             is_mandatory=True)
-        members1["4"] = Model.Param(
+        members1["4"] = Param(
             name="arrayOfEnum4",
-            param_type=Model.Array(
+            param_type=Array(
                 min_size=10,
                 max_size=41,
-                element_type=Model.EnumSubset(
+                element_type=EnumSubset(
                     name="sub1",
                     enum=enum1,
                     allowed_elements={"e1": elements1["name1"]})))
-        members1["5"] = Model.Param(
+        members1["5"] = Param(
             name="arrayOfEnum5",
-            param_type=Model.Array(
+            param_type=Array(
                 min_size=10,
                 max_size=42,
-                element_type=Model.EnumSubset(
+                element_type=EnumSubset(
                     name="sub2",
                     enum=enum1,
                     allowed_elements={"e1": elements1["name2"]})))
-        members1["6"] = Model.Param(
+        members1["6"] = Param(
             name="arrayOfEnum6",
-            param_type=Model.Array(
+            param_type=Array(
                 min_size=10,
                 max_size=43,
-                element_type=Model.EnumSubset(
+                element_type=EnumSubset(
                     name="sub3",
                     enum=enum4,
                     allowed_elements={"e1": elements4["name2"]})))
 
         structs = collections.OrderedDict()
-        structs["Struct1"] = Model.Struct(
+        structs["Struct1"] = Struct(
             name="Struct1",
             design_description=DESIGN_DESCRIPTION,
             issues=ISSUES,
             members=members1)
-        structs["Struct2"] = Model.Struct(name="Struct2",
-                                          issues=ISSUES)
+        structs["Struct2"] = Struct(name="Struct2",
+                                    issues=ISSUES)
 
-        interface = Model.Interface(enums=enums,
-                                    structs=structs,
-                                    functions=functions,
-                                    params={"param1": "value1",
-                                            "param2": "value2"})
+        interface = Interface(enums=enums,
+                              structs=structs,
+                              functions=functions,
+                              params={"param1": "value1",
+                                      "param2": "value2"})
 
         os.path.exists = MagicMock(return_value=True)
         uuid.uuid1 = MagicMock(
@@ -311,15 +328,21 @@ class Test(unittest.TestCase):
                          "Invalid header file creation")
 
         self.assertEqual(mock_calls[4],
-                         call('/some/test/dir/Test.cc',
+                         call('/some/test/dir/Test_schema.h',
                               mode='w',
                               encoding='utf-8'),
                          "Invalid source file creation")
+        try:
+            self.assertSequenceEqual(str(mock_calls[2])[27:-2].replace("\\n", "\n"),
+                                     expected_h_file_content,
+                                     "Invalid header file content")
+
+            self.assertSequenceEqual(str(mock_calls[6])[27:-2].replace("\\n", "\n"),
+                                     expected_cc_file_content,
+                                     "Invalid source file content")
+        except AssertionError as message:
+            print(message)
 
-        self.assertEqual(str(mock_calls[2])[27:-2].replace("\\n", "\n"),
-                         expected_h_file_content,
-                         "Invalid header file content")
 
-        self.assertEqual(str(mock_calls[6])[27:-2].replace("\\n", "\n"),
-                         expected_cc_file_content,
-                         "Invalid source file content")
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc
index 49369d2559..05795ecf3b 100644
--- a/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc
+++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_jsonrpc.cc
@@ -95,17 +95,17 @@ void XXX::YYY::ZZZ::Test::InitFunctionSchemes(
     const TStructsSchemaItems &struct_schema_items,
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::kCode] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::kMessage] = CObjectSchemaItem::SMember(CStringSchemaItem::create(), true);
-
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::kCode] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::kMessage] = SMember(CStringSchemaItem::create(), true);
+
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   CSmartSchema error_response_schema(CObjectSchemaItem::create(root_members_map));
 
@@ -147,21 +147,21 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_name1_request(
   // Function parameter param2.
   TSharedPtr<ISchemaItem> param2_SchemaItem = TEnumSchemaItem<Enum1::eType>::create(param2_allowed_enum_subset_values, TSchemaItemParameter<Enum1::eType>(name1));
 
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
-  schema_members["param1"] = CObjectSchemaItem::SMember(param1_SchemaItem, true);
-  schema_members["param2"] = CObjectSchemaItem::SMember(param2_SchemaItem, true);
+  schema_members["param1"] = SMember(param1_SchemaItem, true);
+  schema_members["param2"] = SMember(param2_SchemaItem, true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -170,19 +170,19 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_1_response(
     const TStructsSchemaItems &struct_schema_items,
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::kCode] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::kCode] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -191,17 +191,17 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_2_notification(
     const TStructsSchemaItems &struct_schema_items,
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -270,28 +270,28 @@ TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1(
   // Struct member arrayOfEnum6.
   TSharedPtr<ISchemaItem> arrayOfEnum6_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem<Enum_new4::eType>::create(sub3_allowed_enum_subset_values, TSchemaItemParameter<Enum_new4::eType>()), TSchemaItemParameter<size_t>(10), TSchemaItemParameter<size_t>(43));
 
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
-
-  schema_members["intParam"] = CObjectSchemaItem::SMember(intParam_SchemaItem, true);
-  schema_members["doubleParam"] = CObjectSchemaItem::SMember(doubleParam_SchemaItem, false);
-  schema_members["boolParam"] = CObjectSchemaItem::SMember(boolParam_SchemaItem, true);
-  schema_members["structParam"] = CObjectSchemaItem::SMember(structParam_SchemaItem, true);
-  schema_members["enumParam"] = CObjectSchemaItem::SMember(enumParam_SchemaItem, true);
-  schema_members["enumParam1"] = CObjectSchemaItem::SMember(enumParam1_SchemaItem, true);
-  schema_members["enumSubset1"] = CObjectSchemaItem::SMember(enumSubset1_SchemaItem, false);
-  schema_members["arrayOfInt"] = CObjectSchemaItem::SMember(arrayOfInt_SchemaItem, false);
-  schema_members["arrayOfEnum1"] = CObjectSchemaItem::SMember(arrayOfEnum1_SchemaItem, false);
-  schema_members["arrayOfEnum3"] = CObjectSchemaItem::SMember(arrayOfEnum3_SchemaItem, true);
-  schema_members["arrayOfEnum4"] = CObjectSchemaItem::SMember(arrayOfEnum4_SchemaItem, true);
-  schema_members["arrayOfEnum5"] = CObjectSchemaItem::SMember(arrayOfEnum5_SchemaItem, true);
-  schema_members["arrayOfEnum6"] = CObjectSchemaItem::SMember(arrayOfEnum6_SchemaItem, true);
+  std::map<std::string, SMember> schema_members;
+
+  schema_members["intParam"] = SMember(intParam_SchemaItem, true);
+  schema_members["doubleParam"] = SMember(doubleParam_SchemaItem, false);
+  schema_members["boolParam"] = SMember(boolParam_SchemaItem, true);
+  schema_members["structParam"] = SMember(structParam_SchemaItem, true);
+  schema_members["enumParam"] = SMember(enumParam_SchemaItem, true);
+  schema_members["enumParam1"] = SMember(enumParam1_SchemaItem, true);
+  schema_members["enumSubset1"] = SMember(enumSubset1_SchemaItem, false);
+  schema_members["arrayOfInt"] = SMember(arrayOfInt_SchemaItem, false);
+  schema_members["arrayOfEnum1"] = SMember(arrayOfEnum1_SchemaItem, false);
+  schema_members["arrayOfEnum3"] = SMember(arrayOfEnum3_SchemaItem, true);
+  schema_members["arrayOfEnum4"] = SMember(arrayOfEnum4_SchemaItem, true);
+  schema_members["arrayOfEnum5"] = SMember(arrayOfEnum5_SchemaItem, true);
+  schema_members["arrayOfEnum6"] = SMember(arrayOfEnum6_SchemaItem, true);
 
   return CObjectSchemaItem::create(schema_members);
 }
 
 TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2(
     const TStructsSchemaItems &struct_schema_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
   return CObjectSchemaItem::create(schema_members);
 }
diff --git a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc
index a62f485eb9..30b9b645ab 100644
--- a/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc
+++ b/tools/InterfaceGenerator/test/generator/generators/test_expected_sdlrpc.cc
@@ -130,21 +130,21 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_name1_request(
   // Function parameter param2.
   TSharedPtr<ISchemaItem> param2_SchemaItem = TEnumSchemaItem<Enum1::eType>::create(param2_allowed_enum_subset_values, TSchemaItemParameter<Enum1::eType>(name1));
 
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
-  schema_members["param1"] = CObjectSchemaItem::SMember(param1_SchemaItem, true);
-  schema_members["param2"] = CObjectSchemaItem::SMember(param2_SchemaItem, true);
+  schema_members["param1"] = SMember(param1_SchemaItem, true);
+  schema_members["param2"] = SMember(param2_SchemaItem, true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -153,18 +153,18 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_1_response(
     const TStructsSchemaItems &struct_schema_items,
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_CORRELATION_ID] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -173,17 +173,17 @@ CSmartSchema XXX::YYY::ZZZ::Test::InitFunction_val_2_notification(
     const TStructsSchemaItems &struct_schema_items,
     const std::set<FunctionID::eType> &function_id_items,
     const std::set<messageType::eType> &message_type_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
-  std::map<std::string, CObjectSchemaItem::SMember> params_members;
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = CObjectSchemaItem::SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = CObjectSchemaItem::SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
-  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = CObjectSchemaItem::SMember(TNumberSchemaItem<int>::create(), true);
+  std::map<std::string, SMember> params_members;
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_FUNCTION_ID] = SMember(TEnumSchemaItem<FunctionID::eType>::create(function_id_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_MESSAGE_TYPE] = SMember(TEnumSchemaItem<messageType::eType>::create(message_type_items), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_VERSION] = SMember(TNumberSchemaItem<int>::create(), true);
+  params_members[ns_smart_device_link::ns_json_handler::strings::S_PROTOCOL_TYPE] = SMember(TNumberSchemaItem<int>::create(), true);
 
-  std::map<std::string, CObjectSchemaItem::SMember> root_members_map;
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(schema_members), true);
-  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = CObjectSchemaItem::SMember(CObjectSchemaItem::create(params_members), true);
+  std::map<std::string, SMember> root_members_map;
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_MSG_PARAMS] = SMember(CObjectSchemaItem::create(schema_members), true);
+  root_members_map[ns_smart_device_link::ns_json_handler::strings::S_PARAMS] = SMember(CObjectSchemaItem::create(params_members), true);
 
   return CSmartSchema(CObjectSchemaItem::create(root_members_map));
 }
@@ -252,28 +252,28 @@ TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct1(
   // Struct member arrayOfEnum6.
   TSharedPtr<ISchemaItem> arrayOfEnum6_SchemaItem = CArraySchemaItem::create(TEnumSchemaItem<Enum_new4::eType>::create(sub3_allowed_enum_subset_values, TSchemaItemParameter<Enum_new4::eType>()), TSchemaItemParameter<size_t>(10), TSchemaItemParameter<size_t>(43));
 
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
-
-  schema_members["intParam"] = CObjectSchemaItem::SMember(intParam_SchemaItem, true);
-  schema_members["doubleParam"] = CObjectSchemaItem::SMember(doubleParam_SchemaItem, false);
-  schema_members["boolParam"] = CObjectSchemaItem::SMember(boolParam_SchemaItem, true);
-  schema_members["structParam"] = CObjectSchemaItem::SMember(structParam_SchemaItem, true);
-  schema_members["enumParam"] = CObjectSchemaItem::SMember(enumParam_SchemaItem, true);
-  schema_members["enumParam1"] = CObjectSchemaItem::SMember(enumParam1_SchemaItem, true);
-  schema_members["enumSubset1"] = CObjectSchemaItem::SMember(enumSubset1_SchemaItem, false);
-  schema_members["arrayOfInt"] = CObjectSchemaItem::SMember(arrayOfInt_SchemaItem, false);
-  schema_members["arrayOfEnum1"] = CObjectSchemaItem::SMember(arrayOfEnum1_SchemaItem, false);
-  schema_members["arrayOfEnum3"] = CObjectSchemaItem::SMember(arrayOfEnum3_SchemaItem, true);
-  schema_members["arrayOfEnum4"] = CObjectSchemaItem::SMember(arrayOfEnum4_SchemaItem, true);
-  schema_members["arrayOfEnum5"] = CObjectSchemaItem::SMember(arrayOfEnum5_SchemaItem, true);
-  schema_members["arrayOfEnum6"] = CObjectSchemaItem::SMember(arrayOfEnum6_SchemaItem, true);
+  std::map<std::string, SMember> schema_members;
+
+  schema_members["intParam"] = SMember(intParam_SchemaItem, true);
+  schema_members["doubleParam"] = SMember(doubleParam_SchemaItem, false);
+  schema_members["boolParam"] = SMember(boolParam_SchemaItem, true);
+  schema_members["structParam"] = SMember(structParam_SchemaItem, true);
+  schema_members["enumParam"] = SMember(enumParam_SchemaItem, true);
+  schema_members["enumParam1"] = SMember(enumParam1_SchemaItem, true);
+  schema_members["enumSubset1"] = SMember(enumSubset1_SchemaItem, false);
+  schema_members["arrayOfInt"] = SMember(arrayOfInt_SchemaItem, false);
+  schema_members["arrayOfEnum1"] = SMember(arrayOfEnum1_SchemaItem, false);
+  schema_members["arrayOfEnum3"] = SMember(arrayOfEnum3_SchemaItem, true);
+  schema_members["arrayOfEnum4"] = SMember(arrayOfEnum4_SchemaItem, true);
+  schema_members["arrayOfEnum5"] = SMember(arrayOfEnum5_SchemaItem, true);
+  schema_members["arrayOfEnum6"] = SMember(arrayOfEnum6_SchemaItem, true);
 
   return CObjectSchemaItem::create(schema_members);
 }
 
 TSharedPtr<ISchemaItem> XXX::YYY::ZZZ::Test::InitStructSchemaItem_Struct2(
     const TStructsSchemaItems &struct_schema_items) {
-  std::map<std::string, CObjectSchemaItem::SMember> schema_members;
+  std::map<std::string, SMember> schema_members;
 
   return CObjectSchemaItem::create(schema_members);
 }
diff --git a/tools/InterfaceGenerator/test/generator/parsers/test_JSONRPC.py b/tools/InterfaceGenerator/test/generator/parsers/test_JSONRPC.py
index f2fecdb901..90700fdbb9 100755
--- a/tools/InterfaceGenerator/test/generator/parsers/test_JSONRPC.py
+++ b/tools/InterfaceGenerator/test/generator/parsers/test_JSONRPC.py
@@ -1,13 +1,25 @@
 """JSONRPC XML parser unit test."""
 import os
+import sys
 import unittest
-
-import generator.Model
-import generator.parsers.JSONRPC
+from pathlib import Path
+
+sys.path.append(Path(__file__).absolute().parents[3].as_posix())
+sys.path.append(Path(__file__).absolute().parents[4].joinpath('rpc_spec/InterfaceParser').as_posix())
+try:
+    import generator.parsers.JSONRPC
+    from model.array import Array
+    from model.boolean import Boolean
+    from model.enum_subset import EnumSubset
+    from model.integer import Integer
+    from model.float import Float
+    from model.string import String
+except ModuleNotFoundError as error:
+    print('{}.\nJSONRPC\tProbably you did not initialize submodule'.format(error))
+    sys.exit(1)
 
 
 class TestJSONRPCVParser(unittest.TestCase):
-
     """Test for JSONRPC xml parser."""
 
     class _Issue:
@@ -21,7 +33,7 @@ class TestJSONRPCVParser(unittest.TestCase):
     def setUp(self):
         """Test initialization."""
         self.valid_xml_name = os.path.dirname(os.path.realpath(__file__)) + \
-            "/valid_JSONRPC.xml"
+                              "/valid_JSONRPC.xml"
         self.parser = generator.parsers.JSONRPC.Parser()
 
     def test_valid_xml(self):
@@ -37,7 +49,7 @@ class TestJSONRPCVParser(unittest.TestCase):
                               "interface1_design_description": "dd",
                               "interface2_attribute": "value",
                               "interface2_description":
-                              "Description of interface2",
+                                  "Description of interface2",
                               "interface2_todos": "i2 todo"},
                              interface.params)
 
@@ -217,7 +229,7 @@ class TestJSONRPCVParser(unittest.TestCase):
             name="member1",
             description=["Param1 description"])
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Integer)
+        self.assertIsInstance(member.param_type, Integer)
         self.assertIsNone(member.param_type.min_value)
         self.assertIsNone(member.param_type.max_value)
 
@@ -226,13 +238,13 @@ class TestJSONRPCVParser(unittest.TestCase):
         self.verify_base_item(item=member, name="member2",
                               platform="member2 platform")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Boolean)
+        self.assertIsInstance(member.param_type, Boolean)
 
         self.assertIn("member3", struct.members)
         member = struct.members["member3"]
         self.verify_base_item(item=member, name="member3")
         self.assertEqual(False, member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Double)
+        self.assertIsInstance(member.param_type, Float)
         self.assertIsNone(member.param_type.min_value)
         self.assertAlmostEqual(20.5, member.param_type.max_value)
 
@@ -240,11 +252,11 @@ class TestJSONRPCVParser(unittest.TestCase):
         member = struct.members["member4"]
         self.verify_base_item(item=member, name="member4")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertIsNone(member.param_type.min_size)
         self.assertIsNone(member.param_type.max_size)
         self.assertIsInstance(member.param_type.element_type,
-                              generator.Model.Integer)
+                              Integer)
         self.assertEqual(11, member.param_type.element_type.min_value)
         self.assertEqual(100, member.param_type.element_type.max_value)
 
@@ -263,18 +275,18 @@ class TestJSONRPCVParser(unittest.TestCase):
         member = struct.members["m1"]
         self.verify_base_item(item=member, name="m1")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.String)
+        self.assertIsInstance(member.param_type, String)
         self.assertIsNone(member.param_type.max_length)
 
         self.assertIn("m2", struct.members)
         member = struct.members["m2"]
         self.verify_base_item(item=member, name="m2")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertEqual(1, member.param_type.min_size)
         self.assertEqual(50, member.param_type.max_size)
         self.assertIsInstance(member.param_type.element_type,
-                              generator.Model.String)
+                              String)
         self.assertEqual(100, member.param_type.element_type.max_length)
 
         self.assertIn("m3", struct.members)
@@ -287,7 +299,7 @@ class TestJSONRPCVParser(unittest.TestCase):
         member = struct.members["m4"]
         self.verify_base_item(item=member, name="m4")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertIsNone(member.param_type.min_size)
         self.assertEqual(10, member.param_type.max_size)
         self.assertIs(member.param_type.element_type,
@@ -305,7 +317,7 @@ class TestJSONRPCVParser(unittest.TestCase):
         member = struct.members["m_1"]
         self.verify_base_item(item=member, name="m_1")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertEqual(1, member.param_type.min_size)
         self.assertEqual(10, member.param_type.max_size)
         self.assertIs(member.param_type.element_type,
@@ -321,7 +333,7 @@ class TestJSONRPCVParser(unittest.TestCase):
         member = struct.members["m_3"]
         self.verify_base_item(item=member, name="m_3")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.String)
+        self.assertIsInstance(member.param_type, String)
         self.assertEqual(20, member.param_type.max_length)
 
         # Functions
@@ -357,9 +369,10 @@ class TestJSONRPCVParser(unittest.TestCase):
             name="param1",
             issues=[TestJSONRPCVParser._Issue(creator="", value="")])
         self.assertEqual(False, param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.String)
+        self.assertIsInstance(param.param_type, String)
         self.assertIsNone(param.param_type.max_length)
-        self.assertEqual("String default value", param.default_value)
+        self.assertIsNone(param.default_value)
+        self.assertEqual("String default value", param.param_type.default_value)
 
         self.assertIn("param2", function.params)
         param = function.params["param2"]
@@ -370,7 +383,7 @@ class TestJSONRPCVParser(unittest.TestCase):
             todos=["Param2 todo"],
             platform="param2 platform")
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Integer)
+        self.assertIsInstance(param.param_type, Integer)
         self.assertIsNone(param.param_type.min_value)
         self.assertIsNone(param.param_type.max_value)
         self.assertIsNone(param.default_value)
@@ -418,16 +431,18 @@ class TestJSONRPCVParser(unittest.TestCase):
         self.verify_base_item(item=param, name="p2")
         self.assertTrue(param.is_mandatory)
         self.assertIs(param.param_type, interface.enums["interface1_enum1"])
-        self.assertIs(
-            param.default_value,
-            interface.enums["interface1_enum1"].elements["element2"])
+        self.assertIsNone(param.default_value)
+        self.assertIsNone(param.param_type.default_value)
+        self.assertIs(param.param_type.elements["element2"],
+                      interface.enums["interface1_enum1"].elements["element2"])
 
         self.assertIn("p3", function.params)
         param = function.params["p3"]
         self.verify_base_item(item=param, name="p3", design_description=[""])
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Boolean)
-        self.assertEqual(False, param.default_value)
+        self.assertIsInstance(param.param_type, Boolean)
+        self.assertIsNone(param.default_value)
+        self.assertFalse(param.param_type.default_value)
 
         # Function notification "interface1_Function2"
 
@@ -454,14 +469,14 @@ class TestJSONRPCVParser(unittest.TestCase):
         param = function.params["n1"]
         self.verify_base_item(item=param, name="n1", todos=["n1 todo"])
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.EnumSubset)
+        self.assertIsInstance(param.param_type, EnumSubset)
         self.assertIs(param.param_type.enum,
                       interface.enums["interface1_enum1"])
         self.assertDictEqual(
             {"element2":
-                interface.enums["interface1_enum1"].elements["element2"],
+                 interface.enums["interface1_enum1"].elements["element2"],
              "element3":
-                interface.enums["interface1_enum1"].elements["element3"]},
+                 interface.enums["interface1_enum1"].elements["element3"]},
             param.param_type.allowed_elements)
         self.assertIsNone(param.default_value)
 
@@ -469,18 +484,18 @@ class TestJSONRPCVParser(unittest.TestCase):
         param = function.params["n2"]
         self.verify_base_item(item=param, name="n2", todos=["n2 todo"])
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Array)
+        self.assertIsInstance(param.param_type, Array)
         self.assertEqual(1, param.param_type.min_size)
         self.assertEqual(100, param.param_type.max_size)
         self.assertIsInstance(param.param_type.element_type,
-                              generator.Model.EnumSubset)
+                              EnumSubset)
         self.assertIs(param.param_type.element_type.enum,
                       interface.enums["interface1_enum1"])
         self.assertDictEqual(
             {"element1":
-                interface.enums["interface1_enum1"].elements["element1"],
+                 interface.enums["interface1_enum1"].elements["element1"],
              "element3":
-                interface.enums["interface1_enum1"].elements["element3"]},
+                 interface.enums["interface1_enum1"].elements["element3"]},
             param.param_type.element_type.allowed_elements)
         self.assertIsNone(param.default_value)
 
@@ -521,7 +536,7 @@ class TestJSONRPCVParser(unittest.TestCase):
         param = function.params["param2"]
         self.verify_base_item(item=param, name="param2")
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Array)
+        self.assertIsInstance(param.param_type, Array)
         self.assertEqual(5, param.param_type.min_size)
         self.assertEqual(25, param.param_type.max_size)
         self.assertIs(param.param_type.element_type,
@@ -555,14 +570,14 @@ class TestJSONRPCVParser(unittest.TestCase):
         param = function.params["param"]
         self.verify_base_item(item=param, name="param")
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.EnumSubset)
+        self.assertIsInstance(param.param_type, EnumSubset)
         self.assertIs(param.param_type.enum,
                       interface.enums["interface2_enum2"])
         self.assertDictEqual(
             {"element2":
-                interface.enums["interface2_enum2"].elements["element2"],
+                 interface.enums["interface2_enum2"].elements["element2"],
              "element3":
-                interface.enums["interface2_enum2"].elements["element3"]},
+                 interface.enums["interface2_enum2"].elements["element3"]},
             param.param_type.allowed_elements)
         self.assertIsNone(param.default_value)
 
@@ -591,5 +606,6 @@ class TestJSONRPCVParser(unittest.TestCase):
         """Return provided list or empty list if None is provided."""
         return list if list is not None else []
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV1.py b/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV1.py
index 1464658ff4..b039473c24 100755
--- a/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV1.py
+++ b/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV1.py
@@ -1,13 +1,25 @@
 """SDLRPCV1 XML parser unit test."""
 import os
+import sys
 import unittest
-
-import generator.Model
-import generator.parsers.SDLRPCV1
+from pathlib import Path
+
+sys.path.append(Path(__file__).absolute().parents[3].as_posix())
+sys.path.append(Path(__file__).absolute().parents[4].joinpath('rpc_spec/InterfaceParser').as_posix())
+try:
+    import generator.parsers.SDLRPCV1
+    from model.array import Array
+    from model.boolean import Boolean
+    from model.enum_subset import EnumSubset
+    from model.float import Float
+    from model.integer import Integer
+    from model.string import String
+except ModuleNotFoundError as error:
+    print('{}.\nProbably you did not initialize submodule'.format(error))
+    sys.exit(1)
 
 
 class TestSDLRPCV1Parser(unittest.TestCase):
-
     """Test for SDLRPCV1 xml parser."""
 
     class _Issue:
@@ -21,7 +33,7 @@ class TestSDLRPCV1Parser(unittest.TestCase):
     def setUp(self):
         """Test initialization."""
         self.valid_xml_name = os.path.dirname(os.path.realpath(__file__)) + \
-            "/valid_SDLRPCV1.xml"
+                              "/valid_SDLRPCV1.xml"
         self.parser = generator.parsers.SDLRPCV1.Parser()
 
     def test_valid_xml(self):
@@ -150,7 +162,7 @@ class TestSDLRPCV1Parser(unittest.TestCase):
             name="member1",
             description=["Param1 description"])
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Integer)
+        self.assertIsInstance(member.param_type, Integer)
         self.assertIsNone(member.param_type.min_value)
         self.assertIsNone(member.param_type.max_value)
 
@@ -159,13 +171,13 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         self.verify_base_item(item=member, name="member2",
                               platform="member2 platform")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Boolean)
+        self.assertIsInstance(member.param_type, Boolean)
 
         self.assertIn("member3", struct.members)
         member = struct.members["member3"]
         self.verify_base_item(item=member, name="member3")
         self.assertEqual(False, member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Double)
+        self.assertIsInstance(member.param_type, Float)
         self.assertIsNone(member.param_type.min_value)
         self.assertAlmostEqual(20.5, member.param_type.max_value)
 
@@ -173,11 +185,11 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         member = struct.members["member4"]
         self.verify_base_item(item=member, name="member4")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertIsNone(member.param_type.min_size)
         self.assertIsNone(member.param_type.max_size)
         self.assertIsInstance(member.param_type.element_type,
-                              generator.Model.Integer)
+                              Integer)
         self.assertEqual(11, member.param_type.element_type.min_value)
         self.assertEqual(100, member.param_type.element_type.max_value)
 
@@ -196,18 +208,18 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         member = struct.members["m1"]
         self.verify_base_item(item=member, name="m1")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.String)
+        self.assertIsInstance(member.param_type, String)
         self.assertIsNone(member.param_type.max_length)
 
         self.assertIn("m2", struct.members)
         member = struct.members["m2"]
         self.verify_base_item(item=member, name="m2")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertEqual(1, member.param_type.min_size)
         self.assertEqual(50, member.param_type.max_size)
         self.assertIsInstance(member.param_type.element_type,
-                              generator.Model.String)
+                              String)
         self.assertEqual(100, member.param_type.element_type.max_length)
 
         self.assertIn("m3", struct.members)
@@ -220,7 +232,7 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         member = struct.members["m4"]
         self.verify_base_item(item=member, name="m4")
         self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
+        self.assertIsInstance(member.param_type, Array)
         self.assertIsNone(member.param_type.min_size)
         self.assertEqual(10, member.param_type.max_size)
         self.assertIs(member.param_type.element_type,
@@ -258,9 +270,10 @@ class TestSDLRPCV1Parser(unittest.TestCase):
             name="param1",
             issues=[TestSDLRPCV1Parser._Issue(creator="", value="")])
         self.assertEqual(False, param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.String)
+        self.assertIsInstance(param.param_type, String)
         self.assertIsNone(param.param_type.max_length)
-        self.assertEqual("String default value", param.default_value)
+        self.assertIsNone(param.default_value)
+        self.assertEqual("String default value", param.param_type.default_value)
 
         self.assertIn("param2", function.params)
         param = function.params["param2"]
@@ -271,7 +284,7 @@ class TestSDLRPCV1Parser(unittest.TestCase):
             todos=["Param2 todo"],
             platform="param2 platform")
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Integer)
+        self.assertIsInstance(param.param_type, Integer)
         self.assertIsNone(param.param_type.min_value)
         self.assertIsNone(param.param_type.max_value)
         self.assertIsNone(param.default_value)
@@ -317,15 +330,17 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         self.verify_base_item(item=param, name="p2")
         self.assertTrue(param.is_mandatory)
         self.assertIs(param.param_type, interface.enums["enum1"])
-        self.assertIs(param.default_value,
-                      interface.enums["enum1"].elements["element2"])
+        self.assertIsNone(param.default_value)
+        self.assertIsNone(param.param_type.default_value)
+        self.assertIs(param.param_type.elements["element2"], interface.enums["enum1"].elements["element2"])
 
         self.assertIn("p3", function.params)
         param = function.params["p3"]
         self.verify_base_item(item=param, name="p3", design_description=[""])
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Boolean)
-        self.assertEqual(False, param.default_value)
+        self.assertIsInstance(param.param_type, Boolean)
+        self.assertIsNone(param.default_value)
+        self.assertFalse(param.param_type.default_value)
 
         # Function notification "Function2"
 
@@ -351,7 +366,7 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         param = function.params["n1"]
         self.verify_base_item(item=param, name="n1", todos=["n1 todo"])
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.EnumSubset)
+        self.assertIsInstance(param.param_type, EnumSubset)
         self.assertIs(param.param_type.enum, interface.enums["enum1"])
         self.assertDictEqual(
             {"element2": interface.enums["enum1"].elements["element2"],
@@ -363,11 +378,11 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         param = function.params["n2"]
         self.verify_base_item(item=param, name="n2", todos=["n2 todo"])
         self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Array)
+        self.assertIsInstance(param.param_type, Array)
         self.assertEqual(1, param.param_type.min_size)
         self.assertEqual(100, param.param_type.max_size)
         self.assertIsInstance(param.param_type.element_type,
-                              generator.Model.EnumSubset)
+                              EnumSubset)
         self.assertIs(param.param_type.element_type.enum,
                       interface.enums["enum1"])
         self.assertDictEqual(
@@ -400,5 +415,6 @@ class TestSDLRPCV1Parser(unittest.TestCase):
         """Return provided list or empty list if None is provided."""
         return list if list is not None else []
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV2.py b/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV2.py
deleted file mode 100755
index c37962cfe6..0000000000
--- a/tools/InterfaceGenerator/test/generator/parsers/test_SDLRPCV2.py
+++ /dev/null
@@ -1,417 +0,0 @@
-"""SDLRPCV2 XML parser unit test."""
-import os
-import unittest
-
-import generator.Model
-import generator.parsers.SDLRPCV2
-
-
-class TestSDLRPCV2Parser(unittest.TestCase):
-
-    """Test for SDLRPCV2 xml parser."""
-
-    class _Issue:
-        def __init__(self, creator, value):
-            self.creator = creator
-            self.value = value
-
-        def __eq__(self, other):
-            return self.creator == other.creator and self.value == other.value
-
-    def setUp(self):
-        """Test initialization."""
-        self.valid_xml_name = os.path.dirname(os.path.realpath(__file__)) + \
-            "/valid_SDLRPCV2.xml"
-        self.parser = generator.parsers.SDLRPCV2.Parser()
-
-    def test_valid_xml(self):
-        """Test parsing of valid xml."""
-        interface = self.parser.parse(self.valid_xml_name)
-
-        self.assertEqual(2, len(interface.params))
-        self.assertDictEqual({"attribute1": "value1", "attribute2": "value2"},
-                             interface.params)
-
-        # Enumerations
-
-        self.assertEqual(3, len(interface.enums))
-
-        # Enumeration "FunctionID"
-
-        self.assertIn("FunctionID", interface.enums)
-        enum = interface.enums["FunctionID"]
-        self.verify_base_item(item=enum,
-                              name="FunctionID",
-                              description=["Description string 1",
-                                           "Description string 2"],
-                              todos=['Function id todo'])
-        self.assertIsNone(enum.internal_scope)
-
-        self.assertEqual(2, len(enum.elements))
-
-        self.assertIn("Function1_id", enum.elements)
-        element = enum.elements["Function1_id"]
-        self.verify_base_item(
-            item=element,
-            name="Function1_id",
-            design_description=["Function1 element design description"])
-        self.assertIsNone(element.internal_name)
-        self.assertEqual(10, element.value)
-
-        self.assertIn("Function2_id", enum.elements)
-        element = enum.elements["Function2_id"]
-        self.verify_base_item(
-            item=element,
-            name="Function2_id")
-        self.assertEqual("Function2_internal", element.internal_name)
-        self.assertIsNone(element.value)
-
-        # Enumeration "messageType"
-
-        self.assertIn("messageType", interface.enums)
-        enum = interface.enums["messageType"]
-        self.verify_base_item(
-            item=enum,
-            name="messageType",
-            design_description=["messageType design description",
-                                "messageType design description 2"],
-            issues=[TestSDLRPCV2Parser._Issue(
-                creator="messageType issue creator",
-                value="Issue text")])
-        self.assertIsNone(enum.internal_scope)
-
-        self.assertEqual(3, len(enum.elements))
-
-        self.assertIn("request", enum.elements)
-        element = enum.elements["request"]
-        self.verify_base_item(item=element,
-                              name="request",
-                              todos=["request todo 1", "request todo 2"],
-                              issues=[TestSDLRPCV2Parser._Issue(
-                                  creator="issue creator",
-                                  value="request issue")])
-        self.assertIsNone(element.internal_name)
-        self.assertEqual(0, element.value)
-
-        self.assertIn("response", enum.elements)
-        element = enum.elements["response"]
-        self.verify_base_item(item=element, name="response")
-        self.assertIsNone(element.internal_name)
-        self.assertEqual(1, element.value)
-
-        self.assertIn("notification", enum.elements)
-        element = enum.elements["notification"]
-        self.verify_base_item(item=element, name="notification")
-        self.assertIsNone(element.internal_name)
-        self.assertEqual(2, element.value)
-
-        # Enumeration "enum1"
-
-        self.assertIn("enum1", interface.enums)
-        enum = interface.enums["enum1"]
-        self.verify_base_item(item=enum, name="enum1",
-                              platform="enum1 platform")
-        self.assertEqual("scope", enum.internal_scope)
-
-        self.assertEqual(3, len(enum.elements))
-
-        self.assertIn("element1", enum.elements)
-        element = enum.elements["element1"]
-        self.verify_base_item(item=element, name="element1")
-        self.assertIsNone(element.internal_name)
-        self.assertEqual(10, element.value)
-
-        self.assertIn("element2", enum.elements)
-        element = enum.elements["element2"]
-        self.verify_base_item(item=element, name="element2")
-        self.assertEqual("element2_internal", element.internal_name)
-        self.assertEqual(11, element.value)
-
-        self.assertIn("element3", enum.elements)
-        element = enum.elements["element3"]
-        self.verify_base_item(
-            item=element,
-            name="element3",
-            design_description=["Element design description"],
-            platform="element3 platform")
-        self.assertIsNone(element.internal_name)
-        self.assertIsNone(element.value)
-
-        # Structures
-
-        self.assertEqual(2, len(interface.structs))
-
-        # Structure "struct1"
-
-        self.assertIn("struct1", interface.structs)
-        struct = interface.structs["struct1"]
-        self.verify_base_item(
-            item=struct,
-            name="struct1",
-            description=["Struct description"],
-            issues=[TestSDLRPCV2Parser._Issue(creator="creator1",
-                                              value="Issue1"),
-                    TestSDLRPCV2Parser._Issue(creator="creator2",
-                                              value="Issue2")])
-
-        self.assertEqual(4, len(struct.members))
-
-        self.assertIn("member1", struct.members)
-        member = struct.members["member1"]
-        self.verify_base_item(
-            item=member,
-            name="member1",
-            description=["Param1 description"])
-        self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Integer)
-        self.assertIsNone(member.param_type.min_value)
-        self.assertIsNone(member.param_type.max_value)
-
-        self.assertIn("member2", struct.members)
-        member = struct.members["member2"]
-        self.verify_base_item(item=member, name="member2",
-                              platform="member2 platform")
-        self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Boolean)
-
-        self.assertIn("member3", struct.members)
-        member = struct.members["member3"]
-        self.verify_base_item(item=member, name="member3")
-        self.assertEqual(False, member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Double)
-        self.assertIsNone(member.param_type.min_value)
-        self.assertAlmostEqual(20.5, member.param_type.max_value)
-
-        self.assertIn("member4", struct.members)
-        member = struct.members["member4"]
-        self.verify_base_item(item=member, name="member4")
-        self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
-        self.assertIsNone(member.param_type.min_size)
-        self.assertIsNone(member.param_type.max_size)
-        self.assertIsInstance(member.param_type.element_type,
-                              generator.Model.Integer)
-        self.assertEqual(11, member.param_type.element_type.min_value)
-        self.assertEqual(100, member.param_type.element_type.max_value)
-
-        # Structure "struct2"
-
-        self.assertIn("struct2", interface.structs)
-        struct = interface.structs["struct2"]
-        self.verify_base_item(item=struct,
-                              name="struct2",
-                              description=["Description of struct2"],
-                              platform="struct2 platform")
-
-        self.assertEqual(4, len(struct.members))
-
-        self.assertIn("m1", struct.members)
-        member = struct.members["m1"]
-        self.verify_base_item(item=member, name="m1")
-        self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.String)
-        self.assertIsNone(member.param_type.max_length)
-
-        self.assertIn("m2", struct.members)
-        member = struct.members["m2"]
-        self.verify_base_item(item=member, name="m2")
-        self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
-        self.assertEqual(1, member.param_type.min_size)
-        self.assertEqual(50, member.param_type.max_size)
-        self.assertIsInstance(member.param_type.element_type,
-                              generator.Model.String)
-        self.assertEqual(100, member.param_type.element_type.max_length)
-
-        self.assertIn("m3", struct.members)
-        member = struct.members["m3"]
-        self.verify_base_item(item=member, name="m3")
-        self.assertTrue(member.is_mandatory)
-        self.assertIs(member.param_type, interface.enums["enum1"])
-
-        self.assertIn("m4", struct.members)
-        member = struct.members["m4"]
-        self.verify_base_item(item=member, name="m4")
-        self.assertTrue(member.is_mandatory)
-        self.assertIsInstance(member.param_type, generator.Model.Array)
-        self.assertIsNone(member.param_type.min_size)
-        self.assertEqual(10, member.param_type.max_size)
-        self.assertIs(member.param_type.element_type,
-                      interface.structs["struct1"])
-
-        # Functions
-
-        self.assertEqual(3, len(interface.functions))
-
-        # Function request "Function1"
-
-        self.assertIn(
-            (interface.enums["FunctionID"].elements["Function1_id"],
-             interface.enums["messageType"].elements["request"]),
-            interface.functions)
-        function = interface.functions[
-            (interface.enums["FunctionID"].elements["Function1_id"],
-             interface.enums["messageType"].elements["request"])]
-        self.verify_base_item(
-            item=function,
-            name="Function1",
-            description=["Description of request Function1"],
-            todos=["Function1 request todo"])
-        self.assertIs(function.function_id,
-                      interface.enums["FunctionID"].elements["Function1_id"])
-        self.assertIs(function.message_type,
-                      interface.enums["messageType"].elements["request"])
-
-        self.assertEqual(3, len(function.params))
-
-        self.assertIn("param1", function.params)
-        param = function.params["param1"]
-        self.verify_base_item(
-            item=param,
-            name="param1",
-            issues=[TestSDLRPCV2Parser._Issue(creator="", value="")])
-        self.assertEqual(False, param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.String)
-        self.assertIsNone(param.param_type.max_length)
-        self.assertEqual("String default value", param.default_value)
-
-        self.assertIn("param2", function.params)
-        param = function.params["param2"]
-        self.verify_base_item(
-            item=param,
-            name="param2",
-            description=["Param2 description", ""],
-            todos=["Param2 todo"],
-            platform="param2 platform")
-        self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Integer)
-        self.assertIsNone(param.param_type.min_value)
-        self.assertIsNone(param.param_type.max_value)
-        self.assertIsNone(param.default_value)
-
-        self.assertIn("param3", function.params)
-        param = function.params["param3"]
-        self.verify_base_item(item=param, name="param3")
-        self.assertEqual(False, param.is_mandatory)
-        self.assertIs(param.param_type, interface.structs["struct1"])
-        self.assertIsNone(param.default_value)
-
-        # Function response "Function1"
-
-        self.assertIn(
-            (interface.enums["FunctionID"].elements["Function1_id"],
-             interface.enums["messageType"].elements["response"]),
-            interface.functions)
-        function = interface.functions[
-            (interface.enums["FunctionID"].elements["Function1_id"],
-             interface.enums["messageType"].elements["response"])]
-        self.verify_base_item(
-            item=function,
-            name="Function1",
-            issues=[TestSDLRPCV2Parser._Issue(creator="c1", value=""),
-                    TestSDLRPCV2Parser._Issue(creator="c2", value="")],
-            platform="")
-        self.assertIs(function.function_id,
-                      interface.enums["FunctionID"].elements["Function1_id"])
-        self.assertIs(function.message_type,
-                      interface.enums["messageType"].elements["response"])
-
-        self.assertEqual(3, len(function.params))
-
-        self.assertIn("p1", function.params)
-        param = function.params["p1"]
-        self.verify_base_item(item=param, name="p1")
-        self.assertTrue(param.is_mandatory)
-        self.assertIs(param.param_type, interface.enums["enum1"])
-        self.assertIsNone(param.default_value)
-
-        self.assertIn("p2", function.params)
-        param = function.params["p2"]
-        self.verify_base_item(item=param, name="p2")
-        self.assertTrue(param.is_mandatory)
-        self.assertIs(param.param_type, interface.enums["enum1"])
-        self.assertIs(param.default_value,
-                      interface.enums["enum1"].elements["element2"])
-
-        self.assertIn("p3", function.params)
-        param = function.params["p3"]
-        self.verify_base_item(item=param, name="p3", design_description=[""])
-        self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Boolean)
-        self.assertEqual(False, param.default_value)
-
-        # Function notification "Function2"
-
-        self.assertIn(
-            (interface.enums["FunctionID"].elements["Function2_id"],
-             interface.enums["messageType"].elements["notification"]),
-            interface.functions)
-        function = interface.functions[
-            (interface.enums["FunctionID"].elements["Function2_id"],
-             interface.enums["messageType"].elements["notification"])]
-        self.verify_base_item(item=function,
-                              name="Function2",
-                              description=["Function2 description"],
-                              platform="function2 platform")
-        self.assertIs(function.function_id,
-                      interface.enums["FunctionID"].elements["Function2_id"])
-        self.assertIs(function.message_type,
-                      interface.enums["messageType"].elements["notification"])
-
-        self.assertEqual(3, len(function.params))
-
-        self.assertIn("n1", function.params)
-        param = function.params["n1"]
-        self.verify_base_item(item=param, name="n1", todos=["n1 todo"])
-        self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.EnumSubset)
-        self.assertIs(param.param_type.enum, interface.enums["enum1"])
-        self.assertDictEqual(
-            {"element2": interface.enums["enum1"].elements["element2"],
-             "element3": interface.enums["enum1"].elements["element3"]},
-            param.param_type.allowed_elements)
-        self.assertIsNone(param.default_value)
-
-        self.assertIn("n2", function.params)
-        param = function.params["n2"]
-        self.verify_base_item(item=param, name="n2", todos=["n2 todo"])
-        self.assertTrue(param.is_mandatory)
-        self.assertIsInstance(param.param_type, generator.Model.Array)
-        self.assertEqual(1, param.param_type.min_size)
-        self.assertEqual(100, param.param_type.max_size)
-        self.assertIsInstance(param.param_type.element_type,
-                              generator.Model.EnumSubset)
-        self.assertIs(param.param_type.element_type.enum,
-                      interface.enums["enum1"])
-        self.assertDictEqual(
-            {"element1": interface.enums["enum1"].elements["element1"],
-             "element3": interface.enums["enum1"].elements["element3"]},
-            param.param_type.element_type.allowed_elements)
-        self.assertIsNone(param.default_value)
-
-        self.assertIn("n3", function.params)
-        param = function.params["n3"]
-        self.verify_base_item(item=param, name="n3")
-        self.assertEqual(False, param.is_mandatory)
-        self.assertIs(param.param_type, interface.structs["struct2"])
-        self.assertIsNone(param.default_value)
-
-    def verify_base_item(self, item, name, description=None,
-                         design_description=None, issues=None, todos=None,
-                         platform=None):
-        """Verify base interface item variables."""
-        self.assertEqual(name, item.name)
-        self.assertSequenceEqual(self.get_list(description), item.description)
-        self.assertSequenceEqual(self.get_list(design_description),
-                                 item.design_description)
-        self.assertSequenceEqual(self.get_list(issues), item.issues)
-        self.assertSequenceEqual(self.get_list(todos), item.todos)
-        self.assertEqual(platform, item.platform)
-
-    @staticmethod
-    def get_list(list=None):
-        """Return provided list or empty list if None is provided."""
-        return list if list is not None else []
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/InterfaceGenerator/test/generator/parsers/valid_JSONRPC.xml b/tools/InterfaceGenerator/test/generator/parsers/valid_JSONRPC.xml
index a754e5714e..a964ce6e92 100644
--- a/tools/InterfaceGenerator/test/generator/parsers/valid_JSONRPC.xml
+++ b/tools/InterfaceGenerator/test/generator/parsers/valid_JSONRPC.xml
@@ -2,7 +2,7 @@
 <interfaces attr1="v1" attr2="v2">
     <interface name="interface1" attribute1="value1" attribute2="value2">
         <struct name="struct1">
-            <param name="member1" type="Integer">
+            <param name="member1" type="Integer" mandatory="true">
                 <description>Param1 description</description>
             </param>
             <issue creator="creator1">Issue1</issue>
@@ -10,7 +10,7 @@
             <param name="member3" type="Float" maxvalue="20.5" mandatory="false"/>
             <description>Struct description</description>
             <issue creator="creator2">Issue2</issue>
-            <param name="member4" type="Integer" minvalue="11" maxvalue="100" array="true"/>
+            <param name="member4" type="Integer" minvalue="11" maxvalue="100" array="true" mandatory="true"/>
         </struct>
         <issue creator="c">Issue1</issue>
         <function name="Function1" messagetype="request">
@@ -18,7 +18,7 @@
             <param name="param1" type="String" mandatory="false" defvalue="String default value">
                 <issue creator=""/>
             </param>
-            <param name="param2" type="Integer" platform="param2 platform">
+            <param name="param2" type="Integer" platform="param2 platform" mandatory="true">
                 <description>Param2 description</description>
                 <todo>Param2 todo</todo>
                 <description/>
@@ -36,29 +36,29 @@
         <designdescription>dd</designdescription>
         <issue creator="c">Issue2</issue>
         <function name="Function1" messagetype="response" platform="">
-            <param name="p1" type="enum1"/>
+            <param name="p1" type="enum1" mandatory="true"/>
             <issue creator="c1"/>
-            <issue creator="c2"></issue>
-            <param name="p2" type="enum1" defvalue="element2"/>
-            <param name="p3" type="Boolean" defvalue="false">
+            <issue creator="c2"/>
+            <param name="p2" type="enum1" defvalue="element2" mandatory="true"/>
+            <param name="p3" type="Boolean" defvalue="false" mandatory="true">
                 <designdescription/>
             </param>
         </function>
         <struct name="struct2" platform="struct2 platform">
             <description>Description of struct2</description>
-            <param name="m1" type="String"/>
-            <param name="m2" type="String" maxlength="100" array="true" minsize="1" maxsize="50"/>
-            <param name="m3" type="enum1"/>
-            <param name="m4" type="struct1" array="true" maxsize="10"/>
+            <param name="m1" type="String" mandatory="true"/>
+            <param name="m2" type="String" maxlength="100" array="true" minsize="1" maxsize="50" mandatory="true"/>
+            <param name="m3" type="enum1" mandatory="true"/>
+            <param name="m4" type="struct1" array="true" maxsize="10" mandatory="true"/>
         </struct>
         <function name="Function2" messagetype="notification" platform="function2 platform">
             <description>Function2 description</description>
-            <param name="n1" type="enum1">
+            <param name="n1" type="enum1" mandatory="true">
                 <element name="element2"/>
                 <element name="element3"/>
                 <todo>n1 todo</todo>
             </param>
-            <param name="n2" type="enum1" array="true" minsize="1" maxsize="100">
+            <param name="n2" type="enum1" array="true" minsize="1" maxsize="100" mandatory="true">
                 <element name="element3"/>
                 <todo>n2 todo</todo>
                 <element name="element1"/>
@@ -79,22 +79,22 @@
             <element name="element3"/>
         </enum>
         <struct name="struct1">
-            <param name="m_1" type="enum1" minsize="1" maxsize="10" array="true"/>
-            <param name="m_2" type="enum2"/>
-            <param name="m_3" type="String" maxlength="20"/>
+            <param name="m_1" type="enum1" minsize="1" maxsize="10" array="true" mandatory="true"/>
+            <param name="m_2" type="enum2" mandatory="true"/>
+            <param name="m_3" type="String" maxlength="20" mandatory="true"/>
         </struct>
         <function name="Function1" messagetype="request">
             <param name="param1" type="enum1" mandatory="false"/>
-            <param name="param2" type="struct1" array="true" minsize="5" maxsize="25"/>
+            <param name="param2" type="struct1" array="true" minsize="5" maxsize="25" mandatory="true"/>
         </function>
         <todo>i2 todo</todo>
         <function name="Function1" messagetype="notification" platform="platform">
             <issue creator="c">Issue text</issue>
-            <param name="param" type="enum2">
+            <param name="param" type="enum2" mandatory="true">
                 <element name="element2"/>
                 <element name="element3"/>
             </param>
-            <param name="i1" type="interface1.struct2"/>
+            <param name="i1" type="interface1.struct2" mandatory="true"/>
         </function>
     </interface>
 </interfaces>
\ No newline at end of file
diff --git a/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV1.xml b/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV1.xml
index 37ebf39d3a..05a83c5834 100644
--- a/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV1.xml
+++ b/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <interface name="test_interface" attribute1="value1" attribute2="value2">
     <struct name="struct1">
-        <param name="member1" type="Integer">
+        <param name="member1" type="Integer" mandatory="true">
             <description>Param1 description</description>
         </param>
         <issue creator="creator1">Issue1</issue>
@@ -9,14 +9,14 @@
         <param name="member3" type="Float" maxvalue="20.5" mandatory="false"/>
         <description>Struct description</description>
         <issue creator="creator2">Issue2</issue>
-        <param name="member4" type="Integer" minvalue="11" maxvalue="100" array="true"/>
+        <param name="member4" type="Integer" minvalue="11" maxvalue="100" array="true" mandatory="true"/>
     </struct>
-    <function name="Function1" messagetype="request">
+    <function name="Function1" functionID="Function1_id" messagetype="request">
         <description>Description of request Function1</description>
         <param name="param1" type="String" mandatory="false" defvalue="String default value">
             <issue creator=""/>
         </param>
-        <param name="param2" type="Integer" platform="param2 platform">
+        <param name="param2" type="Integer" platform="param2 platform" mandatory="true">
             <description>Param2 description</description>
             <todo>Param2 todo</todo>
             <description/>
@@ -31,30 +31,30 @@
             <designdescription>Element design description</designdescription>
         </element>
     </enum>
-    <function name="Function1" messagetype="response" platform="">
-        <param name="p1" type="enum1"/>
+    <function name="Function1" functionID="Function1_id" messagetype="response" platform="">
+        <param name="p1" type="enum1" mandatory="true"/>
         <issue creator="c1"/>
-        <issue creator="c2"></issue>
-        <param name="p2" type="enum1" defvalue="element2"/>
-        <param name="p3" type="Boolean" defvalue="false">
+        <issue creator="c2"/>
+        <param name="p2" type="enum1" defvalue="element2" mandatory="true"/>
+        <param name="p3" type="Boolean" defvalue="false" mandatory="true">
             <designdescription/>
         </param>
     </function>
     <struct name="struct2" platform="struct2 platform">
         <description>Description of struct2</description>
-        <param name="m1" type="String"/>
-        <param name="m2" type="String" maxlength="100" array="true" minsize="1" maxsize="50"/>
-        <param name="m3" type="enum1"/>
-        <param name="m4" type="struct1" array="true" maxsize="10"/>
+        <param name="m1" type="String" mandatory="true"/>
+        <param name="m2" type="String" maxlength="100" array="true" minsize="1" maxsize="50" mandatory="true"/>
+        <param name="m3" type="enum1" mandatory="true"/>
+        <param name="m4" type="struct1" array="true" maxsize="10" mandatory="true"/>
     </struct>
-    <function name="Function2" messagetype="notification" platform="function2 platform">
+    <function name="Function2" functionID="Function2_id" messagetype="notification" platform="function2 platform">
         <description>Function2 description</description>
-        <param name="n1" type="enum1">
+        <param name="n1" type="enum1" mandatory="true">
             <element name="element2"/>
             <element name="element3"/>
             <todo>n1 todo</todo>
         </param>
-        <param name="n2" type="enum1" array="true" minsize="1" maxsize="100">
+        <param name="n2" type="enum1" array="true" minsize="1" maxsize="100" mandatory="true">
             <element name="element3"/>
             <todo>n2 todo</todo>
             <element name="element1"/>
diff --git a/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV2.xml b/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV2.xml
deleted file mode 100644
index cdc5f1ae85..0000000000
--- a/tools/InterfaceGenerator/test/generator/parsers/valid_SDLRPCV2.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<interface name="test_interface" attribute1="value1" attribute2="value2">
-    <enum name="FunctionID">
-        <description>Description string 1</description>
-        <element name="Function1_id" value="10">
-            <designdescription>Function1 element design description</designdescription>
-        </element>
-        <description>Description string 2</description>
-        <todo>Function id todo</todo>
-        <element name="Function2_id" internal_name="Function2_internal"/>
-    </enum>
-    <enum name="messageType">
-        <element name="request" value="0">
-            <todo>request todo 1</todo>
-            <issue creator="issue creator">request issue</issue>
-            <todo>request todo 2</todo>
-        </element>
-        <designdescription>messageType design description</designdescription>
-        <issue creator="messageType issue creator">Issue text</issue>
-        <element name="response" value="1"/>
-        <element name="notification" value="2"/>
-        <designdescription>messageType design description 2</designdescription>
-    </enum>
-    <struct name="struct1">
-        <param name="member1" type="Integer">
-            <description>Param1 description</description>
-        </param>
-        <issue creator="creator1">Issue1</issue>
-        <param name="member2" type="Boolean" mandatory="true" platform="member2 platform"/>
-        <param name="member3" type="Float" maxvalue="20.5" mandatory="false"/>
-        <description>Struct description</description>
-        <issue creator="creator2">Issue2</issue>
-        <param name="member4" type="Integer" minvalue="11" maxvalue="100" array="true"/>
-    </struct>
-    <function name="Function1" functionID="Function1_id" messagetype="request">
-        <description>Description of request Function1</description>
-        <param name="param1" type="String" mandatory="false" defvalue="String default value">
-            <issue creator=""/>
-        </param>
-        <param name="param2" type="Integer" platform="param2 platform">
-            <description>Param2 description</description>
-            <todo>Param2 todo</todo>
-            <description/>
-        </param>
-        <todo>Function1 request todo</todo>
-        <param name="param3" type="struct1" mandatory="false"/>
-    </function>
-    <enum name="enum1" internal_scope="scope" platform="enum1 platform">
-        <element name="element1" value="10"/>
-        <element name="element2" internal_name="element2_internal" value="11"/>
-        <element name="element3" platform="element3 platform">
-            <designdescription>Element design description</designdescription>
-        </element>
-    </enum>
-    <function name="Function1" functionID="Function1_id" messagetype="response" platform="">
-        <param name="p1" type="enum1"/>
-        <issue creator="c1"/>
-        <issue creator="c2"></issue>
-        <param name="p2" type="enum1" defvalue="element2"/>
-        <param name="p3" type="Boolean" defvalue="false">
-            <designdescription/>
-        </param>
-    </function>
-    <struct name="struct2" platform="struct2 platform">
-        <description>Description of struct2</description>
-        <param name="m1" type="String"/>
-        <param name="m2" type="String" maxlength="100" array="true" minsize="1" maxsize="50"/>
-        <param name="m3" type="enum1"/>
-        <param name="m4" type="struct1" array="true" maxsize="10"/>
-    </struct>
-    <function name="Function2" functionID="Function2_id" messagetype="notification" platform="function2 platform">
-        <description>Function2 description</description>
-        <param name="n1" type="enum1">
-            <element name="element2"/>
-            <element name="element3"/>
-            <todo>n1 todo</todo>
-        </param>
-        <param name="n2" type="enum1" array="true" minsize="1" maxsize="100">
-            <element name="element3"/>
-            <todo>n2 todo</todo>
-            <element name="element1"/>
-        </param>
-        <param name="n3" type="struct2" mandatory="false"/>
-    </function>
-</interface>
diff --git a/tools/InterfaceGenerator/test/generator/test_Model.py b/tools/InterfaceGenerator/test/generator/test_Model.py
deleted file mode 100755
index 55f6a54705..0000000000
--- a/tools/InterfaceGenerator/test/generator/test_Model.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""Interface model unit test"""
-import unittest
-
-import generator.Model
-
-
-class TestInterfaceModel(unittest.TestCase):
-
-    """Test for interface model."""
-
-    def test_enum_element_primary_name(self):
-        """Test property primary_name of EnumElement."""
-        element = generator.Model.EnumElement(name="name1")
-        self.assertEqual("name1", element.primary_name)
-
-        element = generator.Model.EnumElement(name="name2",
-                                              internal_name="internal_name1")
-        self.assertEqual("internal_name1", element.primary_name)
-
-        element.internal_name = None
-        self.assertEqual("name2", element.primary_name)
-
-        element.internal_name = "internal_name2"
-        self.assertEqual("internal_name2", element.primary_name)
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/tools/InterfaceGenerator/test/test_CodeFormatAndQuality.py b/tools/InterfaceGenerator/test/test_CodeFormatAndQuality.py
deleted file mode 100755
index 3ce56e0fae..0000000000
--- a/tools/InterfaceGenerator/test/test_CodeFormatAndQuality.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import subprocess
-import unittest
-import flake8.main
-import pep257
-import os.path
-import fnmatch
-import os
-import pylint.lint
-import sys
-
-class TestCodeFormatAndQuality(unittest.TestCase):
-
-    def setUp(self):
-        self.projectRootDir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-        projectTestsDir = os.path.join(self.projectRootDir, "test")
-        self.filesToAnalyze = []
-        for root, dirnames, filenames in os.walk(self.projectRootDir):
-            if root.startswith(projectTestsDir):
-                continue # Currently we skipping test files
-            for filename in fnmatch.filter(filenames, '*.py'):
-                fullFileName = os.path.join(root, filename)
-                relativeFileName = os.path.relpath(fullFileName, self.projectRootDir)
-                self.filesToAnalyze.append(relativeFileName)
-
-    def test_pep8_conformance(self):
-        maxCyclomaticComplexity = 10
-        errors = 0
-        for file in self.filesToAnalyze:
-            errors = errors + flake8.main.check_file(file, None, maxCyclomaticComplexity)
-
-        self.assertEqual(errors, 0, "Found code style errors or warnings.")
-
-    def test_pep257_conformance(self):
-        errors = []
-
-        for filePath in self.filesToAnalyze:
-            print("Processing file: {0}".format(filePath))
-            result = pep257.check_files([filePath])
-            if result:
-                errors.extend(result)
-                for error in result:
-                    print(error)
-                print
-        self.assertEqual(len(errors), 0, "Found Docstring Conventions violations.")
-
-    def test_pylint_conformance(self):
-        print
-        self.assertEqual(0,
-                         subprocess.call(
-                             ["pylint",
-                              '--rcfile=pylint.cfg',
-                              'generator',
-                              'Generator.py']
-                         ), "Found Pylint violations")
-        return
-
-if __name__ == '__main__':
-    unittest.main()
-
diff --git a/tools/cmake/helpers/generators.cmake b/tools/cmake/helpers/generators.cmake
index 64f7c1f670..1a5a4b8fa1 100644
--- a/tools/cmake/helpers/generators.cmake
+++ b/tools/cmake/helpers/generators.cmake
@@ -28,12 +28,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-find_package(PythonInterp REQUIRED)
+find_package(PythonInterp 3.5 REQUIRED)
 
 if(NOT PYTHONINTERP_FOUND)
   message(STATUS "Python interpreter is not found")
   message(STATUS "To install it type in the command line:")
-  message(STATUS "sudo apt-get install python")
+  message(STATUS "sudo apt-get install python3")
   message(FATAL_ERROR "Exiting!")
 endif(NOT PYTHONINTERP_FOUND)
 
@@ -41,6 +41,19 @@ set(INTEFRACE_GENERATOR "${CMAKE_SOURCE_DIR}/tools/InterfaceGenerator/Generator.
 set(INTEFRACE_GENERATOR_CMD ${PYTHON_EXECUTABLE} -B ${INTEFRACE_GENERATOR})
 file(GLOB_RECURSE INTERFACE_GENERATOR_DEPENDENCIES "${CMAKE_SOURCE_DIR}/tools/InterfaceGenerator/*.*")
 
+macro(generate_policy_types GENERATED_FILES
+                            ARG_FULL_XML_NAME
+                            ARG_NAMESPACE
+                            PARSER_TYPE)
+  add_custom_command(
+    OUTPUT ${GENERATED_FILES}
+    COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${ARG_FULL_XML_NAME}" "--namespace" "${ARG_NAMESPACE}" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "${PARSER_TYPE}" "-y"
+    DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${ARG_FULL_XML_NAME}
+    COMMENT "Generating files:\n\t${GENERATED_FILES}\nfrom:\n\t${ARG_FULL_XML_NAME}\n\
+    ${INTEFRACE_GENERATOR_CMD} --source-xml ${ARG_FULL_XML_NAME} --namespace ${ARG_NAMESPACE} --output-dir ${CMAKE_CURRENT_BINARY_DIR} --parser-type ${PARSER_TYPE}" -y
+    VERBATIM)
+endmacro()
+
 macro(generate_interface ARG_XML_NAME ARG_NAMESPACE PARSER_TYPE)
   string(REGEX MATCH "^[a-zA-Z_0-9]*[^.]" FILE_NAME ${ARG_XML_NAME})  # TODO: make expression more robust
 
@@ -54,7 +67,7 @@ macro(generate_interface ARG_XML_NAME ARG_NAMESPACE PARSER_TYPE)
 
   add_custom_command(
     OUTPUT ${HPP_FILE} ${CPP_FILE}
-    COMMAND ${INTEFRACE_GENERATOR_CMD} ${FULL_XML_NAME} ${ARG_NAMESPACE} ${CMAKE_CURRENT_BINARY_DIR} "--parser-type" "${PARSER_TYPE}"
+    COMMAND ${INTEFRACE_GENERATOR_CMD} "--source-xml" "${FULL_XML_NAME}" "--namespace" "${ARG_NAMESPACE}" "--output-dir" "${CMAKE_CURRENT_BINARY_DIR}" "--parser-type" "${PARSER_TYPE}" "-y"
     DEPENDS ${INTERFACE_GENERATOR_DEPENDENCIES} ${FULL_XML_NAME}
     COMMENT "Generating files:\n   ${HPP_FILE}\n   ${CPP_FILE}\nfrom:\n   ${FULL_XML_NAME} ..."
     VERBATIM
diff --git a/tools/intergen/test/generated_interface_json_tests.cc b/tools/intergen/test/generated_interface_json_tests.cc
index ee1db2167b..7601441707 100644
--- a/tools/intergen/test/generated_interface_json_tests.cc
+++ b/tools/intergen/test/generated_interface_json_tests.cc
@@ -35,7 +35,7 @@
 #include <test_rpc_interface/interface.h>
 #include <test_rpc_interface/functions.h>
 
-#include "json/reader.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "json/writer.h"
 #include "rpc_base/gtest_support.h"
 
@@ -52,23 +52,30 @@ public:
 
 class GeneratedInterfaceTests: public ::testing::Test {
  public:
+  GeneratedInterfaceTests(){
+    reader_ = std::unique_ptr<Json::CharReader>(reader_builder_.newCharReader());
+    writer_builder_.settings_["indentation"] = "";
+  }
+
   Json::Value JsonValue(const char* json) {
+    utils::JsonReader reader_;
     Json::Value value;
-    reader.parse(json, value);
+    reader_.parse(json, &value);
     return value;
   }
-  Json::Reader reader;
-  Json::FastWriter writer;
+
+  std::unique_ptr<Json::CharReader> reader_;
+  Json::CharReaderBuilder reader_builder_;
+  Json::StreamWriterBuilder writer_builder_;
 };
 
 TEST_F(GeneratedInterfaceTests, ScrollableMessageTest) {
-  const char* org_json = "{\"reason\":\"MASTER_RESET\"}\n";
+  const char* org_json = "{\"reason\":\"MASTER_RESET\"}";
   Value json_value = JsonValue(org_json);
   notification::OnAppInterfaceUnregistered oaiu(&json_value);
   ASSERT_TRUE(oaiu.is_initialized());
   ASSERT_RPCTYPE_VALID(oaiu);
-
-  std::string serialized = writer.write(oaiu.ToJsonValue());
+  const std::string serialized = Json::writeString(writer_builder_, oaiu.ToJsonValue());
   ASSERT_EQ(org_json, serialized);
 }
 
@@ -79,26 +86,26 @@ TEST_F(GeneratedInterfaceTests, FunctionWithoutParams) {
   oapt.mark_initialized();
   ASSERT_TRUE(oapt.is_initialized());
   ASSERT_RPCTYPE_VALID(oapt);
-  std::string serialized = writer.write(oapt.ToJsonValue());
-  ASSERT_EQ("{}\n", serialized);
+  const std::string serialized = Json::writeString(writer_builder_, oapt.ToJsonValue());
+  ASSERT_EQ("{}", serialized);
 }
 
 TEST_F(GeneratedInterfaceTests, DefValueTest) {
   const char* org_json = "{\"menuID\":2,\"menuName\":\"Hello\"}";
-  const char* awaited_json = "{\"menuID\":2,\"menuName\":\"Hello\",\"position\":1000}\n";
+  const char* awaited_json = "{\"menuID\":2,\"menuName\":\"Hello\",\"position\":1000}";
   Value json_value = JsonValue(org_json);
   request::AddSubMenu aasm(&json_value);
   ASSERT_TRUE(aasm.is_initialized());
   ASSERT_RPCTYPE_VALID(aasm);
   ASSERT_EQ(aasm.position, 1000);
 
-  std::string serialized = writer.write(aasm.ToJsonValue());
+  const std::string serialized = Json::writeString(writer_builder_, aasm.ToJsonValue());
   ASSERT_EQ(awaited_json, serialized);
 }
 
 TEST_F(GeneratedInterfaceTests, MapTest) {
   const char* expected_json =
-  "{\"choiceID\":1,\"menuName\":\"Menu name\",\"vrCommands\":{\"one\":\"First value\",\"two\":\"Second value\"}}\n";
+  "{\"choiceID\":1,\"menuName\":\"Menu name\",\"vrCommands\":{\"one\":\"First value\",\"two\":\"Second value\"}}";
 
   Choice choice;
   ASSERT_FALSE(choice.is_initialized());
@@ -110,20 +117,20 @@ TEST_F(GeneratedInterfaceTests, MapTest) {
   ASSERT_TRUE(choice.is_initialized());
   ASSERT_RPCTYPE_VALID(choice);
 
-  std::string serialized = writer.write(choice.ToJsonValue());
+  const std::string serialized = Json::writeString(writer_builder_, choice.ToJsonValue());
   ASSERT_EQ(expected_json, serialized);
 }
 
 TEST_F(GeneratedInterfaceTests, TypedefTest) {
   const char* expected_json =
-  "{\"optionalResArrMap\":{\"World\":[\"INVALID_DATA\"]},\"resArrMap\":{\"Hello\":[\"SUCCESS\"]}}\n";
+  "{\"optionalResArrMap\":{\"World\":[\"INVALID_DATA\"]},\"resArrMap\":{\"Hello\":[\"SUCCESS\"]}}";
 
   TdStruct ts;
   ts.resArrMap["Hello"].push_back(R_SUCCESS);
   (*ts.optionalResArrMap)["World"].push_back(R_INVALID_DATA);
   ASSERT_TRUE(ts.is_initialized());
   ASSERT_RPCTYPE_VALID(ts);
-  std::string serialized = writer.write(ts.ToJsonValue());
+  const std::string serialized = Json::writeString(writer_builder_, ts.ToJsonValue());
   ASSERT_EQ(expected_json, serialized);
 }
 
@@ -182,26 +189,26 @@ TEST_F(GeneratedInterfaceTests, TestNullableStructMember) {
 
 TEST_F(GeneratedInterfaceTests, TestNullableStructMemberNullInitializationFromJson) {
   const char* input_json =
-      "{\"nullableInt\":null}\n";
+      "{\"nullableInt\":null}";
   Value json_value = JsonValue(input_json);
   TestStructWithNullableParam with_nullable(&json_value);
   ASSERT_TRUE(with_nullable.is_initialized());
   ASSERT_RPCTYPE_VALID(with_nullable);
   ASSERT_TRUE(with_nullable.nullableInt.is_null());
-  std::string result = writer.write(with_nullable.ToJsonValue());
+  const std::string result = Json::writeString(writer_builder_, with_nullable.ToJsonValue());
   ASSERT_EQ(input_json, result);
 }
 
 TEST_F(GeneratedInterfaceTests, TestNullableStructMemberInitializationFromJson) {
   const char* input_json =
-      "{\"nullableInt\":3}\n";
+      "{\"nullableInt\":3}";
   Value json_value = JsonValue(input_json);
   TestStructWithNullableParam with_nullable(&json_value);
   ASSERT_TRUE(with_nullable.is_initialized());
   ASSERT_RPCTYPE_VALID(with_nullable);
   ASSERT_FALSE(with_nullable.nullableInt.is_null());
   ASSERT_EQ(3, with_nullable.nullableInt);
-  std::string result = writer.write(with_nullable.ToJsonValue());
+  const std::string result = Json::writeString(writer_builder_, with_nullable.ToJsonValue());
   ASSERT_EQ(input_json, result);
 }
 
@@ -211,15 +218,15 @@ TEST_F(GeneratedInterfaceTests, TestNullableEnumInitialization) {
   strct_with_nullable.nonNullableEnum = IT_STATIC;
   ASSERT_TRUE(strct_with_nullable.is_initialized());
   ASSERT_RPCTYPE_VALID(strct_with_nullable);
-  std::string result = writer.write(strct_with_nullable.ToJsonValue());
-  const char* awaited_json1 = "{\"nonNullableEnum\":\"STATIC\",\"nullableEnum\":\"DYNAMIC\"}\n";
+  std::string result = Json::writeString(writer_builder_, strct_with_nullable.ToJsonValue());
+  const char* awaited_json1 = "{\"nonNullableEnum\":\"STATIC\",\"nullableEnum\":\"DYNAMIC\"}";
   ASSERT_EQ(awaited_json1, result);
 
   strct_with_nullable.nullableEnum.set_to_null();
   ASSERT_TRUE(strct_with_nullable.is_initialized());
   ASSERT_RPCTYPE_VALID(strct_with_nullable);
-  result = writer.write(strct_with_nullable.ToJsonValue());
-  const char* awaited_json2 = "{\"nonNullableEnum\":\"STATIC\",\"nullableEnum\":null}\n";
+  result = Json::writeString(writer_builder_, strct_with_nullable.ToJsonValue());
+  const char* awaited_json2 = "{\"nonNullableEnum\":\"STATIC\",\"nullableEnum\":null}";
   ASSERT_EQ(awaited_json2, result);
 }
 
@@ -233,8 +240,8 @@ TEST_F(GeneratedInterfaceTests, TestStructWithNullableTypedef) {
   ASSERT_EQ(R_SUCCESS, swntd.nullableTdResult);
 
   swntd.nullableTdResult.set_to_null();
-  const char* awaited_json = "{\"nullableTdResult\":null}\n";
-  std::string result = writer.write(swntd.ToJsonValue());
+  const char* awaited_json = "{\"nullableTdResult\":null}";
+  const std::string result = Json::writeString(writer_builder_, swntd.ToJsonValue());
   ASSERT_EQ(awaited_json, result);
 }
 
@@ -247,8 +254,8 @@ TEST_F(GeneratedInterfaceTests, TestNullingStructWithNullableMapOfNullableInts)
   ASSERT_TRUE(nmoni.is_initialized());
   ASSERT_RPCTYPE_VALID(nmoni);
   ASSERT_TRUE(nmoni.nullableMap.is_null());
-  const char* awaited_json = "{\"nullableMap\":null}\n";
-  std::string result = writer.write(nmoni.ToJsonValue());
+  const char* awaited_json = "{\"nullableMap\":null}";
+  const std::string result = Json::writeString(writer_builder_, nmoni.ToJsonValue());
   ASSERT_EQ(awaited_json, result);
 }
 
@@ -263,8 +270,8 @@ TEST_F(GeneratedInterfaceTests, TestNullingValueInStructWithNullableMapOfNullabl
   ASSERT_RPCTYPE_VALID(nmoni);
   ASSERT_FALSE(nmoni.nullableMap.is_null());
   ASSERT_TRUE(nmoni.nullableMap["Hello"].is_null());
-  const char* awaited_json = "{\"nullableMap\":{\"Hello\":null}}\n";
-  std::string result = writer.write(nmoni.ToJsonValue());
+  const char* awaited_json = "{\"nullableMap\":{\"Hello\":null}}";
+  const std::string result = Json::writeString(writer_builder_, nmoni.ToJsonValue());
   ASSERT_EQ(awaited_json, result);
 }
 
@@ -303,8 +310,8 @@ TEST_F(GeneratedInterfaceTests, EmptyStructJsonTests) {
   e.mark_initialized();
   ASSERT_RPCTYPE_VALID(e);
   ASSERT_TRUE(e.is_initialized());
-  const char* expected_json = "{}\n";
-  ASSERT_EQ(expected_json, writer.write(e.ToJsonValue()));
+  const char* expected_json = "{}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, e.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithOptionalEmptyStructFieldJsonTest) {
@@ -314,8 +321,8 @@ TEST_F(GeneratedInterfaceTests, StructWithOptionalEmptyStructFieldJsonTest) {
   oe.mark_initialized();
   ASSERT_RPCTYPE_VALID(oe);
   ASSERT_TRUE(oe.is_initialized());
-  const char* expected_json = "{}\n";
-  ASSERT_EQ(expected_json, writer.write(oe.ToJsonValue()));
+  const char* expected_json = "{}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, oe.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithMandatoryEmptyStructFieldJsonTest) {
@@ -325,8 +332,8 @@ TEST_F(GeneratedInterfaceTests, StructWithMandatoryEmptyStructFieldJsonTest) {
   me.emptyOne.mark_initialized();
   ASSERT_RPCTYPE_VALID(me);
   ASSERT_TRUE(me.is_initialized());
-  const char* expected_json = "{\"emptyOne\":{}}\n";
-  ASSERT_EQ(expected_json, writer.write(me.ToJsonValue()));
+  const char* expected_json = "{\"emptyOne\":{}}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, me.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithOneOptionalIntFieldTest) {
@@ -350,18 +357,18 @@ TEST_F(GeneratedInterfaceTests, StructWithOneOptionalIntFieldJsonTest) {
   ASSERT_FALSE(soo.is_valid());
   ASSERT_FALSE(soo.is_initialized());
   soo.mark_initialized();
-  const char* expected_json = "{}\n";
-  ASSERT_EQ(expected_json, writer.write(soo.ToJsonValue()));
+  const char* expected_json = "{}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, soo.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithOneInitializedOptionalIntFieldJsonTest) {
-  const char* input_json = "{\"optionalInt\":11}\n";
+  const char* input_json = "{\"optionalInt\":11}";
   Json::Value json_value = JsonValue(input_json);
   StructWithOneOptionalIntField soo(&json_value);
   ASSERT_RPCTYPE_VALID(soo);
   ASSERT_TRUE(soo.is_initialized());
   ASSERT_EQ(11, *soo.optionalInt);
-  ASSERT_EQ(input_json, writer.write(soo.ToJsonValue()));
+  ASSERT_EQ(input_json, Json::writeString(writer_builder_, soo.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithFieldOfStructThatMightBeEmptyTest) {
@@ -384,18 +391,18 @@ TEST_F(GeneratedInterfaceTests, StructWithFieldOfStructThatMightBeEmptyJsonNoVal
   ASSERT_FALSE(sfme.struct_empty());
   ASSERT_RPCTYPE_VALID(sfme);
   ASSERT_TRUE(sfme.is_initialized());
-  const char* expcected_json = "{\"fieldThatMightBeEmpty\":{}}\n";
-  ASSERT_EQ(expcected_json, writer.write(sfme.ToJsonValue()));
+  const char* expcected_json = "{\"fieldThatMightBeEmpty\":{}}";
+  ASSERT_EQ(expcected_json, Json::writeString(writer_builder_, sfme.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithFieldOfStructThatMightBeEmptyJsonHasValueTest) {
-  const char* input_json = "{\"fieldThatMightBeEmpty\":{\"optionalInt\":12}}\n";
+  const char* input_json = "{\"fieldThatMightBeEmpty\":{\"optionalInt\":12}}";
   Json::Value json_value = JsonValue(input_json);
   StructWithFieldOfStructThatMightBeEmpty sfme(&json_value);
   ASSERT_RPCTYPE_VALID(sfme);
   ASSERT_TRUE(sfme.is_initialized());
   ASSERT_EQ(12, *sfme.fieldThatMightBeEmpty.optionalInt);
-  ASSERT_EQ(input_json, writer.write(sfme.ToJsonValue()));
+  ASSERT_EQ(input_json, Json::writeString(writer_builder_, sfme.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithFieldOfOptionalMapTest) {
@@ -418,8 +425,8 @@ TEST_F(GeneratedInterfaceTests, StructWithFieldOfOptionalMapToJsonTest) {
   ASSERT_TRUE(snom.struct_empty());
   ASSERT_RPCTYPE_VALID(snom);
   ASSERT_TRUE(snom.is_initialized());
-  const char* expected_json = "{}\n";
-  ASSERT_EQ(expected_json, writer.write(snom.ToJsonValue()));
+  const char* expected_json = "{}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, snom.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithFieldOfOptionalMapNulledToJsonTest) {
@@ -431,64 +438,64 @@ TEST_F(GeneratedInterfaceTests, StructWithFieldOfOptionalMapNulledToJsonTest) {
   ASSERT_FALSE(snom.struct_empty());
   ASSERT_RPCTYPE_VALID(snom);
   ASSERT_TRUE(snom.is_initialized());
-  const char* expected_json = "{\"nullableOptionalIntMap\":null}\n";
-  ASSERT_EQ(expected_json, writer.write(snom.ToJsonValue()));
+  const char* expected_json = "{\"nullableOptionalIntMap\":null}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, snom.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithFieldOfOptionalMapNulledInJsonTest) {
-  const char* input_json = "{\"nullableOptionalIntMap\":null}\n";
+  const char* input_json = "{\"nullableOptionalIntMap\":null}";
   Json::Value json_value = JsonValue(input_json);
   StructWithNullableOptionalMap snom(&json_value);
   ASSERT_RPCTYPE_VALID(snom);
   ASSERT_TRUE(snom.is_initialized());
   ASSERT_TRUE(snom.nullableOptionalIntMap->is_null());
-  ASSERT_EQ(input_json, writer.write(snom.ToJsonValue()));
+  ASSERT_EQ(input_json, Json::writeString(writer_builder_, snom.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithFieldOfOptionalMapInitializedInJsonTest) {
-  const char* input_json = "{\"nullableOptionalIntMap\":{\"Hello\":2}}\n";
+  const char* input_json = "{\"nullableOptionalIntMap\":{\"Hello\":2}}";
   Json::Value json_value = JsonValue(input_json);
   StructWithNullableOptionalMap snom(&json_value);
   ASSERT_RPCTYPE_VALID(snom);
   ASSERT_TRUE(snom.is_initialized());
   ASSERT_FALSE(snom.nullableOptionalIntMap->is_null());
-  ASSERT_EQ(input_json, writer.write(snom.ToJsonValue()));
+  ASSERT_EQ(input_json, Json::writeString(writer_builder_, snom.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithOptionalArrayTest) {
-  const char* expected_json = "{}\n";
+  const char* expected_json = "{}";
   StructWithOptionalIntArray soia;
   ASSERT_TRUE(soia.struct_empty());
   ASSERT_FALSE(soia.is_valid());
   ASSERT_FALSE(soia.is_initialized());
   soia.mark_initialized();
-  ASSERT_EQ(expected_json, writer.write(soia.ToJsonValue()));
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, soia.ToJsonValue()));
   (*soia.optionalIntArray).push_back(2);
   ASSERT_RPCTYPE_VALID(soia);
   ASSERT_TRUE(soia.is_initialized());
-  const char* expected_json2 = "{\"optionalIntArray\":[2]}\n";
-  ASSERT_EQ(expected_json2, writer.write(soia.ToJsonValue()));
+  const char* expected_json2 = "{\"optionalIntArray\":[2]}";
+  ASSERT_EQ(expected_json2, Json::writeString(writer_builder_, soia.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithMandatoryArrayTest) {
-  const char* expected_json = "{\"mandatoryIntArray\":[]}\n";
+  const char* expected_json = "{\"mandatoryIntArray\":[]}";
   StructWithMandatoryIntArray smia;
   ASSERT_FALSE(smia.is_valid());
   ASSERT_FALSE(smia.is_initialized());
   smia.mandatoryIntArray.mark_initialized();
   ASSERT_RPCTYPE_VALID(smia);
   ASSERT_TRUE(smia.is_initialized());
-  ASSERT_EQ(expected_json, writer.write(smia.ToJsonValue()));
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, smia.ToJsonValue()));
 
   smia.mandatoryIntArray.push_back(3);
   ASSERT_RPCTYPE_VALID(smia);
   ASSERT_TRUE(smia.is_initialized());
-  const char* expected_json2 = "{\"mandatoryIntArray\":[3]}\n";
-  ASSERT_EQ(expected_json2, writer.write(smia.ToJsonValue()));
+  const char* expected_json2 = "{\"mandatoryIntArray\":[3]}";
+  ASSERT_EQ(expected_json2, Json::writeString(writer_builder_, smia.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithOptionalMapTest) {
-  const char* expected_json = "{}\n";
+  const char* expected_json = "{}";
   StructWithOptionalIntMap soim;
   ASSERT_TRUE(soim.struct_empty());
   ASSERT_FALSE(soim.is_valid());
@@ -497,32 +504,32 @@ TEST_F(GeneratedInterfaceTests, StructWithOptionalMapTest) {
   ASSERT_TRUE(soim.struct_empty());
   ASSERT_RPCTYPE_VALID(soim);
   ASSERT_TRUE(soim.is_initialized());
-  ASSERT_EQ(expected_json, writer.write(soim.ToJsonValue()));
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, soim.ToJsonValue()));
   (*soim.optionalIntMap)["Yay"] = 2;
   ASSERT_RPCTYPE_VALID(soim);
   ASSERT_TRUE(soim.is_initialized());
-  const char* expected_json2 = "{\"optionalIntMap\":{\"Yay\":2}}\n";
-  ASSERT_EQ(expected_json2, writer.write(soim.ToJsonValue()));
+  const char* expected_json2 = "{\"optionalIntMap\":{\"Yay\":2}}";
+  ASSERT_EQ(expected_json2, Json::writeString(writer_builder_, soim.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithMandatoryMapTest) {
-  const char* expected_json = "{\"mandatoryIntMap\":{}}\n";
+  const char* expected_json = "{\"mandatoryIntMap\":{}}";
   StructWithMandatoryIntMap smim;
   ASSERT_FALSE(smim.is_valid());
   ASSERT_FALSE(smim.is_initialized());
   smim.mandatoryIntMap.mark_initialized();
   ASSERT_RPCTYPE_VALID(smim);
   ASSERT_TRUE(smim.is_initialized());
-  ASSERT_EQ(expected_json, writer.write(smim.ToJsonValue()));
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, smim.ToJsonValue()));
   smim.mandatoryIntMap["Yay"] = 2;
   ASSERT_RPCTYPE_VALID(smim);
   ASSERT_TRUE(smim.is_initialized());
-  const char* expected_json2 = "{\"mandatoryIntMap\":{\"Yay\":2}}\n";
-  ASSERT_EQ(expected_json2, writer.write(smim.ToJsonValue()));
+  const char* expected_json2 = "{\"mandatoryIntMap\":{\"Yay\":2}}";
+  ASSERT_EQ(expected_json2, Json::writeString(writer_builder_, smim.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, StructWithMandatoryMapInitFromWrongJsonTest) {
-  const char* empty_json = "{}\n";
+  const char* empty_json = "{}";
   Json::Value json_value = JsonValue(empty_json);
 
   StructWithMandatoryIntMap smim(&json_value);
@@ -535,8 +542,8 @@ TEST_F(GeneratedInterfaceTests, StructWithMandatoryMapInitFromWrongJsonTest) {
   ASSERT_FALSE(smim.struct_empty());
   ASSERT_RPCTYPE_VALID(smim);
   ASSERT_TRUE(smim.is_initialized());
-  const char* expected_json = "{\"mandatoryIntMap\":{\"Yay\":2}}\n";
-  ASSERT_EQ(expected_json, writer.write(smim.ToJsonValue()));
+  const char* expected_json = "{\"mandatoryIntMap\":{\"Yay\":2}}";
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, smim.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, ReportIncorrectlyInitializedMap1) {
@@ -584,7 +591,7 @@ TEST_F(GeneratedInterfaceTests, TestFrankenstructCreation) {
 }
 
 TEST_F(GeneratedInterfaceTests, FrankenstructToJson) {
-  const char* expected_json = "{\"hello\":\"str\",\"mandatoryInt\":2}\n";
+  const char* expected_json = "{\"hello\":\"str\",\"mandatoryInt\":2}";
   FrankenstructOfEmptyStringWithMandatoryInt fbmi;
   fbmi.mandatoryInt = 2;
   fbmi["hello"] = "str";
@@ -592,12 +599,11 @@ TEST_F(GeneratedInterfaceTests, FrankenstructToJson) {
   ASSERT_RPCTYPE_VALID(fbmi);
   ASSERT_FALSE(fbmi.empty());
   ASSERT_FALSE(fbmi.struct_empty());
-  ASSERT_EQ(expected_json,
-            writer.write(fbmi.ToJsonValue()));
+  ASSERT_EQ(expected_json, Json::writeString(writer_builder_, fbmi.ToJsonValue()));
 }
 
 TEST_F(GeneratedInterfaceTests, FrankenstructFromJson) {
-  const char* input_json = "{\"hello\":\"str\",\"mandatoryInt\":2}\n";
+  const char* input_json = "{\"hello\":\"str\",\"mandatoryInt\":2}";
   Json::Value json_value = JsonValue(input_json);
   FrankenstructOfEmptyStringWithMandatoryInt fbmi(&json_value);
   ASSERT_TRUE(fbmi.is_initialized());
@@ -610,7 +616,7 @@ TEST_F(GeneratedInterfaceTests, FrankenstructFromJson) {
 }
 
 TEST_F(GeneratedInterfaceTests, FrankenstructFromInvalidJson) {
-  const char* input_json = "{\"hello\":true,\"mandatoryInt\":2}\n";
+  const char* input_json = "{\"hello\":true,\"mandatoryInt\":2}";
   Json::Value json_value = JsonValue(input_json);
   FrankenstructOfEmptyStringWithMandatoryInt fbmi(&json_value);
   ASSERT_TRUE(fbmi.is_initialized());
diff --git a/tools/policy_table_validator/CMakeLists.txt b/tools/policy_table_validator/CMakeLists.txt
index eabe4cfd5c..6b9f26f01a 100644
--- a/tools/policy_table_validator/CMakeLists.txt
+++ b/tools/policy_table_validator/CMakeLists.txt
@@ -3,14 +3,18 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/components/rpc_base/include/
   ${CMAKE_SOURCE_DIR}/src/components/utils/include/
-	${JSONCPP_INCLUDE_DIRECTORY}
+  ${COMPONENTS_DIR}/smart_objects/include/
+  ${JSONCPP_INCLUDE_DIRECTORY}
+  ${BOOST_INCLUDE_DIR}
 )
 
 message(STATUS "Using ${EXTENDED_POLICY} policy mode")
 if (${EXTENDED_POLICY} STREQUAL "EXTERNAL_PROPRIETARY")
   include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_external/include/)
+  include_directories(${CMAKE_BINARY_DIR}/src/components/policy/policy_external/)
 else()
   include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_regular/include/)
+  include_directories(${CMAKE_BINARY_DIR}/src/components/policy/policy_regular/)
 endif()
 
 link_directories (
diff --git a/tools/policy_table_validator/main.cpp b/tools/policy_table_validator/main.cpp
index 99a4b7d7f9..80c5e2eddc 100644
--- a/tools/policy_table_validator/main.cpp
+++ b/tools/policy_table_validator/main.cpp
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include "policy/policy_table/types.h"
 
-#include "json/reader.h"
+#include "utils/jsoncpp_reader_wrapper.h"
 #include "utils/file_system.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
@@ -59,12 +59,11 @@ int main(int argc, char** argv) {
     exit(READ_ERROR);
   }
 
-  Json::Reader reader;
+  utils::JsonReader  reader;
   Json::Value value;
+  bool parse_result = reader.parse(json_string, &value);
 
-  bool parce_result = reader.parse(json_string, value);
-  if (false == parce_result) {
-    std::cout << "Json parce fails" << std::endl;
+  if (false == parse_result) {
     exit(PARSE_ERROR);
   }
   std::cout << "DEFAULT_POLICY" << std::endl;
diff --git a/tools/rpc_spec b/tools/rpc_spec
new file mode 160000
+Subproject 53e3dfb3cd7ff75a3425312ae4aeb758a1e0fc5